5 files changed, 29 insertions, 99 deletions
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 2891987d..dde1a99f 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -33,12 +33,12 @@
   <string-array name="app_theme_options">
     <item>@string/pref_app_theme_value_light</item>
     <item>@string/pref_app_theme_value_dark</item>
-    <item>@string/pref_app_theme_value_battery_saver</item>
+    <item>@string/pref_app_theme_value_follow_system</item>
   </string-array>
   <string-array name="app_theme_values">
     <item>light</item>
     <item>dark</item>
-    <item>battery_saver</item>
+    <item>follow_system</item>
   </string-array>
 
 </resources>
diff --git a/app/src/main/res/values/colors_material3.xml b/app/src/main/res/values/colors_material3.xml
index ecd34921..47ffbc6a 100644
--- a/app/src/main/res/values/colors_material3.xml
+++ b/app/src/main/res/values/colors_material3.xml
@@ -5,59 +5,5 @@
 
 <resources>
   <color name="md_theme_light_primary">#006591</color>
-  <color name="md_theme_light_onPrimary">#FFFFFF</color>
-  <color name="md_theme_light_primaryContainer">#C7E6FF</color>
-  <color name="md_theme_light_onPrimaryContainer">#001E30</color>
-  <color name="md_theme_light_secondary">#4F606E</color>
-  <color name="md_theme_light_onSecondary">#FFFFFF</color>
-  <color name="md_theme_light_secondaryContainer">#D3E5F5</color>
-  <color name="md_theme_light_onSecondaryContainer">#0B1D29</color>
-  <color name="md_theme_light_tertiary">#006494</color>
-  <color name="md_theme_light_onTertiary">#FFFFFF</color>
-  <color name="md_theme_light_tertiaryContainer">#C8E6FF</color>
-  <color name="md_theme_light_onTertiaryContainer">#001E31</color>
-  <color name="md_theme_light_error">#BA1B1B</color>
-  <color name="md_theme_light_errorContainer">#FFDAD4</color>
-  <color name="md_theme_light_onError">#FFFFFF</color>
-  <color name="md_theme_light_onErrorContainer">#410001</color>
-  <color name="md_theme_light_background">#FCFCFF</color>
-  <color name="md_theme_light_onBackground">#1A1C1E</color>
-  <color name="md_theme_light_surface">#FCFCFF</color>
-  <color name="md_theme_light_onSurface">#1A1C1E</color>
-  <color name="md_theme_light_surfaceVariant">#DDE3EA</color>
-  <color name="md_theme_light_onSurfaceVariant">#41474D</color>
-  <color name="md_theme_light_outline">#72787E</color>
-  <color name="md_theme_light_inverseOnSurface">#F0F0F3</color>
-  <color name="md_theme_light_inverseSurface">#2E3133</color>
-  <color name="md_theme_light_primaryInverse">#85CEFF</color>
-  <color name="md_theme_dark_primary">#85CEFF</color>
-  <color name="md_theme_dark_onPrimary">#00344E</color>
-  <color name="md_theme_dark_primaryContainer">#004C6F</color>
-  <color name="md_theme_dark_onPrimaryContainer">#C7E6FF</color>
-  <color name="md_theme_dark_secondary">#B7C9D9</color>
-  <color name="md_theme_dark_onSecondary">#21323E</color>
-  <color name="md_theme_dark_secondaryContainer">#384956</color>
-  <color name="md_theme_dark_onSecondaryContainer">#D3E5F5</color>
-  <color name="md_theme_dark_tertiary">#8ACEFF</color>
-  <color name="md_theme_dark_onTertiary">#003450</color>
-  <color name="md_theme_dark_tertiaryContainer">#004B70</color>
-  <color name="md_theme_dark_onTertiaryContainer">#C8E6FF</color>
-  <color name="md_theme_dark_error">#FFB4A9</color>
-  <color name="md_theme_dark_errorContainer">#930006</color>
-  <color name="md_theme_dark_onError">#680003</color>
-  <color name="md_theme_dark_onErrorContainer">#FFDAD4</color>
-  <color name="md_theme_dark_background">#1A1C1E</color>
-  <color name="md_theme_dark_onBackground">#E1E2E5</color>
-  <color name="md_theme_dark_surface">#1A1C1E</color>
-  <color name="md_theme_dark_onSurface">#E1E2E5</color>
-  <color name="md_theme_dark_surfaceVariant">#41474D</color>
-  <color name="md_theme_dark_onSurfaceVariant">#C1C7CE</color>
-  <color name="md_theme_dark_outline">#8B9197</color>
-  <color name="md_theme_dark_inverseOnSurface">#1A1C1E</color>
-  <color name="md_theme_dark_inverseSurface">#E1E2E5</color>
-  <color name="md_theme_dark_primaryInverse">#006591</color>
-  <color name="seed">#003E5B</color>
-  <color name="error">#BA1B1B</color>
 
