From 19fe0fdd8a0fa6d9e4655e9c83dfff9268bcfb33 Mon Sep 17 00:00:00 2001
From: Josia Pietsch <git@jrpie.de>
Date: Sat, 2 Nov 2024 13:50:27 +0100
Subject: [PATCH] add button to join chat

---
 .../ui/settings/meta/SettingsFragmentMeta.kt  | 18 +++++++++++++
 app/src/main/res/layout/settings_meta.xml     | 26 +++++++++++++++++--
 app/src/main/res/values/donottranslate.xml    |  5 ++--
 app/src/main/res/values/strings.xml           |  2 ++
 app/src/main/res/values/styles.xml            |  8 +++---
 .../metadata/android/en-US/changelogs/27.txt  |  8 +++++-
 6 files changed, 57 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/de/jrpie/android/launcher/ui/settings/meta/SettingsFragmentMeta.kt b/app/src/main/java/de/jrpie/android/launcher/ui/settings/meta/SettingsFragmentMeta.kt
index a1e0eba..fd3af1d 100644
--- a/app/src/main/java/de/jrpie/android/launcher/ui/settings/meta/SettingsFragmentMeta.kt
+++ b/app/src/main/java/de/jrpie/android/launcher/ui/settings/meta/SettingsFragmentMeta.kt
@@ -77,6 +77,14 @@ class SettingsFragmentMeta : Fragment(), UIObject {
         }
 
 
+        // view code
+        binding.settingsMetaButtonViewCode.setOnClickListener {
+            openNewTabWindow(
+                getString(R.string.settings_meta_link_github),
+                requireContext()
+            )
+        }
+
         // report a bug
         binding.settingsMetaButtonReportBug.setOnClickListener {
             openNewTabWindow(
@@ -86,6 +94,16 @@ class SettingsFragmentMeta : Fragment(), UIObject {
         }
 
 
+        // join chat
+        binding.settingsMetaButtonJoinChat.setOnClickListener {
+            openNewTabWindow(
+                getString(R.string.settings_meta_chat_url),
+                requireContext()
+            )
+        }
+
+
+
         // contact developer
         binding.settingsMetaButtonContact.setOnClickListener {
             openNewTabWindow(
diff --git a/app/src/main/res/layout/settings_meta.xml b/app/src/main/res/layout/settings_meta.xml
index 4cae007..8da6a9d 100644
--- a/app/src/main/res/layout/settings_meta.xml
+++ b/app/src/main/res/layout/settings_meta.xml
@@ -27,19 +27,37 @@
             android:id="@+id/settings_meta_button_reset_settings"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="32sp"
             android:text="@string/settings_meta_reset"
             android:textAllCaps="false" />
 
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="64sp" />
+
+        <Button
+            android:id="@+id/settings_meta_button_view_code"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/settings_meta_view_code"
+            android:textAllCaps="false" />
 
         <Button
             android:id="@+id/settings_meta_button_report_bug"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="32sp"
             android:text="@string/settings_meta_report_bug"
             android:textAllCaps="false" />
 
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="64sp" />
+
+        <Button
+            android:id="@+id/settings_meta_button_join_chat"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/settings_meta_join_chat"
+            android:textAllCaps="false" />
 
         <Button
             android:id="@+id/settings_meta_button_contact"
@@ -55,6 +73,10 @@
             android:text="@string/settings_meta_fork_contact"
             android:textAllCaps="false" />
 
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="64sp" />
+
         <Button
             android:id="@+id/settings_meta_button_privacy"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml
index 3a3a569..f81eca0 100644
--- a/app/src/main/res/values/donottranslate.xml
+++ b/app/src/main/res/values/donottranslate.xml
@@ -109,12 +109,11 @@
           -
         -->
         <string name="settings_meta_link_github" translatable="false">https://github.com/jrpie/Launcher</string>
-        <string name="settings_meta_report_bug_link" translatable="false">https://github.com/jrpie/Launcher/issues/new</string>
+        <string name="settings_meta_report_bug_link" translatable="false">https://github.com/jrpie/Launcher/issues/new/choose</string>
         <string name="settings_meta_fork_contact_url" translatable="false">https://s.jrpie.de/contact</string>
         <string name="settings_meta_privacy_url" translatable="false">https://s.jrpie.de/android-legal</string>
         <string name="settings_meta_contact_url" translatable="false">https://www.finnmglas.com/contact/</string>
-        <string name="settings_meta_discord_url" translatable="false">https://discord.com/invite/jV2AhF8</string>
-
+        <string name="settings_meta_chat_url" translatable="false">https://s.jrpie.de/launcher-chat</string>
 
         <!--
           -
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dc70a26..7e519aa 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -157,9 +157,11 @@
     <string name="settings_meta_reset">Reset Settings</string>
     <string name="settings_meta_reset_confirm">You are going to discard all your preferences. Continue?</string>
 
+    <string name="settings_meta_view_code">View source code</string>
     <string name="settings_meta_report_bug">Report a bug</string>
 
     <string name="settings_meta_fork_contact">Contact the developer of the fork</string>
+    <string name="settings_meta_join_chat">Join µLauncher chat</string>
 
     <string name="settings_meta_privacy">Privacy Policy</string>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a228bd7..a9a2302 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,4 +1,4 @@
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 
     <!-- Base theme for Launcher -->
     <style name="launcherBaseTheme" parent="Theme.AppCompat.Light.NoActionBar">
@@ -42,7 +42,7 @@
         <item name="android:textColor">@color/finnmglasTheme_text_color</item>
     </style>
 
-    <style name="colorThemeLight">
+    <style name="colorThemeLight" tools:keep="@style/colorThemeLight">
         <item name="colorPrimary">@color/lightTheme_background_color</item>
         <item name="colorPrimaryDark">@color/lightTheme_background_color</item>
         <item name="colorAccent">@color/lightTheme_accent_color</item>
@@ -80,14 +80,14 @@
     <style name="fontSansSerif">
         <item name="android:fontFamily">sans-serif</item>
     </style>
-    <style name="fontSerif">
+    <style name="fontSerif" tools:keep="@style/fontSerif">
         <item name="android:fontFamily">serif</item>
     </style>
 
 
 
 
-    <style name="PopupMenuCustom" parent="@android:style/Widget.PopupMenu">
+    <style name="PopupMenuCustom" parent="@android:style/Widget.PopupMenu" tools:keep="@style/PopupMenuCustom">
         <item name="android:popupBackground">#252827</item>
     </style>
 
diff --git a/fastlane/metadata/android/en-US/changelogs/27.txt b/fastlane/metadata/android/en-US/changelogs/27.txt
index fa18945..80bae96 100644
--- a/fastlane/metadata/android/en-US/changelogs/27.txt
+++ b/fastlane/metadata/android/en-US/changelogs/27.txt
@@ -1 +1,7 @@
-* New action: Lock screen (thank you, yzqzss!)
+* Chat on Matrix and Discord
+* Improved gesture detection
+* New action: Lock screen - thank you, yzqzss!
+* New action: Open quick settings
+* Improved French translation - thank you, toby-bro!
+* Improved Portugese translation - thank you, "Vossa Excelencia"!
+* Fixed some bugs