Updated libraries.
This commit is contained in:
parent
c85f9f0722
commit
6bbb92fc00
5 changed files with 14 additions and 40 deletions
|
|
@ -96,8 +96,8 @@ android {
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile fileTree(dir: 'libs', include: ['*.jar'])
|
compile fileTree(dir: 'libs', include: ['*.jar'])
|
||||||
compile('com.crashlytics.sdk.android:crashlytics:2.5.3@aar') {
|
compile('com.crashlytics.sdk.android:crashlytics:2.5.5@aar') {
|
||||||
transitive = true;
|
transitive = true
|
||||||
}
|
}
|
||||||
|
|
||||||
compile('com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:0.8.5@aar') {
|
compile('com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:0.8.5@aar') {
|
||||||
|
|
@ -111,7 +111,7 @@ dependencies {
|
||||||
transitive = true
|
transitive = true
|
||||||
}
|
}
|
||||||
|
|
||||||
compile('com.afollestad:material-cab:0.1.6@aar') {
|
compile('com.afollestad:material-cab:0.1.8@aar') {
|
||||||
transitive = true
|
transitive = true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -131,7 +131,7 @@ dependencies {
|
||||||
compile 'com.android.support:percent:23.1.1'
|
compile 'com.android.support:percent:23.1.1'
|
||||||
compile 'com.android.support:preference-v7:23.1.1'
|
compile 'com.android.support:preference-v7:23.1.1'
|
||||||
compile 'com.github.ksoichiro:android-observablescrollview:1.6.0'
|
compile 'com.github.ksoichiro:android-observablescrollview:1.6.0'
|
||||||
compile 'com.github.semoncat.seekarc:library:0.1'
|
compile 'com.github.kabouzeid:SeekArc:80bdd8330e'
|
||||||
compile 'com.github.kabouzeid:AndroidSlidingUpPanel:3.2.1'
|
compile 'com.github.kabouzeid:AndroidSlidingUpPanel:3.2.1'
|
||||||
compile 'com.squareup.retrofit2:retrofit:2.0.0-beta4'
|
compile 'com.squareup.retrofit2:retrofit:2.0.0-beta4'
|
||||||
compile 'com.squareup.retrofit2:converter-gson:2.0.0-beta4'
|
compile 'com.squareup.retrofit2:converter-gson:2.0.0-beta4'
|
||||||
|
|
@ -143,5 +143,5 @@ dependencies {
|
||||||
compile 'com.github.kabouzeid:AppIntro:3.3.0k'
|
compile 'com.github.kabouzeid:AppIntro:3.3.0k'
|
||||||
compile 'com.github.bumptech.glide:glide:3.7.0'
|
compile 'com.github.bumptech.glide:glide:3.7.0'
|
||||||
compile 'com.github.bumptech.glide:okhttp3-integration:1.4.0@aar'
|
compile 'com.github.bumptech.glide:okhttp3-integration:1.4.0@aar'
|
||||||
compile 'com.github.kabouzeid:RecyclerView-FastScroll:v1.4-kmod'
|
compile 'com.github.kabouzeid:RecyclerView-FastScroll:v1.6-kmod'
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -6,9 +6,6 @@ import android.app.PendingIntent;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.DialogInterface;
|
import android.content.DialogInterface;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.graphics.Paint;
|
|
||||||
import android.graphics.PorterDuff;
|
|
||||||
import android.graphics.drawable.Drawable;
|
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.os.CountDownTimer;
|
import android.os.CountDownTimer;
|
||||||
import android.os.SystemClock;
|
import android.os.SystemClock;
|
||||||
|
|
@ -27,8 +24,6 @@ import com.kabouzeid.gramophone.util.MusicUtil;
|
||||||
import com.kabouzeid.gramophone.util.PreferenceUtil;
|
import com.kabouzeid.gramophone.util.PreferenceUtil;
|
||||||
import com.triggertrap.seekarc.SeekArc;
|
import com.triggertrap.seekarc.SeekArc;
|
||||||
|
|
||||||
import java.lang.reflect.Field;
|
|
||||||
|
|
||||||
import butterknife.Bind;
|
import butterknife.Bind;
|
||||||
import butterknife.ButterKnife;
|
import butterknife.ButterKnife;
|
||||||
|
|
||||||
|
|
@ -108,6 +103,9 @@ public class SleepTimerDialog extends DialogFragment {
|
||||||
|
|
||||||
ButterKnife.bind(this, materialDialog.getCustomView());
|
ButterKnife.bind(this, materialDialog.getCustomView());
|
||||||
|
|
||||||
|
seekArc.setProgressColor(ThemeSingleton.get().positiveColor.getDefaultColor());
|
||||||
|
seekArc.setThumbColor(ThemeSingleton.get().positiveColor.getDefaultColor());
|
||||||
|
|
||||||
seekArc.post(new Runnable() {
|
seekArc.post(new Runnable() {
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
|
|
@ -118,20 +116,6 @@ public class SleepTimerDialog extends DialogFragment {
|
||||||
FrameLayout.LayoutParams layoutParams = new FrameLayout.LayoutParams(seekArc.getLayoutParams());
|
FrameLayout.LayoutParams layoutParams = new FrameLayout.LayoutParams(seekArc.getLayoutParams());
|
||||||
layoutParams.height = small;
|
layoutParams.height = small;
|
||||||
seekArc.setLayoutParams(layoutParams);
|
seekArc.setLayoutParams(layoutParams);
|
||||||
|
|
||||||
try {
|
|
||||||
Field f1 = SeekArc.class.getDeclaredField("mThumb");
|
|
||||||
f1.setAccessible(true);
|
|
||||||
Drawable thumb = (Drawable) f1.get(seekArc);
|
|
||||||
thumb.setColorFilter(ThemeSingleton.get().positiveColor.getDefaultColor(), PorterDuff.Mode.SRC_IN);
|
|
||||||
|
|
||||||
Field f2 = SeekArc.class.getDeclaredField("mProgressPaint");
|
|
||||||
f2.setAccessible(true);
|
|
||||||
Paint progressPaint = (Paint) f2.get(seekArc);
|
|
||||||
progressPaint.setColor(ThemeSingleton.get().positiveColor.getDefaultColor());
|
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:shape="oval">
|
|
||||||
<size
|
|
||||||
android:width="16dp"
|
|
||||||
android:height="16dp" />
|
|
||||||
<solid android:color="@android:color/black" />
|
|
||||||
</shape>
|
|
||||||
|
|
@ -10,13 +10,12 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="center"
|
android:layout_gravity="center"
|
||||||
android:padding="30dp"
|
android:padding="30dp"
|
||||||
seekarc:clockwise="false"
|
seekarc:SeekArc_clockwise="false"
|
||||||
seekarc:max="120"
|
seekarc:SeekArc_max="120"
|
||||||
seekarc:progressColor="?colorAccent"
|
seekarc:SeekArc_progressColor="?colorAccent"
|
||||||
seekarc:rotation="180"
|
seekarc:SeekArc_rotation="180"
|
||||||
seekarc:startAngle="30"
|
seekarc:SeekArc_startAngle="30"
|
||||||
seekarc:sweepAngle="300"
|
seekarc:SeekArc_sweepAngle="300" />
|
||||||
seekarc:thumb="@drawable/traditional_slider_thumb" />
|
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/timer_display"
|
android:id="@+id/timer_display"
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,6 @@
|
||||||
|
|
||||||
<style name="TraditionalMusicProgressSlider" parent="TraditionalMusicProgressSliderParent">
|
<style name="TraditionalMusicProgressSlider" parent="TraditionalMusicProgressSliderParent">
|
||||||
<item name="android:thumbOffset">0dp</item>
|
<item name="android:thumbOffset">0dp</item>
|
||||||
<item name="android:thumb">@drawable/traditional_slider_thumb</item>
|
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="Toolbar">
|
<style name="Toolbar">
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue