Merge pull request #106 from angrezichatterbox/Reference-all-strings-…

…from-Scribe-i18n

Reference all strings from scribe i18n

app/src/main/assets/i18n/Scribe-i18n/jsons/en-US.json

@@ -33,9 +33,11 @@
   "app.about.legal.third_party": "Third-party licenses",
   "app.about.legal.third_party.author": "Author",
   "app.about.legal.third_party.caption": "Whose code we used",
+  "app.about.legal.third_party.entry_custom_keyboard": "Custom Keyboard\n• Author: EthanSK\n• License: MIT\n• Link: https://github.com/EthanSK/CustomKeyboard/blob/master/LICENSE",
+  "app.about.legal.third_party.entry_simple_keyboard": "Simple Keyboard\n• Author:Simple Mobile Tools\n• License: GPL-3.0\n• Link: https://github.com/SimpleMobileTools/Simple-Keyboard/blob/main/LICENSE",
   "app.about.legal.third_party.license": "License",
   "app.about.legal.third_party.link": "Link",
-  "app.about.legal.third_party.text": "The Scribe developers (SCRIBE) built the iOS application \"Scribe - Language Keyboards\" (SERVICE) using third party code. All source code used in the creation of this SERVICE comes from sources that allow its full use in the manner done so by the SERVICE. This section lists the source code on which the SERVICE was based as well as the coinciding licenses of each.\n\nThe following is a list of all used source code, the main author or authors of the code, the license under which it was released at time of usage, and a link to the license.\n\n1. Custom Keyboard\n• Author: EthanSK\n• License: MIT\n• Link: https://github.com/EthanSK/CustomKeyboard/blob/master/LICENSE",
+  "app.about.legal.third_party.text": "The Scribe developers (SCRIBE) built the iOS application \"Scribe - Language Keyboards\" (SERVICE) using third party code. All source code used in the creation of this SERVICE comes from sources that allow its full use in the manner done so by the SERVICE. This section lists the source code on which the SERVICE was based as well as the coinciding licenses of each.\n\nThe following is a list of all used source code, the main author or authors of the code, the license under which it was released at time of usage, and a link to the license.",
   "app.about.legal.title": "Legal",
   "app.about.title": "About",
   "app.conjugate.choose_conjugation.select_tense": "Select tense",
@@ -81,6 +83,8 @@
   "app.settings.keyboard.functionality.double_space_period_description": "Automatically insert a period when the space key is pressed twice.",
   "app.settings.keyboard.functionality.hold_for_alt_chars": "Hold for alternate characters",
   "app.settings.keyboard.functionality.hold_for_alt_chars_description": "Select alternate characters by holding keys and dragging to the desired character.",
+  "app.settings.keyboard.functionality.popup_on_keypress": "Show popup on keypress",
+  "app.settings.keyboard.functionality.popup_on_keypress_description": "Display a popup of keys as they're pressed.",
   "app.settings.keyboard.functionality.punctuation_spacing": "Delete punctuation spacing",
   "app.settings.keyboard.functionality.punctuation_spacing_description": "Remove excess spaces before punctuation marks.",
   "app.settings.keyboard.functionality.title": "Functionality",
@@ -103,6 +107,8 @@
   "app.settings.keyboard.translation.select_source.title": "Translation language",
   "app.settings.keyboard.translation.select_source_description": "Change the language to translate from.",
   "app.settings.keyboard.translation.title": "Translation source language",
+  "app.settings.menu.app_color_mode": "Dark mode",
+  "app.settings.menu.app_color_mode_description": "Change the application display to dark mode.",
   "app.settings.menu.app_language": "App language",
   "app.settings.menu.app_language.caption": "Select language for app texts",
   "app.settings.menu.app_language.one_device_language_warning.message": "You only have one language installed on your device. Please install more languages in Settings and then you can select different localizations of Scribe.",

app/src/main/assets/i18n/Scribe-i18n/values/en-US/string.xml

