diff options
author | Kazuki Yamaguchi <k@rhe.jp> | 2015-09-15 00:56:02 +0900 |
---|---|---|
committer | Kazuki Yamaguchi <k@rhe.jp> | 2015-09-15 00:56:02 +0900 |
commit | 7c4deb7a9109a277f95066ac40af1d96f8f410ec (patch) | |
tree | 396f8bf3e7b7a4b458fffc503e372a8544123d22 /app/src/main/java/net/lacolaco/smileessence/view | |
parent | 93b315a3ac7536b007e385bba4434bbda9410de8 (diff) | |
download | SmileEssence-7c4deb7a9109a277f95066ac40af1d96f8f410ec.tar.gz |
Preferences まわりをリファクタ
Diffstat (limited to 'app/src/main/java/net/lacolaco/smileessence/view')
5 files changed, 11 insertions, 15 deletions
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/PostFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/PostFragment.java index a4d8ddb1..2fb4ea9e 100644 --- a/app/src/main/java/net/lacolaco/smileessence/view/PostFragment.java +++ b/app/src/main/java/net/lacolaco/smileessence/view/PostFragment.java @@ -230,13 +230,12 @@ public class PostFragment extends PageFragment implements TextWatcher, View.OnFo Logger.debug("onCreateView"); MainActivity activity = (MainActivity) getActivity(); PostState.getState().setListener(this); - UserPreferenceHelper preferenceHelper = new UserPreferenceHelper(activity); View v = inflater.inflate(R.layout.fragment_post, null); buttonTweet = getTweetButton(v); buttonTweet.setOnClickListener(this); editText = getEditText(v); textViewCount = getCountTextView(v); - int textSize = preferenceHelper.getValue(R.string.key_setting_text_size, 10); + int textSize = UserPreferenceHelper.getInstance().get(R.string.key_setting_text_size, 10); editText.addTextChangedListener(this); editText.setOnFocusChangeListener(this); editText.setTextSize(textSize + 4); @@ -376,7 +375,7 @@ public class PostFragment extends PageFragment implements TextWatcher, View.OnFo PostState state = PostState.getState(); StatusUpdate statusUpdate = state.toStatusUpdate(); MainActivity mainActivity = (MainActivity) getActivity(); - boolean resizeFlag = new UserPreferenceHelper(mainActivity).getValue(R.string.key_setting_resize_post_image, false); + boolean resizeFlag = UserPreferenceHelper.getInstance().get(R.string.key_setting_resize_post_image, false); TweetTask tweetTask = new TweetTask(mainActivity.getCurrentAccount().getTwitter(), statusUpdate, state.getMediaFilePath(), resizeFlag); tweetTask.execute(); PostState.newState().beginTransaction().commit(); diff --git a/app/src/main/java/net/lacolaco/smileessence/view/SettingFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/SettingFragment.java index e3f813c2..894461a0 100644 --- a/app/src/main/java/net/lacolaco/smileessence/view/SettingFragment.java +++ b/app/src/main/java/net/lacolaco/smileessence/view/SettingFragment.java @@ -37,7 +37,6 @@ import net.lacolaco.smileessence.R; import net.lacolaco.smileessence.activity.LicenseActivity; import net.lacolaco.smileessence.entity.Account; import net.lacolaco.smileessence.notification.Notificator; -import net.lacolaco.smileessence.preference.UserPreferenceHelper; import net.lacolaco.smileessence.view.dialog.ConfirmDialogFragment; import net.lacolaco.smileessence.view.dialog.SimpleDialogFragment; @@ -45,6 +44,10 @@ import static android.content.SharedPreferences.OnSharedPreferenceChangeListener public class SettingFragment extends PreferenceFragment implements OnSharedPreferenceChangeListener, Preference.OnPreferenceChangeListener, Preference.OnPreferenceClickListener { + private static final int TEXT_SIZE_MIN = 8; + private static final int TEXT_SIZE_MAX = 24; + private static final int TIMELINES_MIN = 1; + private static final int TIMELINES_MAX = 200; // ------------------------ INTERFACE METHODS ------------------------ @@ -57,7 +60,7 @@ public class SettingFragment extends PreferenceFragment implements OnSharedPrefe if (preference.getKey().contentEquals(getString(R.string.key_setting_text_size))) { if (TextUtils.isDigitsOnly(newValueStr)) { int newTextSize = Integer.parseInt(newValueStr); - if (UserPreferenceHelper.TEXT_SIZE_MIN <= newTextSize && newTextSize <= UserPreferenceHelper.TEXT_SIZE_MAX) { + if (TEXT_SIZE_MIN <= newTextSize && newTextSize <= TEXT_SIZE_MAX) { return true; } Notificator.getInstance().publish(R.string.error_setting_text_size_range); @@ -68,7 +71,7 @@ public class SettingFragment extends PreferenceFragment implements OnSharedPrefe } else if (preference.getKey().contentEquals(getString(R.string.key_setting_timelines))) { if (TextUtils.isDigitsOnly(newValueStr)) { int newTextSize = Integer.parseInt(newValueStr); - if (UserPreferenceHelper.TIMELINES_MIN <= newTextSize && newTextSize <= UserPreferenceHelper.TIMELINES_MAX) { + if (TIMELINES_MIN <= newTextSize && newTextSize <= TIMELINES_MAX) { return true; } Notificator.getInstance().publish(R.string.error_setting_timelines_range); @@ -98,7 +101,7 @@ public class SettingFragment extends PreferenceFragment implements OnSharedPrefe public void run() { Notificator.getInstance().publish(R.string.notice_cleared_account); Account.deleteAll(); - finishActivity(); + getActivity().finish(); } }, false); } else if (key.contentEquals(getString(R.string.key_setting_licenses))) { @@ -159,10 +162,6 @@ public class SettingFragment extends PreferenceFragment implements OnSharedPrefe return findPreference(getString(preferenceResID)); } - private void finishActivity() { - getActivity().finish(); - } - private void openLicenseActivity() { Intent intent = new Intent(getActivity(), LicenseActivity.class); getActivity().startActivity(intent); diff --git a/app/src/main/java/net/lacolaco/smileessence/view/UserListFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/UserListFragment.java index 9e8fd65b..cd186dca 100644 --- a/app/src/main/java/net/lacolaco/smileessence/view/UserListFragment.java +++ b/app/src/main/java/net/lacolaco/smileessence/view/UserListFragment.java @@ -219,7 +219,7 @@ public class UserListFragment extends CustomListFragment<UserListListAdapter> im } public void startUserList(Twitter twitter, String listFullName) { - getMainActivity().saveLastUserList(listFullName); + getMainActivity().setLastUserList(listFullName); final UserListListAdapter adapter = getAdapter(); adapter.setListFullName(listFullName); adapter.clear(); diff --git a/app/src/main/java/net/lacolaco/smileessence/view/adapter/CustomListAdapter.java b/app/src/main/java/net/lacolaco/smileessence/view/adapter/CustomListAdapter.java index 99146758..76824e45 100644 --- a/app/src/main/java/net/lacolaco/smileessence/view/adapter/CustomListAdapter.java +++ b/app/src/main/java/net/lacolaco/smileessence/view/adapter/CustomListAdapter.java @@ -29,8 +29,6 @@ import android.view.View; import android.view.ViewGroup; import android.widget.BaseAdapter; -import com.google.common.collect.Iterables; - import net.lacolaco.smileessence.util.UIHandler; import net.lacolaco.smileessence.viewmodel.IViewModel; diff --git a/app/src/main/java/net/lacolaco/smileessence/view/dialog/ConfirmDialogFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/dialog/ConfirmDialogFragment.java index f1f1f126..f86f0a5f 100644 --- a/app/src/main/java/net/lacolaco/smileessence/view/dialog/ConfirmDialogFragment.java +++ b/app/src/main/java/net/lacolaco/smileessence/view/dialog/ConfirmDialogFragment.java @@ -59,7 +59,7 @@ public abstract class ConfirmDialogFragment extends StackableDialogFragment { } public static void show(Activity activity, String text, final Runnable onOK, final Runnable onCancel, boolean ignorable) { - boolean confirm = new UserPreferenceHelper(activity).getValue(R.string.key_setting_show_confirm_dialog, true); + boolean confirm = UserPreferenceHelper.getInstance().get(R.string.key_setting_show_confirm_dialog, true); if (!confirm && ignorable) { onOK.run(); return; |