Final commit
Aurailus
parent
1a96cb285d
commit
c59a7aa901
|
|
@ -27,7 +27,7 @@
|
|||
</value>
|
||||
</option>
|
||||
</component>
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
|
||||
<output url="file://$PROJECT_DIR$/build/classes" />
|
||||
</component>
|
||||
<component name="ProjectType">
|
||||
|
|
|
|||
|
|
@ -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<Pixel> 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;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,11 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<set xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<translate
|
||||
android:duration="@android:integer/config_shortAnimTime"
|
||||
android:fromXDelta="-40%p"
|
||||
android:toXDelta="0%p"/>
|
||||
<alpha
|
||||
android:duration="@android:integer/config_mediumAnimTime"
|
||||
android:fromAlpha="0.4"
|
||||
android:toAlpha="1" />
|
||||
</set>
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<set xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<translate
|
||||
android:duration="@android:integer/config_shortAnimTime"
|
||||
android:fromXDelta="100%p"
|
||||
android:toXDelta="0%p" />
|
||||
<alpha
|
||||
android:duration="@android:integer/config_mediumAnimTime"
|
||||
android:fromAlpha="0.4"
|
||||
android:toAlpha="1" />
|
||||
</set>
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<set xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<translate
|
||||
android:duration="@android:integer/config_shortAnimTime"
|
||||
android:fromXDelta="0%p"
|
||||
android:toXDelta="100%p">
|
||||
</translate>
|
||||
</set>
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<set xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<translate
|
||||
android:duration="@android:integer/config_shortAnimTime"
|
||||
android:fromXDelta="0%p"
|
||||
android:toXDelta="-40%p">
|
||||
</translate>
|
||||
</set>
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
<vector android:height="24dp" android:viewportHeight="256.0"
|
||||
android:viewportWidth="256.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<path android:fillAlpha="1" android:fillColor="@color/player_button_color"
|
||||
android:pathData="m127.06,28.41c-18.33,0 -36.69,6.31 -51.49,14.97l14.94,18.65c10.82,-5.95 23.27,-9.34 36.55,-9.34 41.95,0 75.7,33.75 75.7,75.7 0,41.95 -33.75,75.7 -75.7,75.7 -41.95,0 -75.7,-33.75 -75.7,-75.7 0,-15.52 4.63,-29.92 12.58,-41.9L45.73,70.36C34,86.74 27.09,106.78 27.09,128.39c0,55.07 44.9,99.98 99.97,99.98 55.07,0 99.98,-44.9 99.98,-99.98 0,-55.07 -44.91,-99.98 -99.98,-99.98z"
|
||||
android:strokeAlpha="1" android:strokeColor="#00000000"
|
||||
android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="24.28124809"/>
|
||||
<path android:fillAlpha="1" android:fillColor="@color/player_button_color"
|
||||
android:pathData="m26.55,63.32 l47.72,44.33 -1.34,-45.69z"
|
||||
android:strokeAlpha="1" android:strokeColor="#00000000" android:strokeWidth="1.14125931"/>
|
||||
</vector>
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="@color/player_button_color"
|
||||
android:pathData="M10.59,9.17L5.41,4 4,5.41l5.17,5.17 1.42,-1.41zM14.5,4l2.04,2.04L4,18.59 5.41,20 17.96,7.46 20,9.5L20,4h-5.5zM14.83,13.41l-1.41,1.41 3.13,3.13L14.5,20L20,20v-5.5l-2.04,2.04 -3.13,-3.13z"/>
|
||||
</vector>
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
<vector android:height="24dp" android:viewportHeight="256.0"
|
||||
android:viewportWidth="256.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<path android:fillAlpha="1" android:fillColor="#646464"
|
||||
android:pathData="m169.36,10.14 l76.83,75.69v-75.69z"
|
||||
android:strokeAlpha="1" android:strokeColor="#00000000" android:strokeWidth="1.88971829"/>
|
||||
<path android:fillAlpha="1" android:fillColor="#646464"
|
||||
android:pathData="m244.24,166.01 l-78.3,79.48h78.3z"
|
||||
android:strokeAlpha="1" android:strokeColor="#00000000" android:strokeWidth="1.95493877"/>
|
||||
<path android:fillAlpha="1" android:fillColor="#f9f9f9"
|
||||
android:pathData="M231.98,232.02 L23.65,23.69"
|
||||
android:strokeAlpha="1" android:strokeColor="#646464"
|
||||
android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="24.74979401"/>
|
||||
<path android:fillColor="#00000000"
|
||||
android:pathData="M231.32,23.69 L22.99,232.02"
|
||||
android:strokeAlpha="1" android:strokeColor="#646464"
|
||||
android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="24.74999871"/>
|
||||
</vector>
|
||||
|
|
@ -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 @@
|
|||
|
||||
<ImageView
|
||||
android:id="@+id/button_shuffle"
|
||||
android:padding="12dp"
|
||||
android:layout_width="60dp"
|
||||
android:clickable="true"
|
||||
android:layout_height="60dp"
|
||||
android:layout_marginBottom="16dp"
|
||||
android:layout_marginEnd="12dp"
|
||||
android:layout_marginLeft="6dp"
|
||||
android:layout_marginRight="12dp"
|
||||
android:layout_marginStart="6dp"
|
||||
android:background="@drawable/ripple_oval"
|
||||
android:background="@drawable/ripple_oval_light"
|
||||
android:contentDescription="@string/shuffle_state"
|
||||
android:scaleType="centerInside"
|
||||
android:scaleType="fitCenter"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintDimensionRatio="w,1:1"
|
||||
app:layout_constraintLeft_toLeftOf="parent"
|
||||
app:srcCompat="@drawable/ic_shuffle_flat" />
|
||||
app:srcCompat="@drawable/ic_shuffle" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/button_repeat"
|
||||
android:padding="12dp"
|
||||
android:clickable="true"
|
||||
android:layout_width="60dp"
|
||||
android:layout_height="60dp"
|
||||
android:layout_marginBottom="16dp"
|
||||
|
|
@ -80,13 +84,13 @@
|
|||
android:layout_marginLeft="12dp"
|
||||
android:layout_marginRight="6dp"
|
||||
android:layout_marginStart="12dp"
|
||||
android:background="@drawable/ripple_oval"
|
||||
android:background="@drawable/ripple_oval_light"
|
||||
android:contentDescription="@string/repeat_state"
|
||||
android:scaleType="centerInside"
|
||||
android:scaleType="fitCenter"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintDimensionRatio="w,1:1"
|
||||
app:layout_constraintRight_toRightOf="parent"
|
||||
app:srcCompat="@mipmap/ic_repeat" />
|
||||
app:srcCompat="@drawable/ic_repeat" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/button_previous"
|
||||
|
|
@ -104,7 +108,7 @@
|
|||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintDimensionRatio="w,1:1"
|
||||
app:layout_constraintRight_toLeftOf="@+id/playpause_frame"
|
||||
android:background="@drawable/ripple_oval"
|
||||
android:background="@drawable/ripple_oval_light"
|
||||
app:layout_constraintLeft_toRightOf="@+id/button_shuffle"/>
|
||||
|
||||
<ImageView
|
||||
|
|
@ -123,7 +127,7 @@
|
|||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintDimensionRatio="w,1:1"
|
||||
app:layout_constraintLeft_toRightOf="@+id/playpause_frame"
|
||||
android:background="@drawable/ripple_oval"
|
||||
android:background="@drawable/ripple_oval_light"
|
||||
app:layout_constraintRight_toLeftOf="@+id/button_repeat"/>
|
||||
|
||||
<FrameLayout
|
||||
|
|
|
|||
|
|
@ -114,7 +114,7 @@
|
|||
android:layout_marginEnd="0dp"
|
||||
android:layout_marginRight="0dp"
|
||||
android:layout_marginTop="8dp"
|
||||
android:background="@mipmap/ic_overflow"
|
||||
android:background="@drawable/ic_overflow"
|
||||
android:clickable="true"
|
||||
android:contentDescription="@string/overflow"
|
||||
android:cropToPadding="false"
|
||||
|
|
|
|||
|
|
@ -105,8 +105,7 @@
|
|||
android:horizontalSpacing="0dp"
|
||||
android:numColumns="auto_fit"
|
||||
android:stretchMode="columnWidth"
|
||||
android:verticalSpacing="0dp"
|
||||
android:animateLayoutChanges="true"/>
|
||||
android:verticalSpacing="0dp"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 450 B |
Binary file not shown.
|
Before Width: | Height: | Size: 1.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 272 B |
Binary file not shown.
|
Before Width: | Height: | Size: 761 B |
Binary file not shown.
|
Before Width: | Height: | Size: 538 B |
Binary file not shown.
|
Before Width: | Height: | Size: 1.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 933 B |
Binary file not shown.
|
Before Width: | Height: | Size: 2.5 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.6 KiB |
|
|
@ -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">
|
||||
<defs
|
||||
id="defs4">
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
id="linearGradient894">
|
||||
<stop
|
||||
style="stop-color:#646464;stop-opacity:0.48235294"
|
||||
offset="0"
|
||||
id="stop890" />
|
||||
<stop
|
||||
style="stop-color:#646464;stop-opacity:1"
|
||||
offset="1"
|
||||
id="stop892" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient894"
|
||||
id="linearGradient896"
|
||||
x1="63.798317"
|
||||
y1="79.716614"
|
||||
x2="134.32434"
|
||||
y2="36.932522"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(0.93749995,0,0,0.93749995,0.32936565,797.15575)" />
|
||||
</defs>
|
||||
id="defs4" />
|
||||
<sodipodi:namedview
|
||||
id="base"
|
||||
pagecolor="#ffffff"
|
||||
pagecolor="#2a2a2a"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1.0"
|
||||
inkscape:pageopacity="0.0"
|
||||
inkscape:pageopacity="0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:zoom="1"
|
||||
inkscape:cx="85.893715"
|
||||
inkscape:cy="46.215684"
|
||||
inkscape:zoom="2"
|
||||
inkscape:cx="344.45507"
|
||||
inkscape:cy="105.67397"
|
||||
inkscape:document-units="px"
|
||||
inkscape:current-layer="layer1"
|
||||
showgrid="false"
|
||||
units="px"
|
||||
inkscape:window-width="1536"
|
||||
inkscape:window-height="801"
|
||||
inkscape:window-x="-8"
|
||||
inkscape:window-y="-8"
|
||||
inkscape:window-width="1920"
|
||||
inkscape:window-height="1005"
|
||||
inkscape:window-x="1280"
|
||||
inkscape:window-y="0"
|
||||
inkscape:window-maximized="1"
|
||||
inkscape:snap-nodes="true" />
|
||||
<metadata
|
||||
|
|
@ -70,7 +46,7 @@
|
|||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
<dc:title />
|
||||
<dc:title></dc:title>
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
|
|
@ -80,18 +56,15 @@
|
|||
id="layer1"
|
||||
transform="translate(0,-796.36216)">
|
||||
<path
|
||||
style="fill:none;fill-opacity:1;stroke:#646464;stroke-width:26.4013176;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="M 223.62725 104.0366 A 93.572718 93.572718 0 0 1 229.37188 136.31787 L 229.37188 136.31787 A 93.572718 93.572718 0 0 1 135.79916 229.89059 A 93.572718 93.572718 0 0 1 42.226443 136.31787 A 93.572718 93.572718 0 0 1 56.675985 86.364126 "
|
||||
id="path888"
|
||||
transform="matrix(0.93749995,0,0,0.93749995,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" />
|
||||
<path
|
||||
style="fill:none;fill-opacity:1;stroke:url(#linearGradient896);stroke-width:24.75123405;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="m 53.463099,878.12211 a 87.724418,87.724418 0 0 1 74.177981,-40.89278 87.724418,87.724418 0 0 1 82.33883,57.46073"
|
||||
id="path9"
|
||||
inkscape:connector-curvature="0" />
|
||||
<path
|
||||
style="fill:#646464;fill-opacity:1;stroke:none;stroke-width:1.14125931;stroke-opacity:1"
|
||||
d="m 25.833194,857.44616 46.399799,45.71225 v -45.71225 z"
|
||||
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.14125931;stroke-opacity:1"
|
||||
d="m 26.548882,859.68186 47.724055,44.32793 -1.344325,-45.69248 z"
|
||||
id="rect4143"
|
||||
inkscape:connector-curvature="0"
|
||||
sodipodi:nodetypes="cccc" />
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 3.7 KiB |
Loading…
Reference in New Issue