Fix Buy pro CardView

2019-06-05 13:47:45 +05:30 · 2019-06-05 13:47:45 +05:30 · 8f1672b38e
commit 8f1672b38e
parent d4147923d9
56 changed files with 280 additions and 132 deletions
--- a/app/src/main/res/drawable/ic_cellphone_lock_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_cellphone_lock_white_24dp.xml
@ -0,0 +1,24 @@
+<!--
+  ~ Copyright (c) 2019 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
+<!-- drawable/cellphone_lock.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M17,1H7A2,2 0 0,0 5,3V6H7V4H17V20H7V18H5V21A2,2 0 0,0 7,23H17A2,2 0 0,0 19,21V3A2,2 0 0,0 17,1M8.8,11V9.5C8.8,8.1 7.4,7 6,7C4.6,7 3.2,8.1 3.2,9.5V11C2.6,11 2,11.6 2,12.2V15.7C2,16.4 2.6,17 3.2,17H8.7C9.4,17 10,16.4 10,15.8V12.3C10,11.6 9.4,11 8.8,11M7.5,11H4.5V9.5C4.5,8.7 5.2,8.2 6,8.2C6.8,8.2 7.5,8.7 7.5,9.5V11Z" />
+</vector>
--- a/app/src/main/res/drawable/ic_cellphone_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_cellphone_white_24dp.xml
@ -0,0 +1,24 @@
+<!--
+  ~ Copyright (c) 2019 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
+<!-- drawable/cellphone.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M17,19H7V5H17M17,1H7C5.89,1 5,1.89 5,3V21A2,2 0 0,0 7,23H17A2,2 0 0,0 19,21V3C19,1.89 18.1,1 17,1Z" />
+</vector>
--- a/app/src/main/res/drawable/ic_diamond_stone_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_diamond_stone_white_24dp.xml
@ -0,0 +1,26 @@
+<!--
+  ~ Copyright (c) 2019 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
+<!-- drawable/diamond_stone.xml -->
+
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M16,9H19L14,16M10,9H14L12,17M5,9H8L10,16M15,4H17L19,7H16M11,4H13L14,7H10M7,4H9L8,7H5M6,2L2,8L12,22L22,8L18,2H6Z" />
+</vector>
--- a/app/src/main/res/drawable/ic_file_music_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_file_music_white_24dp.xml
@ -1,8 +1,22 @@
+<!--
+  ~ Copyright (c) 2019 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
    <path
        android:fillColor="#FFFFFFFF"
        android:pathData="M13,9H18.5L13,3.5V9M6,2H14L20,8V20A2,2 0 0,1 18,22H6C4.89,22 4,21.1 4,20V4C4,2.89 4.89,2 6,2M9,16A2,2 0 0,0 7,18A2,2 0 0,0 9,20A2,2 0 0,0 11,18V13H14V11H10V16.27C9.71,16.1 9.36,16 9,16Z" />
--- a/app/src/main/res/drawable/ic_play_arrow_white_32dp.xml
+++ b/app/src/main/res/drawable/ic_play_arrow_white_32dp.xml
@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2019 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="@dimen/icon_notification_dimen"
+    android:height="@dimen/icon_notification_dimen"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M10 8.64L15.27 12 10 15.36V8.64M8 5v14l11-7L8 5z" />
+</vector>
--- a/app/src/main/res/drawable/ic_play_arrow_white_64dp.xml
+++ b/app/src/main/res/drawable/ic_play_arrow_white_64dp.xml
--- a/app/src/main/res/drawable/promotional.webp
+++ b/app/src/main/res/drawable/promotional.webp
--- a/app/src/main/res/layout-land/fragment_slide_player.xml
+++ b/app/src/main/res/layout-land/fragment_slide_player.xml
@ -256,7 +256,7 @@
                    app:layout_constraintHorizontal_bias="0.5"
                    app:layout_constraintStart_toEndOf="@+id/previousButton"
                    app:layout_constraintTop_toTopOf="parent"
-                    app:srcCompat="@drawable/ic_play_arrow_white_24dp"
+                    app:srcCompat="@drawable/ic_play_arrow_white_32dp"
                    tools:layout_editor_absoluteY="0dp"
                    tools:tint="@color/md_black_1000" />

