status-im
/
syng-client
mirror of https://github.com/status-im/syng-client.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

When Full client mode- preference with Json-RPC server becomes disabled

This commit is contained in:
Yaroslav Berezanskyi 2015-08-17 18:49:40 +03:00
parent b15a447c5e
commit 256f03abf4
4 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/io/syng/activity/BaseActivity.java
View File

@ -588,4 +588,5 @@ public abstract class BaseActivity extends AppCompatActivity implements
populateProfiles();
Glide.with(this).load(PrefsUtil.getBackgroundResourceId(ProfileManager.getCurrentProfile().getId())).into(mHeaderImageView);
}
}

9
app/src/main/java/io/syng/activity/SettingsActivity.java
View File

@ -109,10 +109,11 @@ public class SettingsActivity extends PreferenceActivity {
int index = listPreference.findIndexOfValue(stringValue);
// Set the summary to reflect the new value.
preference.setSummary(
index >= 0
? listPreference.getEntries()[index]
: null);
preference.setSummary(index >= 0 ? listPreference.getEntries()[index] : null);
Preference jsonRPC = findPreference(getString(R.string.pref_json_rpc_server_key));
jsonRPC.setEnabled(!stringValue.equals(getString(R.string.pref_running_mode_full_value)));
} else if (key.equals(getString(R.string.pref_json_rpc_server_key))) {
preference.setSummary("Current server address is " + stringValue);
} else {

17
app/src/main/res/values/strings_settings.xml
View File

@ -17,16 +17,19 @@
<string name="pref_title_running_mode">Running Mode</string>
<string name="pref_running_mode_full_name">Full Client</string>
<string name="pref_running_mode_light_name">Light Client</string>
<string name="pref_running_mode_full_value">1</string>
<string name="pref_running_mode_light_value">2</string>
<string-array name="pref_running_modes_titles">
<item>Full Client</item>
<item>Light Client</item>
<item>Json RPC Client</item>
<item>@string/pref_running_mode_full_name</item>
<item>@string/pref_running_mode_light_name</item>
</string-array>
<string-array name="pref_running_modes_values">
<item>1</item>
<item>2</item>
<item>3</item>
<item>@string/pref_running_mode_full_value</item>
<item>@string/pref_running_mode_light_value</item>
</string-array>
<!-- Example settings for Data & Sync -->
@ -55,7 +58,7 @@
<string name="pref_json_rpc_server_default" translate="false">rpc0.syng.io:8545</string>
<string name="pref_json_rpc_server_key" translate="false">pref_json_rpc_server_key</string>
<string name="pref_json_rpc_server_title" translate="false">JSON-RPC server address</string>
<string name="pref_running_mode_key" translate="false">runningMode</string>
<string name="pref_running_mode_key" translate="false">running_mode</string>
</resources>

17
app/src/main/res/xml/pref_general.xml
View File

@ -1,6 +1,14 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<ListPreference
android:entries="@array/pref_running_modes_titles"
android:entryValues="@array/pref_running_modes_values"
android:key="@string/pref_running_mode_key"
android:negativeButtonText="@null"
android:positiveButtonText="@null"
android:title="@string/pref_title_running_mode"/>
<EditTextPreference
android:defaultValue="@string/pref_json_rpc_server_default"
android:inputType="text"
@ -8,15 +16,6 @@
android:singleLine="true"
android:title="@string/pref_json_rpc_server_title"/>
<ListPreference
android:defaultValue="3"
android:entries="@array/pref_running_modes_titles"
android:entryValues="@array/pref_running_modes_values"
android:key="@string/pref_running_mode_key"
android:negativeButtonText="@null"
android:positiveButtonText="@null"
android:title="@string/pref_title_running_mode"/>
<CheckBoxPreference
android:defaultValue="true"
android:key="syncInBackground"