tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Massive adapter clean up. Lots of stuff unfinished there yet. Don't mess around with it yet.

Browse source
This commit is contained in:
Karim Abou Zeid 2015-07-13 02:16:26 +02:00
commit 0650df6250
35 changed files with 847 additions and 1438 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/res/drawable-v21/colored_notification_selector.xml
View file

@ -1,3 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/ripple_material_dark" />

9
app/src/main/res/drawable/colored_notification_selector.xml
View file

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_activated="true" android:state_pressed="true" android:drawable="@color/activated_selected_dark" />
<item android:state_activated="true" android:drawable="@color/ripple_material_dark" />
<item android:state_pressed="true" android:drawable="@color/ripple_material_dark" />
<item android:drawable="@android:color/transparent" />
</selector>

3
app/src/main/res/layout/activity_music_controller.xml
View file

@ -110,7 +110,8 @@
android:layout_height="match_parent"
android:layout_margin="16dp"
android:visibility="gone"
app:cardBackgroundColor="?music_controller_container_color" />
app:cardBackgroundColor="?music_controller_container_color"
app:elevation="@dimen/card_elevation" />
<ImageButton
android:id="@+id/prev_button"

83
app/src/main/res/layout/item_grid.xml
View file

@ -1,63 +1,56 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="2dp">
android:layout_margin="2dp"
android:foreground="?rect_selector">
<FrameLayout
android:id="@+id/container"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:foreground="?rect_selector">
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical"
tools:ignore="UnusedAttribute,UselessParent">
<LinearLayout
<com.kabouzeid.gramophone.views.WidthFitSquareImageView
android:id="@+id/image"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:scaleType="centerCrop" />
<LinearLayout
android:id="@+id/palette_color_container"
android:layout_width="match_parent"
android:layout_height="68dp"
android:background="?default_bar_color"
android:gravity="center_vertical"
android:orientation="vertical"
tools:ignore="UnusedAttribute,UselessParent">
android:paddingLeft="16dp"
android:paddingRight="16dp">
<com.kabouzeid.gramophone.views.WidthFitSquareImageView
android:id="@+id/image"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop" />
<TextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="sans-serif-medium"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
android:textColor="?title_text_color" />
<LinearLayout
android:id="@+id/footer"
android:layout_width="match_parent"
android:layout_height="68dp"
android:background="?default_bar_color"
android:gravity="center_vertical"
android:orientation="vertical"
android:paddingLeft="16dp"
android:paddingRight="16dp">
<TextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="sans-serif-medium"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
android:textColor="?title_text_color" />
<TextView
android:id="@+id/text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="sans-serif"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Caption"
android:textColor="?caption_text_color" />
</LinearLayout>
<TextView
android:id="@+id/text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="sans-serif"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Caption"
android:textColor="?caption_text_color" />
</LinearLayout>
</FrameLayout>
</LinearLayout>
<ImageView
android:id="@+id/selected_indicator"

3
app/src/main/res/layout/item_grid_card.xml → app/src/main/res/layout/item_grid_card_horizontal.xml
View file

@ -7,7 +7,7 @@
android:layout_marginRight="8dp"
android:foreground="?rect_selector"
app:cardBackgroundColor="?card_color"
app:elevation="3dp">
app:elevation="@dimen/card_elevation">
<LinearLayout
android:layout_width="match_parent"
@ -22,7 +22,6 @@
tools:ignore="ContentDescription,UnusedAttribute" />
<LinearLayout
android:id="@+id/footer"
android:layout_width="match_parent"
android:layout_height="match_parent">

2
app/src/main/res/layout/item_list.xml
View file

@ -17,7 +17,6 @@
android:paddingStart="16dp">
<FrameLayout
android:id="@+id/image_container"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center">
@ -43,7 +42,6 @@
</FrameLayout>
<LinearLayout
android:id="@+id/text_container"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center"