F-Droid (#130)

README.md

@@ -5,13 +5,18 @@
 [![Discord](https://img.shields.io/discord/793235453871390720)](https://discord.gg/dGFDpmWp46)
 [![Continuous Delivery Pipeline](https://github.com/photos-network/android/actions/workflows/continuous-delivery-pipeline.yml/badge.svg)](https://github.com/photos-network/android/actions/workflows/continuous-delivery-pipeline.yml)
 
+<img src="/fastlane/metadata/android/en-US/images/icon.png" width="120" height="120"/>
+
 [Photos.network](https://photos.network) A privacy first, self-hosted photo storage and sharing service for fediverse.
 Its core features are:
 
 - Keep track of your photos with privacy
 - Share photos and albums with friends, family or public
 - Search for photos by attributes like location or objects
 
+[<img src="fastlane/fdroid_badge.png" alt="Get it on F-Droid" height="80" />](https://f-droid.org/repository/browse/?fdid=photos.network)
+[<img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png" alt="Get it on Google Play" height="80" />](https://play.google.com/store/apps/details?id=photos.network&utm_source=github)
+
 ## App
 
 The Android app itself is self-sufficient and can be used to browse local photos on an android device, add tags or search by attributes.

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionSha256Sum=e111cb9948407e26351227dabce49822fb88c37ee72f1d1582a69c68af2e702f
 distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -143,12 +140,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,6 +194,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in

gradlew.bat

@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 

ui/settings/src/main/kotlin/photos/network/ui/settings/SettingsScreen.kt

@@ -24,14 +24,18 @@ import androidx.compose.animation.fadeIn
 import androidx.compose.animation.shrinkVertically
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.TextField
 import androidx.compose.material.icons.Icons
@@ -106,11 +110,57 @@ fun SettingsScreen(
 
     Column(
         modifier = modifier
-            .verticalScroll(verticalScrollState)
-            .fillMaxSize(),
+            .fillMaxSize()
+            .verticalScroll(verticalScrollState),
     ) {
         SettingsHeader(serverStatus = uiState.serverStatus)
 
+        Text(
+            modifier = Modifier.padding(horizontal = 16.dp),
+            text = stringResource(id = R.string.settings_features_pre),
+        )
+        val map = listOf(
+            stringResource(id = R.string.feature_sharing_title) to stringResource(id = R.string.feature_sharing_description),
+            stringResource(id = R.string.feature_backup_title) to stringResource(id = R.string.feature_backup_description),
+            stringResource(id = R.string.feature_image_analysis_title) to stringResource(id = R.string.feature_image_analysis_description),
+        )
+
+        Column(
+            modifier = Modifier.padding(vertical = 8.dp, horizontal = 16.dp),
+            verticalArrangement = Arrangement.spacedBy(8.dp),
+        ) {
+            map.forEach {
+                Row(
+                    verticalAlignment = Alignment.CenterVertically,
+                ) {
+                    Box(
+                        modifier = Modifier
+                            .padding(start = 8.dp, end = 8.dp)
+                            .size(8.dp)
+                            .background(Color.Black, shape = CircleShape),
+                    )
+
+                    Text(
+                        text = it.first,
+                        style = MaterialTheme.typography.headlineMedium,
+                    )
+                }
+                Text(
+                    modifier = Modifier.padding(start = 24.dp),
+                    text = it.second,
+                )
+            }
+        }
+
+        Text(
+            modifier = Modifier
+                .padding(horizontal = 16.dp)
+                .padding(bottom = 16.dp),
+            text = stringResource(id = R.string.settings_features_post),
+        )
+
+        Divider()
+
         ServerSetupItem(
             onServerSetupClicked = {
                 handleEvent(SettingsEvent.ToggleServerSetup)
@@ -136,7 +186,7 @@ fun SettingsScreen(
             }
         }
 
-        SectionSpacer()
+        Spacer(modifier = Modifier.weight(1f))
 
         AppVersionItem(version = uiState.appVersion) {
             handleEvent(SettingsEvent.SetClipboardEvent)

ui/settings/src/main/res/values-de/strings.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="settings_item_server_setup">Setup server</string>
+    <string name="settings_item_server_update">Server Setup ändern</string>
+    <string name="settings_copied_to_clipboard">Version kopiert</string>
+
+    <string name="feature_sharing_title">Foto teilen</string>
+    <string name="feature_sharing_description">Teile Fotos oder Alben mit der Familie, Freunden oder der Öffentlichkeit</string>
+    <string name="feature_backup_title">Datensicherung</string>
+    <string name="feature_backup_description">Behalte eine Kopie deiner Daten sicher in der Cloud um den Verlust des Geräts zu minimieren oder den begrenzten Speicherplatz zu umgehen.</string>
+    <string name="feature_image_analysis_title">Bilderkennung</string>
+    <string name="feature_image_analysis_description">Gewinne aussagekräftige Informationen aus deinen Fotos wie die Erkennung von Personen anhand ihrer Gesichter</string>
+
+    <string name="settings_features_pre">Um Funktionen wie</string>
+    <string name="settings_features_post">nutzen zu können, wird ein Benutzerkonto auf einem Photos.network Server benötigt.</string>
+</resources>

ui/settings/src/main/res/values/strings.xml

@@ -1,5 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="settings_item_server_setup">Setup server instance</string>
+    <string name="settings_item_server_setup">Setup server</string>
     <string name="settings_item_server_update">Change server setup</string>
     <string name="settings_copied_to_clipboard">Version copied into clipboard</string>
+
+    <string name="feature_sharing_title">Photo sharing</string>
+    <string name="feature_sharing_description">Share photos or albums with family, friends or public.</string>
+    <string name="feature_backup_title">Backup</string>
+    <string name="feature_backup_description">Keep a copy of your data safe in the cloud to mitigate the loss of the device or to bypass storage limits.</string>
+    <string name="feature_image_analysis_title">Image analysis</string>
+    <string name="feature_image_analysis_description">Extract meaningful informations from your photos like identifying a person from their face.</string>
+
+    <string name="settings_features_pre">To use features like</string>
+    <string name="settings_features_post">you need an account on any Photos.network server.</string>
 </resources>