icons changed

therovermind · Oct 21, 2018 · 4773d5e · 4773d5e
1 parent ebd3b0f
commit 4773d5e
Show file tree

Hide file tree

Showing 58 changed files with 94 additions and 64 deletions.
diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/app/build.gradle b/app/build.gradle
@@ -42,4 +42,5 @@ dependencies {
     implementation 'com.squareup.picasso:picasso:2.71828'
     implementation "com.mikepenz:materialdrawer:6.0.3"
     implementation 'com.android.support:cardview-v7:27.1.1'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
 }
diff --git a/app/src/main/ic_cancel-web.png b/app/src/main/ic_cancel-web.png
diff --git a/app/src/main/ic_pause-web.png b/app/src/main/ic_pause-web.png
diff --git a/app/src/main/ic_play-web.png b/app/src/main/ic_play-web.png
diff --git a/app/src/main/ic_previous-web.png b/app/src/main/ic_previous-web.png
diff --git a/app/src/main/ic_repeat_off-web.png b/app/src/main/ic_repeat_off-web.png
diff --git a/app/src/main/ic_repeat_on-web.png b/app/src/main/ic_repeat_on-web.png
diff --git a/app/src/main/ic_skip-web.png b/app/src/main/ic_skip-web.png
diff --git a/app/src/main/ic_suffle_off-web.png b/app/src/main/ic_suffle_off-web.png
diff --git a/app/src/main/ic_suffle_on-web.png b/app/src/main/ic_suffle_on-web.png
diff --git a/app/src/main/res/layout/playermain.xml b/app/src/main/res/layout/playermain.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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">
 
@@ -20,13 +21,14 @@
             android:orientation="vertical">
 
             <RelativeLayout
-                android:layout_width="300dp"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:layout_marginTop="70dp"
-                android:layout_marginStart="30dp"
-                android:layout_marginEnd="30dp"
-                android:layout_marginBottom="40dp" >
+                android:layout_marginStart="20dp"
+                android:layout_marginEnd="20dp"
+                android:layout_marginBottom="20dp"
+                tools:ignore="UselessParent">
 
                 <FrameLayout
                     android:layout_width="match_parent"
@@ -43,71 +45,91 @@
 
                     <com.sahdeepsingh.Bop.controls.CircularSeekBar
                         android:id="@+id/circularSeekBar"
-                        android:layout_width="match_parent"
+                        android:layout_width="300dp"
                         android:layout_height="match_parent"
                         android:layout_gravity="center_horizontal"
                         android:indeterminate="true">
 
                     </com.sahdeepsingh.Bop.controls.CircularSeekBar>
                 </FrameLayout>
-                <com.sahdeepsingh.Bop.visualizer.barVisuals
-                    android:id="@+id/barVisuals"
-                    android:layout_width="match_parent"
-                    android:layout_height="80dp"
-                    android:layout_marginBottom="30dp"
-                    android:layout_above="@+id/lul"/>
 
-                <LinearLayout
-                    android:id="@+id/lul"
+                <RelativeLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentBottom="true"
-                    android:layout_margin="0dp"
-                    android:orientation="horizontal"
-                    android:weightSum="5">
-
-                    <ImageButton
-                        android:id="@+id/shuffle"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:background="@color/transparent"
-                        android:src="@mipmap/ic_suffle_on" />
-
-                    <ImageButton
-                        android:id="@+id/previous"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:background="@color/transparent"
-                        android:src="@mipmap/ic_previous" />
-
-                    <ImageButton
-                        android:id="@+id/playPause"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:background="@color/transparent"
-                        android:src="@mipmap/ic_pause" />
+                    android:layout_height="wrap_content">
 
-                    <ImageButton
-                        android:id="@+id/skip_next"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:background="@color/transparent"
-                        android:src="@mipmap/ic_skip" />
-
-                    <ImageButton
-                        android:id="@+id/repeat"
-                        android:layout_width="wrap_content"
+                    <com.sahdeepsingh.Bop.visualizer.barVisuals
+                        android:id="@+id/barVisuals"
+                        android:layout_width="match_parent"
+                        android:layout_height="80dp"
+                        android:layout_above="@+id/lul"
+                        android:layout_alignParentStart="true"
+                        android:layout_marginStart="0dp"
+                        android:layout_marginBottom="30dp" />
+
+                    <android.support.v7.widget.CardView
+                        android:id="@+id/lul"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:background="@color/transparent"
-                        android:src="@mipmap/ic_repeat_on" />
-
-
-                </LinearLayout>
+                        android:layout_alignParentBottom="true">
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_margin="3dp"
+                            android:gravity="center"
+                            android:orientation="horizontal"
+                            android:weightSum="6">
+
+                            <ImageButton
+                                android:id="@+id/shuffle"
+                                android:layout_width="wrap_content"
+                                android:layout_height="40dp"
+                                android:layout_weight="1"
+                                android:background="@color/transparent"
+                                android:scaleType="centerInside"
+                                android:src="@mipmap/ic_suffle_on" />
+
+                            <ImageButton
+                                android:id="@+id/previous"
+                                android:layout_width="wrap_content"
+                                android:layout_height="40dp"
+                                android:layout_weight="1"
+                                android:background="@color/transparent"
+                                android:scaleType="centerInside"
+                                android:src="@mipmap/ic_previous" />
+
+                            <ImageButton
+                                android:id="@+id/playPause"
+                                android:layout_width="wrap_content"
+                                android:layout_height="70dp"
+                                android:layout_weight="2"
+                                android:background="@color/transparent"
+                                android:scaleType="centerCrop"
+                                android:src="@mipmap/ic_pause" />
+
+                            <ImageButton
+                                android:id="@+id/skip_next"
+                                android:layout_width="wrap_content"
+                                android:layout_height="40dp"
+                                android:layout_weight="1"
+                                android:background="@color/transparent"
+                                android:scaleType="centerInside"
+                                android:src="@mipmap/ic_skip" />
+
+                            <ImageButton
+                                android:id="@+id/repeat"
+                                android:layout_width="wrap_content"
+                                android:layout_height="40dp"
+                                android:layout_weight="1"
+                                android:background="@color/transparent"
+                                android:scaleType="centerInside"
+                                android:src="@mipmap/ic_repeat_on" />
+
+
+                        </LinearLayout>
+
+                    </android.support.v7.widget.CardView>
+                </RelativeLayout>
 
             </RelativeLayout>
 