--- a/app/src/main/res/layout-land/pager_item.xml
+++ b/app/src/main/res/layout-land/pager_item.xml
@ -29,7 +29,7 @@
            android:background="@drawable/color_circle_gradient"
            android:backgroundTint="@color/eighty_percent_black_overlay"
            android:padding="8dp"
-            app:srcCompat="@drawable/ic_play_arrow_white_24dp" />
+            app:srcCompat="@drawable/ic_play_arrow_white_32dp" />
    </com.google.android.material.card.MaterialCardView>

    <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
--- a/app/src/main/res/layout-xlarge-land/pager_item.xml
+++ b/app/src/main/res/layout-xlarge-land/pager_item.xml
@ -29,7 +29,7 @@
            android:background="@drawable/color_circle_gradient"
            android:backgroundTint="@color/eighty_percent_black_overlay"
            android:padding="8dp"
-            app:srcCompat="@drawable/ic_play_arrow_white_24dp" />
+            app:srcCompat="@drawable/ic_play_arrow_white_32dp" />
    </com.google.android.material.card.MaterialCardView>

    <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
--- a/app/src/main/res/layout-xlarge/pager_item.xml
+++ b/app/src/main/res/layout-xlarge/pager_item.xml
@ -29,7 +29,7 @@
            android:background="@drawable/color_circle_gradient"
            android:backgroundTint="@color/eighty_percent_black_overlay"
            android:padding="8dp"
-            app:srcCompat="@drawable/ic_play_arrow_white_24dp" />
+            app:srcCompat="@drawable/ic_play_arrow_white_32dp" />
    </com.google.android.material.card.MaterialCardView>

    <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
--- a/app/src/main/res/layout/app_widget_big.xml
+++ b/app/src/main/res/layout/app_widget_big.xml
@ -41,7 +41,7 @@
      android:padding="22dp"
      android:background="@drawable/widget_selector_dark"
      tools:ignore="ContentDescription"
-      tools:src="@drawable/ic_play_arrow_white_24dp"
+      tools:src="@drawable/ic_play_arrow_white_32dp"
      tools:tint="@color/ate_primary_text_dark"/>

    <ImageButton
--- a/app/src/main/res/layout/app_widget_card.xml
+++ b/app/src/main/res/layout/app_widget_card.xml
@ -86,7 +86,7 @@
                android:layout_weight="1"
                android:background="@drawable/widget_selector_light"
                tools:ignore="ContentDescription"
-                tools:src="@drawable/ic_play_arrow_white_24dp"
+                tools:src="@drawable/ic_play_arrow_white_32dp"
                tools:tint="@color/ate_secondary_text_light" />

            <ImageButton
--- a/app/src/main/res/layout/app_widget_classic.xml
+++ b/app/src/main/res/layout/app_widget_classic.xml
@ -45,7 +45,7 @@
                android:layout_height="match_parent"
                android:layout_weight="1"
                android:background="@drawable/widget_selector"
-                tools:src="@drawable/ic_play_arrow_white_24dp"
+                tools:src="@drawable/ic_play_arrow_white_32dp"
                tools:tint="@color/ate_secondary_text_dark" />

            <ImageButton
--- a/app/src/main/res/layout/app_widget_small.xml
+++ b/app/src/main/res/layout/app_widget_small.xml
@ -40,7 +40,7 @@
            android:layout_weight="1"
            android:background="@drawable/widget_selector"
            tools:ignore="ContentDescription"
-            tools:src="@drawable/ic_play_arrow_white_24dp"
+            tools:src="@drawable/ic_play_arrow_white_32dp"
            tools:tint="@color/ate_secondary_text_dark"/>

        <ImageButton
--- a/app/src/main/res/layout/app_widget_text.xml
+++ b/app/src/main/res/layout/app_widget_text.xml
@ -74,7 +74,7 @@
            android:layout_weight="1"
            android:background="@drawable/widget_selector"
            tools:ignore="ContentDescription"
-            tools:src="@drawable/ic_play_arrow_white_24dp"
+            tools:src="@drawable/ic_play_arrow_white_32dp"
            tools:tint="@color/ate_secondary_text_dark" />

        <ImageButton
--- a/app/src/main/res/layout/fragment_adaptive_player_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_adaptive_player_playback_controls.xml
@ -141,7 +141,7 @@
            android:background="@drawable/color_circle_gradient"
            android:elevation="4dp"
            android:padding="16dp"
