From cba292d3d3d82ee8b1499f72e6cfa0fac3cc3660 Mon Sep 17 00:00:00 2001 From: tom79 Date: Mon, 11 Nov 2019 15:19:02 +0100 Subject: [PATCH] Some changes --- .../android/activities/MainApplication.java | 5 ++++- .../activities/PixelfedComposeActivity.java | 12 ++++++------ .../android/activities/SettingsActivity.java | 18 +----------------- .../android/activities/TootActivity.java | 13 +++++++------ .../fragments/ColorSettingsFragment.java | 15 +++------------ app/src/main/res/values/styles.xml | 3 +++ 6 files changed, 24 insertions(+), 42 deletions(-) diff --git a/app/src/main/java/app/fedilab/android/activities/MainApplication.java b/app/src/main/java/app/fedilab/android/activities/MainApplication.java index a5095dd48..4badbec84 100644 --- a/app/src/main/java/app/fedilab/android/activities/MainApplication.java +++ b/app/src/main/java/app/fedilab/android/activities/MainApplication.java @@ -102,7 +102,10 @@ public class MainApplication extends MultiDexApplication { Cyanea.getInstance().edit().accent(accent).apply(); } if( pref_color_background != -1){ - Cyanea.getInstance().edit().background(pref_color_background).apply(); + Cyanea.getInstance().edit() + .background(pref_color_background) + .backgroundLight(pref_color_background) + .backgroundDark(pref_color_background).apply(); } Cyanea.getInstance().edit().shouldTintNavBar(pref_color_navigation_bar).apply(); diff --git a/app/src/main/java/app/fedilab/android/activities/PixelfedComposeActivity.java b/app/src/main/java/app/fedilab/android/activities/PixelfedComposeActivity.java index 11f2c3a05..5da04fcd4 100644 --- a/app/src/main/java/app/fedilab/android/activities/PixelfedComposeActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/PixelfedComposeActivity.java @@ -340,13 +340,13 @@ public class PixelfedComposeActivity extends BaseActivity implements UploadStatu if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); int iconColor = prefs.getInt("theme_icons_color", -1); - if( iconColor == -1){ - iconColor = ThemeHelper.getAttColor(getApplicationContext(), R.attr.iconColor); + if( iconColor != -1){ + Helper.changeDrawableColor(getApplicationContext(), toot_visibility, iconColor); + Helper.changeDrawableColor(getApplicationContext(), toot_emoji, iconColor); + toot_sensitive.setButtonTintList(ColorStateList.valueOf(iconColor)); + toot_sensitive.setTextColor(iconColor); } - Helper.changeDrawableColor(getApplicationContext(), toot_visibility, iconColor); - Helper.changeDrawableColor(getApplicationContext(), toot_emoji, iconColor); - toot_sensitive.setButtonTintList(ColorStateList.valueOf(iconColor)); - toot_sensitive.setTextColor(iconColor); + } Bundle b = getIntent().getExtras(); ArrayList sharedUri = new ArrayList<>(); diff --git a/app/src/main/java/app/fedilab/android/activities/SettingsActivity.java b/app/src/main/java/app/fedilab/android/activities/SettingsActivity.java index 9ee1c0c02..f7a733b4d 100644 --- a/app/src/main/java/app/fedilab/android/activities/SettingsActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/SettingsActivity.java @@ -31,16 +31,13 @@ import android.widget.LinearLayout; import android.widget.TextView; import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AlertDialog; -import androidx.appcompat.widget.Toolbar; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentStatePagerAdapter; -import androidx.preference.PreferenceManager; import androidx.viewpager.widget.PagerAdapter; import androidx.viewpager.widget.ViewPager; import com.google.android.material.tabs.TabLayout; -import com.jaredrummler.cyanea.Cyanea; import org.jetbrains.annotations.NotNull; import app.fedilab.android.R; @@ -169,9 +166,6 @@ public class SettingsActivity extends BaseActivity { Bundle bundle = new Bundle(); ContentSettingsFragment.type typeOfSettings; switch (position) { - case 0: - typeOfSettings = ContentSettingsFragment.type.TIMELINES; - break; case 1: typeOfSettings = ContentSettingsFragment.type.NOTIFICATIONS; break; @@ -211,17 +205,7 @@ public class SettingsActivity extends BaseActivity { private void showDialog(){ - SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(SettingsActivity.this); - int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK); - int style; - if (theme == Helper.THEME_DARK) { - style = R.style.DialogDark; - } else if (theme == Helper.THEME_BLACK) { - style = R.style.DialogBlack; - } else { - style = R.style.Dialog; - } - AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(SettingsActivity.this, style); + AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(SettingsActivity.this); dialogBuilder.setMessage(R.string.restart_message); dialogBuilder.setTitle(R.string.apply_changes); dialogBuilder.setPositiveButton(R.string.restart, new DialogInterface.OnClickListener() { diff --git a/app/src/main/java/app/fedilab/android/activities/TootActivity.java b/app/src/main/java/app/fedilab/android/activities/TootActivity.java index 52b8743f5..6881c046d 100644 --- a/app/src/main/java/app/fedilab/android/activities/TootActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/TootActivity.java @@ -57,6 +57,7 @@ import android.text.Html; import android.text.InputFilter; import android.text.InputType; import android.text.TextWatcher; +import android.util.Log; import android.util.Patterns; import android.view.LayoutInflater; import android.view.Menu; @@ -405,13 +406,13 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate, SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); int iconColor = prefs.getInt("theme_icons_color", -1); - if( iconColor == -1){ - iconColor = ThemeHelper.getAttColor(getApplicationContext(), R.attr.iconColor); + if( iconColor != -1){ + Helper.changeDrawableColor(getApplicationContext(), toot_emoji, iconColor); + Helper.changeDrawableColor(getApplicationContext(), toot_visibility, iconColor); + Helper.changeDrawableColor(getApplicationContext(), poll_action, iconColor); + Helper.changeDrawableColor(getApplicationContext(), toot_picture, iconColor); } - Helper.changeDrawableColor(getApplicationContext(), toot_emoji, iconColor); - Helper.changeDrawableColor(getApplicationContext(), toot_visibility, iconColor); - Helper.changeDrawableColor(getApplicationContext(), poll_action, iconColor); - Helper.changeDrawableColor(getApplicationContext(), toot_picture, iconColor); + isScheduled = false; if (sharedpreferences.getBoolean(Helper.SET_DISPLAY_EMOJI, true)) { final EmojiPopup emojiPopup = EmojiPopup.Builder.fromRootView(drawer_layout).build(toot_content); diff --git a/app/src/main/java/app/fedilab/android/fragments/ColorSettingsFragment.java b/app/src/main/java/app/fedilab/android/fragments/ColorSettingsFragment.java index 40eb4df76..4dd586503 100644 --- a/app/src/main/java/app/fedilab/android/fragments/ColorSettingsFragment.java +++ b/app/src/main/java/app/fedilab/android/fragments/ColorSettingsFragment.java @@ -20,7 +20,6 @@ import app.fedilab.android.helper.Helper; public class ColorSettingsFragment extends PreferenceFragmentCompat implements SharedPreferences.OnSharedPreferenceChangeListener { - private HashMap initialPref; @Override public void onCreatePreferences(Bundle bundle, String s) { @@ -28,23 +27,14 @@ public class ColorSettingsFragment extends PreferenceFragmentCompat implements Preference button = findPreference("reset_pref"); FragmentActivity context = getActivity(); - int style; + assert context != null; SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(context); - int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK); - if (theme == Helper.THEME_DARK) { - style = R.style.DialogDark; - } else if (theme == Helper.THEME_BLACK) { - style = R.style.DialogBlack; - } else { - style = R.style.Dialog; - } - initialPref = new HashMap<>(); PreferenceFragmentCompat preferenceFragmentCompat = this; button.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() { @Override public boolean onPreferenceClick(Preference preference) { - AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(context, style); + AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(context); dialogBuilder.setMessage(R.string.reset_color); dialogBuilder.setPositiveButton(R.string.reset, new DialogInterface.OnClickListener() { @Override @@ -58,6 +48,7 @@ public class ColorSettingsFragment extends PreferenceFragmentCompat implements editor.remove("pref_color_background"); editor.remove("pref_color_navigation_bar"); editor.remove("theme_accent"); + editor.remove("theme_text_color"); editor.remove("theme_primary"); editor.commit(); dialog.dismiss(); diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index add3d8dac..0031d9d8e 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -84,11 +84,14 @@ 5dp 5dp + +