From 830e778b432ef5b7d6c57a457e8d9ba56ba4a093 Mon Sep 17 00:00:00 2001 From: Thomas Date: Sun, 8 May 2022 10:37:47 +0200 Subject: [PATCH] Fix theming and crashes for Android 21 --- .../app/fedilab/android/BaseMainActivity.java | 4 ++++ .../android/activities/ActionActivity.java | 6 +++++- .../android/activities/ComposeActivity.java | 2 ++ .../android/activities/ContextActivity.java | 3 +++ .../activities/CustomSharingActivity.java | 3 +++ .../android/activities/DraftActivity.java | 6 ++++++ .../android/activities/EditProfileActivity.java | 6 +++++- .../android/activities/FilterActivity.java | 6 +++++- .../android/activities/HashTagActivity.java | 3 +++ .../android/activities/MastodonListActivity.java | 3 +++ .../android/activities/MediaActivity.java | 2 ++ .../android/activities/ProfileActivity.java | 2 ++ .../activities/ReorderTimelinesActivity.java | 6 +++++- .../android/activities/ReportActivity.java | 6 +++++- .../android/activities/ScheduledActivity.java | 3 +++ .../activities/SearchResultTabActivity.java | 5 ++++- .../android/activities/SettingsActivity.java | 6 +++++- .../android/activities/StatusInfoActivity.java | 3 +++ .../android/activities/WebviewActivity.java | 2 ++ .../android/services/PostMessageServiceSave.java | 4 ++-- .../timeline/FragmentMastodonTimeline.java | 4 +++- .../main/res/drawable-hdpi/ic_notification.png | Bin 0 -> 619 bytes .../main/res/drawable-mdpi/ic_notification.png | Bin 0 -> 427 bytes .../main/res/drawable-xhdpi/ic_notification.png | Bin 0 -> 812 bytes .../main/res/drawable-xxhdpi/ic_notification.png | Bin 0 -> 1193 bytes 25 files changed, 75 insertions(+), 10 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/ic_notification.png create mode 100644 app/src/main/res/drawable-mdpi/ic_notification.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_notification.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_notification.png diff --git a/app/src/main/java/app/fedilab/android/BaseMainActivity.java b/app/src/main/java/app/fedilab/android/BaseMainActivity.java index 5acfd5ad..e4eb1c6d 100644 --- a/app/src/main/java/app/fedilab/android/BaseMainActivity.java +++ b/app/src/main/java/app/fedilab/android/BaseMainActivity.java @@ -26,6 +26,7 @@ import android.content.Intent; import android.content.IntentFilter; import android.content.SharedPreferences; import android.graphics.PorterDuff; +import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.Handler; @@ -47,6 +48,7 @@ import androidx.appcompat.app.AlertDialog; import androidx.appcompat.widget.PopupMenu; import androidx.appcompat.widget.SearchView; import androidx.core.app.ActivityOptionsCompat; +import androidx.core.content.ContextCompat; import androidx.core.view.GravityCompat; import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProvider; @@ -217,6 +219,8 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt binding.compose.setOnClickListener(v -> startActivity(new Intent(this, ComposeActivity.class))); headerMenuOpen = false; binding.bottomNavView.inflateMenu(R.menu.bottom_nav_menu); + binding.bottomNavView.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary))); + binding.navView.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary))); binding.bottomNavView.setOnItemSelectedListener(item -> { int itemId = item.getItemId(); if (itemId == R.id.nav_home) { diff --git a/app/src/main/java/app/fedilab/android/activities/ActionActivity.java b/app/src/main/java/app/fedilab/android/activities/ActionActivity.java index 18c5e7df..12c0db8f 100644 --- a/app/src/main/java/app/fedilab/android/activities/ActionActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/ActionActivity.java @@ -14,10 +14,12 @@ package app.fedilab.android.activities; * You should have received a copy of the GNU General Public License along with Fedilab; if not, * see . */ +import android.graphics.drawable.ColorDrawable; import android.os.Bundle; import android.view.MenuItem; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentTransaction; @@ -43,8 +45,10 @@ public class ActionActivity extends BaseActivity { binding = ActivityActionsBinding.inflate(getLayoutInflater()); setContentView(binding.getRoot()); - if (getSupportActionBar() != null) + if (getSupportActionBar() != null) { getSupportActionBar().setDisplayHomeAsUpEnabled(true); + getSupportActionBar().setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary))); + } canGoBack = false; binding.favourites.setOnClickListener(v -> displayTimeline(Timeline.TimeLineEnum.FAVOURITE_TIMELINE)); binding.bookmarks.setOnClickListener(v -> displayTimeline(Timeline.TimeLineEnum.BOOKMARK_TIMELINE)); diff --git a/app/src/main/java/app/fedilab/android/activities/ComposeActivity.java b/app/src/main/java/app/fedilab/android/activities/ComposeActivity.java index af3f7084..16f99c87 100644 --- a/app/src/main/java/app/fedilab/android/activities/ComposeActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/ComposeActivity.java @@ -22,6 +22,7 @@ import android.annotation.SuppressLint; import android.content.ClipData; import android.content.Intent; import android.content.pm.PackageManager; +import android.graphics.drawable.ColorDrawable; import android.net.Uri; import android.os.Build; import android.os.Bundle; @@ -111,6 +112,7 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana //Remove title if (actionBar != null) { actionBar.setDisplayShowTitleEnabled(false); + actionBar.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary))); } if (getSupportActionBar() != null) { getSupportActionBar().setDisplayHomeAsUpEnabled(true); diff --git a/app/src/main/java/app/fedilab/android/activities/ContextActivity.java b/app/src/main/java/app/fedilab/android/activities/ContextActivity.java index 5003508b..307d669a 100644 --- a/app/src/main/java/app/fedilab/android/activities/ContextActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/ContextActivity.java @@ -17,6 +17,7 @@ package app.fedilab.android.activities; import android.content.SharedPreferences; import android.content.res.Resources; +import android.graphics.drawable.ColorDrawable; import android.os.Bundle; import android.os.Handler; import android.os.Looper; @@ -25,6 +26,7 @@ import android.view.MenuItem; import androidx.annotation.NonNull; import androidx.appcompat.app.ActionBar; +import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import androidx.preference.PreferenceManager; @@ -58,6 +60,7 @@ public class ContextActivity extends BaseActivity { //Remove title if (actionBar != null) { actionBar.setDisplayShowTitleEnabled(false); + actionBar.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary))); } binding.title.setText(R.string.context_conversation); if (getSupportActionBar() != null) { diff --git a/app/src/main/java/app/fedilab/android/activities/CustomSharingActivity.java b/app/src/main/java/app/fedilab/android/activities/CustomSharingActivity.java index e16231f9..8a832a4b 100644 --- a/app/src/main/java/app/fedilab/android/activities/CustomSharingActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/CustomSharingActivity.java @@ -15,6 +15,7 @@ package app.fedilab.android.activities; * see . */ import android.content.SharedPreferences; +import android.graphics.drawable.ColorDrawable; import android.net.Uri; import android.os.Build; import android.os.Bundle; @@ -23,6 +24,7 @@ import android.text.TextUtils; import android.view.MenuItem; import android.widget.Toast; +import androidx.core.content.ContextCompat; import androidx.preference.PreferenceManager; import java.util.List; @@ -70,6 +72,7 @@ public class CustomSharingActivity extends BaseActivity implements OnCustomShari if (getSupportActionBar() != null) { getSupportActionBar().setDisplayHomeAsUpEnabled(true); getSupportActionBar().setDisplayShowHomeEnabled(true); + getSupportActionBar().setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary))); } Bundle b = getIntent().getExtras(); status = null; diff --git a/app/src/main/java/app/fedilab/android/activities/DraftActivity.java b/app/src/main/java/app/fedilab/android/activities/DraftActivity.java index bc93cd93..e6ceff39 100644 --- a/app/src/main/java/app/fedilab/android/activities/DraftActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/DraftActivity.java @@ -14,6 +14,7 @@ package app.fedilab.android.activities; * You should have received a copy of the GNU General Public License along with Fedilab; if not, * see . */ +import android.graphics.drawable.ColorDrawable; import android.os.Bundle; import android.os.Handler; import android.os.Looper; @@ -25,6 +26,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AlertDialog; +import androidx.core.content.ContextCompat; import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.LinearLayoutManager; @@ -61,6 +63,10 @@ public class DraftActivity extends BaseActivity implements StatusDraftAdapter.Dr setContentView(binding.getRoot()); setSupportActionBar(binding.toolbar); ActionBar actionBar = getSupportActionBar(); + if (actionBar != null) { + actionBar.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary))); + } + //Remove title if (actionBar != null) { actionBar.setDisplayShowTitleEnabled(false); diff --git a/app/src/main/java/app/fedilab/android/activities/EditProfileActivity.java b/app/src/main/java/app/fedilab/android/activities/EditProfileActivity.java index 415b121d..b8430b33 100644 --- a/app/src/main/java/app/fedilab/android/activities/EditProfileActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/EditProfileActivity.java @@ -17,6 +17,7 @@ package app.fedilab.android.activities; import static app.fedilab.android.BaseMainActivity.instanceInfo; import android.content.Intent; +import android.graphics.drawable.ColorDrawable; import android.os.Build; import android.os.Bundle; import android.provider.MediaStore; @@ -28,6 +29,7 @@ import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; +import androidx.core.content.ContextCompat; import androidx.lifecycle.ViewModelProvider; import androidx.localbroadcastmanager.content.LocalBroadcastManager; @@ -63,8 +65,10 @@ public class EditProfileActivity extends BaseActivity { ThemeHelper.applyThemeBar(this); binding = ActivityEditProfileBinding.inflate(getLayoutInflater()); setContentView(binding.getRoot()); - if (getSupportActionBar() != null) + if (getSupportActionBar() != null) { getSupportActionBar().setDisplayHomeAsUpEnabled(true); + getSupportActionBar().setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary))); + } new ViewModelProvider(EditProfileActivity.this).get(AccountsVM.class).getConnectedAccount(BaseMainActivity.currentInstance, BaseMainActivity.currentToken) .observe(EditProfileActivity.this, account -> { diff --git a/app/src/main/java/app/fedilab/android/activities/FilterActivity.java b/app/src/main/java/app/fedilab/android/activities/FilterActivity.java index 27d52b0e..d45272bb 100644 --- a/app/src/main/java/app/fedilab/android/activities/FilterActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/FilterActivity.java @@ -15,6 +15,7 @@ package app.fedilab.android.activities; * see . */ import android.content.Context; +import android.graphics.drawable.ColorDrawable; import android.os.Bundle; import android.view.LayoutInflater; import android.view.MenuItem; @@ -27,6 +28,7 @@ import android.widget.Button; import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; +import androidx.core.content.ContextCompat; import androidx.lifecycle.LifecycleOwner; import androidx.lifecycle.ViewModelProvider; import androidx.lifecycle.ViewModelStoreOwner; @@ -184,8 +186,10 @@ public class FilterActivity extends BaseActivity implements FilterAdapter.Delete binding = ActivityFiltersBinding.inflate(getLayoutInflater()); setContentView(binding.getRoot()); filterList = new ArrayList<>(); - if (getSupportActionBar() != null) + if (getSupportActionBar() != null) { getSupportActionBar().setDisplayHomeAsUpEnabled(true); + getSupportActionBar().setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary))); + } AccountsVM accountsVM = new ViewModelProvider(FilterActivity.this).get(AccountsVM.class); accountsVM.getFilters(BaseMainActivity.currentInstance, BaseMainActivity.currentToken) diff --git a/app/src/main/java/app/fedilab/android/activities/HashTagActivity.java b/app/src/main/java/app/fedilab/android/activities/HashTagActivity.java index 060f0b4a..f05e5865 100644 --- a/app/src/main/java/app/fedilab/android/activities/HashTagActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/HashTagActivity.java @@ -16,6 +16,7 @@ package app.fedilab.android.activities; import android.content.Intent; +import android.graphics.drawable.ColorDrawable; import android.os.Bundle; import android.os.Handler; import android.os.Looper; @@ -24,6 +25,7 @@ import android.view.MenuItem; import androidx.annotation.NonNull; import androidx.appcompat.app.ActionBar; +import androidx.core.content.ContextCompat; import androidx.localbroadcastmanager.content.LocalBroadcastManager; import java.util.ArrayList; @@ -70,6 +72,7 @@ public class HashTagActivity extends BaseActivity { //Remove title if (actionBar != null) { actionBar.setDisplayShowTitleEnabled(false); + actionBar.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary))); } binding.title.setText(tag); if (getSupportActionBar() != null) { diff --git a/app/src/main/java/app/fedilab/android/activities/MastodonListActivity.java b/app/src/main/java/app/fedilab/android/activities/MastodonListActivity.java index e92a1c5e..c4527da4 100644 --- a/app/src/main/java/app/fedilab/android/activities/MastodonListActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/MastodonListActivity.java @@ -16,6 +16,7 @@ package app.fedilab.android.activities; import android.content.Intent; +import android.graphics.drawable.ColorDrawable; import android.os.Bundle; import android.text.Editable; import android.text.InputFilter; @@ -27,6 +28,7 @@ import android.view.View; import androidx.annotation.NonNull; import androidx.appcompat.app.AlertDialog; +import androidx.core.content.ContextCompat; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentTransaction; import androidx.lifecycle.ViewModelProvider; @@ -81,6 +83,7 @@ public class MastodonListActivity extends BaseActivity implements MastodonListAd if (getSupportActionBar() != null) { getSupportActionBar().setDisplayHomeAsUpEnabled(true); getSupportActionBar().setDisplayShowHomeEnabled(true); + getSupportActionBar().setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary))); } flagLoading = false; max_id = null; diff --git a/app/src/main/java/app/fedilab/android/activities/MediaActivity.java b/app/src/main/java/app/fedilab/android/activities/MediaActivity.java index 176dd1a7..104ce803 100644 --- a/app/src/main/java/app/fedilab/android/activities/MediaActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/MediaActivity.java @@ -25,6 +25,7 @@ import android.content.IntentFilter; import android.content.SharedPreferences; import android.content.pm.PackageManager; import android.graphics.Point; +import android.graphics.drawable.ColorDrawable; import android.net.Uri; import android.os.Build; import android.os.Bundle; @@ -124,6 +125,7 @@ public class MediaActivity extends BaseActivity implements OnDownloadInterface { if (getSupportActionBar() != null) { getSupportActionBar().setDisplayHomeAsUpEnabled(true); getSupportActionBar().setDisplayShowHomeEnabled(true); + getSupportActionBar().setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary))); } if (attachments == null || attachments.size() == 0) diff --git a/app/src/main/java/app/fedilab/android/activities/ProfileActivity.java b/app/src/main/java/app/fedilab/android/activities/ProfileActivity.java index b11dbbca..d19fc1e2 100644 --- a/app/src/main/java/app/fedilab/android/activities/ProfileActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/ProfileActivity.java @@ -23,6 +23,7 @@ import android.content.Intent; import android.content.IntentFilter; import android.content.SharedPreferences; import android.content.res.ColorStateList; +import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.os.Build; import android.os.Bundle; @@ -152,6 +153,7 @@ public class ProfileActivity extends BaseActivity { //Remove title if (actionBar != null) { actionBar.setDisplayShowTitleEnabled(false); + actionBar.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary))); } if (getSupportActionBar() != null) { diff --git a/app/src/main/java/app/fedilab/android/activities/ReorderTimelinesActivity.java b/app/src/main/java/app/fedilab/android/activities/ReorderTimelinesActivity.java index 674b8aba..8d6e6561 100644 --- a/app/src/main/java/app/fedilab/android/activities/ReorderTimelinesActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/ReorderTimelinesActivity.java @@ -19,6 +19,7 @@ import static app.fedilab.android.helper.PinnedTimelineHelper.sortPositionAsc; import android.content.Intent; import android.graphics.Paint; +import android.graphics.drawable.ColorDrawable; import android.os.Bundle; import android.os.Handler; import android.text.Editable; @@ -34,6 +35,7 @@ import android.widget.Toast; import androidx.annotation.NonNull; import androidx.appcompat.app.AlertDialog; +import androidx.core.content.ContextCompat; import androidx.lifecycle.ViewModelProvider; import androidx.localbroadcastmanager.content.LocalBroadcastManager; import androidx.recyclerview.widget.ItemTouchHelper; @@ -87,8 +89,10 @@ public class ReorderTimelinesActivity extends BaseActivity implements OnStartDra binding = ActivityReorderTabsBinding.inflate(getLayoutInflater()); setContentView(binding.getRoot()); searchInstanceRunning = false; - if (getSupportActionBar() != null) + if (getSupportActionBar() != null) { getSupportActionBar().setDisplayHomeAsUpEnabled(true); + getSupportActionBar().setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary))); + } changes = false; ReorderVM reorderVM = new ViewModelProvider(ReorderTimelinesActivity.this).get(ReorderVM.class); diff --git a/app/src/main/java/app/fedilab/android/activities/ReportActivity.java b/app/src/main/java/app/fedilab/android/activities/ReportActivity.java index dcf56db4..0c3a1a4e 100644 --- a/app/src/main/java/app/fedilab/android/activities/ReportActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/ReportActivity.java @@ -14,6 +14,7 @@ package app.fedilab.android.activities; * You should have received a copy of the GNU General Public License along with Fedilab; if not, * see . */ +import android.graphics.drawable.ColorDrawable; import android.os.Bundle; import android.view.MenuItem; import android.view.View; @@ -21,6 +22,7 @@ import android.widget.RadioButton; import androidx.annotation.Nullable; import androidx.appcompat.widget.LinearLayoutCompat; +import androidx.core.content.ContextCompat; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentTransaction; import androidx.lifecycle.ViewModelProvider; @@ -67,8 +69,10 @@ public class ReportActivity extends BaseActivity { setContentView(binding.getRoot()); - if (getSupportActionBar() != null) + if (getSupportActionBar() != null) { getSupportActionBar().setDisplayHomeAsUpEnabled(true); + getSupportActionBar().setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary))); + } Bundle b = getIntent().getExtras(); if (b != null) { diff --git a/app/src/main/java/app/fedilab/android/activities/ScheduledActivity.java b/app/src/main/java/app/fedilab/android/activities/ScheduledActivity.java index 98b6686d..f57e1124 100644 --- a/app/src/main/java/app/fedilab/android/activities/ScheduledActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/ScheduledActivity.java @@ -14,11 +14,13 @@ package app.fedilab.android.activities; * You should have received a copy of the GNU General Public License along with Fedilab; if not, * see . */ +import android.graphics.drawable.ColorDrawable; import android.os.Bundle; import android.view.MenuItem; import androidx.annotation.Nullable; import androidx.appcompat.app.ActionBar; +import androidx.core.content.ContextCompat; import com.google.android.material.tabs.TabLayout; @@ -44,6 +46,7 @@ public class ScheduledActivity extends BaseActivity { //Remove title if (actionBar != null) { actionBar.setDisplayShowTitleEnabled(false); + actionBar.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary))); } if (getSupportActionBar() != null) { getSupportActionBar().setDisplayHomeAsUpEnabled(true); diff --git a/app/src/main/java/app/fedilab/android/activities/SearchResultTabActivity.java b/app/src/main/java/app/fedilab/android/activities/SearchResultTabActivity.java index f493cc60..417cfa36 100644 --- a/app/src/main/java/app/fedilab/android/activities/SearchResultTabActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/SearchResultTabActivity.java @@ -16,6 +16,7 @@ package app.fedilab.android.activities; import android.app.SearchManager; import android.content.Context; +import android.graphics.drawable.ColorDrawable; import android.os.Bundle; import android.view.Menu; import android.view.MenuInflater; @@ -71,8 +72,10 @@ public class SearchResultTabActivity extends BaseActivity { return; } - if (getSupportActionBar() != null) + if (getSupportActionBar() != null) { getSupportActionBar().setDisplayHomeAsUpEnabled(true); + getSupportActionBar().setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary))); + } setTitle(search); binding.searchTabLayout.addTab(binding.searchTabLayout.newTab().setText(getString(R.string.tags))); binding.searchTabLayout.addTab(binding.searchTabLayout.newTab().setText(getString(R.string.accounts))); 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 2527a4f2..f481f8f6 100644 --- a/app/src/main/java/app/fedilab/android/activities/SettingsActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/SettingsActivity.java @@ -14,10 +14,12 @@ package app.fedilab.android.activities; * You should have received a copy of the GNU General Public License along with Fedilab; if not, * see . */ +import android.graphics.drawable.ColorDrawable; import android.os.Bundle; import android.view.MenuItem; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentTransaction; @@ -52,8 +54,10 @@ public class SettingsActivity extends BaseActivity { binding = ActivitySettingsBinding.inflate(getLayoutInflater()); setContentView(binding.getRoot()); - if (getSupportActionBar() != null) + if (getSupportActionBar() != null) { getSupportActionBar().setDisplayHomeAsUpEnabled(true); + getSupportActionBar().setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary))); + } canGoBack = false; binding.setTimelines.setOnClickListener(v -> displaySettings(SettingsEnum.TIMELINES)); diff --git a/app/src/main/java/app/fedilab/android/activities/StatusInfoActivity.java b/app/src/main/java/app/fedilab/android/activities/StatusInfoActivity.java index 77c9d813..d204a19b 100644 --- a/app/src/main/java/app/fedilab/android/activities/StatusInfoActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/StatusInfoActivity.java @@ -15,11 +15,13 @@ package app.fedilab.android.activities; * see . */ +import android.graphics.drawable.ColorDrawable; import android.os.Bundle; import android.view.MenuItem; import android.view.View; import androidx.annotation.NonNull; +import androidx.core.content.ContextCompat; import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -59,6 +61,7 @@ public class StatusInfoActivity extends BaseActivity { if (getSupportActionBar() != null) { getSupportActionBar().setDisplayHomeAsUpEnabled(true); getSupportActionBar().setDisplayShowHomeEnabled(true); + getSupportActionBar().setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary))); } accountList = new ArrayList<>(); Bundle b = getIntent().getExtras(); diff --git a/app/src/main/java/app/fedilab/android/activities/WebviewActivity.java b/app/src/main/java/app/fedilab/android/activities/WebviewActivity.java index 565cd094..818c6249 100644 --- a/app/src/main/java/app/fedilab/android/activities/WebviewActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/WebviewActivity.java @@ -19,6 +19,7 @@ import android.annotation.SuppressLint; import android.content.Intent; import android.content.pm.PackageManager; import android.database.sqlite.SQLiteDatabase; +import android.graphics.drawable.ColorDrawable; import android.net.Uri; import android.os.AsyncTask; import android.os.Build; @@ -78,6 +79,7 @@ public class WebviewActivity extends BaseActivity { if (getSupportActionBar() != null) { getSupportActionBar().setDisplayHomeAsUpEnabled(true); getSupportActionBar().setDisplayShowHomeEnabled(true); + getSupportActionBar().setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary))); } Bundle b = getIntent().getExtras(); if (b != null) { diff --git a/app/src/main/java/app/fedilab/android/services/PostMessageServiceSave.java b/app/src/main/java/app/fedilab/android/services/PostMessageServiceSave.java index d55089c3..cbf0aab4 100644 --- a/app/src/main/java/app/fedilab/android/services/PostMessageServiceSave.java +++ b/app/src/main/java/app/fedilab/android/services/PostMessageServiceSave.java @@ -88,8 +88,8 @@ public class PostMessageServiceSave extends IntentService { } notificationBuilder = new NotificationCompat.Builder(getBaseContext(), CHANNEL_ID); - notificationBuilder.setSmallIcon(R.drawable.ic_notification) - .setLargeIcon(BitmapFactory.decodeResource(getResources(), R.drawable.ic_launcher_foreground)) + notificationBuilder.setSmallIcon(R.drawable.ic_notification); + notificationBuilder.setLargeIcon(BitmapFactory.decodeResource(getResources(), R.drawable.ic_launcher_foreground)) .setContentTitle(getString(R.string.post_message)) .setContentText(getString(R.string.post_message_text, messageSent, messageToSend)) .setDefaults(NotificationCompat.DEFAULT_ALL) diff --git a/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTimeline.java b/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTimeline.java index 4cb912a7..12cfae6f 100644 --- a/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTimeline.java +++ b/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTimeline.java @@ -426,7 +426,9 @@ public class FragmentMastodonTimeline extends Fragment { * @param direction - DIRECTION null if first call, then is set to TOP or BOTTOM depending of scroll */ private void route(DIRECTION direction) { - + if (binding == null) { + return; + } new Thread(() -> { QuickLoad quickLoad = new QuickLoad(requireActivity()).getSavedValue(timelineType, ident); if (!binding.swipeContainer.isRefreshing() && direction == null && quickLoad != null && quickLoad.statuses != null && quickLoad.statuses.size() > 0) { diff --git a/app/src/main/res/drawable-hdpi/ic_notification.png b/app/src/main/res/drawable-hdpi/ic_notification.png new file mode 100644 index 0000000000000000000000000000000000000000..3d58514e647a9cfb2dbe86845247b59d5d2c75d2 GIT binary patch literal 619 zcmV-x0+juUP) zjZxz;5QQm$5>f&k#2t_h&K=x!Ksta9NC(gX>457X?f^P??90j%`9+fD7&E{(vy+VW z*DGo5tE=AzfNPVr$(_hrZ5PE7HYQIP=h385|4+k$-;5_Mk(TlE_S z-VHwOUe=4P4t^y%^{ECv=8px0|93$+M^<8f1U{upWZ#F?;Pn29Nq%r)xYbH>n_t>Uc7v6Iks;576oe{h;PdW3VklyCipE%b|dK7h0>P9un@+}zV(a1 zhg*p@vSk-rcyW7^|3UblYa7}`;irMj2bpkCzs11$>mbM3ty%bnT|h8=1& zbAnF&76s$mcG)bM1JYNY^Q2YVF9SaOc%~>V=FF3y%mt}VXPje@c!_)OBAeP^RDyq^jvkAM_#+sM61~Jv znD_9IDtgVJC~R!PdMUG$*JeR#aLKH1p&1cow6poz#^w7k(L@v12{g+ln#p)4aqx39 zoH^;@I+6Lk#2X%|xd)nNqzW3}0E5KVt#uN;lc!MZHWQYMb4>k+^kbV~_ne`Jk!;pi zklw)oX;ve&T}w34GXb|Q8f|>BaqBe9Xo_Y zJ7`&WAWd65`huE4jy7snfqX}hK5AEiFQ{?BjYmegPF* Vrw#9M|Jncm002ovPDHLkV1k1ezmNa` literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_notification.png b/app/src/main/res/drawable-xhdpi/ic_notification.png new file mode 100644 index 0000000000000000000000000000000000000000..fe790ea9bd713c6eea1e1e0245aff665b62f3a89 GIT binary patch literal 812 zcmV+{1JnG8P)NklrOP~aI5IV3s2pz;7KnHOLrh{__&_S+)yAJFQezaa;#0P-{;_j01o7u5% zq+NYUD`~mA`{q9cz=N^USYzyjF^#d`#va-CY8Wy1P|@#>&=91*OeW))7sCwx%L>_o z_?H}eSD>qYAR$}%gG=lNRJ;tf2eKOvJZ3VmulSDrCV~CMcbtsf^Z1)E0bghk=EGQR ztg`ktY>wu@8dhV1WgMN5$&FSF>UX5RG2|R`70{LSQE`74=(%axDUgQaMT7a(KXd;n zun@yo0lS0d?-Pa-&M90R(0uk$aDN||-bE2VN<9I6|C-yP!2I^-+}{T@l|)o`CM2%+ zy0raeg74fGg&oX?S3nBTr&GplK^Vt;sCUE@``i>*o zVRIOoYKKAVH0i}d3oALqVs2s9I{&9Y&PE#XP|>fLuWh7{9OSJNIV0tV5yFeI%<;() zcfSiV@uD9&0a&g+U8)IxNi(@_B^^W{TV>nRqzZ%O+lARj$Qls0`W=gng%RNcVcC1Yw_j1^e9; q&=*y1rK2NSCRHQlSJF5CFn<9r)P?g3PbldC0000fL$u>cN8tX9vJr*FL#+aqWs>F0Q?}_QAC`s^?U=0lsSnyM(K2pIysT|J~vS z^VAG1H5b=%wRbl-=ig(Uz$jmEPczCn`x<^3Y|RJt<#0GB-?;WoJ>QTQ*Iuh%hX6h} zKf3bV8|)?nLf3gVa6S4<>x@PS(^P}?pw_?cj(Q28O?1OHtWBqCRPtKbY}YI%f8 z<)?rT(i$^qn_1)xJ*(vbZYpa9ez{p;Fh8PM!u$y@&t|r}z{*wSPY?W2 z8bhW!Vu9aapWqArZ}s`1K>XdSR2^2}mosb4eQ+P#=K?wg;seBd$$Zj;U^qA-naT|T zpPpQT7QN9=g7^TD=r>InRWiUAmF)xl1-)GREe7)fRH~ja;QxXe!wW`cDg42r!6CW! zT@2<0$TWlC2V%{!6b68S{k@69-^IA8k1f+&Tv!f#q80-avrKewx_?G@Kj?eIYcn|O zW`npqh?F898{oCLg?=Riahdc@Wc9+hCw1ssQedz4y%)KQcG!_J^eri{70YUoVGc3| z_bTdTKQ3doviW=s(&s=eRIb)~$b$Y{mRETm!Wr4SVe)g>%PUrHY9~1~qE-V+>C2fg z#9(kjkTyu`+~h+rd>U~{bOwy!Bis}m!hT4%+%nal91J^L^z_w!?S5klPD>-RluGrk z2L4?-we}(KS#91neQu?ZUrMHWR|9?)-2&se_DKo#2e#%=sm|5GU#Ba5mYTrU9QY!m zmUJ@UOA~*L^LLD260fd3g*q(2UIOW3y}TzD*f-M)BHk*-bEz>*)r3ueEr|@V7Q9Lo zG*YRqUBSHj){E*1!EnwsMWwoS1=IJfF<2;jC;C|Mx^%mlsX|@510S5BjCo6#gm$V3 zn}P1PbJ%!Nu`<|KCgq8fWBksRni^Xsf-RW$MU=de<&i&kgSEn!P;|ZC2+aTLQYLyb z_&}wcQTqjkU_9BIqELM;dm=i3@PaXJO1>OKWXSG_yuzrS!`I?@H~yH})!1JV&Lq*NPs4VKkh`Y6@LU4ut}#=#>% z)945nvd_hFP0;`ShFPfYQ-E~KtWw>l0k$uZjKR9h+ zfkJhi7R3Gg$#s2ujOi8<00000NkvXX Hu0mjf=yE-D literal 0 HcmV?d00001