diff --git a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java index 9ea541d18..0b26c23b9 100644 --- a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java @@ -429,6 +429,15 @@ public abstract class BaseMainActivity extends BaseActivity pTabLocal.setCustomView(R.layout.tab_badge); + + + Helper.changeDrawableColor(getApplicationContext(),R.drawable.ic_subscriptions, R.attr.iconColorMenu); + Helper.changeDrawableColor(getApplicationContext(),R.drawable.ic_overview, R.attr.iconColorMenu); + Helper.changeDrawableColor(getApplicationContext(),R.drawable.ic_trending_up, R.attr.iconColorMenu); + Helper.changeDrawableColor(getApplicationContext(),R.drawable.ic_recently_added, R.attr.iconColorMenu); + Helper.changeDrawableColor(getApplicationContext(),R.drawable.ic_home, R.attr.iconColorMenu); + + @SuppressWarnings("ConstantConditions") @SuppressLint("CutPasteId") ImageView iconSub = pTabsub.getCustomView().findViewById(R.id.tab_icon); @@ -520,6 +529,10 @@ public abstract class BaseMainActivity extends BaseActivity //TabLayout.Tab pfTabDiscover = tabLayout.newTab(); + Helper.changeDrawableColor(getApplicationContext(),R.drawable.ic_notifications, R.attr.iconColorMenu); + Helper.changeDrawableColor(getApplicationContext(),R.drawable.ic_people, R.attr.iconColorMenu); + Helper.changeDrawableColor(getApplicationContext(),R.drawable.ic_home, R.attr.iconColorMenu); + pfTabHome.setCustomView(R.layout.tab_badge); pfTabLocal.setCustomView(R.layout.tab_badge); pfTabNotification.setCustomView(R.layout.tab_badge); diff --git a/app/src/main/java/app/fedilab/android/activities/LoginActivity.java b/app/src/main/java/app/fedilab/android/activities/LoginActivity.java index 51593bfc0..bac81e844 100644 --- a/app/src/main/java/app/fedilab/android/activities/LoginActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/LoginActivity.java @@ -181,9 +181,6 @@ public class LoginActivity extends BaseActivity { case Helper.THEME_LIGHT: setTheme(R.style.AppTheme_Fedilab); break; - case Helper.THEME_DARK: - setTheme(R.style.AppThemeDark); - break; case Helper.THEME_BLACK: setTheme(R.style.AppThemeBlack); break; @@ -196,7 +193,7 @@ public class LoginActivity extends BaseActivity { if (actionBar != null) { LayoutInflater inflater = (LayoutInflater) this.getSystemService(LAYOUT_INFLATER_SERVICE); assert inflater != null; - View view = inflater.inflate(R.layout.simple_bar, new LinearLayout(getApplicationContext()), false); + View view = inflater.inflate(R.layout.simple_bar, new LinearLayout(LoginActivity.this), false); view.setBackground(new ColorDrawable(ContextCompat.getColor(LoginActivity.this, R.color.cyanea_primary))); actionBar.setCustomView(view, new ActionBar.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)); actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM); @@ -746,7 +743,7 @@ public class LoginActivity extends BaseActivity { menu.findItem(R.id.action_custom_tabs).setChecked(!embedded_browser); boolean security_provider = sharedpreferences.getBoolean(Helper.SET_SECURITY_PROVIDER, true); menu.findItem(R.id.action_provider).setChecked(security_provider); - return super.onCreateOptionsMenu(menu); + return true; } @Override 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 fbc9d8b46..715c646fb 100644 --- a/app/src/main/java/app/fedilab/android/activities/TootActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/TootActivity.java @@ -729,7 +729,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate, autocomplete = false; - + setContentView(R.layout.activity_toot); ActionBar actionBar = getSupportActionBar(); if (actionBar != null) { LayoutInflater inflater = (LayoutInflater) this.getSystemService(LAYOUT_INFLATER_SERVICE); @@ -792,7 +792,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate, pp_progress = actionBar.getCustomView().findViewById(R.id.pp_progress); } - setContentView(R.layout.activity_toot); + //By default the toot is not restored so the id -1 is defined currentToId = -1; diff --git a/app/src/main/java/app/fedilab/android/client/Entities/ManageTimelines.java b/app/src/main/java/app/fedilab/android/client/Entities/ManageTimelines.java index 4ac13fdb7..d09bca8c3 100644 --- a/app/src/main/java/app/fedilab/android/client/Entities/ManageTimelines.java +++ b/app/src/main/java/app/fedilab/android/client/Entities/ManageTimelines.java @@ -270,7 +270,6 @@ public class ManageTimelines { public TabLayout createTabs(Context context, TabLayout tabLayout, java.util.List manageTimelines) { SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); - int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK); tabLayout.removeAllTabs(); int position = 0; for (ManageTimelines tl : manageTimelines) { @@ -281,6 +280,14 @@ public class ManageTimelines { if (tb.getCustomView() != null) icon = tb.getCustomView().findViewById(R.id.tab_icon); } + + Helper.changeDrawableColor(context,R.drawable.ic_home, R.attr.iconColorMenu); + Helper.changeDrawableColor(context,R.drawable.ic_notifications, R.attr.iconColorMenu); + Helper.changeDrawableColor(context,R.drawable.ic_direct_messages, R.attr.iconColorMenu); + Helper.changeDrawableColor(context,R.drawable.ic_people, R.attr.iconColorMenu); + Helper.changeDrawableColor(context,R.drawable.ic_public, R.attr.iconColorMenu); + Helper.changeDrawableColor(context,R.drawable.ic_color_lens, R.attr.iconColorMenu); + Helper.changeDrawableColor(context,R.drawable.ic_video_peertube, R.attr.iconColorMenu); if (icon != null) { switch (tl.getType()) { case HOME: 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 c13aefaca..60e27ce3c 100644 --- a/app/src/main/java/app/fedilab/android/fragments/ColorSettingsFragment.java +++ b/app/src/main/java/app/fedilab/android/fragments/ColorSettingsFragment.java @@ -13,6 +13,7 @@ import android.graphics.BitmapFactory; import android.net.Uri; import android.os.Bundle; import android.os.Environment; +import android.util.Log; import android.widget.Toast; import androidx.appcompat.app.AlertDialog; @@ -267,7 +268,9 @@ public class ColorSettingsFragment extends PreferenceFragmentCompat implements S Preference pref_import = findPreference("pref_import"); Preference pref_export = findPreference("pref_export"); Preference reset_pref = findPreference("reset_pref"); - if (!sharedpreferences.getBoolean("use_custom_theme", false)) { + Log.v(Helper.TAG,"preferenceScreen! " + preferenceScreen); + Log.v(Helper.TAG,"theme_link_color! " + theme_link_color); + if (!sharedpreferences.getBoolean("use_custom_theme", false) ) { preferenceScreen.removePreference(theme_link_color); preferenceScreen.removePreference(theme_boost_header_color); preferenceScreen.removePreference(theme_text_header_1_line); @@ -380,7 +383,7 @@ public class ColorSettingsFragment extends PreferenceFragmentCompat implements S editor.remove("theme_accent"); editor.remove("theme_text_color"); editor.remove("theme_primary"); - editor.remove("use_custom_theme"); + //editor.remove("use_custom_theme"); editor.commit(); } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 2ef43dfbe..49c467311 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -161,7 +161,7 @@ android:layout_gravity="start" android:fitsSystemWindows="false" app:itemTextColor="?attr/textColor" - android:background="?colorPrimaryDark" + app:headerLayout="@layout/nav_header_main" app:menu="@menu/activity_main_drawer" /> diff --git a/app/src/main/res/layout/tab_badge.xml b/app/src/main/res/layout/tab_badge.xml index 5060d0a14..eac2cd822 100644 --- a/app/src/main/res/layout/tab_badge.xml +++ b/app/src/main/res/layout/tab_badge.xml @@ -31,7 +31,6 @@ android:layout_height="wrap_content" android:layout_alignTop="@+id/tab_icon" android:layout_alignEnd="@+id/tab_icon" - android:layout_alignRight="@+id/tab_icon" android:background="@drawable/shape_counter" android:paddingLeft="2dp" android:paddingRight="2dp" diff --git a/app/src/main/res/layout/toot_action_bar.xml b/app/src/main/res/layout/toot_action_bar.xml index 433a3b527..e06a8aafc 100644 --- a/app/src/main/res/layout/toot_action_bar.xml +++ b/app/src/main/res/layout/toot_action_bar.xml @@ -24,6 +24,7 @@ android:contentInsetStart="0dp" android:contentInsetLeft="0dp" android:contentInsetEnd="0dp" + android:background="?colorPrimary" android:contentInsetRight="0dp" app:contentInsetEnd="0dp" app:contentInsetLeft="0dp" diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index fd35821b5..edf4efd3e 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -22,7 +22,7 @@ @color/black @color/light_link_toot @style/Fedilab.PopupMenu.Light - + @drawable/menu_selector @@ -37,6 +37,7 @@ @color/black @color/light_link_toot @style/Fedilab.PopupMenu.Light + @drawable/menu_selector @@ -135,6 +138,7 @@ @color/black @color/black @color/light_link_toot + @drawable/menu_selector -