From 490df42ea24e82f593bd74ebc8b6d55971629372 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Wed, 21 May 2025 14:29:54 -0300 Subject: [PATCH] Flesh out About page a bit more --- basic/build.gradle.kts | 1 + basic/src/main/AndroidManifest.xml | 3 +- .../java/org/fdroid/basic/MainViewModel.kt | 30 ++-- .../java/org/fdroid/basic/ui/main/About.kt | 89 ++++++++- .../ui/main/discover/CategoryCarousel.kt | 12 +- .../drawable-v24/ic_launcher_foreground.xml | 30 ---- .../res/drawable/category_connectivity.png | 1 - .../res/drawable/category_development.png | 1 - .../src/main/res/drawable/category_games.png | 1 - .../main/res/drawable/category_graphics.png | 1 - .../main/res/drawable/category_internet.png | 1 - .../src/main/res/drawable/category_money.png | 1 - .../main/res/drawable/category_navigation.png | 1 - .../main/res/drawable/category_reading.png | 1 - .../drawable/category_science_education.png | 1 - .../main/res/drawable/category_security.png | 1 - .../src/main/res/drawable/category_system.png | 1 - .../main/res/drawable/category_theming.png | 1 - .../main/res/drawable/category_writing.png | 1 - basic/src/main/res/drawable/ic_launcher.png | Bin 0 -> 10858 bytes .../res/drawable/ic_launcher_background.xml | 170 ------------------ .../res/mipmap-anydpi-v26/ic_launcher.xml | 6 - .../mipmap-anydpi-v26/ic_launcher_round.xml | 6 - 23 files changed, 104 insertions(+), 256 deletions(-) delete mode 100644 basic/src/main/res/drawable-v24/ic_launcher_foreground.xml delete mode 120000 basic/src/main/res/drawable/category_connectivity.png delete mode 120000 basic/src/main/res/drawable/category_development.png delete mode 120000 basic/src/main/res/drawable/category_games.png delete mode 120000 basic/src/main/res/drawable/category_graphics.png delete mode 120000 basic/src/main/res/drawable/category_internet.png delete mode 120000 basic/src/main/res/drawable/category_money.png delete mode 120000 basic/src/main/res/drawable/category_navigation.png delete mode 120000 basic/src/main/res/drawable/category_reading.png delete mode 120000 basic/src/main/res/drawable/category_science_education.png delete mode 120000 basic/src/main/res/drawable/category_security.png delete mode 120000 basic/src/main/res/drawable/category_system.png delete mode 120000 basic/src/main/res/drawable/category_theming.png delete mode 120000 basic/src/main/res/drawable/category_writing.png create mode 100644 basic/src/main/res/drawable/ic_launcher.png delete mode 100644 basic/src/main/res/drawable/ic_launcher_background.xml delete mode 100644 basic/src/main/res/mipmap-anydpi-v26/ic_launcher.xml delete mode 100644 basic/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/basic/build.gradle.kts b/basic/build.gradle.kts index df519a543..958e96496 100644 --- a/basic/build.gradle.kts +++ b/basic/build.gradle.kts @@ -39,6 +39,7 @@ android { } buildFeatures { compose = true + buildConfig = true } packaging { resources { diff --git a/basic/src/main/AndroidManifest.xml b/basic/src/main/AndroidManifest.xml index 93c98cbdd..c58d5cca5 100644 --- a/basic/src/main/AndroidManifest.xml +++ b/basic/src/main/AndroidManifest.xml @@ -4,9 +4,8 @@ Unit) { ) }, ) { paddingValues -> - Text( - stringResource(R.string.about_title_full), + val scrollableState = rememberScrollState() + Column( modifier = Modifier - .padding(paddingValues) - .padding(16.dp) + .padding(horizontal = 16.dp) + .padding(top = paddingValues.calculateTopPadding()) + .verticalScroll(scrollableState) + ) { + AboutHeader(modifier = Modifier.padding(top = 32.dp)) + Text( + text = "F-Droid is an installable catalogue of FOSS (Free and Open Source Software) applications for the Android platform. This app makes it easy to browse, install, and keep track of updates on your device.", + style = MaterialTheme.typography.bodyLarge, + modifier = Modifier.padding(top = 24.dp), + ) + Column(modifier = Modifier.padding(top = 24.dp, bottom = 16.dp)) { + val uriHandler = LocalUriHandler.current + Text( + text = "Links", + fontWeight = FontWeight.Bold, + style = MaterialTheme.typography.bodyLarge, + ) + Text( + text = "Homepage", + style = MaterialTheme.typography.bodyLarge, + color = MaterialTheme.colorScheme.secondary, + modifier = Modifier + .padding(top = 4.dp) + .clickable { uriHandler.openUri("https://f-droid.org") } + ) + Text( + text = "Gitlab", + style = MaterialTheme.typography.bodyLarge, + color = MaterialTheme.colorScheme.secondary, + modifier = Modifier + .padding(top = 4.dp) + .clickable { uriHandler.openUri("https://gitlab.com/fdroid") } + ) + } + Spacer(Modifier.windowInsetsBottomHeight(WindowInsets.systemBars)) + } + } +} + +@Composable +fun AboutHeader(modifier: Modifier = Modifier) { + Column( + horizontalAlignment = Alignment.CenterHorizontally, + modifier = modifier.fillMaxWidth() + ) { + Image( + painter = painterResource(id = R.drawable.ic_launcher), + contentDescription = null, // decorative element + ) + Text( + text = "${stringResource(R.string.about_version)} $VERSION_NAME", + style = MaterialTheme.typography.bodyLarge, + modifier = Modifier + .padding(top = 16.dp) + .alpha(0.75f) ) } } -@Preview -@PreviewScreenSizes +@Preview(showBackground = true) @Composable fun AboutPreview() { FDroidContent { - About { } + About {} } } + +@Preview(showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES) +@Composable +fun AboutPreviewDark() = AboutPreview() diff --git a/basic/src/main/java/org/fdroid/basic/ui/main/discover/CategoryCarousel.kt b/basic/src/main/java/org/fdroid/basic/ui/main/discover/CategoryCarousel.kt index fa5ba1f1e..ce3b41f0f 100644 --- a/basic/src/main/java/org/fdroid/basic/ui/main/discover/CategoryCarousel.kt +++ b/basic/src/main/java/org/fdroid/basic/ui/main/discover/CategoryCarousel.kt @@ -107,12 +107,12 @@ fun CategoryBox(category: Pair, onCategoryTap: (String) -> Unit) { @Composable fun CategoryCarouselPreview() { val categories = listOf( - Pair(stringResource(R.string.category_Time), R.drawable.category_theming), - Pair(stringResource(R.string.category_Games), R.drawable.category_games), - Pair(stringResource(R.string.category_Money), R.drawable.category_money), - Pair(stringResource(R.string.category_Reading), R.drawable.category_reading), - Pair(stringResource(R.string.category_Theming), R.drawable.category_theming), - Pair(stringResource(R.string.category_Connectivity), R.drawable.category_connectivity), + Pair(stringResource(R.string.category_Time), R.drawable.ic_launcher), + Pair(stringResource(R.string.category_Games), R.drawable.ic_launcher), + Pair(stringResource(R.string.category_Money), R.drawable.ic_launcher), + Pair(stringResource(R.string.category_Reading), R.drawable.ic_launcher), + Pair(stringResource(R.string.category_Theming), R.drawable.ic_launcher), + Pair(stringResource(R.string.category_Connectivity), R.drawable.ic_launcher), ) FDroidContent { CategoryCarousel(categories, onTitleTap = {}) {} diff --git a/basic/src/main/res/drawable-v24/ic_launcher_foreground.xml b/basic/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index 7706ab9e6..000000000 --- a/basic/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - diff --git a/basic/src/main/res/drawable/category_connectivity.png b/basic/src/main/res/drawable/category_connectivity.png deleted file mode 120000 index f9bf4859b..000000000 --- a/basic/src/main/res/drawable/category_connectivity.png +++ /dev/null @@ -1 +0,0 @@ -../../../../../app//src/main/res/drawable/category_connectivity.png \ No newline at end of file diff --git a/basic/src/main/res/drawable/category_development.png b/basic/src/main/res/drawable/category_development.png deleted file mode 120000 index 9877c43db..000000000 --- a/basic/src/main/res/drawable/category_development.png +++ /dev/null @@ -1 +0,0 @@ -../../../../../app//src/main/res/drawable/category_development.png \ No newline at end of file diff --git a/basic/src/main/res/drawable/category_games.png b/basic/src/main/res/drawable/category_games.png deleted file mode 120000 index d6c6a5e97..000000000 --- a/basic/src/main/res/drawable/category_games.png +++ /dev/null @@ -1 +0,0 @@ -../../../../../app//src/main/res/drawable/category_games.png \ No newline at end of file diff --git a/basic/src/main/res/drawable/category_graphics.png b/basic/src/main/res/drawable/category_graphics.png deleted file mode 120000 index 9c06c883e..000000000 --- a/basic/src/main/res/drawable/category_graphics.png +++ /dev/null @@ -1 +0,0 @@ -../../../../../app//src/main/res/drawable/category_graphics.png \ No newline at end of file diff --git a/basic/src/main/res/drawable/category_internet.png b/basic/src/main/res/drawable/category_internet.png deleted file mode 120000 index 7aa90b227..000000000 --- a/basic/src/main/res/drawable/category_internet.png +++ /dev/null @@ -1 +0,0 @@ -../../../../../app//src/main/res/drawable/category_internet.png \ No newline at end of file diff --git a/basic/src/main/res/drawable/category_money.png b/basic/src/main/res/drawable/category_money.png deleted file mode 120000 index 66940a8df..000000000 --- a/basic/src/main/res/drawable/category_money.png +++ /dev/null @@ -1 +0,0 @@ -../../../../../app//src/main/res/drawable/category_money.png \ No newline at end of file diff --git a/basic/src/main/res/drawable/category_navigation.png b/basic/src/main/res/drawable/category_navigation.png deleted file mode 120000 index 6a0ed59d2..000000000 --- a/basic/src/main/res/drawable/category_navigation.png +++ /dev/null @@ -1 +0,0 @@ -../../../../../app//src/main/res/drawable/category_navigation.png \ No newline at end of file diff --git a/basic/src/main/res/drawable/category_reading.png b/basic/src/main/res/drawable/category_reading.png deleted file mode 120000 index 054ebf935..000000000 --- a/basic/src/main/res/drawable/category_reading.png +++ /dev/null @@ -1 +0,0 @@ -../../../../../app//src/main/res/drawable/category_reading.png \ No newline at end of file diff --git a/basic/src/main/res/drawable/category_science_education.png b/basic/src/main/res/drawable/category_science_education.png deleted file mode 120000 index 2384b51de..000000000 --- a/basic/src/main/res/drawable/category_science_education.png +++ /dev/null @@ -1 +0,0 @@ -../../../../../app//src/main/res/drawable/category_science_education.png \ No newline at end of file diff --git a/basic/src/main/res/drawable/category_security.png b/basic/src/main/res/drawable/category_security.png deleted file mode 120000 index eed4a3cc0..000000000 --- a/basic/src/main/res/drawable/category_security.png +++ /dev/null @@ -1 +0,0 @@ -../../../../../app//src/main/res/drawable/category_security.png \ No newline at end of file diff --git a/basic/src/main/res/drawable/category_system.png b/basic/src/main/res/drawable/category_system.png deleted file mode 120000 index 23784d432..000000000 --- a/basic/src/main/res/drawable/category_system.png +++ /dev/null @@ -1 +0,0 @@ -../../../../../app//src/main/res/drawable/category_system.png \ No newline at end of file diff --git a/basic/src/main/res/drawable/category_theming.png b/basic/src/main/res/drawable/category_theming.png deleted file mode 120000 index d79a9166a..000000000 --- a/basic/src/main/res/drawable/category_theming.png +++ /dev/null @@ -1 +0,0 @@ -../../../../../app//src/main/res/drawable/category_theming.png \ No newline at end of file diff --git a/basic/src/main/res/drawable/category_writing.png b/basic/src/main/res/drawable/category_writing.png deleted file mode 120000 index 912639a30..000000000 --- a/basic/src/main/res/drawable/category_writing.png +++ /dev/null @@ -1 +0,0 @@ -../../../../../app//src/main/res/drawable/category_writing.png \ No newline at end of file diff --git a/basic/src/main/res/drawable/ic_launcher.png b/basic/src/main/res/drawable/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..6107595cf86aff526de92931a9aebe5172d6b419 GIT binary patch literal 10858 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 agGoHuHCwxL%pd+C1(aW_%U8;ph5kRWr7s!) literal 0 HcmV?d00001 diff --git a/basic/src/main/res/drawable/ic_launcher_background.xml b/basic/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9cb..000000000 --- a/basic/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/basic/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/basic/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index b3e26b4c6..000000000 --- a/basic/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/basic/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/basic/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index b3e26b4c6..000000000 --- a/basic/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - -