Settings refactor + Feedback reporter + Translations

app/src/main/res/xml/preferences.xml

@@ -27,70 +27,71 @@
 
     <Preference
         a:defaultValue="false"
-        a:key="buy_premium"
+        a:key="prefs.supportProject"
         a:summary="@string/c_calc_ad_free_summary"
         a:title="@string/c_calc_ad_free_title" />
 
     <PreferenceCategory
         a:key="category-basic"
-        a:title="Basic">
+        a:title="@string/cpp_prefs_basic">
 
         <ListPreference
-            a:entries="@array/p_layout_names"
-            a:entryValues="@array/p_layout_values"
+            a:entries="@array/cpp_layout_names"
+            a:entryValues="@array/cpp_layouts"
             a:key="gui.mode"
             a:title="@string/cpp_mode" />
 
         <ListPreference
-            a:entries="@array/p_angle_units_names"
-            a:entryValues="@array/p_angle_units"
+            a:entries="@array/cpp_angle_unit_names"
+            a:entryValues="@array/cpp_angle_units"
             a:key="engine.angleUnit"
             a:title="@string/cpp_angles" />
 
         <ListPreference
-            a:entries="@array/p_numeral_bases_names"
-            a:entryValues="@array/p_numeral_bases"
+            a:entries="@array/cpp_numeral_base_names"
+            a:entryValues="@array/cpp_numeral_bases"
             a:key="engine.numeralBase"
             a:title="@string/cpp_radix" />
 
         <Preference
             a:key="screen-number-format"
-            a:title="Number format" />
+            a:title="@string/cpp_number_format" />
     </PreferenceCategory>
 
     <PreferenceCategory
         a:key="category-advanced"
-        a:title="Advanced">
+        a:title="@string/cpp_prefs_advanced">
 
-        <Preference
-            a:key="screen-calculations"
-            a:title="@string/c_prefs_calculations_category" />
         <Preference
             a:key="screen-appearance"
-            a:title="@string/c_prefs_appearance_category" />
-        <Preference
-            a:key="screen-other"
-            a:title="@string/c_prefs_other_category" />
+            a:title="@string/cpp_appearance" />
         <Preference
             a:key="screen-onscreen"
-            a:title="@string/prefs_onscreen_title" />
+            a:title="@string/cpp_floating_calculator" />
         <Preference
             a:key="screen-widget"
-            a:title="@string/prefs_widget_title" />
+            a:title="@string/cpp_widget" />
+        <Preference
+            a:key="screen-other"
+            a:title="@string/cpp_other" />
 
     </PreferenceCategory>
 
     <PreferenceCategory
         a:key="category-help"
-        a:title="Help">
+        a:title="@string/cpp_help">
 
         <Preference
-            a:key="restart_wizard"
-            a:title="@string/cpp_restart_wizard" />
+            a:key="prefs.introduction"
+            a:title="@string/cpp_introduction" />
 
         <Preference
             a:key="prefs.reportBug"
-            a:title="Report a problem" />
+            a:title="@string/cpp_report_problem" />
+
+        <Preference
+            a:key="prefs.about"
+            a:title="@string/cpp_about" />
 
     </PreferenceCategory>
 

app/src/main/res/xml/preferences_calculations.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<PreferenceScreen xmlns:a="http://schemas.android.com/apk/res/android">
-
-    <android.preference.CheckBoxPreference
-        a:key="calculations_calculate_on_fly"
-        a:summary="@string/p_calculations_calculate_on_fly_summary"
-        a:title="@string/p_calculations_calculate_on_fly_title" />
-
-</PreferenceScreen>

app/src/main/res/xml/preferences_number_format.xml

@@ -27,23 +27,23 @@
 
     <org.solovyev.android.material.preferences.ListPreference
         a:key="engine.output.notation"
-        a:title="Notation"
+        a:title="@string/cpp_format"
         m:materialColor="@color/material_text_selector" />
 
     <org.solovyev.android.calculator.preferences.PrecisionPreference
         a:key="engine.output.precision"
-        a:title="@string/p_calc_result_precision_title" />
+        a:title="@string/cpp_precision" />
 
     <org.solovyev.android.material.preferences.ListPreference
-        a:entries="@array/p_grouping_separator_names"
-        a:entryValues="@array/p_grouping_separator_values"
+        a:entries="@array/cpp_thousands_separator_names"
+        a:entryValues="@array/cpp_thousands_separators"
         a:key="engine.output.separator"
-        a:title="@string/c_calc_grouping_separator"
+        a:title="@string/cpp_thousands_separator"
         m:materialColor="@color/material_text_selector" />
 
     <org.solovyev.android.calculator.preferences.NumberFormatExamplesPreference
         a:key="numberFormat.examples"
         a:selectable="false"
-        a:title="Examples" />
+        a:title="@string/cpp_examples" />
 
 </PreferenceScreen>

app/src/main/res/xml/preferences_onscreen.xml

@@ -24,15 +24,14 @@
 
 <PreferenceScreen xmlns:a="http://schemas.android.com/apk/res/android">
 
-    <ListPreference
-        a:entries="@array/p_simple_theme_names"
-        a:entryValues="@array/p_simple_theme_values"
-        a:key="onscreen.theme"
-        a:title="@string/c_calc_theme" />
-
     <android.preference.CheckBoxPreference
         a:key="onscreen_show_app_icon"
-        a:summary="@string/prefs_onscreen_show_app_icon_summary"
-        a:title="@string/prefs_onscreen_show_app_icon_title" />
+        a:title="@string/cpp_enable"/>
+
+    <ListPreference
+        a:entries="@array/cpp_simple_theme_names"
+        a:entryValues="@array/cpp_simple_themes"
+        a:key="onscreen.theme"
+        a:title="@string/cpp_theme" />
 
 </PreferenceScreen>

app/src/main/res/xml/preferences_other.xml

@@ -24,14 +24,17 @@
 
 <PreferenceScreen xmlns:a="http://schemas.android.com/apk/res/android">
 
+
+    <android.preference.CheckBoxPreference
+        a:key="calculations_calculate_on_fly"
+        a:title="@string/p_calculations_calculate_on_fly_title" />
+
     <android.preference.CheckBoxPreference
         a:key="gui.showReleaseNotes"
-        a:summary="@string/c_calc_show_release_notes_summary"
         a:title="@string/c_calc_show_release_notes_title" />
 
     <android.preference.CheckBoxPreference
         a:key="gui.useBackAsPrevious"
-        a:summary="@string/c_calc_use_back_button_as_prev_summary"
         a:title="@string/c_calc_use_back_button_as_prev_title" />
 
 </PreferenceScreen>

app/src/main/res/xml/preferences_widget.xml

@@ -25,9 +25,9 @@
 <PreferenceScreen xmlns:a="http://schemas.android.com/apk/res/android">
 
     <ListPreference
-        a:entries="@array/p_simple_theme_names"
-        a:entryValues="@array/p_simple_theme_values"
+        a:entries="@array/cpp_simple_theme_names"
+        a:entryValues="@array/cpp_simple_themes"
         a:key="widget.theme"
-        a:title="@string/c_calc_theme" />
+        a:title="@string/cpp_theme" />
 
 </PreferenceScreen>