-            app:srcCompat="@drawable/ic_play_arrow_white_24dp" />
+            app:srcCompat="@drawable/ic_play_arrow_white_32dp" />

    </RelativeLayout>

--- a/app/src/main/res/layout/fragment_blur_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_blur_playback_controls.xml
@ -171,7 +171,7 @@
            android:background="@drawable/color_circle_gradient"
            android:elevation="4dp"
            android:padding="16dp"
-            app:srcCompat="@drawable/ic_play_arrow_white_24dp" />
+            app:srcCompat="@drawable/ic_play_arrow_white_32dp" />

    </RelativeLayout>

--- a/app/src/main/res/layout/fragment_main_settings.xml
+++ b/app/src/main/res/layout/fragment_main_settings.xml
@ -17,83 +17,83 @@
            android:id="@+id/buyProContainer"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            app:cardBackgroundColor="@color/md_grey_400"
            app:cardCornerRadius="8dp"
            app:cardElevation="6dp"
            app:cardUseCompatPadding="true">

-            <LinearLayout
+            <androidx.constraintlayout.widget.ConstraintLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:orientation="vertical">

                <LinearLayout
-                    android:layout_width="match_parent"
+                    android:id="@+id/titleContainer"
+                    android:layout_width="0dp"
                    android:layout_height="wrap_content"
-                    android:orientation="horizontal">
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:orientation="vertical">
-
-                        <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-                            android:id="@+id/text"
-                            style="@style/TextAppearance.MaterialComponents.Overline"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:paddingStart="16dp"
-                            android:paddingTop="16dp"
-                            android:paddingEnd="16dp"
-                            android:text="@string/upgrade_to_premium" />
-
-                        <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-                            android:id="@+id/title"
-                            style="@style/TextAppearance.MaterialComponents.Headline6"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:paddingStart="16dp"
-                            android:paddingTop="8dp"
-                            android:paddingEnd="16dp"
-                            android:paddingBottom="8dp"
-                            android:text="@string/buy_pro"
-                            android:textColor="@color/md_white_1000" />
-
-                        <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-                            android:id="@+id/text2"
-                            style="@style/TextAppearance.MaterialComponents.Body1"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:letterSpacing="0.1"
-                            android:paddingStart="16dp"
-                            android:paddingEnd="16dp"
-                            android:paddingBottom="8dp"
-                            android:text="@string/pro_summary"
-                            android:textColor="@color/md_white_1000" />
-                    </LinearLayout>
+                    android:layout_weight="1"
+                    android:orientation="vertical"
+                    app:layout_constraintEnd_toStartOf="@+id/text3"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent">

                    <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-                        android:id="@+id/text3"
-                        style="@style/TextAppearance.MaterialComponents.Headline4"
+                        android:id="@+id/text"
+                        style="@style/TextAppearance.MaterialComponents.Overline"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:paddingStart="16dp"
+                        android:paddingTop="16dp"
+                        android:paddingEnd="0dp"
+                        android:text="@string/upgrade_to_premium" />
+
+                    <code.name.monkey.appthemehelper.common.views.ATEAccentTextView
+                        android:id="@+id/title"
+                        style="@style/TextAppearance.MaterialComponents.Headline6"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:paddingStart="16dp"
+                        android:paddingTop="8dp"
+                        android:paddingEnd="0dp"
+                        android:paddingBottom="8dp"
+                        android:text="@string/buy_pro"
+                        android:textColor="@color/md_white_1000" />
+
+                    <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
+                        android:id="@+id/text2"
+                        style="@style/TextAppearance.MaterialComponents.Body1"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:paddingEnd="16dp"
-                        android:text="50%"
-                        android:textStyle="bold" />
+                        android:paddingStart="16dp"
+                        android:paddingEnd="0dp"
+                        android:text="@string/pro_summary"
+                        android:textColor="@color/md_white_1000" />
                </LinearLayout>

+                <androidx.appcompat.widget.AppCompatImageView
+                    android:id="@+id/text3"
+                    android:layout_width="72dp"
+                    android:layout_height="72dp"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginEnd="16dp"
+                    app:srcCompat="@drawable/promotional"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="@id/titleContainer" />
+
                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/buyPremium"
                    style="@style/Widget.MaterialComponents.Button.TextButton"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
