Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make nav text smaller #1201

Merged
merged 2 commits into from
Aug 29, 2023
Merged

Make nav text smaller #1201

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6bc42d3
Make nav text smaller
MV-GH Aug 26, 2023
2e93452
Center text
MV-GH Aug 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion app/src/main/java/com/jerboa/ui/components/common/AppBars.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,11 @@ import androidx.compose.ui.platform.testTag
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.font.FontStyle
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.TextUnit
import androidx.compose.ui.unit.TextUnitType
import androidx.compose.ui.unit.dp
import com.jerboa.R
import com.jerboa.datatypes.samplePerson
Expand Down Expand Up @@ -131,6 +134,8 @@ fun BottomAppBarAll(
label = {
if (showTextDescriptionsInNavbar) {
Text(
textAlign = TextAlign.Center,
fontSize = TextUnit(10f, TextUnitType.Sp),
text = stringResource(tab.textId),
color = MaterialTheme.colorScheme.onSurface,
)
Expand Down Expand Up @@ -627,7 +632,10 @@ fun LoadingBar(
padding: PaddingValues = PaddingValues(0.dp),
) {
LinearProgressIndicator(
modifier = Modifier.fillMaxWidth().padding(padding).testTag("jerboa:loading"),
modifier = Modifier
.fillMaxWidth()
.padding(padding)
.testTag("jerboa:loading"),
)
}

Expand Down