Merge pull request #4102 from ByteHamster/material-components

Switched to MaterialComponents theme

10 files changed, 26 insertions, 11 deletions

diff --git a/app/src/main/assets/licenses.xml b/app/src/main/assets/licenses.xml
index c69f692cf..4f0255182 100644
--- a/app/src/main/assets/licenses.xml
+++ b/app/src/main/assets/licenses.xml
@@ -13,6 +13,12 @@
         license="Apache 2.0"
         licenseText="LICENSE_APACHE-2.0.txt" />
     <library
+        name="Android Jetpack"
+        author="Google"
+        website="https://developer.android.com/jetpack"
+        license="Apache 2.0"
+        licenseText="LICENSE_APACHE-2.0.txt" />
+    <library
         name="Apache Commons"
         author="The Apache Software Foundation"
         website="http://commons.apache.org/"
@@ -67,6 +73,12 @@
         license="SIL Open Font, Version 1.1"
         licenseText="LICENSE_SIL.txt" />
     <library
+        name="Material Components"
+        author="Google"
+        website="https://github.com/material-components/material-components-android"
+        license="Apache 2.0"
+        licenseText="LICENSE_APACHE-2.0.txt" />
+    <library
         name="OkHttp"
         author="Square"
         website="https://github.com/square/okhttp"
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/AuthenticationDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/AuthenticationDialog.java
index fb2f92742..39d321f18 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/AuthenticationDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/AuthenticationDialog.java
@@ -1,9 +1,9 @@
 package de.danoeh.antennapod.dialog;
 
-import android.app.AlertDialog;
 import android.content.Context;
 import android.view.View;
 import android.widget.EditText;
+import androidx.appcompat.app.AlertDialog;
 import de.danoeh.antennapod.R;
 
 /**
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java b/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java
index 4390b8069..abab94852 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java
@@ -1,6 +1,5 @@
 package de.danoeh.antennapod.dialog;
 
-import android.app.AlertDialog;
 import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
@@ -17,6 +16,7 @@ import androidx.annotation.IdRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.PluralsRes;
 import androidx.annotation.StringRes;
+import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.collection.ArrayMap;
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/DownloadLogFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/DownloadLogFragment.java
index a2fea9f24..312e3cb62 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/DownloadLogFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/DownloadLogFragment.java
@@ -1,9 +1,9 @@
 package de.danoeh.antennapod.fragment;
 
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.res.TypedArray;
 import android.os.Bundle;
+import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.ListFragment;
 import androidx.core.view.MenuItemCompat;
 import android.util.Log;
diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/NumberPickerPreference.java b/app/src/main/java/de/danoeh/antennapod/preferences/NumberPickerPreference.java
index a58986241..484d56e96 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/NumberPickerPreference.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/NumberPickerPreference.java
@@ -1,7 +1,7 @@
 package de.danoeh.antennapod.preferences;
 
-import android.app.AlertDialog;
 import android.content.Context;
+import androidx.appcompat.app.AlertDialog;
 import androidx.preference.Preference;
 import android.text.InputFilter;
 import android.util.AttributeSet;
diff --git a/app/src/main/res/layout/feed_item_list_fragment.xml b/app/src/main/res/layout/feed_item_list_fragment.xml
index 38496dd4f..d6c7409a8 100644
--- a/app/src/main/res/layout/feed_item_list_fragment.xml
+++ b/app/src/main/res/layout/feed_item_list_fragment.xml
@@ -14,7 +14,8 @@
                 android:id="@+id/collapsing_toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                app:contentScrim="?attr/colorPrimary"
+                android:background="?android:attr/windowBackground"
+                app:contentScrim="?android:attr/windowBackground"
                 app:scrimAnimationDuration="200"
                 app:layout_scrollFlags="scroll|exitUntilCollapsed">
 
diff --git a/app/src/main/res/layout/feedinfo.xml b/app/src/main/res/layout/feedinfo.xml
index d2e077be1..fa6aac251 100644
--- a/app/src/main/res/layout/feedinfo.xml
+++ b/app/src/main/res/layout/feedinfo.xml
@@ -14,7 +14,8 @@
                 android:id="@+id/collapsing_toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                app:contentScrim="?attr/colorPrimary"
+                android:background="?android:attr/windowBackground"
+                app:contentScrim="?android:attr/windowBackground"
                 app:scrimAnimationDuration="200"
                 app:layout_scrollFlags="scroll|exitUntilCollapsed">
 
diff --git a/app/src/main/res/layout/quick_feed_discovery.xml b/app/src/main/res/layout/quick_feed_discovery.xml
index 78a59c7eb..a274fcdc7 100644
--- a/app/src/main/res/layout/quick_feed_discovery.xml
+++ b/app/src/main/res/layout/quick_feed_discovery.xml
@@ -25,8 +25,8 @@
                 android:minHeight="0dp"
                 android:minWidth="0dp"
                 android:text="@string/discover_more"
-                android:id="@+id/discover_more"
-                style="?android:attr/buttonBarButtonStyle"/>
+                style="@style/Widget.MaterialComponents.Button.TextButton"
+                android:id="@+id/discover_more"/>
     </LinearLayout>
 
     <RelativeLayout
diff --git a/app/src/main/res/layout/searchlist_item_feed.xml b/app/src/main/res/layout/searchlist_item_feed.xml
index f5e76801e..607a3197f 100644
--- a/app/src/main/res/layout/searchlist_item_feed.xml
+++ b/app/src/main/res/layout/searchlist_item_feed.xml
@@ -14,6 +14,7 @@
             android:elevation="4dp"
             android:outlineProvider="bounds"
             android:foreground="?android:attr/selectableItemBackground"
+            android:background="?android:attr/windowBackground"
             squareImageView:direction="height" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/subscription_item.xml b/app/src/main/res/layout/subscription_item.xml
index 43c3d99fa..a01b6d070 100644
--- a/app/src/main/res/layout/subscription_item.xml
+++ b/app/src/main/res/layout/subscription_item.xml
@@ -11,7 +11,7 @@
         android:id="@+id/imgvCover"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-        android:scaleType="centerCrop"
+        android:scaleType="fitCenter"
         tools:src="@mipmap/ic_launcher_round"
         squareImageView:direction="width"/>
 
@@ -37,9 +37,9 @@
         android:layout_alignParentRight="true"
         android:layout_alignParentEnd="true"
         android:layout_alignParentTop="true"
-        app:backgroundColor="?attr/colorAccent"
+        app:backgroundColor="?attr/colorSecondary"
         app:corner="rightTop"
         app:primaryText="Test"
-        app:primaryTextColor="@color/white"
+        app:primaryTextColor="?attr/colorOnSecondary"
         app:primaryTextSize="12sp" />
 </RelativeLayout>