From ed9524a25d4694ce39e3eed3400ff004ab6ad375 Mon Sep 17 00:00:00 2001 From: Karim Abou Zeid Date: Sun, 31 May 2015 15:59:44 +0200 Subject: [PATCH] Added floating labels to all EditTexts. Added accent color in parent themes so EditTexts no longer use the material green as indicator. An artist's albums are now sorted by year. --- .../ui/activities/SearchActivity.java | 12 +- .../gramophone/util/PreferenceUtils.java | 2 +- .../res/layout/activity_album_tag_editor.xml | 74 ++++------ .../res/layout/activity_song_tag_editor.xml | 135 ++++++++---------- .../main/res/layout/item_list_album_song.xml | 25 ++-- app/src/main/res/layout/item_list_song.xml | 2 +- app/src/main/res/values/styles_parents.xml | 6 + 7 files changed, 106 insertions(+), 150 deletions(-) diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SearchActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SearchActivity.java index 09d593f2..96e2c17c 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SearchActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SearchActivity.java @@ -2,9 +2,9 @@ package com.kabouzeid.gramophone.ui.activities; import android.annotation.SuppressLint; import android.app.ActionBar; +import android.graphics.Color; import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; -import android.os.Build; import android.os.Bundle; import android.support.v4.content.ContextCompat; import android.support.v4.view.MenuItemCompat; @@ -17,7 +17,6 @@ import android.view.MenuItem; import android.view.MotionEvent; import android.view.View; -import com.afollestad.materialdialogs.ThemeSingleton; import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.adapter.SearchAdapter; import com.kabouzeid.gramophone.ui.activities.base.AbsBaseActivity; @@ -93,13 +92,8 @@ public class SearchActivity extends AbsBaseActivity { View searchViewPlate = searchView.findViewById(android.support.v7.appcompat.R.id.search_plate); Drawable drawable = ContextCompat.getDrawable(this, R.drawable.abc_textfield_search_activated_mtrl_alpha); - drawable.setColorFilter(ThemeSingleton.get().widgetColor, PorterDuff.Mode.SRC_IN); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) { - searchViewPlate.setBackground(drawable); - } else { - //noinspection deprecation - searchViewPlate.setBackgroundDrawable(drawable); - } + drawable.setColorFilter(Color.TRANSPARENT, PorterDuff.Mode.SRC_IN); + searchViewPlate.setBackground(drawable); ActionBar.LayoutParams params = new ActionBar.LayoutParams(ActionBar.LayoutParams.MATCH_PARENT, ActionBar.LayoutParams.MATCH_PARENT); searchView.setLayoutParams(params); diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtils.java b/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtils.java index 41af08b1..d88978e3 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtils.java +++ b/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtils.java @@ -201,7 +201,7 @@ public final class PreferenceUtils { public final String getArtistAlbumSortOrder() { return mPreferences.getString(ARTIST_ALBUM_SORT_ORDER, - SortOrder.ArtistAlbumSortOrder.ALBUM_A_Z); + SortOrder.ArtistAlbumSortOrder.ALBUM_YEAR); } // public void setAlbumSortOrder(final String value) { diff --git a/app/src/main/res/layout/activity_album_tag_editor.xml b/app/src/main/res/layout/activity_album_tag_editor.xml index fccab64c..f9090141 100644 --- a/app/src/main/res/layout/activity_album_tag_editor.xml +++ b/app/src/main/res/layout/activity_album_tag_editor.xml @@ -36,19 +36,23 @@ android:paddingTop="8dp" tools:ignore="UnusedAttribute"> - + android:layout_height="wrap_content"> + + + + @@ -61,18 +65,9 @@ android:orientation="vertical" android:padding="16dp"> - - - + android:layout_height="wrap_content"> - + - - - + android:layout_height="wrap_content"> - + - - - + android:layout_height="wrap_content"> - + - diff --git a/app/src/main/res/layout/activity_song_tag_editor.xml b/app/src/main/res/layout/activity_song_tag_editor.xml index e00c88e4..f65064d3 100644 --- a/app/src/main/res/layout/activity_song_tag_editor.xml +++ b/app/src/main/res/layout/activity_song_tag_editor.xml @@ -36,33 +36,40 @@ android:paddingTop="8dp" tools:ignore="UnusedAttribute"> - + android:layout_height="wrap_content"> - + + + + + android:layout_height="wrap_content"> + + + @@ -75,18 +82,11 @@ android:orientation="vertical" android:padding="16dp"> - - + - - + + + - - + android:layout_height="wrap_content" + > - - + + + - - + android:layout_height="wrap_content" + > - - + + + - - + android:layout_height="wrap_content" + > - + + - diff --git a/app/src/main/res/layout/item_list_album_song.xml b/app/src/main/res/layout/item_list_album_song.xml index c4783981..cc9d1ab6 100644 --- a/app/src/main/res/layout/item_list_album_song.xml +++ b/app/src/main/res/layout/item_list_album_song.xml @@ -1,18 +1,18 @@ + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="72dp" + android:background="?rect_selector"> + android:layout_width="match_parent" + android:layout_height="match_parent" + android:descendantFocusability="blocksDescendants" + android:orientation="horizontal" + android:paddingLeft="16dp" + android:paddingStart="16dp" + tools:ignore="RtlSymmetry"> + android:layout_marginRight="2dp" + tools:ignore="ContentDescription" /> + android:paddingStart="16dp"> @color/materialmusic_dark_default_bar_color @style/ThemeOverlay.AppCompat + + + @color/white