From 020cb0854cb1325fc6b2ec72ed0cbd4bdaac01d4 Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Sat, 26 Dec 2015 14:36:56 -0800 Subject: Lower shadow on tablets since it is no longer rounded --- app/src/main/java/github/daneren2005/dsub/view/CardView.java | 2 +- app/src/main/res/values-large/integers.xml | 1 + app/src/main/res/values/integers.xml | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) (limited to 'app/src/main') diff --git a/app/src/main/java/github/daneren2005/dsub/view/CardView.java b/app/src/main/java/github/daneren2005/dsub/view/CardView.java index 973e63fa..7a38b13b 100644 --- a/app/src/main/java/github/daneren2005/dsub/view/CardView.java +++ b/app/src/main/java/github/daneren2005/dsub/view/CardView.java @@ -48,7 +48,7 @@ public class CardView extends FrameLayout{ setClipChildren(true); setBackgroundResource(R.drawable.card_rounded_corners); if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - setElevation(10.0f); + setElevation(getResources().getInteger(R.integer.Card_Elevation)); } } } diff --git a/app/src/main/res/values-large/integers.xml b/app/src/main/res/values-large/integers.xml index 914ec84a..243d3fc1 100644 --- a/app/src/main/res/values-large/integers.xml +++ b/app/src/main/res/values-large/integers.xml @@ -2,4 +2,5 @@ 3 10 + 4 \ No newline at end of file diff --git a/app/src/main/res/values/integers.xml b/app/src/main/res/values/integers.xml index 05bcdb28..db45c591 100644 --- a/app/src/main/res/values/integers.xml +++ b/app/src/main/res/values/integers.xml @@ -3,4 +3,5 @@ 2 @integer/Grid.Columns 5 + 10 \ No newline at end of file -- cgit v1.2.3 From b04edc61886a4ab198f0d4c22c4f06e989fb973a Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Sat, 26 Dec 2015 14:53:21 -0800 Subject: #608 Add a color/spacing difference between Track # and title --- app/src/main/java/github/daneren2005/dsub/view/SongView.java | 11 ++++++++--- app/src/main/res/layout/song_list_item.xml | 11 ++++++++++- 2 files changed, 18 insertions(+), 4 deletions(-) (limited to 'app/src/main') diff --git a/app/src/main/java/github/daneren2005/dsub/view/SongView.java b/app/src/main/java/github/daneren2005/dsub/view/SongView.java index 625303b7..13620715 100644 --- a/app/src/main/java/github/daneren2005/dsub/view/SongView.java +++ b/app/src/main/java/github/daneren2005/dsub/view/SongView.java @@ -41,6 +41,7 @@ import java.io.File; public class SongView extends UpdateView2 { private static final String TAG = SongView.class.getSimpleName(); + private TextView trackTextView; private TextView titleTextView; private TextView artistTextView; private TextView durationTextView; @@ -70,6 +71,7 @@ public class SongView extends UpdateView2 { super(context); LayoutInflater.from(context).inflate(R.layout.song_list_item, this, true); + trackTextView = (TextView) findViewById(R.id.song_track); titleTextView = (TextView) findViewById(R.id.song_title); artistTextView = (TextView) findViewById(R.id.song_artist); durationTextView = (TextView) findViewById(R.id.song_duration); @@ -139,7 +141,10 @@ public class SongView extends UpdateView2 { String title = song.getTitle(); Integer track = song.getTrack(); if(track != null && Util.getDisplayTrack(context)) { - title = String.format("%02d", track) + " " + title; + trackTextView.setText(String.format("%02d", track)); + trackTextView.setVisibility(View.VISIBLE); + } else { + trackTextView.setVisibility(View.GONE); } titleTextView.setText(title); @@ -246,12 +251,12 @@ public class SongView extends UpdateView2 { if (playing) { if(!this.playing) { this.playing = playing; - titleTextView.setCompoundDrawablesWithIntrinsicBounds(DrawableTint.getDrawableRes(context, R.attr.playing), 0, 0, 0); + trackTextView.setCompoundDrawablesWithIntrinsicBounds(DrawableTint.getDrawableRes(context, R.attr.playing), 0, 0, 0); } } else { if(this.playing) { this.playing = playing; - titleTextView.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0); + trackTextView.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0); } } diff --git a/app/src/main/res/layout/song_list_item.xml b/app/src/main/res/layout/song_list_item.xml index 6bf025b8..30b86d3b 100644 --- a/app/src/main/res/layout/song_list_item.xml +++ b/app/src/main/res/layout/song_list_item.xml @@ -17,6 +17,16 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical"> + + -- cgit v1.2.3 From b72c6a9edd88c5aa8529bfbca2187eb63582679e Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Sat, 26 Dec 2015 14:55:21 -0800 Subject: Fix track # position with play icon --- app/src/main/res/layout/song_list_item.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/src/main') diff --git a/app/src/main/res/layout/song_list_item.xml b/app/src/main/res/layout/song_list_item.xml index 30b86d3b..ffd17e00 100644 --- a/app/src/main/res/layout/song_list_item.xml +++ b/app/src/main/res/layout/song_list_item.xml @@ -30,7 +30,7 @@ Date: Sat, 26 Dec 2015 15:02:14 -0800 Subject: Fix card background colors for other themes --- app/src/main/res/drawable/card_rounded_corners.xml | 2 +- app/src/main/res/values/attrs.xml | 1 + app/src/main/res/values/themes.xml | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) (limited to 'app/src/main') diff --git a/app/src/main/res/drawable/card_rounded_corners.xml b/app/src/main/res/drawable/card_rounded_corners.xml index 5475c3d6..87e84c0d 100644 --- a/app/src/main/res/drawable/card_rounded_corners.xml +++ b/app/src/main/res/drawable/card_rounded_corners.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index c4f80478..e4fa4b5a 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -55,6 +55,7 @@ + diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 6321852f..8c6b1a59 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -62,6 +62,7 @@ @style/TextAppearance.AppCompat.Widget.ActionBar.Subtitle.Inverse true ?attr/colorPrimary + @android:color/white