Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/news-android.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid-Development <david-dev@live.de>2021-05-01 12:23:16 +0300
committerDavid Luhmer <david-dev@live.de>2021-05-01 12:23:16 +0300
commitf8fe360fe4bfc8a000fc1ae9d71b0f23ee780d1d (patch)
treed69e8999fea96c129f98f94c83e5c33980da779b /News-Android-App/src
parentab858aa67d13abf248c11d6f895784bca1a694f3 (diff)
Fix broken text color in dialogs
Signed-off-by: David Luhmer <david-dev@live.de>
Diffstat (limited to 'News-Android-App/src')
-rw-r--r--News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailActivity.java5
-rw-r--r--News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/helper/ThemeUtils.java2
-rw-r--r--News-Android-App/src/main/res/values/themes.xml19
3 files changed, 14 insertions, 12 deletions
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailActivity.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailActivity.java
index c7a5ab95..801c7612 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailActivity.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailActivity.java
@@ -61,8 +61,6 @@ import de.luhmer.owncloudnewsreader.model.TTSItem;
import de.luhmer.owncloudnewsreader.view.PodcastSlidingUpPanelLayout;
import de.luhmer.owncloudnewsreader.widget.WidgetProvider;
-import static de.luhmer.owncloudnewsreader.database.DatabaseConnectionOrm.SORT_DIRECTION;
-
public class NewsDetailActivity extends PodcastFragmentActivity {
@@ -537,8 +535,7 @@ public class NewsDetailActivity extends PodcastFragmentActivity {
link = rssItem.getLink();
}
- if (link.length() > 0)
- {
+ if (link.length() > 0) {
newsDetailFragment.loadURL(link);
}
}
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/helper/ThemeUtils.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/helper/ThemeUtils.java
index 95827017..7c1a77f5 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/helper/ThemeUtils.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/helper/ThemeUtils.java
@@ -61,7 +61,6 @@ public class ThemeUtils {
mCursorDrawableRes.setAccessible(true);
mCursorDrawableRes.set(searchAutoComplete, R.drawable.cursor);
-
// Set color of handle
// https://stackoverflow.com/a/49555923
@@ -103,7 +102,6 @@ public class ThemeUtils {
* @param toolbarBackgroundColor the target background color
*/
public static void colorizeToolbar(Toolbar toolbarView, @ColorInt int toolbarBackgroundColor) {
-
toolbarView.setBackgroundColor(toolbarBackgroundColor);
for(int i = 0; i < toolbarView.getChildCount(); i++) {
diff --git a/News-Android-App/src/main/res/values/themes.xml b/News-Android-App/src/main/res/values/themes.xml
index a2deb490..7b88e39e 100644
--- a/News-Android-App/src/main/res/values/themes.xml
+++ b/News-Android-App/src/main/res/values/themes.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
-
<style name="AppTheme" parent="AppTheme.Base"/>
<style name="SplashTheme" parent="AppTheme.Base">
@@ -43,6 +42,8 @@
<item name="starredDrawable">@drawable/swipe_setstarred</item>
<item name="news_detail_background_color">@color/news_detail_background_color</item>
+
+ <item name="alertDialogTheme">@style/AlertDialogTheme</item>
</style>
<style name="ToolbarOptionMenuBackgroundTheme" parent="Theme.MaterialComponents.DayNight">
@@ -55,10 +56,6 @@
<item name="android:textColor">@color/material_button_text_color</item>
</style>
-
-
-
-
<style name="ToolbarTheme" parent="ThemeOverlay.MaterialComponents.ActionBar">
<item name="android:background">@color/colorPrimary</item>
<item name="android:textColor">@color/options_menu_item_text</item>
@@ -98,7 +95,6 @@
</style>
-
<style name="ErrorText" parent="TextAppearance.AppCompat">
<item name="android:textColor">@color/material_red_600</item>
<item name="android:textSize">16sp</item>
@@ -109,4 +105,15 @@
<item name="android:textSize">14sp</item>
</style>
+
+ <!-- https://stackoverflow.com/a/54751236 -->
+ <style name="AlertDialogTheme" parent="ThemeOverlay.MaterialComponents.Dialog.Alert">
+ <item name="buttonBarButtonStyle">@style/ButtonBarButtonStyle</item>
+ </style>
+
+ <style name="ButtonBarButtonStyle" parent="Widget.MaterialComponents.Button.TextButton.Dialog.Flush">
+ <item name="android:textColor">@color/primaryTextColor</item>
+ </style>
+
+
</resources>