-                    android:layout_gravity="end"
-                    android:layout_margin="8dp"
-                    android:id="@+id/buyPremium"
-                    android:text="@string/premium" />
-            </LinearLayout>
-
+                    android:layout_marginStart="16dp"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginBottom="8dp"
+                    android:text="@string/premium"
+                    app:icon="@drawable/ic_diamond_stone_white_24dp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/titleContainer" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
        </com.google.android.material.card.MaterialCardView>

        <LinearLayout
--- a/app/src/main/res/layout/fragment_slide_player.xml
+++ b/app/src/main/res/layout/fragment_slide_player.xml
@ -202,7 +202,7 @@
                    app:layout_constraintHorizontal_bias="0.5"
                    app:layout_constraintStart_toEndOf="@+id/previousButton"
                    app:layout_constraintTop_toTopOf="parent"
-                    app:srcCompat="@drawable/ic_play_arrow_white_24dp"
+                    app:srcCompat="@drawable/ic_play_arrow_white_32dp"
                    tools:layout_editor_absoluteY="0dp"
                    tools:tint="@color/md_black_1000" />

--- a/app/src/main/res/layout/media_button.xml
+++ b/app/src/main/res/layout/media_button.xml
@ -81,6 +81,6 @@
        android:background="@drawable/color_circle_gradient"
        android:elevation="4dp"
        android:padding="16dp"
-        app:srcCompat="@drawable/ic_play_arrow_white_24dp" />
+        app:srcCompat="@drawable/ic_play_arrow_white_32dp" />

 </RelativeLayout>
--- a/app/src/main/res/layout/pager_item.xml
+++ b/app/src/main/res/layout/pager_item.xml
@ -29,7 +29,7 @@
            android:background="@drawable/color_circle_gradient"
            android:backgroundTint="@color/eighty_percent_black_overlay"
            android:padding="8dp"
-            app:srcCompat="@drawable/ic_play_arrow_white_24dp" />
+            app:srcCompat="@drawable/ic_play_arrow_white_32dp" />
    </com.google.android.material.card.MaterialCardView>

    <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
--- a/app/src/main/res/xml/pref_audio.xml
+++ b/app/src/main/res/xml/pref_audio.xml
@ -39,7 +39,7 @@
        android:summary="@string/pref_summary_toggle_headset"
        android:title="@string/pref_title_toggle_toggle_headset"
        app:enableCopying="true"
-        app:icon="@drawable/ic_play_arrow_white_24dp" />
+        app:icon="@drawable/ic_play_arrow_white_32dp" />

    <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
        android:defaultValue="false"
--- a/app/src/main/res/xml/pref_notification.xml
+++ b/app/src/main/res/xml/pref_notification.xml
@ -7,7 +7,8 @@
        android:key="colored_notification"
        android:summary="@string/pref_summary_colored_notification"
        android:title="@string/pref_title_colored_notification"
-        app:enableCopying="true" />
+        app:enableCopying="true"
+        app:icon="@drawable/ic_cellphone_lock_white_24dp" />

    <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
        android:defaultValue="false"
--- a/app/src/main/res/xml/pref_now_playing_screen.xml
+++ b/app/src/main/res/xml/pref_now_playing_screen.xml
@ -33,7 +33,7 @@
    <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
        app:defaultValue="false"
        app:enableCopying="true"
-        app:icon="@drawable/ic_play_arrow_white_24dp"
+        app:icon="@drawable/ic_play_arrow_white_32dp"
        app:key="toggle_add_controls"
        app:summary="@string/pref_summary_extra_controls"
        app:title="@string/pref_title_extra_controls" />
--- a/app/src/main/res/xml/pref_window.xml
+++ b/app/src/main/res/xml/pref_window.xml
@ -14,5 +14,11 @@
            app:enableCopying="true"
            app:icon="@drawable/ic_rounded_corner" />

+        <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
+            android:defaultValue="false"
+            android:key="toggle_full_screen"
+            android:summary="@string/pref_summary_toggle_full_screen"
+            android:title="@string/pref_title_toggle_full_screen"
+            app:icon="@drawable/ic_cellphone_white_24dp" />
    </code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory>
 </androidx.preference.PreferenceScreen>