Skip to content

Displayed Year, added color, edited button design #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lucasd23 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Displayed Year, added color, edited button design #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions app/src/main/res/drawable/button_normal.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />


Expand Down
12 changes: 7 additions & 5 deletions app/src/main/res/drawable/button_pressed.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />


Expand Down
5 changes: 5 additions & 0 deletions app/src/main/res/drawable/button_selector.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
20 changes: 11 additions & 9 deletions app/src/main/res/layout/activity_new_tunes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/fragment_dashboard.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
12 changes: 9 additions & 3 deletions app/src/main/res/layout/fragment_home.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
20 changes: 11 additions & 9 deletions app/src/main/res/layout/results_layout.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand All @@ -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"
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/res/menu/popup_menu_layout.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
6 changes: 3 additions & 3 deletions app/src/main/res/values/colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
9 changes: 9 additions & 0 deletions app/src/main/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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. -->
Expand All @@ -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>

Expand Down Expand Up @@ -74,4 +79,8 @@
<item name="android:windowNoTitle">true</item>
</style>

<style name="appButtons">
<item name="android:background">@drawable/button_selector</item>
</style>

</resources>
6 changes: 6 additions & 0 deletions app/src/main/res/values/themes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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>
Expand Down