Skip to content

Commit dae3d7c

Browse files
authored
Fix deprecated Material3 ListItem usage in SettingsScreen
1 parent 93f5ceb commit dae3d7c

1 file changed

Lines changed: 8 additions & 16 deletions

File tree

android/src/main/kotlin/dev/msfjarvis/claw/android/ui/screens/SettingsScreen.kt

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ fun SettingsScreen(
8888
SectionHeader(title = "Account")
8989
if (isLoggedIn) {
9090
ListItem(
91-
headlineContent = { Text("Log out") },
9291
supportingContent = { Text(loggedInAccountText(username)) },
9392
leadingContent = {
9493
Icon(
@@ -98,10 +97,9 @@ fun SettingsScreen(
9897
)
9998
},
10099
modifier = Modifier.clickable(onClick = onLogout),
101-
)
100+
) { Text("Log out") }
102101
} else {
103102
ListItem(
104-
headlineContent = { Text("Log in with lobste.rs") },
105103
supportingContent = { Text("Sign in to your lobste.rs account") },
106104
leadingContent = {
107105
Icon(
@@ -111,14 +109,13 @@ fun SettingsScreen(
111109
)
112110
},
113111
modifier = Modifier.clickable(onClick = openLoginScreen),
114-
)
112+
) { Text("Log in with lobste.rs") }
115113
}
116114
Spacer(modifier = Modifier.height(24.dp))
117115

118116
// Data Management Section
119117
SectionHeader(title = stringResource(R.string.data_management))
120118
ListItem(
121-
headlineContent = { Text(stringResource(R.string.data_transfer)) },
122119
supportingContent = { Text(stringResource(R.string.import_and_export_your_saved_posts)) },
123120
leadingContent = {
124121
Icon(
@@ -139,14 +136,13 @@ fun SettingsScreen(
139136
)
140137
}
141138
},
142-
)
139+
) { Text(stringResource(R.string.data_transfer)) }
143140

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

146143
// App Information Section
147144
SectionHeader(title = stringResource(R.string.app_information))
148145
ListItem(
149-
headlineContent = { Text(stringResource(R.string.version)) },
150146
supportingContent = {
151147
Text(
152148
stringResource(
@@ -163,9 +159,8 @@ fun SettingsScreen(
163159
modifier = Modifier.height(32.dp),
164160
)
165161
},
166-
)
162+
) { Text(stringResource(R.string.version)) }
167163
ListItem(
168-
headlineContent = { Text(stringResource(R.string.saved_posts)) },
169164
supportingContent = { Text(stringResource(R.string.posts_saved_locally, savedPostsCount)) },
170165
leadingContent = {
171166
Icon(
@@ -174,9 +169,8 @@ fun SettingsScreen(
174169
modifier = Modifier.height(32.dp),
175170
)
176171
},
177-
)
172+
) { Text(stringResource(R.string.saved_posts)) }
178173
ListItem(
179-
headlineContent = { Text(stringResource(R.string.tag_filtering)) },
180174
supportingContent = { Text(stringResource(R.string.filter_posts_by_tags)) },
181175
leadingContent = {
182176
Icon(
@@ -186,14 +180,13 @@ fun SettingsScreen(
186180
)
187181
},
188182
modifier = Modifier.clickable(onClick = openTagFiltering),
189-
)
183+
) { Text(stringResource(R.string.tag_filtering)) }
190184

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

193187
// About Section
194188
SectionHeader(title = stringResource(R.string.about))
195189
ListItem(
196-
headlineContent = { Text(stringResource(R.string.libraries)) },
197190
supportingContent = {
198191
Text(stringResource(R.string.view_open_source_libraries_used_in_this_))
199192
},
@@ -205,9 +198,8 @@ fun SettingsScreen(
205198
)
206199
},
207200
modifier = Modifier.clickable(onClick = openLibrariesScreen),
208-
)
201+
) { Text(stringResource(R.string.libraries)) }
209202
ListItem(
210-
headlineContent = { Text(stringResource(R.string.source_code)) },
211203
supportingContent = { Text(stringResource(R.string.view_the_source_code_on_github)) },
212204
leadingContent = {
213205
Icon(
@@ -217,7 +209,7 @@ fun SettingsScreen(
217209
)
218210
},
219211
modifier = Modifier.clickable(onClick = openRepository),
220-
)
212+
) { Text(stringResource(R.string.source_code)) }
221213
}
222214
}
223215

0 commit comments

Comments
 (0)