diff --git a/Clover/app/src/main/AndroidManifest.xml b/Clover/app/src/main/AndroidManifest.xml index 3eb26f25..7d5976e1 100644 --- a/Clover/app/src/main/AndroidManifest.xml +++ b/Clover/app/src/main/AndroidManifest.xml @@ -134,6 +134,14 @@ along with this program. If not, see . + + + . + */ +package org.floens.chan.ui.activity; + +import android.os.Bundle; +import android.preference.Preference; +import android.preference.PreferenceActivity; +import android.preference.PreferenceFragment; + +import org.floens.chan.R; + +public class AdvancedSettingsActivity extends PreferenceActivity { + @Override + protected void onCreate(final Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + getFragmentManager().beginTransaction().replace(android.R.id.content, new AdvancedSettingsFragment()).commit(); + } + + public static class AdvancedSettingsFragment extends PreferenceFragment { + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + addPreferencesFromResource(R.xml.preference_advanced); + + findPreference("preference_force_phone_layout").setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { + @Override + public boolean onPreferenceChange(final Preference preference, final Object newValue) { + BaseActivity.doRestartOnResume = true; + return true; + } + }); + } + } +} diff --git a/Clover/app/src/main/java/org/floens/chan/ui/activity/SettingsActivity.java b/Clover/app/src/main/java/org/floens/chan/ui/activity/SettingsActivity.java index f10c6c26..f19ecafb 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/activity/SettingsActivity.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/activity/SettingsActivity.java @@ -20,7 +20,10 @@ package org.floens.chan.ui.activity; import android.app.Activity; import android.content.Intent; import android.os.Bundle; +import android.view.Menu; +import android.view.MenuItem; +import org.floens.chan.R; import org.floens.chan.ui.fragment.SettingsFragment; import org.floens.chan.utils.ThemeHelper; @@ -61,4 +64,21 @@ public class SettingsActivity extends Activity { BaseActivity.doRestartOnResume = true; } } + + @Override + public boolean onCreateOptionsMenu(final Menu menu) { + getMenuInflater().inflate(R.menu.settings, menu); + + return true; + } + + @Override + public boolean onOptionsItemSelected(final MenuItem item) { + if (item.getItemId() == R.id.action_settings_advanced) { + startActivity(new Intent(this, AdvancedSettingsActivity.class)); + return true; + } else { + return super.onOptionsItemSelected(item); + } + } } diff --git a/Clover/app/src/main/res/menu/settings.xml b/Clover/app/src/main/res/menu/settings.xml new file mode 100644 index 00000000..8e39bcca --- /dev/null +++ b/Clover/app/src/main/res/menu/settings.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/Clover/app/src/main/res/values/strings.xml b/Clover/app/src/main/res/values/strings.xml index 38a7b86a..4db31c7e 100644 --- a/Clover/app/src/main/res/values/strings.xml +++ b/Clover/app/src/main/res/values/strings.xml @@ -40,6 +40,7 @@ along with this program. If not, see . View mode List Grid + Advanced Unsupported link Clover can\'t open this link. Opening it in your browser instead. @@ -201,6 +202,8 @@ along with this program. If not, see . COUNT images will be downloaded to FOLDER Add more… + + Advanced settings diff --git a/Clover/app/src/main/res/xml/preference.xml b/Clover/app/src/main/res/xml/preference.xml index d27349e0..32c97291 100644 --- a/Clover/app/src/main/res/xml/preference.xml +++ b/Clover/app/src/main/res/xml/preference.xml @@ -72,11 +72,6 @@ along with this program. If not, see . android:key="preference_autoplay" android:dependency="preference_image_auto_load" android:title="@string/preference_autoplay"/> - - diff --git a/Clover/app/src/main/res/xml/preference_advanced.xml b/Clover/app/src/main/res/xml/preference_advanced.xml new file mode 100644 index 00000000..0353d8dd --- /dev/null +++ b/Clover/app/src/main/res/xml/preference_advanced.xml @@ -0,0 +1,25 @@ + + + + + + \ No newline at end of file