Implement encoding option.

xyzz · Mar 2, 2018 · 06db970 · 06db970
1 parent c34f349
commit 06db970
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 89 deletions.
diff --git a/app/src/main/java/ui/activity/MainActivity.java b/app/src/main/java/ui/activity/MainActivity.java
@@ -283,6 +283,8 @@ private void startGame() {
                 // TODO: it will crash if there's no value/invalid value provided
                 file.Writer.write(prefs.getString("data_files", ""), OPENMW_CFG, "data");
 
+                file.Writer.write(prefs.getString("pref_encoding", "win1252"), OPENMW_CFG, "encoding");
+
                 file.Writer.write(prefs.getString("pref_uiScaling", "1.0"), SETTINGS_CFG, "scaling factor");
 
                 runOnUiThread(() -> {

diff --git a/app/src/main/java/ui/fragments/FragmentSettings.java b/app/src/main/java/ui/fragments/FragmentSettings.java
@@ -2,22 +2,14 @@
 
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
-import android.content.pm.PackageManager;
 import android.os.Bundle;
-import android.preference.CheckBoxPreference;
 import android.preference.EditTextPreference;
-import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.PreferenceGroup;
-import android.widget.Toast;
 
 import com.github.machinarius.preferencefragment.PreferenceFragment;
 import com.libopenmw.openmw.R;
 
-import constants.Constants;
-import file.ConfigsFileStorageHelper;
-import ui.screen.ScreenResolutionHelper;
-
 public class FragmentSettings extends PreferenceFragment implements OnSharedPreferenceChangeListener {
 
     @Override
@@ -26,37 +18,6 @@ public void onCreate(final Bundle savedInstanceState) {
 
         addPreferencesFromResource(R.xml.settings);
         getPreferenceScreen().getSharedPreferences().registerOnSharedPreferenceChangeListener(this);
-
-        CheckBoxPreference subtitlescheckBoxPreference = (CheckBoxPreference) findPreference(Constants.SUBTITLES);
-        subtitlescheckBoxPreference.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
-            @Override
-            public boolean onPreferenceChange(final Preference preference, final Object newValue) {
-                boolean showSubtitles = (boolean) newValue;
-                saveSubtitlesSettings(showSubtitles);
-
-                return true;
-            }
-        });
-
-
-        ListPreference encodingList = (ListPreference) findPreference(Constants.LANGUAGE);
-
-        encodingList.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
-            @Override
-            public boolean onPreferenceChange(final Preference preference, final Object newValue) {
-                String encoding = newValue.toString();
-                try {
-                    file.Writer.write(
-                            encoding,
-                            ConfigsFileStorageHelper.OPENMW_CFG,
-                            "encoding");
-
-                } catch (Exception e) {
-
-                }
-                return true;
-            }
-        });
     }
 
     @Override
@@ -76,40 +37,6 @@ public void onResume() {
         }
     }
 
-    private void saveSubtitlesSettings(boolean showSubtitles) {
-
-        try {
-            file.Writer.write(String.valueOf(showSubtitles), ConfigsFileStorageHelper.SETTINGS_CFG, "subtitles");
-
-        } catch (Exception e) {
-
-            Toast toast = Toast.makeText(FragmentSettings.this
-                            .getActivity().getApplicationContext(),
-                    "configs files not found", Toast.LENGTH_LONG);
-            toast.show();
-        }
-    }
-
-    private void saveMipMappingOptions(String mipmapping) {
-        try {
-            file.Writer.write(mipmapping, ConfigsFileStorageHelper.SETTINGS_CFG,
-                    "texture filtering");
-
-        } catch (Exception e) {
-            Toast toast = Toast.makeText(FragmentSettings.this
-                            .getActivity().getApplicationContext(),
-                    "configs files not found",
-                    Toast.LENGTH_LONG);
-            toast.show();
-        }
-
-    }
-
-    private boolean isSensorAvailable() {
-        PackageManager PM = this.getActivity().getPackageManager();
-        return PM.hasSystemFeature(PackageManager.FEATURE_SENSOR_GYROSCOPE);
-    }
-
     @Override
     public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
         updatePreference(findPreference(key), key);

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -2,11 +2,18 @@
 <resources>
     <string name="app_name">OpenMW</string>
 
-    <string-array name="encoding_entry">
+    <string-array name="pref_encoding_entries">
+        <item>Central and Eastern European (win1250)</item>
+        <item>Cyrillic (win1251)</item>
+        <item>Latin (win1252)</item>
+    </string-array>
+
+    <string-array name="pref_encoding_values">
         <item>win1250</item>
         <item>win1251</item>
         <item>win1252</item>
     </string-array>
+
     <string-array name="mipmapping_array">
         <item>trilinear</item>
         <item>bilinear</item>
@@ -42,6 +49,9 @@
     <string name="action_reset_screen_controls">Reset on-screen controls</string>
     <string name="action_show_screen_controls">Configure on-screen controls</string>
     <string name="config_was_reset">Configuration was reset to default values</string>
+    <string name="pref_lang">Language settings</string>
+    <string name="pref_encoding">Game language</string>
+    <string name="pref_encoding_default">win1252</string>
 
     <string-array name="pref_graphicsLibrary_entries">
         <item>GLESv1</item>

diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml
@@ -28,22 +28,16 @@
     </PreferenceCategory>
 
 
-    <PreferenceCategory
-        android:key="categ1anguage"
-        android:title="Language settings">
+    <PreferenceCategory android:title="@string/pref_lang">
         <ListPreference
-            android:key="encoding"
-            android:summary="Game language"
-            android:title="Encoding"
-            android:dialogTitle="Game language"
-            android:entries="@array/encoding_entry"
-            android:entryValues="@array/encoding_entry" />
-
-        <CheckBoxPreference
-            android:key="subtitiles"
-            android:summary="Show subtitles"
-            android:title="Subtitles" />
-
+            android:key="pref_encoding"
+            android:summary="%s"
+            android:title="@string/pref_encoding"
+            android:dialogTitle="@string/pref_encoding"
+            android:entries="@array/pref_encoding_entries"
+            android:entryValues="@array/pref_encoding_values"
+            android:defaultValue="@string/pref_encoding_default"
+            />
 
     </PreferenceCategory>