@@ -34,9 +34,11 @@
     <string name="app.about.legal.third_party">Third-party licenses</string>
     <string name="app.about.legal.third_party.author">Author</string>
     <string name="app.about.legal.third_party.caption">Whose code we used</string>
+    <string name="app.about.legal.third_party.entry_custom_keyboard">Custom Keyboard\n• Author: EthanSK\n• License: MIT\n• Link: https://github.com/EthanSK/CustomKeyboard/blob/master/LICENSE</string>
+    <string name="app.about.legal.third_party.entry_simple_keyboard">Simple Keyboard\n• Author:Simple Mobile Tools\n• License: GPL-3.0\n• Link: https://github.com/SimpleMobileTools/Simple-Keyboard/blob/main/LICENSE</string>
     <string name="app.about.legal.third_party.license">License</string>
     <string name="app.about.legal.third_party.link">Link</string>
-    <string name="app.about.legal.third_party.text">The Scribe developers (SCRIBE) built the iOS application "Scribe - Language Keyboards" (SERVICE) using third party code. All source code used in the creation of this SERVICE comes from sources that allow its full use in the manner done so by the SERVICE. This section lists the source code on which the SERVICE was based as well as the coinciding licenses of each.\n\nThe following is a list of all used source code, the main author or authors of the code, the license under which it was released at time of usage, and a link to the license.\n\n1. Custom Keyboard\n• Author: EthanSK\n• License: MIT\n• Link: https://github.com/EthanSK/CustomKeyboard/blob/master/LICENSE</string>
+    <string name="app.about.legal.third_party.text">The Scribe developers (SCRIBE) built the iOS application "Scribe - Language Keyboards" (SERVICE) using third party code. All source code used in the creation of this SERVICE comes from sources that allow its full use in the manner done so by the SERVICE. This section lists the source code on which the SERVICE was based as well as the coinciding licenses of each.\n\nThe following is a list of all used source code, the main author or authors of the code, the license under which it was released at time of usage, and a link to the license.</string>
     <string name="app.about.legal.title">Legal</string>
     <string name="app.about.title">About</string>
     <string name="app.conjugate.choose_conjugation.select_tense">Select tense</string>
@@ -82,6 +84,8 @@
     <string name="app.settings.keyboard.functionality.double_space_period_description">Automatically insert a period when the space key is pressed twice.</string>
     <string name="app.settings.keyboard.functionality.hold_for_alt_chars">Hold for alternate characters</string>
     <string name="app.settings.keyboard.functionality.hold_for_alt_chars_description">Select alternate characters by holding keys and dragging to the desired character.</string>
+    <string name="app.settings.keyboard.functionality.popup_on_keypress">Show popup on keypress</string>
+    <string name="app.settings.keyboard.functionality.popup_on_keypress_description">Display a popup of keys as they\'re pressed</string>
     <string name="app.settings.keyboard.functionality.punctuation_spacing">Delete punctuation spacing</string>
     <string name="app.settings.keyboard.functionality.punctuation_spacing_description">Remove excess spaces before punctuation marks.</string>
     <string name="app.settings.keyboard.functionality.title">Functionality</string>
@@ -104,6 +108,8 @@
     <string name="app.settings.keyboard.translation.select_source.title">Translation language</string>
     <string name="app.settings.keyboard.translation.select_source_description">Change the language to translate from.</string>
     <string name="app.settings.keyboard.translation.title">Translation source language</string>
+    <string name="app.settings.menu.app_color_mode">Dark mode</string>
+    <string name="app.settings.menu.app_color_mode_description">Change the application display to dark mode.</string>
     <string name="app.settings.menu.app_language">App language</string>
     <string name="app.settings.menu.app_language.caption">Select language for app texts</string>
     <string name="app.settings.menu.app_language.one_device_language_warning.message">You only have one language installed on your device. Please install more languages in Settings and then you can select different localizations of Scribe.</string>

