Skip to content

Commit 2a96619

Browse files
authored
Fix the About page edge-to-edge status bar issue (#3529)
1 parent be51865 commit 2a96619

File tree

1 file changed

+122
-121
lines changed
  • modules/features/settings/src/main/java/au/com/shiftyjelly/pocketcasts/settings/about

1 file changed

+122
-121
lines changed

modules/features/settings/src/main/java/au/com/shiftyjelly/pocketcasts/settings/about/AboutFragment.kt

Lines changed: 122 additions & 121 deletions
Original file line numberDiff line numberDiff line change
@@ -212,136 +212,137 @@ private fun AboutPage(
212212
openFragment: (Fragment) -> Unit,
213213
) {
214214
val context = LocalContext.current
215-
LazyColumn(
216-
horizontalAlignment = Alignment.CenterHorizontally,
215+
Column(
217216
modifier = Modifier
218217
.background(MaterialTheme.theme.colors.primaryUi02),
219-
contentPadding = PaddingValues(bottom = bottomInset),
220218
) {
221-
item {
222-
ThemedTopAppBar(
223-
title = stringResource(LR.string.settings_title_about),
224-
onNavigationClick = onBackPressed,
225-
)
226-
}
227-
item {
228-
Image(
229-
painter = painterResource(context.getThemeDrawable(UR.attr.logo_title_vertical)),
230-
contentDescription = stringResource(LR.string.settings_app_icon),
231-
modifier = Modifier.padding(top = 56.dp),
232-
)
233-
}
234-
item {
235-
Text(
236-
text = stringResource(LR.string.settings_version, BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE.toString()),
237-
style = MaterialTheme.typography.body1,
238-
modifier = Modifier.padding(top = 8.dp),
239-
textAlign = TextAlign.Center,
240-
color = MaterialTheme.theme.colors.primaryText02,
241-
)
242-
}
243-
item {
244-
HorizontalDivider(
245-
modifier = Modifier.padding(top = 56.dp, bottom = 8.dp),
246-
)
247-
}
248-
item {
249-
RowTextButton(
250-
text = stringResource(LR.string.settings_about_rate_us),
251-
onClick = {
252-
onRateUsTapped()
253-
rateUs(context)
254-
},
255-
)
256-
}
257-
item {
258-
RowTextButton(
259-
text = stringResource(LR.string.settings_about_share_with_friends),
260-
onClick = {
261-
onShareWithFriendsTapped()
262-
shareWithFriends(context)
263-
},
264-
)
265-
}
266-
item {
267-
HorizontalDivider(modifier = Modifier.padding(vertical = 8.dp))
268-
}
269-
item {
270-
RowTextButton(
271-
text = stringResource(LR.string.settings_about_website),
272-
secondaryText = "pocketcasts.com",
273-
onClick = {
274-
onWebsiteTapped()
275-
openUrl("https://www.pocketcasts.com", context)
276-
},
277-
)
278-
}
279-
item {
280-
RowTextButton(
281-
text = stringResource(LR.string.settings_about_instagram),
282-
secondaryText = "@pocketcasts",
283-
onClick = {
284-
onInstagramTapped()
285-
openUrl("https://www.instagram.com/pocketcasts/", context)
286-
},
287-
)
288-
}
289-
item {
290-
RowTextButton(
291-
text = stringResource(LR.string.settings_about_x),
292-
secondaryText = "@pocketcasts",
293-
onClick = {
294-
onXTapped()
295-
openUrl("https://x.com/pocketcasts", context)
296-
},
297-
)
298-
}
299-
item {
300-
HorizontalDivider(modifier = Modifier.padding(vertical = 8.dp))
301-
}
302-
item {
303-
AutomatticFamilyRow(onAutomatticFamilyTapped = onAutomatticFamilyTapped)
304-
}
305-
item {
306-
HorizontalDivider(modifier = Modifier.padding(bottom = 8.dp))
307-
}
308-
item {
309-
LegalAndMoreRow(onTermsOfServiceTapped, onPrivacyPolicyTapped, openFragment)
310-
}
311-
item {
312-
HorizontalDivider(modifier = Modifier.padding(vertical = 8.dp))
313-
}
314-
item {
315-
Column(
316-
modifier = Modifier
317-
.clickable {
318-
onWorkWithUsTapped()
319-
openUrl("https://automattic.com/work-with-us/", context)
320-
}
321-
.fillMaxWidth()
322-
.padding(all = 14.dp),
323-
) {
324-
Text(
325-
text = stringResource(LR.string.settings_about_work_with_us),
326-
fontSize = 17.sp,
327-
color = MaterialTheme.theme.colors.primaryText01,
219+
ThemedTopAppBar(
220+
title = stringResource(LR.string.settings_title_about),
221+
onNavigationClick = onBackPressed,
222+
)
223+
LazyColumn(
224+
horizontalAlignment = Alignment.CenterHorizontally,
225+
contentPadding = PaddingValues(bottom = bottomInset),
226+
) {
227+
item {
228+
Image(
229+
painter = painterResource(context.getThemeDrawable(UR.attr.logo_title_vertical)),
230+
contentDescription = stringResource(LR.string.settings_app_icon),
231+
modifier = Modifier.padding(top = 56.dp),
328232
)
233+
}
234+
item {
329235
Text(
330-
text = stringResource(LR.string.settings_about_work_from_anywhere),
331-
fontSize = 14.sp,
236+
text = stringResource(LR.string.settings_version, BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE.toString()),
332237
style = MaterialTheme.typography.body1,
238+
modifier = Modifier.padding(top = 8.dp),
239+
textAlign = TextAlign.Center,
333240
color = MaterialTheme.theme.colors.primaryText02,
334241
)
335242
}
336-
}
337-
item {
338-
Spacer(modifier = Modifier.height(24.dp))
339-
}
340-
item {
341-
AutomatticLogo(onAutomatticFamilyTapped = onAutomatticFamilyTapped)
342-
}
343-
item {
344-
Spacer(modifier = Modifier.height(24.dp))
243+
item {
244+
HorizontalDivider(
245+
modifier = Modifier.padding(top = 56.dp, bottom = 8.dp),
246+
)
247+
}
248+
item {
249+
RowTextButton(
250+
text = stringResource(LR.string.settings_about_rate_us),
251+
onClick = {
252+
onRateUsTapped()
253+
rateUs(context)
254+
},
255+
)
256+
}
257+
item {
258+
RowTextButton(
259+
text = stringResource(LR.string.settings_about_share_with_friends),
260+
onClick = {
261+
onShareWithFriendsTapped()
262+
shareWithFriends(context)
263+
},
264+
)
265+
}
266+
item {
267+
HorizontalDivider(modifier = Modifier.padding(vertical = 8.dp))
268+
}
269+
item {
270+
RowTextButton(
271+
text = stringResource(LR.string.settings_about_website),
272+
secondaryText = "pocketcasts.com",
273+
onClick = {
274+
onWebsiteTapped()
275+
openUrl("https://www.pocketcasts.com", context)
276+
},
277+
)
278+
}
279+
item {
280+
RowTextButton(
281+
text = stringResource(LR.string.settings_about_instagram),
282+
secondaryText = "@pocketcasts",
283+
onClick = {
284+
onInstagramTapped()
285+
openUrl("https://www.instagram.com/pocketcasts/", context)
286+
},
287+
)
288+
}
289+
item {
290+
RowTextButton(
291+
text = stringResource(LR.string.settings_about_x),
292+
secondaryText = "@pocketcasts",
293+
onClick = {
294+
onXTapped()
295+
openUrl("https://x.com/pocketcasts", context)
296+
},
297+
)
298+
}
299+
item {
300+
HorizontalDivider(modifier = Modifier.padding(vertical = 8.dp))
301+
}
302+
item {
303+
AutomatticFamilyRow(onAutomatticFamilyTapped = onAutomatticFamilyTapped)
304+
}
305+
item {
306+
HorizontalDivider(modifier = Modifier.padding(bottom = 8.dp))
307+
}
308+
item {
309+
LegalAndMoreRow(onTermsOfServiceTapped, onPrivacyPolicyTapped, openFragment)
310+
}
311+
item {
312+
HorizontalDivider(modifier = Modifier.padding(vertical = 8.dp))
313+
}
314+
item {
315+
Column(
316+
modifier = Modifier
317+
.clickable {
318+
onWorkWithUsTapped()
319+
openUrl("https://automattic.com/work-with-us/", context)
320+
}
321+
.fillMaxWidth()
322+
.padding(all = 14.dp),
323+
) {
324+
Text(
325+
text = stringResource(LR.string.settings_about_work_with_us),
326+
fontSize = 17.sp,
327+
color = MaterialTheme.theme.colors.primaryText01,
328+
)
329+
Text(
330+
text = stringResource(LR.string.settings_about_work_from_anywhere),
331+
fontSize = 14.sp,
332+
style = MaterialTheme.typography.body1,
333+
color = MaterialTheme.theme.colors.primaryText02,
334+
)
335+
}
336+
}
337+
item {
338+
Spacer(modifier = Modifier.height(24.dp))
339+
}
340+
item {
341+
AutomatticLogo(onAutomatticFamilyTapped = onAutomatticFamilyTapped)
342+
}
343+
item {
344+
Spacer(modifier = Modifier.height(24.dp))
345+
}
345346
}
346347
}
347348
}

0 commit comments

Comments
 (0)