diff options
author | Stefan Niedermann <info@niedermann.it> | 2021-03-22 21:03:28 +0300 |
---|---|---|
committer | Stefan Niedermann <info@niedermann.it> | 2021-03-22 21:03:28 +0300 |
commit | 34cd3c1d34bde7e196ebdf299641a0b53a09f820 (patch) | |
tree | cee74891a28cba2eb86ba301421463f08720ae26 /app/src/main/java/it/niedermann/nextcloud/deck/ui/settings | |
parent | 355041558b563e2a3f8f46ef6b70e84ad260d4bf (diff) |
Fix #844 Enabled branding default, use instance color for global elements
Signed-off-by: Stefan Niedermann <info@niedermann.it>
Diffstat (limited to 'app/src/main/java/it/niedermann/nextcloud/deck/ui/settings')
-rw-r--r-- | app/src/main/java/it/niedermann/nextcloud/deck/ui/settings/SettingsActivity.java | 9 | ||||
-rw-r--r-- | app/src/main/java/it/niedermann/nextcloud/deck/ui/settings/SettingsFragment.java | 44 |
2 files changed, 14 insertions, 39 deletions
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/settings/SettingsActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/settings/SettingsActivity.java index 6440ba971..db0c4147c 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/settings/SettingsActivity.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/settings/SettingsActivity.java @@ -6,13 +6,13 @@ import android.os.Bundle; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; import it.niedermann.nextcloud.deck.R; import it.niedermann.nextcloud.deck.databinding.ActivitySettingsBinding; -import it.niedermann.nextcloud.deck.ui.branding.BrandedActivity; import it.niedermann.nextcloud.deck.ui.exception.ExceptionHandler; -public class SettingsActivity extends BrandedActivity { +public class SettingsActivity extends AppCompatActivity { @Override protected void onCreate(@Nullable Bundle savedInstanceState) { @@ -37,11 +37,6 @@ public class SettingsActivity extends BrandedActivity { return true; } - @Override - public void applyBrand(int mainColor) { - // Nothing to do... - } - @NonNull public static Intent createIntent(@NonNull Context context) { return new Intent(context, SettingsActivity.class); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/settings/SettingsFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/settings/SettingsFragment.java index abc345bb7..d002bb09b 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/settings/SettingsFragment.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/settings/SettingsFragment.java @@ -1,28 +1,27 @@ package it.niedermann.nextcloud.deck.ui.settings; import android.app.Activity; -import android.content.Context; import android.os.Bundle; +import android.view.View; +import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.core.app.ActivityCompat; import androidx.preference.ListPreference; import androidx.preference.Preference; import androidx.preference.PreferenceFragmentCompat; +import it.niedermann.nextcloud.deck.DeckApplication; import it.niedermann.nextcloud.deck.DeckLog; import it.niedermann.nextcloud.deck.R; import it.niedermann.nextcloud.deck.persistence.sync.SyncWorker; -import it.niedermann.nextcloud.deck.ui.branding.Branded; import it.niedermann.nextcloud.deck.ui.branding.BrandedSwitchPreference; import static it.niedermann.nextcloud.deck.DeckApplication.setAppTheme; -import static it.niedermann.nextcloud.deck.ui.branding.BrandingUtil.readBrandMainColor; -public class SettingsFragment extends PreferenceFragmentCompat implements Branded { +public class SettingsFragment extends PreferenceFragmentCompat { private BrandedSwitchPreference wifiOnlyPref; - private BrandedSwitchPreference brandingPref; private BrandedSwitchPreference compactPref; private BrandedSwitchPreference debuggingPref; @@ -54,19 +53,6 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Brande DeckLog.error("Could not find preference with key: \"" + getString(R.string.pref_key_dark_theme) + "\""); } - brandingPref = findPreference(getString(R.string.pref_key_branding)); - if (brandingPref != null) { - brandingPref.setOnPreferenceChangeListener((Preference preference, Object newValue) -> { - final Boolean branding = (Boolean) newValue; - DeckLog.log("branding: " + branding); - requireActivity().setResult(Activity.RESULT_OK); - ActivityCompat.recreate(requireActivity()); - return true; - }); - } else { - DeckLog.error("Could not find preference with key: \"" + getString(R.string.pref_key_dark_theme) + "\""); - } - compactPref = findPreference(getString(R.string.pref_key_compact)); final ListPreference backgroundSyncPref = findPreference(getString(R.string.pref_key_background_sync)); @@ -92,19 +78,13 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Brande } @Override - public void onStart() { - super.onStart(); - @Nullable Context context = getContext(); - if (context != null) { - applyBrand(readBrandMainColor(context)); - } - } - - @Override - public void applyBrand(int mainColor) { - wifiOnlyPref.applyBrand(mainColor); - brandingPref.applyBrand(mainColor); - compactPref.applyBrand(mainColor); - debuggingPref.applyBrand(mainColor); + public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + + DeckApplication.readCurrentAccountColor().observe(getViewLifecycleOwner(), (mainColor) -> { + wifiOnlyPref.applyBrand(mainColor); + compactPref.applyBrand(mainColor); + debuggingPref.applyBrand(mainColor); + }); } } |