app/src/main/java/be/scri/fragments/MainFragment.kt

@@ -30,6 +30,7 @@ class MainFragment : Fragment() {
         binding.scribeKey.setOnClickListener {
             (requireActivity().getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager).showInputMethodPicker()
         }
+        (requireActivity() as MainActivity).unsetActionBarLayoutMargin()
         applyUserDarkModePreference()
         if (!isKeyboardEnabled()) {
             ConfirmationAdvancedDialog(

app/src/main/java/be/scri/fragments/SettingsFragment.kt

@@ -80,7 +80,13 @@ class SettingsFragment : Fragment() {
         val sharedPref = requireActivity().getSharedPreferences("app_preferences", Context.MODE_PRIVATE)
         return listOf(
             TextItem(R.string.app_settings_menu_app_language, image = R.drawable.right_arrow, action = ::selectLanguage),
-            SwitchItem("Dark mode", isChecked = sharedPref.getBoolean("dark_mode", false), action = ::darkMode, action2 = ::lightMode),
+            SwitchItem(
+                getString(R.string.app_settings_menu_app_color_mode),
+                description = getString(R.string.app_settings_menu_app_color_mode_description),
+                isChecked = sharedPref.getBoolean("dark_mode", false),
+                action = ::darkMode,
+                action2 = ::lightMode,
+            ),
             SwitchItem(
                 getString(R.string.app_settings_keyboard_keypress_vibration),
                 description = getString(R.string.app_settings_keyboard_keypress_vibration_description),
@@ -89,7 +95,8 @@ class SettingsFragment : Fragment() {
                 action2 = ::disableVibrateOnKeypress,
             ),
             SwitchItem(
-                "Show a popup on keypress",
+                getString(R.string.app_settings_keyboard_functionality_popup_on_keypress),
+                description = getString(R.string.app_settings_keyboard_functionality_popup_on_keypress_description),
                 isChecked = requireContext().config.showPopupOnKeypress,
                 action = ::enableShowPopupOnKeypress,
                 action2 = ::disableShowPopupOnKeypress,

app/src/main/res/layout/fragment_privacy_policy.xml

@@ -71,6 +71,10 @@
                         android:src="@drawable/shield_check" />
                 </androidx.cardview.widget.CardView>
             </FrameLayout>
+            <View
+                android:layout_width="100dp"
+                android:layout_height="50dp">
+            </View>
         </LinearLayout>
     </ScrollView>
 

app/src/main/res/layout/fragment_third_party.xml

@@ -46,7 +46,13 @@
                             android:layout_width="304dp"
                             android:layout_height="wrap_content"
                             android:layout_gravity=""
-                            android:text="@string/third_party_licenses_body"
+                            android:text="@string/app.about.legal.third_party.text"
+                            android:textSize="16sp" />
+                        <TextView
+                            android:layout_width="304dp"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity=""
+                            android:text="@string/app.about.legal.third_party.entry_simple_keyboard"
                             android:textSize="16sp" />
 
                     </LinearLayout>
@@ -66,6 +72,11 @@
                         android:contentDescription="@string/app.about.legal.third_party"
                         android:src="@drawable/doc" />
                 </androidx.cardview.widget.CardView>
+                <View
+                    android:layout_width="100dp"
+                    android:layout_height="900dp">
+                </View>
             </FrameLayout>
         </LinearLayout>
+
     </ScrollView>

app/src/main/res/layout/fragment_wikimedia_scribe.xml

@@ -97,6 +97,10 @@
                         android:contentDescription="@string/app.about.community.wikimedia"
                         android:src="@drawable/wikimedia_logo_black" />
                 </androidx.cardview.widget.CardView>
+                <View
+                    android:layout_width="100dp"
+                    android:layout_height="900dp">
+                </View>
             </FrameLayout>
         </LinearLayout>
     </ScrollView>

app/src/main/res/values/string.xml

@@ -34,9 +34,11 @@
     <string name="app.about.legal.third_party">Third-party licenses</string>
     <string name="app.about.legal.third_party.author">Author</string>
     <string name="app.about.legal.third_party.caption">Whose code we used</string>
+    <string name="app.about.legal.third_party.entry_custom_keyboard">Custom Keyboard\n• Author: EthanSK\n• License: MIT\n• Link: https://github.com/EthanSK/CustomKeyboard/blob/master/LICENSE</string>
+    <string name="app.about.legal.third_party.entry_simple_keyboard">Simple Keyboard\n• Author:Simple Mobile Tools\n• License: GPL-3.0\n• Link: https://github.com/SimpleMobileTools/Simple-Keyboard/blob/main/LICENSE</string>
     <string name="app.about.legal.third_party.license">License</string>
     <string name="app.about.legal.third_party.link">Link</string>
-    <string name="app.about.legal.third_party.text">The Scribe developers (SCRIBE) built the iOS application "Scribe - Language Keyboards" (SERVICE) using third party code. All source code used in the creation of this SERVICE comes from sources that allow its full use in the manner done so by the SERVICE. This section lists the source code on which the SERVICE was based as well as the coinciding licenses of each.\n\nThe following is a list of all used source code, the main author or authors of the code, the license under which it was released at time of usage, and a link to the license.\n\n1. Custom Keyboard\n• Author: EthanSK\n• License: MIT\n• Link: https://github.com/EthanSK/CustomKeyboard/blob/master/LICENSE</string>
+    <string name="app.about.legal.third_party.text">The Scribe developers (SCRIBE) built the iOS application "Scribe - Language Keyboards" (SERVICE) using third party code. All source code used in the creation of this SERVICE comes from sources that allow its full use in the manner done so by the SERVICE. This section lists the source code on which the SERVICE was based as well as the coinciding licenses of each.\n\nThe following is a list of all used source code, the main author or authors of the code, the license under which it was released at time of usage, and a link to the license.</string>
     <string name="app.about.legal.title">Legal</string>
     <string name="app.about.title">About</string>
     <string name="app.conjugate.choose_conjugation.select_tense">Select tense</string>
@@ -82,6 +84,8 @@
     <string name="app.settings.keyboard.functionality.double_space_period_description">Automatically insert a period when the space key is pressed twice.</string>
     <string name="app.settings.keyboard.functionality.hold_for_alt_chars">Hold for alternate characters</string>
     <string name="app.settings.keyboard.functionality.hold_for_alt_chars_description">Select alternate characters by holding keys and dragging to the desired character.</string>
+    <string name="app.settings.keyboard.functionality.popup_on_keypress">Show popup on keypress</string>
+    <string name="app.settings.keyboard.functionality.popup_on_keypress_description">Display a popup of keys as they\'re pressed</string>
     <string name="app.settings.keyboard.functionality.punctuation_spacing">Delete punctuation spacing</string>
     <string name="app.settings.keyboard.functionality.punctuation_spacing_description">Remove excess spaces before punctuation marks.</string>
     <string name="app.settings.keyboard.functionality.title">Functionality</string>
@@ -104,6 +108,8 @@
     <string name="app.settings.keyboard.translation.select_source.title">Translation language</string>
     <string name="app.settings.keyboard.translation.select_source_description">Change the language to translate from.</string>
     <string name="app.settings.keyboard.translation.title">Translation source language</string>
+    <string name="app.settings.menu.app_color_mode">Dark mode</string>
+    <string name="app.settings.menu.app_color_mode_description">Change the application display to dark mode.</string>
     <string name="app.settings.menu.app_language">App language</string>
     <string name="app.settings.menu.app_language.caption">Select language for app texts</string>
     <string name="app.settings.menu.app_language.one_device_language_warning.message">You only have one language installed on your device. Please install more languages in Settings and then you can select different localizations of Scribe.</string>