From 7587b234698ff1421146154a2e361de3fc232a23 Mon Sep 17 00:00:00 2001 From: Twig N Date: Sat, 8 Feb 2020 14:57:39 +1100 Subject: [PATCH] (WIP) - fixed drawables --- .../main/java/org/transdroid/core/gui/DetailsFragment.java | 6 +----- .../transdroid/core/gui/search/SearchResultsFragment.java | 6 +----- app/src/main/res/values-night/styles_transdroid.xml | 2 +- app/src/main/res/values/styles_transdroid.xml | 2 +- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/org/transdroid/core/gui/DetailsFragment.java b/app/src/main/java/org/transdroid/core/gui/DetailsFragment.java index 3039ae71..d701d54e 100644 --- a/app/src/main/java/org/transdroid/core/gui/DetailsFragment.java +++ b/app/src/main/java/org/transdroid/core/gui/DetailsFragment.java @@ -122,11 +122,7 @@ public class DetailsFragment extends Fragment implements OnTrackersUpdatedListen // On large screens where this fragment is shown next to the torrents list, we show a continues grey vertical // line to separate the lists visually if (!NavigationHelper_.getInstance_(getActivity()).isSmallScreen()) { - if (SystemSettings_.getInstance_(getActivity()).useDarkTheme()) { - detailsContainer.setBackgroundResource(R.drawable.details_list_background_dark); - } else { - detailsContainer.setBackgroundResource(R.drawable.details_list_background_light); - } + detailsContainer.setBackgroundResource(R.drawable.details_list_background); } createMenuOptions(); diff --git a/app/src/main/java/org/transdroid/core/gui/search/SearchResultsFragment.java b/app/src/main/java/org/transdroid/core/gui/search/SearchResultsFragment.java index 6fa7fd4f..696d43b0 100644 --- a/app/src/main/java/org/transdroid/core/gui/search/SearchResultsFragment.java +++ b/app/src/main/java/org/transdroid/core/gui/search/SearchResultsFragment.java @@ -86,11 +86,7 @@ public class SearchResultsFragment extends Fragment { // On large screens where this fragment is shown next to the sites list; we show a continues grey vertical line // to separate the lists visually if (!NavigationHelper_.getInstance_(getActivity()).isSmallScreen()) { - if (SystemSettings_.getInstance_(getActivity()).useDarkTheme()) { - resultsList.setBackgroundResource(R.drawable.details_list_background_dark); - } else { - resultsList.setBackgroundResource(R.drawable.details_list_background_light); - } + resultsList.setBackgroundResource(R.drawable.details_list_background); } // Set up the list adapter, which allows multi-select diff --git a/app/src/main/res/values-night/styles_transdroid.xml b/app/src/main/res/values-night/styles_transdroid.xml index ad2c1c04..18f295bb 100644 --- a/app/src/main/res/values-night/styles_transdroid.xml +++ b/app/src/main/res/values-night/styles_transdroid.xml @@ -28,7 +28,7 @@ @color/grey @style/DefaultTextView @color/transdroid_background - @drawable/loading_progress_dark + @drawable/loading_progress @color/transdroid_text_bright @color/transdroid_text_actionbar @color/transdroid_text_actionbar diff --git a/app/src/main/res/values/styles_transdroid.xml b/app/src/main/res/values/styles_transdroid.xml index 3b2089f1..874faae5 100644 --- a/app/src/main/res/values/styles_transdroid.xml +++ b/app/src/main/res/values/styles_transdroid.xml @@ -30,7 +30,7 @@ @color/grey @style/DefaultTextView @color/transdroid_background - @drawable/loading_progress_light + @drawable/loading_progress @color/transdroid_text_bright @color/transdroid_text_actionbar @color/transdroid_text_actionbar