main (2/2)

Signed-off-by: TacoTheDank <SkytkRSfan3895@gmail.com>
andremion · TacoTheDank · Dec 2, 2018 · Dec 2, 2018 · Dec 2, 2018 · Dec 2, 2018
commit 02e255e63f08c4d8d5fff20a76f84c3caa84b53f
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -20,6 +20,7 @@
         <activity
             android:name=".activities.DetailActivity"
             android:theme="@style/AppTheme.Detail">
+
         </activity>
 
         <service

diff --git a/app/src/main/java/com/sample/andremion/musicplayer/activities/DetailActivity.java b/app/src/main/java/com/sample/andremion/musicplayer/activities/DetailActivity.java
@@ -33,7 +33,7 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.content_detail);
 
-        mCoverView = (MusicCoverView) findViewById(R.id.cover);
+        mCoverView = findViewById(R.id.cover);
         mCoverView.setCallbacks(new MusicCoverView.Callbacks() {
             @Override
             public void onMorphEnd(MusicCoverView coverView) {

diff --git a/app/src/main/java/com/sample/andremion/musicplayer/activities/MainActivity.java b/app/src/main/java/com/sample/andremion/musicplayer/activities/MainActivity.java
@@ -53,7 +53,7 @@ protected void onCreate(Bundle savedInstanceState) {
         mFabView = findViewById(R.id.fab);
 
         // Set the recycler adapter
-        RecyclerView recyclerView = (RecyclerView) findViewById(R.id.tracks);
+        RecyclerView recyclerView = findViewById(R.id.tracks);
         assert recyclerView != null;
         recyclerView.setLayoutManager(new LinearLayoutManager(this));
         recyclerView.setAdapter(new RecyclerViewAdapter(MusicContent.ITEMS));

diff --git a/app/src/main/java/com/sample/andremion/musicplayer/activities/PlayerActivity.java b/app/src/main/java/com/sample/andremion/musicplayer/activities/PlayerActivity.java
@@ -94,9 +94,9 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
     @Override
     public void setContentView(@LayoutRes int layoutResID) {
         super.setContentView(layoutResID);
-        mTimeView = (TextView) findViewById(R.id.time);
-        mDurationView = (TextView) findViewById(R.id.duration);
-        mProgressView = (ProgressView) findViewById(R.id.progress);
+        mTimeView = findViewById(R.id.time);
+        mDurationView = findViewById(R.id.duration);
+        mProgressView = findViewById(R.id.progress);
     }
 
     @Override

diff --git a/app/src/main/java/com/sample/andremion/musicplayer/view/InsetsPercentRelativeLayout.java b/app/src/main/java/com/sample/andremion/musicplayer/view/InsetsPercentRelativeLayout.java
@@ -35,12 +35,9 @@ public InsetsPercentRelativeLayout(Context context, AttributeSet attrs) {
 
     public InsetsPercentRelativeLayout(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
-        ViewCompat.setOnApplyWindowInsetsListener(this, new android.support.v4.view.OnApplyWindowInsetsListener() {
-            @Override
-            public WindowInsetsCompat onApplyWindowInsets(View v, WindowInsetsCompat insets) {
-                setWindowInsets(insets);
-                return insets.consumeSystemWindowInsets();
-            }
+        ViewCompat.setOnApplyWindowInsetsListener(this, (v, insets) -> {
+            setWindowInsets(insets);
+            return insets.consumeSystemWindowInsets();
         });
     }
 

diff --git a/app/src/main/java/com/sample/andremion/musicplayer/view/RecyclerViewAdapter.java b/app/src/main/java/com/sample/andremion/musicplayer/view/RecyclerViewAdapter.java
@@ -52,11 +52,8 @@ public void onBindViewHolder(final ViewHolder holder, int position) {
         holder.mArtistView.setText(holder.mItem.getArtist());
         holder.mDurationView.setText(DateUtils.formatElapsedTime(holder.mItem.getDuration()));
 
-        holder.mView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                // Nothing to do
-            }
+        holder.mView.setOnClickListener(v -> {
+            // Nothing to do
         });
     }
 
@@ -76,10 +73,10 @@ public static class ViewHolder extends RecyclerView.ViewHolder {
         public ViewHolder(View view) {
             super(view);
             mView = view;
-            mCoverView = (ImageView) view.findViewById(R.id.cover);
-            mTitleView = (TextView) view.findViewById(R.id.title);
-            mArtistView = (TextView) view.findViewById(R.id.artist);
-            mDurationView = (TextView) view.findViewById(R.id.duration);
+            mCoverView = view.findViewById(R.id.cover);
+            mTitleView = view.findViewById(R.id.title);
+            mArtistView = view.findViewById(R.id.artist);
+            mDurationView = view.findViewById(R.id.duration);
         }
     }
 

diff --git a/app/src/main/res/drawable/ic_pause_vector.xml b/app/src/main/res/drawable/ic_pause_vector.xml
@@ -1,8 +1,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <group
         android:name="rotation"
         android:pivotX="12"

diff --git a/app/src/main/res/drawable/ic_play_vector.xml b/app/src/main/res/drawable/ic_play_vector.xml
@@ -1,8 +1,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <group
         android:name="rotation"
         android:pivotX="12"

diff --git a/app/src/main/res/layout/content_detail.xml b/app/src/main/res/layout/content_detail.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.sample.andremion.musicplayer.view.InsetsPercentRelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<com.sample.andremion.musicplayer.view.InsetsPercentRelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -23,14 +22,14 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
-        app:layout_marginTopPercent="10%"/>
+        app:layout_marginTopPercent="10%" />
 
     <com.sample.andremion.musicplayer.view.ProgressView
         android:id="@+id/progress"
         android:layout_centerInParent="true"
         android:transitionName="@string/transition_name_progress"
         app:layout_aspectRatio="100%"
-        app:layout_heightPercent="40%"/>
+        app:layout_heightPercent="40%" />
 
     <android.support.design.widget.FloatingActionButton
         android:id="@+id/fab"
@@ -40,14 +39,14 @@
         android:onClick="onFabClick"
         android:scaleType="center"
         android:src="@drawable/ic_pause_animatable"
-        android:transitionName="@string/transition_name_fab"/>
+        android:transitionName="@string/transition_name_fab" />
 
     <Space
         android:id="@+id/timers_anchor"
         android:layout_height="wrap_content"
         android:layout_below="@id/cover"
         android:layout_centerHorizontal="true"
-        app:layout_widthPercent="25%"/>
+        app:layout_widthPercent="25%" />
 
     <TextView
         android:id="@+id/time"
@@ -57,7 +56,7 @@
         android:layout_toStartOf="@id/timers_anchor"
         android:textAppearance="@style/TextAppearance.AppCompat.Caption"
         android:transitionName="@string/transition_name_time"
-        tools:text="02:30"/>
+        tools:text="02:30" />
 
     <TextView
         android:id="@+id/duration"
@@ -67,7 +66,7 @@
         android:layout_toEndOf="@id/timers_anchor"
         android:textAppearance="@style/TextAppearance.AppCompat.Caption"
         android:transitionName="@string/transition_name_duration"
-        tools:text="04:30"/>
+        tools:text="04:30" />
 
     <LinearLayout
         android:id="@+id/ordering"
@@ -83,19 +82,21 @@
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackgroundBorderless"
             android:clickable="true"
-            android:src="@drawable/ic_repeat_white_24dp"/>
+            android:focusable="true"
+            android:src="@drawable/ic_repeat_white_24dp" />
 
         <Space
             android:layout_width="@dimen/activity_horizontal_margin"
-            android:layout_height="wrap_content"/>
+            android:layout_height="wrap_content" />
 
         <ImageView
             android:id="@+id/shuffle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackgroundBorderless"
             android:clickable="true"
-            android:src="@drawable/ic_shuffle_white_24dp"/>
+            android:focusable="true"
+            android:src="@drawable/ic_shuffle_white_24dp" />
 
     </LinearLayout>
 
@@ -113,28 +114,28 @@
             style="@style/Widget.AppCompat.Button.Borderless"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/ic_skip_previous_white_24dp"/>
+            android:src="@drawable/ic_skip_previous_white_24dp" />
 
         <ImageView
             android:id="@+id/rewind"
             style="@style/Widget.AppCompat.Button.Borderless"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/ic_fast_rewind_white_24dp"/>
+            android:src="@drawable/ic_fast_rewind_white_24dp" />
 
         <ImageView
             android:id="@+id/forward"
             style="@style/Widget.AppCompat.Button.Borderless"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/ic_fast_forward_white_24dp"/>
+            android:src="@drawable/ic_fast_forward_white_24dp" />
 
         <ImageView
             android:id="@+id/next"
             style="@style/Widget.AppCompat.Button.Borderless"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/ic_skip_next_white_24dp"/>
+            android:src="@drawable/ic_skip_next_white_24dp" />
 
     </LinearLayout>
 

diff --git a/app/src/main/res/layout/content_list.xml b/app/src/main/res/layout/content_list.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.sample.andremion.musicplayer.view.InsetsPercentRelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<com.sample.andremion.musicplayer.view.InsetsPercentRelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -13,17 +12,17 @@
         android:scaleType="centerCrop"
         android:src="@drawable/album_cover_daft_punk"
         android:transitionName="@string/transition_name_cover"
-        app:layout_heightPercent="35%"/>
+        app:layout_heightPercent="35%" />
 
     <View
         android:id="@+id/pane"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_alignBottom="@+id/pane_anchor"
-        android:layout_alignEnd="@+id/pane_anchor"
         android:layout_alignStart="@+id/pane_anchor"
         android:layout_alignTop="@+id/pane_anchor"
-        android:background="@color/colorPane"/>
+        android:layout_alignEnd="@+id/pane_anchor"
+        android:layout_alignBottom="@+id/pane_anchor"
+        android:background="@color/colorPane" />
 
     <LinearLayout
         android:id="@+id/pane_anchor"
@@ -35,7 +34,7 @@
 
         <include
             android:id="@+id/title"
-            layout="@layout/track_title"/>
+            layout="@layout/track_title" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -48,30 +47,30 @@
                 android:layout_height="wrap_content"
                 android:textAppearance="@style/TextAppearance.AppCompat.Caption"
                 android:transitionName="@string/transition_name_time"
-                tools:text="02:30"/>
+                tools:text="02:30" />
 
             <com.sample.andremion.musicplayer.view.ProgressView
                 android:id="@+id/progress"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/inner_padding"
                 android:layout_marginStart="@dimen/inner_padding"
+                android:layout_marginEnd="@dimen/inner_padding"
                 android:layout_weight="1"
-                android:transitionName="@string/transition_name_progress"/>
+                android:transitionName="@string/transition_name_progress" />
 
             <TextView
                 android:id="@+id/duration"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textAppearance="@style/TextAppearance.AppCompat.Caption"
                 android:transitionName="@string/transition_name_duration"
-                tools:text="04:30"/>
+                tools:text="04:30" />
 
             <Space
                 android:id="@+id/fab_placeholder"
                 android:layout_width="@dimen/design_fab_size_mini"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/inner_padding"/>
+                android:layout_marginStart="@dimen/inner_padding" />
 
         </LinearLayout>
 
@@ -90,16 +89,16 @@
             android:id="@+id/name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="My favorites"
-            android:textAppearance="@style/TextAppearance.AppCompat.Subhead"/>
+            android:text="My Favorites"
+            android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
 
         <TextView
             android:id="@+id/counter"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@id/name"
             android:text="102 songs"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"/>
+            android:textAppearance="@style/TextAppearance.AppCompat.Small" />
 
         <ImageView
             android:id="@+id/options"
@@ -109,7 +108,8 @@
             android:layout_centerVertical="true"
             android:background="?attr/selectableItemBackgroundBorderless"
             android:clickable="true"
-            android:src="@drawable/ic_more_vert_white_24dp"/>
+            android:focusable="true"
+            android:src="@drawable/ic_more_vert_white_24dp" />
 
     </RelativeLayout>
 
@@ -119,20 +119,20 @@
         android:layout_height="match_parent"
         android:layout_below="@+id/playlist"
         app:layoutManager="LinearLayoutManager"
-        tools:listitem="@layout/content_list_item"/>
+        tools:listitem="@layout/content_list_item" />
 
     <android.support.design.widget.FloatingActionButton
         android:id="@+id/fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignBottom="@id/cover"
         android:layout_alignParentEnd="true"
-        android:layout_marginBottom="@dimen/fab_vertical_margin"
         android:layout_marginEnd="@dimen/activity_horizontal_margin"
+        android:layout_marginBottom="@dimen/fab_vertical_margin"
         android:onClick="onFabClick"
         android:scaleType="center"
         android:src="@drawable/ic_play_animatable"
         android:transitionName="@string/transition_name_fab"
-        app:fabSize="mini"/>
+        app:fabSize="mini" />
 
 </com.sample.andremion.musicplayer.view.InsetsPercentRelativeLayout>
diff --git a/app/src/main/res/layout/content_list_item.xml b/app/src/main/res/layout/content_list_item.xml
@@ -12,8 +12,8 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:gravity="center_vertical"
-        android:paddingEnd="@dimen/activity_horizontal_margin"
-        android:paddingStart="@dimen/activity_horizontal_margin">
+        android:paddingStart="@dimen/activity_horizontal_margin"
+        android:paddingEnd="@dimen/activity_horizontal_margin">
 
         <ImageView
             android:id="@+id/cover"

diff --git a/app/src/main/res/layout/track_title.xml b/app/src/main/res/layout/track_title.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:transitionName="@string/transition_name_title">
@@ -9,20 +8,20 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="Instant Crush"
-        android:textAppearance="@style/TextAppearance.AppCompat.Title"/>
+        android:textAppearance="@style/TextAppearance.AppCompat.Title" />
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text=" - "
         android:textAppearance="@style/TextAppearance.AppCompat.Title"
-        android:textColor="?android:attr/textColorSecondary"/>
+        android:textColor="?android:attr/textColorSecondary" />
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="Daft Punk"
         android:textAppearance="@style/TextAppearance.AppCompat.Title"
-        android:textColor="?android:attr/textColorSecondary"/>
+        android:textColor="?android:attr/textColorSecondary" />
 
 </LinearLayout>