From b84c67e15e5a1d23b62b749e60a0ed1f4882b50a Mon Sep 17 00:00:00 2001
From: Dillon Lucas <dilloncarterlucas@gmail.com>
Date: Fri, 11 Dec 2020 11:16:55 -0500
Subject: [PATCH] Displayed Year, added color, edited button design

---
 app/src/main/res/drawable/button_normal.xml   | 12 ++++++-----
 app/src/main/res/drawable/button_pressed.xml  | 12 ++++++-----
 app/src/main/res/drawable/button_selector.xml |  5 +++++
 .../main/res/layout/activity_new_tunes.xml    | 20 ++++++++++---------
 .../main/res/layout/fragment_dashboard.xml    |  1 +
 app/src/main/res/layout/fragment_home.xml     | 12 ++++++++---
 app/src/main/res/layout/results_layout.xml    | 20 ++++++++++---------
 app/src/main/res/menu/popup_menu_layout.xml   |  3 +++
 app/src/main/res/values/colors.xml            |  6 +++---
 app/src/main/res/values/strings.xml           |  3 +++
 app/src/main/res/values/styles.xml            |  9 +++++++++
 app/src/main/res/values/themes.xml            |  6 ++++++
 12 files changed, 75 insertions(+), 34 deletions(-)
 create mode 100644 app/src/main/res/drawable/button_selector.xml

diff --git a/app/src/main/res/drawable/button_normal.xml b/app/src/main/res/drawable/button_normal.xml
index dfb58b1..d9615f7 100644
--- a/app/src/main/res/drawable/button_normal.xml
+++ b/app/src/main/res/drawable/button_normal.xml
@@ -2,16 +2,18 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle" >
 
+    <corners android:radius="3dip" />
+
     <gradient
         android:angle="270"
-        android:centerColor="#FFCECFCE"
-        android:endColor="#FFBEBEBE"
-        android:startColor="#FFF7F7F7" />
+        android:centerColor="@color/colorPrimary"
+        android:endColor="@color/colorPrimary"
+        android:startColor="@color/colorPrimary" />
 
     <padding
         android:bottom="8dp"
-        android:left="16dp"
-        android:right="16dp"
+        android:left="8dp"
+        android:right="8dp"
         android:top="8dp" />
 
 
diff --git a/app/src/main/res/drawable/button_pressed.xml b/app/src/main/res/drawable/button_pressed.xml
index a18ce23..7274398 100644
--- a/app/src/main/res/drawable/button_pressed.xml
+++ b/app/src/main/res/drawable/button_pressed.xml
@@ -2,16 +2,18 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle" >
 
+    <corners android:radius="3dip" />
+
     <gradient
         android:angle="270"
-        android:centerColor="#525252"
-        android:endColor="#121212"
-        android:startColor="#bebebe" />
+        android:centerColor="@color/colorPrimaryDark"
+        android:endColor="@color/colorPrimaryDark"
+        android:startColor="@color/colorPrimaryDark" />
 
     <padding
         android:bottom="8dp"
-        android:left="16dp"
-        android:right="16dp"
+        android:left="8dp"
+        android:right="8dp"
         android:top="8dp" />
 
 
diff --git a/app/src/main/res/drawable/button_selector.xml b/app/src/main/res/drawable/button_selector.xml
new file mode 100644
index 0000000..92767e2
--- /dev/null
+++ b/app/src/main/res/drawable/button_selector.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/button_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/button_normal"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_new_tunes.xml b/app/src/main/res/layout/activity_new_tunes.xml
index e12de4b..018e164 100644
--- a/app/src/main/res/layout/activity_new_tunes.xml
+++ b/app/src/main/res/layout/activity_new_tunes.xml
@@ -78,22 +78,24 @@
 
         <View
             android:layout_width="match_parent"
+            android:layout_marginLeft="2dp"
+            android:layout_marginRight="2dp"
             android:layout_height="3dip"
-            android:background="#ff0000" />
+            android:background="@color/colorAccent" />
     </TableLayout>
 
-    <ListView
-        android:id="@+id/records_view"
-        android:layout_width="match_parent"
-        android:layout_height="500dp"
-        android:layout_marginTop="16dp"
 
-        android:layout_marginLeft="10dp">
+            <ListView
+                android:id="@+id/records_view"
+                android:layout_width="match_parent"
+                android:layout_height="500dp"
+                android:layout_marginLeft="10dp"
 
-    </ListView>
+                android:layout_marginTop="16dp">
 
+            </ListView>
 
-        <Button
+            <Button
         android:id="@+id/BtnMain"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml
index 31c7dc0..ef441a2 100644
--- a/app/src/main/res/layout/fragment_dashboard.xml
+++ b/app/src/main/res/layout/fragment_dashboard.xml
@@ -38,6 +38,7 @@
 
     <Button
         android:id="@+id/BtnSearch"
+        style="@style/appButtons"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 023eda5..949e520 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -16,25 +16,31 @@
 
     <Button
         android:id="@+id/BtnSend"
+        style="@style/appButtons"
         android:layout_width="156dp"
         android:layout_height="56dp"
         android:layout_gravity="center"
         android:maxWidth="200dp"
