Skip to content

Commit

Permalink
Android minor changes
Browse files Browse the repository at this point in the history
  • Loading branch information
weihuoya committed Jan 21, 2019
1 parent 3397824 commit bddd0fb
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 30 deletions.

This file was deleted.

Expand Up @@ -262,6 +262,9 @@ public void onClick(DialogInterface dialog, int which)
SingleChoiceSetting scSetting = (SingleChoiceSetting) mClickedItem; SingleChoiceSetting scSetting = (SingleChoiceSetting) mClickedItem;


int value = getValueForSingleChoiceSelection(scSetting, which); int value = getValueForSingleChoiceSelection(scSetting, which);
if (scSetting.getSelectedValue() != value)
mView.onSettingChanged();

MenuTag menuTag = scSetting.getMenuTag(); MenuTag menuTag = scSetting.getMenuTag();
if (menuTag != null) if (menuTag != null)
{ {
Expand Down Expand Up @@ -313,6 +316,9 @@ else if (mClickedItem instanceof StringSingleChoiceSetting)
{ {
StringSingleChoiceSetting scSetting = (StringSingleChoiceSetting) mClickedItem; StringSingleChoiceSetting scSetting = (StringSingleChoiceSetting) mClickedItem;
String value = scSetting.getValueAt(which); String value = scSetting.getValueAt(which);
if (!scSetting.getSelectedValue().equals(value))
mView.onSettingChanged();

StringSetting setting = scSetting.setSelectedValue(value); StringSetting setting = scSetting.setSelectedValue(value);
if (setting != null) if (setting != null)
{ {
Expand All @@ -324,6 +330,9 @@ else if (mClickedItem instanceof StringSingleChoiceSetting)
else if (mClickedItem instanceof SliderSetting) else if (mClickedItem instanceof SliderSetting)
{ {
SliderSetting sliderSetting = (SliderSetting) mClickedItem; SliderSetting sliderSetting = (SliderSetting) mClickedItem;
if (sliderSetting.getSelectedValue() != mSeekbarProgress)
mView.onSettingChanged();

if (sliderSetting.isPercentSetting() || sliderSetting.getSetting() instanceof FloatSetting) if (sliderSetting.isPercentSetting() || sliderSetting.getSetting() instanceof FloatSetting)
{ {
float value; float value;
Expand Down Expand Up @@ -355,7 +364,6 @@ else if (mClickedItem instanceof SliderSetting)
closeDialog(); closeDialog();
} }


mView.onSettingChanged();
mClickedItem = null; mClickedItem = null;
mSeekbarProgress = -1; mSeekbarProgress = -1;
} }
Expand Down
Expand Up @@ -453,7 +453,7 @@ private void addEnhanceSettings(ArrayList<SettingsItem> sl)
R.string.internal_resolution, R.string.internal_resolution_description, R.string.internal_resolution, R.string.internal_resolution_description,
R.array.internalResolutionEntries, R.array.internalResolutionValues, 1, resolution)); R.array.internalResolutionEntries, R.array.internalResolutionValues, 1, resolution));
sl.add(new SingleChoiceSetting(SettingsFile.KEY_FSAA, Settings.SECTION_GFX_SETTINGS, sl.add(new SingleChoiceSetting(SettingsFile.KEY_FSAA, Settings.SECTION_GFX_SETTINGS,
R.string.FSAA, R.string.FSAA_description, R.array.FSAAEntries, R.array.FSAAValues, 0, R.string.FSAA, R.string.FSAA_description, R.array.FSAAEntries, R.array.FSAAValues, 1,
fsaa)); fsaa));
sl.add(new SingleChoiceSetting(SettingsFile.KEY_ANISOTROPY, Settings.SECTION_GFX_ENHANCEMENTS, sl.add(new SingleChoiceSetting(SettingsFile.KEY_ANISOTROPY, Settings.SECTION_GFX_ENHANCEMENTS,
R.string.anisotropic_filtering, R.string.anisotropic_filtering_description, R.string.anisotropic_filtering, R.string.anisotropic_filtering_description,
Expand Down Expand Up @@ -530,7 +530,7 @@ private String[] getShaderList(String subDir)
if (shaderFiles != null) if (shaderFiles != null)
{ {
String[] result = new String[shaderFiles.length + 1]; String[] result = new String[shaderFiles.length + 1];
result[0] = "Off"; result[0] = mView.getActivity().getString(R.string.off);
for (int i = 0; i < shaderFiles.length; i++) for (int i = 0; i < shaderFiles.length; i++)
{ {
String name = shaderFiles[i].getName(); String name = shaderFiles[i].getName();
Expand Down
@@ -1,6 +1,7 @@
package org.dolphinemu.dolphinemu.features.settings.utils; package org.dolphinemu.dolphinemu.features.settings.utils;


import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.text.TextUtils;


import org.dolphinemu.dolphinemu.NativeLibrary; import org.dolphinemu.dolphinemu.NativeLibrary;
import org.dolphinemu.dolphinemu.features.settings.model.BooleanSetting; import org.dolphinemu.dolphinemu.features.settings.model.BooleanSetting;
Expand Down Expand Up @@ -715,9 +716,11 @@ private static void writeSection(PrintWriter writer, SettingSection section)
for (String key : sortedKeySet) for (String key : sortedKeySet)
{ {
Setting setting = settings.get(key); Setting setting = settings.get(key);
String settingString = settingAsString(setting); String valueAsString = setting.getValueAsString();

if (!TextUtils.isEmpty(valueAsString))
writer.println(settingString); {
writer.println(setting.getKey() + " = " + valueAsString);
}
} }
} }


Expand All @@ -726,11 +729,6 @@ private static String sectionAsString(SettingSection section)
return "[" + section.getName() + "]"; return "[" + section.getName() + "]";
} }


private static String settingAsString(Setting setting)
{
return setting.getKey() + " = " + setting.getValueAsString();
}

private static String customWiimoteExtSettingAsString(Setting setting) private static String customWiimoteExtSettingAsString(Setting setting)
{ {
return setting.getKey().substring(0, setting.getKey().length() - 1) + " = " + return setting.getKey().substring(0, setting.getKey().length() - 1) + " = " +
Expand Down
5 changes: 1 addition & 4 deletions Source/Android/app/src/main/res/layout/fragment_settings.xml
Expand Up @@ -6,10 +6,7 @@
<android.support.v7.widget.RecyclerView <android.support.v7.widget.RecyclerView
android:id="@+id/list_settings" android:id="@+id/list_settings"
android:background="@android:color/white" android:background="@android:color/white"
android:elevation="@dimen/elevation_high"
android:layout_marginStart="@dimen/activity_horizontal_margin"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"/> android:layout_height="match_parent"/>


</org.dolphinemu.dolphinemu.features.settings.ui.SettingsFrameLayout> </org.dolphinemu.dolphinemu.features.settings.ui.SettingsFrameLayout>
6 changes: 4 additions & 2 deletions Source/Android/app/src/main/res/values/arrays.xml
Expand Up @@ -143,14 +143,16 @@


<!-- FSAA Preference --> <!-- FSAA Preference -->
<string-array name="FSAAEntries" translatable="false"> <string-array name="FSAAEntries" translatable="false">
<item>1x</item> <item>Off</item>
<item>2x</item> <item>2x</item>
<item>4x</item> <item>4x</item>
<item>8x</item>
</string-array> </string-array>
<integer-array name="FSAAValues" translatable="false"> <integer-array name="FSAAValues" translatable="false">
<item>0</item>
<item>1</item> <item>1</item>
<item>2</item> <item>2</item>
<item>4</item>
<item>8</item>
</integer-array> </integer-array>


<!-- Anisotropic Filtering Preference --> <!-- Anisotropic Filtering Preference -->
Expand Down
1 change: 1 addition & 0 deletions Source/Android/app/src/main/res/values/strings.xml
Expand Up @@ -248,6 +248,7 @@
<string name="yes">Yes</string> <string name="yes">Yes</string>
<string name="no">No</string> <string name="no">No</string>
<string name="ok">OK</string> <string name="ok">OK</string>
<string name="off">Off</string>
<string name="cancel">Cancel</string> <string name="cancel">Cancel</string>
<string name="clear">Clear</string> <string name="clear">Clear</string>
<string name="disabled">Disabled</string> <string name="disabled">Disabled</string>
Expand Down

0 comments on commit bddd0fb

Please sign in to comment.