Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ fun SettingsScreen(
SectionHeader(title = "Account")
if (isLoggedIn) {
ListItem(
headlineContent = { Text("Log out") },
supportingContent = { Text(loggedInAccountText(username)) },
leadingContent = {
Icon(
Expand All @@ -98,10 +97,9 @@ fun SettingsScreen(
)
},
modifier = Modifier.clickable(onClick = onLogout),
)
) { Text("Log out") }
} else {
ListItem(
headlineContent = { Text("Log in with lobste.rs") },
supportingContent = { Text("Sign in to your lobste.rs account") },
leadingContent = {
Icon(
Expand All @@ -111,14 +109,13 @@ fun SettingsScreen(
)
},
modifier = Modifier.clickable(onClick = openLoginScreen),
)
) { Text("Log in with lobste.rs") }
}
Spacer(modifier = Modifier.height(24.dp))

// Data Management Section
SectionHeader(title = stringResource(R.string.data_management))
ListItem(
headlineContent = { Text(stringResource(R.string.data_transfer)) },
supportingContent = { Text(stringResource(R.string.import_and_export_your_saved_posts)) },
leadingContent = {
Icon(
Expand All @@ -139,14 +136,13 @@ fun SettingsScreen(
)
}
},
)
) { Text(stringResource(R.string.data_transfer)) }

Spacer(modifier = Modifier.height(24.dp))

// App Information Section
SectionHeader(title = stringResource(R.string.app_information))
ListItem(
headlineContent = { Text(stringResource(R.string.version)) },
supportingContent = {
Text(
stringResource(
Expand All @@ -163,9 +159,8 @@ fun SettingsScreen(
modifier = Modifier.height(32.dp),
)
},
)
) { Text(stringResource(R.string.version)) }
ListItem(
headlineContent = { Text(stringResource(R.string.saved_posts)) },
supportingContent = { Text(stringResource(R.string.posts_saved_locally, savedPostsCount)) },
leadingContent = {
Icon(
Expand All @@ -174,9 +169,8 @@ fun SettingsScreen(
modifier = Modifier.height(32.dp),
)
},
)
) { Text(stringResource(R.string.saved_posts)) }
ListItem(
headlineContent = { Text(stringResource(R.string.tag_filtering)) },
supportingContent = { Text(stringResource(R.string.filter_posts_by_tags)) },
leadingContent = {
Icon(
Expand All @@ -186,14 +180,13 @@ fun SettingsScreen(
)
},
modifier = Modifier.clickable(onClick = openTagFiltering),
)
) { Text(stringResource(R.string.tag_filtering)) }

Spacer(modifier = Modifier.height(24.dp))

// About Section
SectionHeader(title = stringResource(R.string.about))
ListItem(
headlineContent = { Text(stringResource(R.string.libraries)) },
supportingContent = {
Text(stringResource(R.string.view_open_source_libraries_used_in_this_))
},
Expand All @@ -205,9 +198,8 @@ fun SettingsScreen(
)
},
modifier = Modifier.clickable(onClick = openLibrariesScreen),
)
) { Text(stringResource(R.string.libraries)) }
ListItem(
headlineContent = { Text(stringResource(R.string.source_code)) },
supportingContent = { Text(stringResource(R.string.view_the_source_code_on_github)) },
leadingContent = {
Icon(
Expand All @@ -217,7 +209,7 @@ fun SettingsScreen(
)
},
modifier = Modifier.clickable(onClick = openRepository),
)
) { Text(stringResource(R.string.source_code)) }
}
}

Expand Down
20 changes: 10 additions & 10 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ androidx-test = "1.7.0"
annotation = "1.10.0"
coil3 = "3.5.0"
collection = "1.6.0"
compose-animation = "1.11.3"
compose-foundation = "1.11.3"
compose-animation = "1.11.4"
compose-foundation = "1.11.4"
compose-icons = "1.7.8"
compose-material3 = "1.5.0-alpha22"
compose-runtime = "1.11.3"
benchmark = "1.5.0-alpha06"
compose-ui = "1.11.3"
compose-material3 = "1.5.0-alpha23"
compose-runtime = "1.11.4"
benchmark = "1.5.0-alpha07"
compose-ui = "1.11.4"
coroutines = "1.11.0"
eithernet = "2.0.0"
glance = "1.2.0-rc01"
Expand All @@ -23,15 +23,15 @@ kotlinResult = "2.3.1"
lifecycle = "2.11.0"
metro = "1.3.0"
monitor = "1.9.0-alpha01"
navigation3 = "1.2.0-alpha04"
navigation3 = "1.2.0-alpha05"
navigation3-material = "1.3.0-rc01"
paging = "3.5.0"
retrofit = "3.0.0"
runtimeSaveable = "1.11.3"
runtimeSaveable = "1.11.4"
sentry = "8.46.0"
serialization = "1.11.0"
sqldelight = "2.3.2"
sqlite = "2.7.0-rc01"
sqlite = "2.7.0"
tracing-perfetto = "1.0.1"
workmanager = "2.11.2"
zipline = "1.27.0"
Expand Down Expand Up @@ -92,7 +92,7 @@ androidx-test-core = { module = "androidx.test:core", version.ref = "androidx-te
androidx-test-ext-junit = "androidx.test.ext:junit:1.3.0"
androidx-test-rules = { module = "androidx.test:rules", version.ref = "androidx-test" }
androidx-test-runner = { module = "androidx.test:runner", version.ref = "androidx-test" }
androidx-test-uiautomator = "androidx.test.uiautomator:uiautomator:2.4.0-rc01"
androidx-test-uiautomator = "androidx.test.uiautomator:uiautomator:2.4.0"
androidx-tracing-perfetto = { module = "androidx.tracing:tracing-perfetto", version.ref = "tracing-perfetto" }
androidx-tracing-perfetto-binary = { module = "androidx.tracing:tracing-perfetto-binary", version.ref = "tracing-perfetto" }
androidx-work-runtime = { module = "androidx.work:work-runtime", version.ref = "workmanager" }
Expand Down
Loading