-        android:text="Send a recommendation" />
+        android:text="@string/send_a_recommendation" />
 
     <Button
         android:id="@+id/BtnView"
+        style="@style/appButtons"
         android:layout_width="156dp"
         android:layout_height="56dp"
+        android:layout_marginTop="8dp"
         android:layout_gravity="center"
         android:maxWidth="200dp"
-        android:text="View recommendations" />
+        android:text="@string/view_recommendations" />
 
     <Button
         android:id="@+id/BtnSpotify"
+        style="@style/appButtons"
         android:layout_width="156dp"
         android:layout_height="56dp"
+        android:layout_marginTop="8dp"
         android:layout_gravity="center"
         android:maxWidth="200dp"
-        android:text="Spotify Library Management" />
+        android:text="@string/spotify_library_management" />
+
 </LinearLayout>
diff --git a/app/src/main/res/layout/results_layout.xml b/app/src/main/res/layout/results_layout.xml
index 4b324e7..53829da 100644
--- a/app/src/main/res/layout/results_layout.xml
+++ b/app/src/main/res/layout/results_layout.xml
@@ -40,28 +40,29 @@
 
     <TextView
         android:id="@+id/tvAlbum"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="72dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="24dp"
         android:maxWidth="200dp"
-        app:autoSizeTextType="uniform"
-        app:autoSizeMinTextSize="12sp"
-        app:autoSizeMaxTextSize="100sp"
-        app:autoSizeStepGranularity="2sp"
         android:text="TextView"
         android:textSize="12sp"
+        app:autoSizeMaxTextSize="100sp"
+        app:autoSizeMinTextSize="12sp"
+        app:autoSizeStepGranularity="2sp"
+        app:autoSizeTextType="uniform"
+        app:layout_constraintEnd_toStartOf="@id/tvYear"
         app:layout_constraintStart_toStartOf="@+id/guideline"
         app:layout_constraintTop_toBottomOf="@+id/tvArtist" />
 
     <TextView
         android:id="@+id/tvYear"
-        android:layout_width="60dp"
+        android:layout_width="wrap_content"
         android:layout_height="21dp"
-        android:layout_marginStart="10dp"
         android:layout_marginTop="24dp"
         android:gravity="center"
         android:text="TextView"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/popMenu"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toEndOf="@+id/tvAlbum"
         app:layout_constraintTop_toTopOf="parent" />
@@ -80,6 +81,7 @@
         android:id="@+id/tvGenre"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
         android:text="TextView"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
diff --git a/app/src/main/res/menu/popup_menu_layout.xml b/app/src/main/res/menu/popup_menu_layout.xml
index 97b4c0f..9a05ad6 100644
--- a/app/src/main/res/menu/popup_menu_layout.xml
+++ b/app/src/main/res/menu/popup_menu_layout.xml
@@ -2,4 +2,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:id="@+id/discogs"
         android:title="View on discogs.com" />
+    <item android:id="@+id/send_popup"
+        android:title="Send"
+        android:onClick="openDashboardFragment"/>
 </menu>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index b867c7f..fae844c 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#008577</color>
-    <color name="colorPrimaryDark">#00574B</color>
-    <color name="colorAccent">#D81B60</color>
+    <color name="colorPrimary">#80d8ff</color>
+    <color name="colorPrimaryDark">#49a7cc</color>
+    <color name="colorAccent">#b5ffff</color>
     <color name="button">#D81B60</color>
     <color name="colorPrimary_dark">#D81B60</color>
     <color name="colorAccent_dark">#D81B60</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0fe77b5..c3c4950 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -36,5 +36,8 @@
 
     <!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Hello blank fragment</string>
+    <string name="send_a_recommendation">Send a recommendation</string>
+    <string name="view_recommendations">View recommendations</string>
+    <string name="spotify_library_management">Spotify Library Management</string>
 
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 1679a18..a447020 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -3,6 +3,9 @@
     <!-- Base application theme. -->
     <style name="AppTheme" parent="Theme.AppCompat.Light">
         <item name="android:textColor">#000000</item>
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
 
 
         <!-- Customize your theme here. -->
@@ -11,6 +14,8 @@
 
     //light theme
     <style name="colorPrimary_light">
+        <item name="colorPrimary">@color/colorPrimary</item>
+
         <item name="android:background">@drawable/background_light</item>
     </style>
 
@@ -74,4 +79,8 @@
         <item name="android:windowNoTitle">true</item>
     </style>
 
+    <style name="appButtons">
+        <item name="android:background">@drawable/button_selector</item>
+    </style>
+
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index c7cb8f0..3fd3b3b 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
     <style name="Theme.light" parent = "Theme.AppCompat.Light">
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
         <item name="pageBackground">@style/colorPrimary_light</item>
         <item name="accentLine">@style/colorAccent_light</item>
         <item name="textBoxes">@style/textField_light</item>
@@ -10,6 +13,9 @@
     </style>
 
     <style name="Theme.darkTheme" parent="Theme.AppCompat.Light">
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
         <item name="pageBackground">@style/colorPrimary_dark</item>
         <item name="accentLine">@style/colorAccent_dark</item>
         <item name="textBoxes">@style/textField_dark</item>