From b046c85d78eb3eeb508f793a4ecf7cc383beb92c Mon Sep 17 00:00:00 2001 From: h4h13 Date: Sun, 5 Aug 2018 22:02:54 +0530 Subject: [PATCH] code refactor --- .../ui/activities/SettingsActivity.java | 221 +++++++++--------- 1 file changed, 112 insertions(+), 109 deletions(-) diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/SettingsActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/SettingsActivity.java index 4bdd7df1..fba85c6a 100755 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/SettingsActivity.java +++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/SettingsActivity.java @@ -12,139 +12,142 @@ import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentTransaction; import android.support.v7.widget.Toolbar; import android.view.MenuItem; +import android.view.View; import android.widget.FrameLayout; - -import com.afollestad.materialdialogs.color.ColorChooserDialog; - +import android.widget.TextView; import butterknife.BindView; import butterknife.ButterKnife; import code.name.monkey.appthemehelper.ThemeStore; import code.name.monkey.appthemehelper.util.ColorUtil; +import code.name.monkey.appthemehelper.util.TintHelper; import code.name.monkey.retromusic.R; import code.name.monkey.retromusic.appshortcuts.DynamicShortcutManager; import code.name.monkey.retromusic.ui.activities.base.AbsBaseActivity; import code.name.monkey.retromusic.ui.fragments.settings.MainSettingsFragment; import code.name.monkey.retromusic.util.PreferenceUtil; +import com.afollestad.materialdialogs.color.ColorChooserDialog; public class SettingsActivity extends AbsBaseActivity implements ColorChooserDialog.ColorCallback { - @BindView(R.id.toolbar) - Toolbar toolbar; - @BindView(R.id.app_bar) - AppBarLayout appBarLayout; - @BindView(R.id.detail_content_frame) - @Nullable - FrameLayout detailsFrame; - private FragmentManager fragmentManager = getSupportFragmentManager(); + @BindView(R.id.toolbar) + Toolbar toolbar; + @BindView(R.id.app_bar) + AppBarLayout appBarLayout; + @BindView(R.id.detail_content_frame) + @Nullable + FrameLayout detailsFrame; + private FragmentManager fragmentManager = getSupportFragmentManager(); - @Override - public void onColorSelection(@NonNull ColorChooserDialog dialog, @ColorInt int selectedColor) { - switch (dialog.getTitle()) { - case R.string.primary_color: - int theme = ColorUtil.isColorLight(selectedColor) ? - PreferenceUtil.getThemeResFromPrefValue("light") : - PreferenceUtil.getThemeResFromPrefValue("dark"); + @Override + public void onColorSelection(@NonNull ColorChooserDialog dialog, @ColorInt int selectedColor) { + switch (dialog.getTitle()) { + case R.string.primary_color: + int theme = ColorUtil.isColorLight(selectedColor) ? + PreferenceUtil.getThemeResFromPrefValue("light") : + PreferenceUtil.getThemeResFromPrefValue("dark"); - ThemeStore.editTheme(this).activityTheme(theme).primaryColor(selectedColor).commit(); - break; - case R.string.accent_color: - ThemeStore.editTheme(this).accentColor(selectedColor).commit(); - break; - } - - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) { - new DynamicShortcutManager(this).updateDynamicShortcuts(); - } - recreate(); + ThemeStore.editTheme(this).activityTheme(theme).primaryColor(selectedColor).commit(); + break; + case R.string.accent_color: + ThemeStore.editTheme(this).accentColor(selectedColor).commit(); + break; } - @Override - public void onColorChooserDismissed(@NonNull ColorChooserDialog dialog) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) { + new DynamicShortcutManager(this).updateDynamicShortcuts(); + } + recreate(); + } + @Override + public void onColorChooserDismissed(@NonNull ColorChooserDialog dialog) { + + } + + @Override + protected void onCreate(@Nullable Bundle bundle) { + super.onCreate(bundle); + setContentView(R.layout.activity_settings); + ButterKnife.bind(this); + + setStatusbarColorAuto(); + setNavigationbarColorAuto(); + setTaskDescriptionColorAuto(); + setLightNavigationBar(true); + + setupToolbar(); + + if (bundle == null) { + fragmentManager.beginTransaction().replace(R.id.content_frame, new MainSettingsFragment()) + .commit(); + } else { + restoreFragment(); + } + } + + private void setupToolbar() { + int primaryColor = ThemeStore.primaryColor(this); + appBarLayout.setBackgroundColor(primaryColor); + toolbar.setBackgroundColor(primaryColor); + toolbar.setNavigationOnClickListener(v -> onBackPressed()); + setTitle(R.string.app_name); + setSupportActionBar(toolbar); + } + + private void restoreFragment() { + toolbar.setNavigationIcon(R.drawable.ic_keyboard_backspace_black_24dp); + if (fragmentManager.getBackStackEntryCount() > 0) { + appBarLayout.setExpanded(false, true); + } else { + appBarLayout.setExpanded(true, true); + } + setupToolbar(); + } + + public void setupFragment(Fragment fragment) { + FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction() + .setCustomAnimations(R.animator.slide_up, 0, 0, R.animator.slide_down); + + if (detailsFrame == null) { + fragmentTransaction.replace(R.id.content_frame, fragment, fragment.getTag()); + fragmentTransaction.addToBackStack(null); + fragmentTransaction.commit(); + } else { + fragmentTransaction.replace(R.id.detail_content_frame, fragment, fragment.getTag()); + fragmentTransaction.commit(); } - @Override - protected void onCreate(@Nullable Bundle bundle) { - super.onCreate(bundle); - setContentView(R.layout.activity_settings); - ButterKnife.bind(this); + fragmentManager.addOnBackStackChangedListener(() -> { + if (fragmentManager.getBackStackEntryCount() > 0) { + appBarLayout.setExpanded(false, true); + } else { + appBarLayout.setExpanded(true, true); + } + setupToolbar(); + }); + } - setStatusbarColorAuto(); - setNavigationbarColorAuto(); - setTaskDescriptionColorAuto(); - setLightNavigationBar(true); - setupToolbar(); - - if (bundle == null) { - fragmentManager.beginTransaction().replace(R.id.content_frame, new MainSettingsFragment()).commit(); - } else { - restoreFragment(); - } + @Override + public void onBackPressed() { + if (fragmentManager.getBackStackEntryCount() == 0) { + super.onBackPressed(); + } else { + fragmentManager.popBackStack(); } + } - private void setupToolbar() { - appBarLayout.setBackgroundColor(ThemeStore.primaryColor(this)); - toolbar.setBackgroundColor(ThemeStore.primaryColor(this)); - toolbar.setNavigationOnClickListener(v -> onBackPressed()); - setTitle(R.string.action_settings); - setSupportActionBar(toolbar); + @Override + public boolean onOptionsItemSelected(MenuItem item) { + if (item.getItemId() == android.R.id.home) { + onBackPressed(); + return true; } + return super.onOptionsItemSelected(item); + } - private void restoreFragment() { - toolbar.setNavigationIcon(R.drawable.ic_keyboard_backspace_black_24dp); - if (fragmentManager.getBackStackEntryCount() > 0) { - appBarLayout.setExpanded(false, true); - } else { - appBarLayout.setExpanded(true, true); - } - setupToolbar(); - } - - public void setupFragment(Fragment fragment) { - FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction() - .setCustomAnimations(R.animator.slide_up, 0, 0, R.animator.slide_down); - - if (detailsFrame == null) { - fragmentTransaction.replace(R.id.content_frame, fragment, fragment.getTag()); - fragmentTransaction.addToBackStack(null); - fragmentTransaction.commit(); - } else { - fragmentTransaction.replace(R.id.detail_content_frame, fragment, fragment.getTag()); - fragmentTransaction.commit(); - } - - fragmentManager.addOnBackStackChangedListener(() -> { - if (fragmentManager.getBackStackEntryCount() > 0) { - appBarLayout.setExpanded(false, true); - } else { - appBarLayout.setExpanded(true, true); - } - setupToolbar(); - }); - } - - - @Override - public void onBackPressed() { - if (fragmentManager.getBackStackEntryCount() == 0) { - super.onBackPressed(); - } else { - fragmentManager.popBackStack(); - } - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - if (item.getItemId() == android.R.id.home) { - onBackPressed(); - return true; - } - return super.onOptionsItemSelected(item); - } - - public void addAppbarLayoutElevation(float v) { - TransitionManager.beginDelayedTransition(appBarLayout); - appBarLayout.setElevation(v); - } + public void addAppbarLayoutElevation(float v) { + TransitionManager.beginDelayedTransition(appBarLayout); + appBarLayout.setElevation(v); + } }