From bf35a75877fae7ba275b16f15a7cab3f5f60090b Mon Sep 17 00:00:00 2001
From: Ivan Agosto <ivagosto@protonmail.com>
Date: Thu, 21 Mar 2024 14:23:36 -0600
Subject: [PATCH] Add material theme

---
 app/src/main/AndroidManifest.xml         | 10 ++-
 app/src/main/res/layout/app_bar_main.xml |  7 +-
 app/src/main/res/values-es/strings.xml   |  1 +
 app/src/main/res/values-night/themes.xml | 21 +++++
 app/src/main/res/values/colors.xml       | 97 ++++++++++--------------
 app/src/main/res/values/strings.xml      |  1 +
 app/src/main/res/values/themes.xml       | 21 +++++
 7 files changed, 94 insertions(+), 64 deletions(-)
 create mode 100644 app/src/main/res/values-night/themes.xml
 create mode 100644 app/src/main/res/values/themes.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4743f28..356f669 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -11,22 +11,24 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/P2playTheme">
+        android:theme="@style/Theme.P2play">
         <activity android:name=".ChannelActivity"
             android:theme="@style/P2playTheme.noBar" />
         <activity
             android:name=".SplashActivity"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar">
+            android:theme="@style/Theme.P2play.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".HostActivity" />
+        <activity
+            android:name=".HostActivity"
+            android:theme="@style/Theme.P2play.NoActionBar"/>
         <activity
             android:name=".MainActivity"
-            android:theme="@style/P2playTheme.NoActionBar" />
+            android:theme="@style/Theme.P2play.NoActionBar" />
         <activity
             android:name=".ReproductorActivity"
             android:configChanges="orientation|screenSize"
diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml
index 2aeff0f..a260ff5 100644
--- a/app/src/main/res/layout/app_bar_main.xml
+++ b/app/src/main/res/layout/app_bar_main.xml
@@ -8,15 +8,12 @@
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:theme="@style/P2playTheme.AppBarOverlay">
+        android:layout_height="wrap_content">
 
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/P2playTheme.PopupOverlay" />
+            android:layout_height="?attr/actionBarSize"/>
 
     </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 1dc32f3..2ec2f95 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -25,6 +25,7 @@
     <string name="passwordTxt">Contraseña:</string>
     <string name="loginBtn">Ingresar</string>
     <string name="registerActionBtn">Crear una cuenta</string>
+    <string name="instance">Instancia</string>
     <!-- Toast msg -->
     <string name="loginSuccess_msg">Te has identificado</string>
     <string name="loginError_msg">Ha ocurrido un error</string>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
new file mode 100644
index 0000000..0b30c71
--- /dev/null
+++ b/app/src/main/res/values-night/themes.xml
@@ -0,0 +1,21 @@
+
+<resources>
+    <style name="Theme.P2play" parent="Theme.MaterialComponents">
+        <item name="colorPrimary">@color/md_theme_dark_primary</item>
+        <item name="colorOnPrimary">@color/md_theme_dark_onPrimary</item>
+        <item name="colorSecondary">@color/md_theme_dark_secondary</item>
+        <item name="colorOnSecondary">@color/md_theme_dark_onSecondary</item>
+        <item name="colorError">@color/md_theme_dark_error</item>
+        <item name="colorOnError">@color/md_theme_dark_onError</item>
+        <item name="android:colorBackground">@color/md_theme_dark_background</item>
+        <item name="colorOnBackground">@color/md_theme_dark_onBackground</item>
+        <item name="colorSurface">@color/md_theme_dark_surface</item>
+        <item name="colorOnSurface">@color/md_theme_dark_onSurface</item>
+        <item name="actionBarItemBackground">@color/md_theme_dark_surface</item>
+    </style>
+
+    <style name="Theme.P2play.NoActionBar" parent="Theme.P2play">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 9d56e6b..99fcf75 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -10,79 +10,66 @@
     <color name="colorLike">#FF3C9100</color>
     <color name="colorDislike">#ec020e</color>
     <color name="colorProfile">#262626</color>
-
-    <color name="colorPrimaryContainer">#3F51B5</color>
-    <color name="colorSecondaryContainer">#3F51B5</color>
-    <color name="colorTertiary">#3F51B5</color>
-    <color name="colorTertiaryContainer">#3F51B5</color>
-    <color name="colorErrorContainer">#3F51B5</color>
-    <color name="colorSurfaceVariant">#3F51B5</color>
-    <color name="colorOutline">#3F51B5</color>
-    <color name="colorOnSurfaceInverse">#3F51B5</color>
-    <color name="colorSurfaceInverse">#3F51B5</color>
-    <color name="colorPrimaryInverse">#3F51B5</color>
-
-    <color name="colorOnPrimaryContainer">#3F51B5</color>
-
-    <color name="seed">#f57721</color>
-    <color name="md_theme_light_primary">#9C4400</color>
+ 
+    <color name="seed">#f16805</color>
+    <color name="md_theme_light_primary">#9F4200</color>
     <color name="md_theme_light_onPrimary">#FFFFFF</color>
