Lots of progress with dynamic theming, the nav drawer now uses a RecyclerView, AboutDeveloperDialogHelper is now a DialogFragment, RTL support (to suppress Lint warnings), other various small fixes, cleaned up and formatted lot of code (and removed un-used resources), R.string.ok > android.R.string.ok, R.string.cancel > android.R.string.cancel, switched dialog helpers to DialogFragments.
This commit is contained in:
Aidan Follestad
parent
c1b258dadd
commit
7ce86afd74
265 changed files with 2853 additions and 2292 deletions
|
|
@ -1,14 +1,14 @@
|
|||
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
tools:context="com.kabouzeid.gramophone.ui.activities.AlbumDetailActivity$PlaceholderFragment">
|
||||
<merge xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
tools:context="com.kabouzeid.gramophone.ui.activities.AlbumDetailActivity$PlaceholderFragment">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="horizontal"
|
||||
>
|
||||
android:orientation="horizontal">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/album_art"
|
||||
|
|
@ -17,7 +17,8 @@
|
|||
android:layout_weight="1"
|
||||
android:scaleType="centerCrop"
|
||||
android:src="@drawable/default_album_art"
|
||||
android:transitionName="@string/transition_album_cover"/>
|
||||
android:transitionName="@string/transition_album_cover"
|
||||
tools:ignore="ContentDescription,UnusedAttribute" />
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="match_parent"
|
||||
|
|
@ -30,13 +31,14 @@
|
|||
android:layout_height="match_parent"
|
||||
android:layout_above="@+id/footer"
|
||||
android:layout_alignParentTop="true"
|
||||
android:scaleType="centerCrop"/>
|
||||
android:scaleType="centerCrop"
|
||||
tools:ignore="ContentDescription" />
|
||||
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_above="@+id/footer"
|
||||
android:background="@drawable/shadow_up"/>
|
||||
android:background="@drawable/shadow_up" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
|
|
@ -44,7 +46,8 @@
|
|||
android:layout_above="@+id/footer"
|
||||
android:layout_alignParentTop="true"
|
||||
android:layout_margin="16dp"
|
||||
android:orientation="horizontal">
|
||||
android:orientation="horizontal"
|
||||
tools:ignore="RtlHardcoded">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/song_current_progress"
|
||||
|
|
@ -52,11 +55,12 @@
|
|||
android:layout_height="match_parent"
|
||||
android:layout_weight="1"
|
||||
android:fontFamily="sans-serif-medium"
|
||||
android:gravity="bottom|left"
|
||||
android:gravity="bottom|left|start"
|
||||
android:singleLine="true"
|
||||
android:textAppearance="@style/TextAppearance.AppCompat.Title"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="16sp"/>
|
||||
android:textSize="16sp"
|
||||
tools:ignore="RtlHardcoded" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/song_total_time"
|
||||
|
|
@ -64,11 +68,12 @@
|
|||
android:layout_height="match_parent"
|
||||
android:layout_weight="1"
|
||||
android:fontFamily="sans-serif"
|
||||
android:gravity="bottom|right"
|
||||
android:gravity="bottom|right|end"
|
||||
android:singleLine="true"
|
||||
android:textAppearance="@style/TextAppearance.AppCompat.Title"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="16sp"/>
|
||||
android:textSize="16sp"
|
||||
tools:ignore="RtlHardcoded" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
|
@ -78,15 +83,15 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:background="?default_bar_color"
|
||||
android:orientation="vertical"
|
||||
>
|
||||
android:orientation="vertical">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="16dp"
|
||||
android:orientation="vertical"
|
||||
android:transitionName="@string/transition_album_text">
|
||||
android:transitionName="@string/transition_album_text"
|
||||
tools:ignore="UnusedAttribute">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/song_title"
|
||||
|
|
@ -95,7 +100,7 @@
|
|||
android:fontFamily="sans-serif-medium"
|
||||
android:singleLine="true"
|
||||
android:textAppearance="@style/TextAppearance.AppCompat.Title"
|
||||
android:textColor="?attr/title_text_color"/>
|
||||
android:textColor="?attr/title_text_color" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/song_artist"
|
||||
|
|
@ -104,7 +109,7 @@
|
|||
android:fontFamily="sans-serif"
|
||||
android:singleLine="true"
|
||||
android:textAppearance="@style/TextAppearance.AppCompat.Caption"
|
||||
android:textColor="?attr/caption_text_color"/>
|
||||
android:textColor="?attr/caption_text_color" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
|
@ -112,10 +117,11 @@
|
|||
android:id="@+id/media_controller_placeholder"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="88dp"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:layout_gravity="bottom"
|
||||
android:layout_margin="16dp"
|
||||
android:background="?attr/music_controller_container_color"
|
||||
android:elevation="1dp">
|
||||
android:elevation="1dp"
|
||||
tools:ignore="UnusedAttribute">
|
||||
|
||||
</RelativeLayout>
|
||||
|
||||
|
|
@ -128,13 +134,13 @@
|
|||
android:layout_alignParentBottom="true"
|
||||
android:layout_centerHorizontal="true"
|
||||
android:layout_margin="16dp"
|
||||
android:background="?attr/music_controller_container_color">
|
||||
android:background="?attr/music_controller_container_color"
|
||||
tools:ignore="ContentDescription">
|
||||
|
||||
<com.melnykov.fab.FloatingActionButton
|
||||
android:id="@+id/fab"
|
||||
style="@style/PlayPauseFab"
|
||||
android:layout_centerInParent="true"
|
||||
/>
|
||||
android:layout_centerInParent="true" />
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/prev_button"
|
||||
|
|
@ -142,11 +148,13 @@
|
|||
android:layout_height="56dp"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_marginRight="-4dp"
|
||||
android:layout_marginEnd="-4dp"
|
||||
android:layout_toLeftOf="@+id/fab"
|
||||
android:layout_toStartOf="@+id/fab"
|
||||
android:background="?round_selector"
|
||||
android:padding="14dp"
|
||||
android:scaleType="fitCenter"
|
||||
android:src="@drawable/ic_skip_previous_white_48dp"/>
|
||||
android:src="@drawable/ic_skip_previous_white_48dp" />
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/next_button"
|
||||
|
|
@ -154,35 +162,41 @@
|
|||
android:layout_height="56dp"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_marginLeft="-4dp"
|
||||
android:layout_marginStart="-4dp"
|
||||
android:layout_toRightOf="@+id/fab"
|
||||
android:layout_toEndOf="@+id/fab"
|
||||
android:background="?round_selector"
|
||||
android:padding="14dp"
|
||||
android:scaleType="fitCenter"
|
||||
android:src="@drawable/ic_skip_next_white_48dp"/>
|
||||
android:src="@drawable/ic_skip_next_white_48dp" />
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/repeat_button"
|
||||
android:layout_width="56dp"
|
||||
android:layout_height="56dp"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_alignParentStart="true"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_marginLeft="8dp"
|
||||
android:layout_marginStart="8dp"
|
||||
android:background="?round_selector"
|
||||
android:padding="14dp"
|
||||
android:scaleType="fitCenter"
|
||||
android:src="@drawable/ic_repeat_grey600_48dp"/>
|
||||
android:src="@drawable/ic_repeat_grey600_48dp" />
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/shuffle_button"
|
||||
android:layout_width="56dp"
|
||||
android:layout_height="56dp"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_marginRight="8dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:background="?round_selector"
|
||||
android:padding="14dp"
|
||||
android:scaleType="fitCenter"
|
||||
android:src="@drawable/ic_shuffle_grey600_48dp"/>
|
||||
android:src="@drawable/ic_shuffle_grey600_48dp" />
|
||||
|
||||
</RelativeLayout>
|
||||
|
||||
|
|
@ -194,8 +208,8 @@
|
|||
android:elevation="1dp"
|
||||
android:padding="0dp"
|
||||
android:progressTint="@color/materialmusic_accent_color"
|
||||
android:thumbTint="@color/materialmusic_accent_color_darker"/>
|
||||
|
||||
android:thumbTint="@color/materialmusic_accent_color_darker"
|
||||
tools:ignore="UnusedAttribute" />
|
||||
|
||||
</RelativeLayout>
|
||||
|
||||
|
|
@ -204,20 +218,22 @@
|
|||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentTop="true"
|
||||
app:layout_gravity="top"
|
||||
android:orientation="vertical">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/statusBar"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/statusMargin"
|
||||
android:background="@android:color/transparent"/>
|
||||
android:background="@android:color/transparent"
|
||||
tools:ignore="ContentDescription" />
|
||||
|
||||
<android.support.v7.widget.Toolbar
|
||||
android:id="@+id/toolbar"
|
||||
style="@style/Toolbar"
|
||||
android:background="@android:color/transparent"/>
|
||||
android:background="@android:color/transparent" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</FrameLayout>
|
||||
</merge>
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue