Remove delay of thread watcher options fragment showing.

captchafix
Florens Douwes 11 years ago
parent b8cfc4f9d0
commit 9ab573c879
  1. 38
      Chan/src/org/floens/chan/ui/activity/WatchSettingsActivity.java

@ -31,6 +31,8 @@ public class WatchSettingsActivity extends Activity implements OnCheckedChangeLi
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setFragment(ChanPreferences.getWatchEnabled());
}
@Override
@ -41,29 +43,18 @@ public class WatchSettingsActivity extends Activity implements OnCheckedChangeLi
watchSwitch.setOnCheckedChangeListener(this);
watchSwitch.setPadding(0, 0, Utils.dp(14), 0);
setEnabled(ChanPreferences.getWatchEnabled());
setSwitch(ChanPreferences.getWatchEnabled());
return true;
}
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
setEnabled(isChecked);
setFragment(isChecked);
setSwitch(isChecked);
}
private void setEnabled(boolean enabled) {
if (enabled) {
FragmentTransaction t = getFragmentManager().beginTransaction();
t.replace(android.R.id.content, new WatchSettingsFragment());
t.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
t.commit();
} else {
FragmentTransaction t = getFragmentManager().beginTransaction();
t.replace(android.R.id.content, TextFragment.newInstance(R.string.watch_info_text));
t.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
t.commit();
}
private void setSwitch(boolean enabled) {
watchSwitch.setChecked(enabled);
ChanPreferences.setWatchEnabled(enabled);
@ -77,6 +68,20 @@ public class WatchSettingsActivity extends Activity implements OnCheckedChangeLi
}, 500);
}
private void setFragment(boolean enabled) {
if (enabled) {
FragmentTransaction t = getFragmentManager().beginTransaction();
t.replace(android.R.id.content, new WatchSettingsFragment());
t.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
t.commit();
} else {
FragmentTransaction t = getFragmentManager().beginTransaction();
t.replace(android.R.id.content, TextFragment.newInstance(R.string.watch_info_text));
t.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
t.commit();
}
}
public static class TextFragment extends Fragment {
public static TextFragment newInstance(int textResource) {
TextFragment f = new TextFragment();
@ -112,9 +117,6 @@ public class WatchSettingsActivity extends Activity implements OnCheckedChangeLi
addPreferencesFromResource(R.xml.preference_watch);
// final Preference backgroundEnabled =
// findPreference("preference_watch_background_enabled");
final ListPreference backgroundTimeout = (ListPreference) findPreference("preference_watch_background_timeout");
String currentValue = backgroundTimeout.getValue();
if (currentValue == null) {

Loading…
Cancel
Save