-    <color name="md_theme_light_primaryContainer">#FFDBCA</color>
-    <color name="md_theme_light_onPrimaryContainer">#331200</color>
-    <color name="md_theme_light_secondary">#954906</color>
+    <color name="md_theme_light_primaryContainer">#FFDBCB</color>
+    <color name="md_theme_light_onPrimaryContainer">#341100</color>
+    <color name="md_theme_light_secondary">#566500</color>
     <color name="md_theme_light_onSecondary">#FFFFFF</color>
-    <color name="md_theme_light_secondaryContainer">#FFDBC7</color>
-    <color name="md_theme_light_onSecondaryContainer">#311300</color>
-    <color name="md_theme_light_tertiary">#8F4E00</color>
+    <color name="md_theme_light_secondaryContainer">#D9EC7B</color>
+    <color name="md_theme_light_onSecondaryContainer">#181E00</color>
+    <color name="md_theme_light_tertiary">#904D00</color>
     <color name="md_theme_light_onTertiary">#FFFFFF</color>
-    <color name="md_theme_light_tertiaryContainer">#FFDCC2</color>
-    <color name="md_theme_light_onTertiaryContainer">#2E1500</color>
+    <color name="md_theme_light_tertiaryContainer">#FFDCC3</color>
+    <color name="md_theme_light_onTertiaryContainer">#2F1500</color>
     <color name="md_theme_light_error">#BA1A1A</color>
     <color name="md_theme_light_errorContainer">#FFDAD6</color>
     <color name="md_theme_light_onError">#FFFFFF</color>
     <color name="md_theme_light_onErrorContainer">#410002</color>
-    <color name="md_theme_light_background">#FFFBFF</color>
-    <color name="md_theme_light_onBackground">#2D1600</color>
-    <color name="md_theme_light_surface">#FFFBFF</color>
-    <color name="md_theme_light_onSurface">#2D1600</color>
-    <color name="md_theme_light_surfaceVariant">#F4DED4</color>
+    <color name="md_theme_light_background">#F8FDFF</color>
+    <color name="md_theme_light_onBackground">#001F25</color>
+    <color name="md_theme_light_surface">#F8FDFF</color>
+    <color name="md_theme_light_onSurface">#001F25</color>
+    <color name="md_theme_light_surfaceVariant">#F4DED5</color>
     <color name="md_theme_light_onSurfaceVariant">#52443D</color>
-    <color name="md_theme_light_outline">#85746B</color>
-    <color name="md_theme_light_inverseOnSurface">#FFEEE1</color>
-    <color name="md_theme_light_inverseSurface">#4B2800</color>
-    <color name="md_theme_light_inversePrimary">#FFB68F</color>
+    <color name="md_theme_light_outline">#85736C</color>
+    <color name="md_theme_light_inverseOnSurface">#D6F6FF</color>
+    <color name="md_theme_light_inverseSurface">#00363F</color>
+    <color name="md_theme_light_inversePrimary">#FFB692</color>
     <color name="md_theme_light_shadow">#000000</color>
-    <color name="md_theme_light_surfaceTint">#9C4400</color>
+    <color name="md_theme_light_surfaceTint">#9F4200</color>
     <color name="md_theme_light_outlineVariant">#D7C2B9</color>
     <color name="md_theme_light_scrim">#000000</color>
