diff --git a/.idea/misc.xml b/.idea/misc.xml index b0a270f..7e15d9d 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -27,7 +27,7 @@ - + diff --git a/app/src/main/java/com/aurailus/caninemusic/PaletteGrabber/Palette.java b/app/src/main/java/com/aurailus/caninemusic/PaletteGrabber/Palette.java index 94ba634..eec7e88 100644 --- a/app/src/main/java/com/aurailus/caninemusic/PaletteGrabber/Palette.java +++ b/app/src/main/java/com/aurailus/caninemusic/PaletteGrabber/Palette.java @@ -49,7 +49,7 @@ public class Palette { } public short[] getColour(){ - long startTime = System.nanoTime()/1000000; +// long startTime = System.nanoTime()/1000000; final int THRESH = 50; //defines the maximum difference in pixel values the program will detect ArrayList record = new ArrayList<>(); //set up a temporary record to hold similar pixels @@ -90,16 +90,16 @@ public class Palette { //freqResult = av; //debug //System.out.println(freqResult); //debug - long estimatedTime = (System.nanoTime() - startTime)/1000000; - System.out.println("Palette Check Time Elapsed = " + estimatedTime); +// long estimatedTime = (System.nanoTime() - startTime)/1000000; +// System.out.println("Palette Check Time Elapsed = " + estimatedTime); return avPix; //send out the picked colour } else { short[] avPix = new short[3]; Arrays.fill(avPix, (short)-1); - long estimatedTime = (System.nanoTime() - startTime)/1000000; - System.out.println("Color find time >" + estimatedTime + "\n--------"); +// long estimatedTime = (System.nanoTime() - startTime)/1000000; +// System.out.println("Color find time >" + estimatedTime + "\n--------"); return avPix; } } diff --git a/app/src/main/java/com/aurailus/caninemusic/PlayerActivity.java b/app/src/main/java/com/aurailus/caninemusic/PlayerActivity.java index 53740cd..364bc87 100644 --- a/app/src/main/java/com/aurailus/caninemusic/PlayerActivity.java +++ b/app/src/main/java/com/aurailus/caninemusic/PlayerActivity.java @@ -246,7 +246,7 @@ public class PlayerActivity extends AppCompatActivity implements SeekBar.OnSeekB Intent intent = new Intent(PlayerActivity.this, QueueActivity.class); intent.putExtra(STATE_QUEUE, musicSrv.getList()); startActivity(intent); - overridePendingTransition(R.anim.slide_right_in, R.anim.slide_left_out); + overridePendingTransition(R.anim.slide_fright_small, R.anim.slide_tright_large); } @Override diff --git a/app/src/main/java/com/aurailus/caninemusic/QueueActivity.java b/app/src/main/java/com/aurailus/caninemusic/QueueActivity.java index 53901a2..3cc83b8 100644 --- a/app/src/main/java/com/aurailus/caninemusic/QueueActivity.java +++ b/app/src/main/java/com/aurailus/caninemusic/QueueActivity.java @@ -35,6 +35,6 @@ public class QueueActivity extends AppCompatActivity { @SuppressWarnings("UnusedParameters") public void back(View view) { this.finish(); - overridePendingTransition(R.anim.slide_left_in, R.anim.slide_right_out); + overridePendingTransition(R.anim.slide_fleft_small, R.anim.slide_tleft_large); } } diff --git a/app/src/main/res/anim/slide_fleft_small.xml b/app/src/main/res/anim/slide_fleft_small.xml new file mode 100644 index 0000000..e269bb4 --- /dev/null +++ b/app/src/main/res/anim/slide_fleft_small.xml @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/anim/slide_fright_small.xml b/app/src/main/res/anim/slide_fright_small.xml new file mode 100644 index 0000000..d123e15 --- /dev/null +++ b/app/src/main/res/anim/slide_fright_small.xml @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/anim/slide_tleft_large.xml b/app/src/main/res/anim/slide_tleft_large.xml new file mode 100644 index 0000000..eb2aa0d --- /dev/null +++ b/app/src/main/res/anim/slide_tleft_large.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/anim/slide_tright_large.xml b/app/src/main/res/anim/slide_tright_large.xml new file mode 100644 index 0000000..ea18ef5 --- /dev/null +++ b/app/src/main/res/anim/slide_tright_large.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_repeat.xml b/app/src/main/res/drawable/ic_repeat.xml new file mode 100644 index 0000000..1918a2a --- /dev/null +++ b/app/src/main/res/drawable/ic_repeat.xml @@ -0,0 +1,10 @@ + + + + diff --git a/app/src/main/res/drawable/ic_shuffle.xml b/app/src/main/res/drawable/ic_shuffle.xml new file mode 100644 index 0000000..33e2f92 --- /dev/null +++ b/app/src/main/res/drawable/ic_shuffle.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_shuffle_flat.xml b/app/src/main/res/drawable/ic_shuffle_flat.xml deleted file mode 100644 index cd7f32f..0000000 --- a/app/src/main/res/drawable/ic_shuffle_flat.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - diff --git a/app/src/main/res/layout/activity_player.xml b/app/src/main/res/layout/activity_player.xml index fb1b98e..6475a6a 100644 --- a/app/src/main/res/layout/activity_player.xml +++ b/app/src/main/res/layout/activity_player.xml @@ -43,7 +43,7 @@ android:id="@+id/constraintLayout2" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginBottom="2dp" + android:layout_marginBottom="0dp" android:layout_marginEnd="0dp" android:layout_marginStart="0dp" android:background="?android:attr/colorBackground" @@ -56,23 +56,27 @@ + app:srcCompat="@drawable/ic_shuffle" /> + app:srcCompat="@drawable/ic_repeat" /> + android:verticalSpacing="0dp"/> diff --git a/app/src/main/res/mipmap-hdpi/ic_overflow.png b/app/src/main/res/mipmap-hdpi/ic_overflow.png deleted file mode 100644 index 4631535..0000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_overflow.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_repeat.png b/app/src/main/res/mipmap-hdpi/ic_repeat.png deleted file mode 100644 index b32d8d9..0000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_repeat.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_overflow.png b/app/src/main/res/mipmap-mdpi/ic_overflow.png deleted file mode 100644 index fe17a73..0000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_overflow.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_repeat.png b/app/src/main/res/mipmap-mdpi/ic_repeat.png deleted file mode 100644 index 4758bfe..0000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_repeat.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_overflow.png b/app/src/main/res/mipmap-xhdpi/ic_overflow.png deleted file mode 100644 index a46c0b0..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_overflow.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_repeat.png b/app/src/main/res/mipmap-xhdpi/ic_repeat.png deleted file mode 100644 index 87f6a66..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_repeat.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_overflow.png b/app/src/main/res/mipmap-xxhdpi/ic_overflow.png deleted file mode 100644 index 5cd2bcd..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_overflow.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_repeat.png b/app/src/main/res/mipmap-xxhdpi/ic_repeat.png deleted file mode 100644 index 065c07a..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_repeat.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_overflow.png b/app/src/main/res/mipmap-xxxhdpi/ic_overflow.png deleted file mode 100644 index 26644b2..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_overflow.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_repeat.png b/app/src/main/res/mipmap-xxxhdpi/ic_repeat.png deleted file mode 100644 index 5680104..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_repeat.png and /dev/null differ diff --git a/resources/repeat.svg b/resources/repeat.svg index f7a5e44..e5069e5 100755 --- a/resources/repeat.svg +++ b/resources/repeat.svg @@ -7,7 +7,6 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="273.06668" @@ -15,51 +14,28 @@ viewBox="0 0 256 256" id="svg2" version="1.1" - inkscape:version="0.92.1 r15371" + inkscape:version="0.91 r13725" sodipodi:docname="repeat.svg"> - - - - - - + id="defs4" /> image/svg+xml - + @@ -80,18 +56,15 @@ id="layer1" transform="translate(0,-796.36216)"> + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:24.28124809;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + d="m 135.53125,30.306641 c -19.55264,0 -39.138035,6.725969 -54.921031,15.972807 l 15.934703,19.890474 c 11.545008,-6.34744 24.824668,-9.962891 38.986328,-9.962891 44.74576,0 80.74219,35.996425 80.74219,80.742189 0,44.74577 -35.99643,80.74219 -80.74219,80.74219 -44.745772,0 -80.742188,-35.99642 -80.742188,-80.74219 0,-16.55853 4.939939,-31.91204 13.417969,-44.693361 L 48.777344,75.052734 C 36.268208,92.524097 28.892578,113.90069 28.892578,136.94922 c 0,58.74317 47.895502,106.64062 106.638672,106.64062 58.74316,0 106.64258,-47.89745 106.64258,-106.64062 0,-58.743162 -47.89942,-106.642579 -106.64258,-106.642579 z" + transform="matrix(0.93749995,0,0,0.93749995,0,796.36216)" + id="path4801" + inkscape:connector-curvature="0" + sodipodi:nodetypes="sccssssccssss" /> -