-  <!-- Multiselect color -->
 </resources>
diff --git a/app/src/main/res/values/prefs.xml b/app/src/main/res/values/prefs.xml
index a5977d9d..383b5f8b 100644
--- a/app/src/main/res/values/prefs.xml
+++ b/app/src/main/res/values/prefs.xml
@@ -4,5 +4,5 @@
   -->
 
 <resources>
-  <string name="app_theme_def" translatable="false">battery_saver</string>
+  <string name="app_theme_def" translatable="false">follow_system</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f1a858fd..ec2396be 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -44,7 +44,6 @@
   <string name="git_commit_gpg_id">Initialize GPG IDs in %1$s.</string>
 
   <!-- PGPHandler -->
-  <string name="clipboard_copied_text">Copied to clipboard</string>
   <string name="file_toast_text">Please provide a file name</string>
   <string name="empty_toast_text">You cannot use an empty password or empty extra content</string>
 
@@ -127,6 +126,13 @@
   <string name="pref_rebase_on_pull_title">Rebase on pull</string>
   <string name="pref_rebase_on_pull_summary">When pulling or syncing, create a merge commit with upstream changes</string>
   <string name="pref_rebase_on_pull_summary_on">When pulling or syncing, rebase commits that are not present in the remote repository</string>
+  <string name="pref_export_log_title">Export log</string>
+  <string name="pref_export_log_summary">Save this app\'s logs to a file. They can show entry names, websites, apps and your git server, so read the file before sharing it</string>
+  <string name="log_exported">Log saved</string>
+  <string name="log_export_failed">Could not save the log</string>
+  <string name="pref_push_after_commit_title">Push after each change</string>
+  <string name="pref_push_after_commit_summary">Push to the remote repository after saving, moving or deleting in the app</string>
+  <string name="git_push_after_commit_failed">Saved on this device, but not pushed. Sync to try again</string>
   <string name="pref_disable_sync_on_pull_title">Disable pull to sync action</string>
   <string name="pref_disable_sync_on_pull_summary">Prevent pulling down on the password list from triggering a Git sync</string>
   <string name="pref_import_pgp_key_title">Import PGP key</string>
@@ -263,7 +269,6 @@
   <string name="pref_app_theme_title">App theme</string>
   <string name="pref_app_theme_value_light">Light</string>
   <string name="pref_app_theme_value_dark">Dark</string>
-  <string name="pref_app_theme_value_battery_saver">Set by Battery Saver</string>
   <string name="pref_app_theme_value_follow_system">System default</string>
   <string name="connection_mode_ssh_key">SSH key</string>
   <string name="connection_mode_basic_authentication">Password</string>
@@ -415,4 +420,21 @@
   <string name="git_reset_confirm_message">Local commits and changes that are not on this remote branch are discarded.</string>
   <string name="git_tool_done">%1$s: done</string>
   <string name="store_delete_confirm">Delete the local store? Entries not pushed to the remote are lost.</string>
+  <string name="about">About</string>
+  <string name="about_summary">An Android client for pass, the standard Unix password manager. A maintained fork of Android Password Store.</string>
+  <string name="about_version">Version</string>
+  <string name="about_docs">Documentation</string>
+  <string name="about_changelog">What\'s new</string>
+  <string name="about_source">Source code</string>
+  <string name="about_issues">Report a problem</string>
+  <string name="about_security">Report a security issue</string>
+  <string name="about_support">Support on Ko-fi</string>
+  <string name="about_privacy_title">Privacy</string>
+  <string name="about_privacy">No telemetry, no analytics, no Google services. HardenedPass connects only to your git server, through your proxy if you set one.</string>
+  <string name="about_certificate">Signing certificate (SHA-256)</string>
+  <string name="about_license">License</string>
+  <string name="about_license_text">GNU General Public License v3.0 only. Copyright the Android Password Store authors and HardenedPass contributors.</string>
+  <string name="about_libraries">Open source licenses</string>
+  <string name="about_opens_browser">Opens in the browser</string>
+  <string name="about_no_browser">No browser found to open this link</string>
 </resources>