diff --git a/app/src/main/res/mipmap-hdpi/ic_cancel.png b/app/src/main/res/mipmap-hdpi/ic_cancel.png
diff --git a/app/src/main/res/mipmap-hdpi/ic_pause.png b/app/src/main/res/mipmap-hdpi/ic_pause.png
diff --git a/app/src/main/res/mipmap-hdpi/ic_play.png b/app/src/main/res/mipmap-hdpi/ic_play.png
diff --git a/app/src/main/res/mipmap-hdpi/ic_previous.png b/app/src/main/res/mipmap-hdpi/ic_previous.png
diff --git a/app/src/main/res/mipmap-hdpi/ic_repeat_off.png b/app/src/main/res/mipmap-hdpi/ic_repeat_off.png
diff --git a/app/src/main/res/mipmap-hdpi/ic_repeat_on.png b/app/src/main/res/mipmap-hdpi/ic_repeat_on.png
diff --git a/app/src/main/res/mipmap-hdpi/ic_skip.png b/app/src/main/res/mipmap-hdpi/ic_skip.png
diff --git a/app/src/main/res/mipmap-hdpi/ic_suffle_off.png b/app/src/main/res/mipmap-hdpi/ic_suffle_off.png
diff --git a/app/src/main/res/mipmap-hdpi/ic_suffle_on.png b/app/src/main/res/mipmap-hdpi/ic_suffle_on.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_cancel.png b/app/src/main/res/mipmap-mdpi/ic_cancel.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_pause.png b/app/src/main/res/mipmap-mdpi/ic_pause.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_play.png b/app/src/main/res/mipmap-mdpi/ic_play.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_previous.png b/app/src/main/res/mipmap-mdpi/ic_previous.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_repeat_off.png b/app/src/main/res/mipmap-mdpi/ic_repeat_off.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_repeat_on.png b/app/src/main/res/mipmap-mdpi/ic_repeat_on.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_skip.png b/app/src/main/res/mipmap-mdpi/ic_skip.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_suffle_off.png b/app/src/main/res/mipmap-mdpi/ic_suffle_off.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_suffle_on.png b/app/src/main/res/mipmap-mdpi/ic_suffle_on.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_cancel.png b/app/src/main/res/mipmap-xhdpi/ic_cancel.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_pause.png b/app/src/main/res/mipmap-xhdpi/ic_pause.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_play.png b/app/src/main/res/mipmap-xhdpi/ic_play.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_previous.png b/app/src/main/res/mipmap-xhdpi/ic_previous.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_repeat_off.png b/app/src/main/res/mipmap-xhdpi/ic_repeat_off.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_repeat_on.png b/app/src/main/res/mipmap-xhdpi/ic_repeat_on.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_skip.png b/app/src/main/res/mipmap-xhdpi/ic_skip.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_suffle_off.png b/app/src/main/res/mipmap-xhdpi/ic_suffle_off.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_suffle_on.png b/app/src/main/res/mipmap-xhdpi/ic_suffle_on.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_cancel.png b/app/src/main/res/mipmap-xxhdpi/ic_cancel.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_pause.png b/app/src/main/res/mipmap-xxhdpi/ic_pause.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_play.png b/app/src/main/res/mipmap-xxhdpi/ic_play.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_previous.png b/app/src/main/res/mipmap-xxhdpi/ic_previous.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_repeat_off.png b/app/src/main/res/mipmap-xxhdpi/ic_repeat_off.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_repeat_on.png b/app/src/main/res/mipmap-xxhdpi/ic_repeat_on.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_skip.png b/app/src/main/res/mipmap-xxhdpi/ic_skip.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_suffle_off.png b/app/src/main/res/mipmap-xxhdpi/ic_suffle_off.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_suffle_on.png b/app/src/main/res/mipmap-xxhdpi/ic_suffle_on.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_cancel.png b/app/src/main/res/mipmap-xxxhdpi/ic_cancel.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_pause.png b/app/src/main/res/mipmap-xxxhdpi/ic_pause.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_play.png b/app/src/main/res/mipmap-xxxhdpi/ic_play.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_previous.png b/app/src/main/res/mipmap-xxxhdpi/ic_previous.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_repeat_off.png b/app/src/main/res/mipmap-xxxhdpi/ic_repeat_off.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_repeat_on.png b/app/src/main/res/mipmap-xxxhdpi/ic_repeat_on.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_skip.png b/app/src/main/res/mipmap-xxxhdpi/ic_skip.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_suffle_off.png b/app/src/main/res/mipmap-xxxhdpi/ic_suffle_off.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_suffle_on.png b/app/src/main/res/mipmap-xxxhdpi/ic_suffle_on.png