-    <color name="md_theme_dark_primary">#FFB68F</color>
-    <color name="md_theme_dark_onPrimary">#542100</color>
-    <color name="md_theme_dark_primaryContainer">#773200</color>
-    <color name="md_theme_dark_onPrimaryContainer">#FFDBCA</color>
-    <color name="md_theme_dark_secondary">#FFB688</color>
-    <color name="md_theme_dark_onSecondary">#512400</color>
-    <color name="md_theme_dark_secondaryContainer">#733600</color>
-    <color name="md_theme_dark_onSecondaryContainer">#FFDBC7</color>
-    <color name="md_theme_dark_tertiary">#FFB77A</color>
-    <color name="md_theme_dark_onTertiary">#4C2700</color>
-    <color name="md_theme_dark_tertiaryContainer">#6D3A00</color>
-    <color name="md_theme_dark_onTertiaryContainer">#FFDCC2</color>
+    <color name="md_theme_dark_primary">#FFB692</color>
+    <color name="md_theme_dark_onPrimary">#562000</color>
+    <color name="md_theme_dark_primaryContainer">#793000</color>
+    <color name="md_theme_dark_onPrimaryContainer">#FFDBCB</color>
+    <color name="md_theme_dark_secondary">#BDD062</color>
+    <color name="md_theme_dark_onSecondary">#2C3400</color>
+    <color name="md_theme_dark_secondaryContainer">#404C00</color>
+    <color name="md_theme_dark_onSecondaryContainer">#D9EC7B</color>
+    <color name="md_theme_dark_tertiary">#FFB77C</color>
+    <color name="md_theme_dark_onTertiary">#4D2600</color>
+    <color name="md_theme_dark_tertiaryContainer">#6E3900</color>
+    <color name="md_theme_dark_onTertiaryContainer">#FFDCC3</color>
     <color name="md_theme_dark_error">#FFB4AB</color>
     <color name="md_theme_dark_errorContainer">#93000A</color>
     <color name="md_theme_dark_onError">#690005</color>
     <color name="md_theme_dark_onErrorContainer">#FFDAD6</color>
-    <color name="md_theme_dark_background">#2D1600</color>
-    <color name="md_theme_dark_onBackground">#FFDCC0</color>
-    <color name="md_theme_dark_surface">#2D1600</color>
-    <color name="md_theme_dark_onSurface">#FFDCC0</color>
+    <color name="md_theme_dark_background">#001F25</color>
+    <color name="md_theme_dark_onBackground">#A6EEFF</color>
+    <color name="md_theme_dark_surface">#001F25</color>
+    <color name="md_theme_dark_onSurface">#A6EEFF</color>
     <color name="md_theme_dark_surfaceVariant">#52443D</color>
     <color name="md_theme_dark_onSurfaceVariant">#D7C2B9</color>
-    <color name="md_theme_dark_outline">#9F8D84</color>
-    <color name="md_theme_dark_inverseOnSurface">#2D1600</color>
-    <color name="md_theme_dark_inverseSurface">#FFDCC0</color>
-    <color name="md_theme_dark_inversePrimary">#9C4400</color>
+    <color name="md_theme_dark_outline">#A08D85</color>
+    <color name="md_theme_dark_inverseOnSurface">#001F25</color>
+    <color name="md_theme_dark_inverseSurface">#A6EEFF</color>
+    <color name="md_theme_dark_inversePrimary">#9F4200</color>
     <color name="md_theme_dark_shadow">#000000</color>
-    <color name="md_theme_dark_surfaceTint">#FFB68F</color>
+    <color name="md_theme_dark_surfaceTint">#FFB692</color>
     <color name="md_theme_dark_outlineVariant">#52443D</color>
     <color name="md_theme_dark_scrim">#000000</color>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ded5376..3e995e5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -25,6 +25,7 @@
     <string name="okButton">Accept</string>
     <string name="errorMsg">Error, try again</string>
     <string name="finallyMsg">Host saved</string>
+    <string name="instance">Instance</string>
     <!-- End Host strings -->
     <!-- Start Login strings -->
     <string name="loginInfo">Login or register new account</string>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
new file mode 100644
index 0000000..e7a1b1e
--- /dev/null
+++ b/app/src/main/res/values/themes.xml
@@ -0,0 +1,21 @@
+
+<resources>
+    <style name="Theme.P2play" parent="Theme.MaterialComponents">
+        <item name="colorPrimary">@color/md_theme_light_primary</item>
+        <item name="colorOnPrimary">@color/md_theme_light_onPrimary</item>
+        <item name="colorSecondary">@color/md_theme_light_secondary</item>
+        <item name="colorOnSecondary">@color/md_theme_light_onSecondary</item>
+        <item name="colorError">@color/md_theme_light_error</item>
+        <item name="colorOnError">@color/md_theme_light_onError</item>
+        <item name="android:colorBackground">@color/md_theme_light_background</item>
+        <item name="colorOnBackground">@color/md_theme_light_onBackground</item>
+        <item name="colorSurface">@color/md_theme_light_surface</item>
+        <item name="colorOnSurface">@color/md_theme_light_onSurface</item>
+        <item name="actionBarItemBackground">@color/md_theme_light_surface</item>
+    </style>
+
+    <style name="Theme.P2play.NoActionBar" parent="Theme.P2play">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+</resources>