diff --git a/app/src/main/res/values/themes_material3.xml b/app/src/main/res/values/themes_material3.xml
index 0ec74a45..7db01be0 100644
--- a/app/src/main/res/values/themes_material3.xml
+++ b/app/src/main/res/values/themes_material3.xml
@@ -6,18 +6,11 @@
 <resources>
 
   <style name="AppThemeM3" parent="APSThemeM3">
-    <item name="fontFamily">@font/manrope</item>
     <item name="android:windowLightStatusBar">@bool/light_status_bar</item>
     <item name="android:statusBarColor">?android:colorBackground</item>
     <item name="android:navigationBarColor">?android:colorBackground</item>
   </style>
 
-  <!-- AppCompat activities whose whole UI is Compose -->
-  <style name="NoActionBarThemeM3" parent="AppThemeM3">
-    <item name="windowActionBar">false</item>
-    <item name="windowNoTitle">true</item>
-  </style>
-
   <style name="NoBackgroundThemeM3" parent="@style/AppThemeM3">
     <item name="android:background">@android:color/transparent</item>
     <item name="android:backgroundDimEnabled">true</item>
@@ -25,48 +18,17 @@
     <item name="android:statusBarColor">@android:color/transparent</item>
     <item name="android:windowIsTranslucent">true</item>
     <item name="android:windowContentOverlay">@null</item>
-    <item name="android:windowActionBar">false</item>
     <item name="android:windowBackground">@android:color/transparent</item>
     <item name="android:windowEnterAnimation">@android:anim/fade_in</item>
     <item name="android:windowExitAnimation">@android:anim/fade_out</item>
-    <item name="colorPrimaryDark">@android:color/transparent</item>
-    <item name="windowNoTitle">true</item>
   </style>
 
   <style name="DialogLikeThemeM3" parent="AppThemeM3">
-    <item name="android:windowActionBar">false</item>
     <item name="android:windowIsFloating">true</item>
     <item name="android:backgroundDimEnabled">true</item>
-    <!-- Needs to be set without android: prefix as per https://stackoverflow.com/a/33417456 -->
-    <item name="windowNoTitle">true</item>
   </style>
 
-  <style name="APSThemeM3" parent="Theme.Material3.DayNight">
-    <item name="colorPrimary">@color/md_theme_light_primary</item>
-    <item name="colorOnPrimary">@color/md_theme_light_onPrimary</item>
-    <item name="colorPrimaryContainer">@color/md_theme_light_primaryContainer</item>
-    <item name="colorOnPrimaryContainer">@color/md_theme_light_onPrimaryContainer</item>
-    <item name="colorSecondary">@color/md_theme_light_secondary</item>
-    <item name="colorOnSecondary">@color/md_theme_light_onSecondary</item>
-    <item name="colorSecondaryContainer">@color/md_theme_light_secondaryContainer</item>
-    <item name="colorOnSecondaryContainer">@color/md_theme_light_onSecondaryContainer</item>
-    <item name="colorTertiary">@color/md_theme_light_tertiary</item>
-    <item name="colorOnTertiary">@color/md_theme_light_onTertiary</item>
-    <item name="colorTertiaryContainer">@color/md_theme_light_tertiaryContainer</item>
-    <item name="colorOnTertiaryContainer">@color/md_theme_light_onTertiaryContainer</item>
-    <item name="colorError">@color/md_theme_light_error</item>
-    <item name="colorErrorContainer">@color/md_theme_light_errorContainer</item>
-    <item name="colorOnError">@color/md_theme_light_onError</item>
-    <item name="colorOnErrorContainer">@color/md_theme_light_onErrorContainer</item>
-    <item name="android:colorBackground">@color/md_theme_light_background</item>
-    <item name="colorOnBackground">@color/md_theme_light_onBackground</item>
-    <item name="colorSurface">@color/md_theme_light_surface</item>
-    <item name="colorOnSurface">@color/md_theme_light_onSurface</item>
-    <item name="colorSurfaceVariant">@color/md_theme_light_surfaceVariant</item>
-    <item name="colorOnSurfaceVariant">@color/md_theme_light_onSurfaceVariant</item>
-    <item name="colorOutline">@color/md_theme_light_outline</item>
-    <item name="colorOnSurfaceInverse">@color/md_theme_light_inverseOnSurface</item>
-    <item name="colorSurfaceInverse">@color/md_theme_light_inverseSurface</item>
-    <item name="colorPrimaryInverse">@color/md_theme_light_primaryInverse</item>
+  <style name="APSThemeM3" parent="android:Theme.Material.Light.NoActionBar">
+    <item name="android:colorBackground">@android:color/system_neutral2_10</item>
   </style>
 </resources>