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 000000000..6107595cf Binary files /dev/null and b/basic/src/main/res/drawable/ic_launcher.png differ 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 @@ - - - - - -