diff --git a/app/build.gradle b/app/build.gradle index 5d6a95c8..c5e4a612 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -51,7 +51,7 @@ android { } dependencies { - implementation 'com.simplemobiletools:commons:5.15.23' + implementation 'com.simplemobiletools:commons:5.18.7' implementation 'com.facebook.stetho:stetho:1.5.0' implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta2' implementation 'com.shawnlin:number-picker:2.4.6' diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt index eae2f57c..b2023013 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt +++ b/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt @@ -273,7 +273,7 @@ fun Context.getTimerNotification(pendingIntent: PendingIntent, addDeleteIntent: .setAutoCancel(true) .setSound(Uri.parse(soundUri), AudioManager.STREAM_ALARM) .setChannelId(channelId) - .addAction(R.drawable.ic_cross, getString(R.string.dismiss), if (addDeleteIntent) reminderActivityIntent else getHideTimerPendingIntent()) + .addAction(R.drawable.ic_cross_vector, getString(R.string.dismiss), if (addDeleteIntent) reminderActivityIntent else getHideTimerPendingIntent()) if (addDeleteIntent) { builder.setDeleteIntent(reminderActivityIntent) @@ -343,8 +343,8 @@ fun Context.getAlarmNotification(pendingIntent: PendingIntent, alarm: Alarm): No .setAutoCancel(true) .setSound(Uri.parse(soundUri), AudioManager.STREAM_ALARM) .setChannelId(channelId) - .addAction(R.drawable.ic_snooze, getString(R.string.snooze), getSnoozePendingIntent(alarm)) - .addAction(R.drawable.ic_cross, getString(R.string.dismiss), getHideAlarmPendingIntent(alarm)) + .addAction(R.drawable.ic_snooze_vector, getString(R.string.snooze), getSnoozePendingIntent(alarm)) + .addAction(R.drawable.ic_cross_vector, getString(R.string.dismiss), getHideAlarmPendingIntent(alarm)) builder.setVisibility(Notification.VISIBILITY_PUBLIC) diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/fragments/StopwatchFragment.kt b/app/src/main/kotlin/com/simplemobiletools/clock/fragments/StopwatchFragment.kt index 24880412..04839de7 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/fragments/StopwatchFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/clock/fragments/StopwatchFragment.kt @@ -195,7 +195,7 @@ class StopwatchFragment : Fragment() { } private fun updateIcons() { - val drawableId = if (isRunning) R.drawable.ic_pause else R.drawable.ic_play + val drawableId = if (isRunning) R.drawable.ic_pause_vector else R.drawable.ic_play_vector val iconColor = if (context!!.getAdjustedPrimaryColor() == Color.WHITE) Color.BLACK else context!!.config.textColor view.stopwatch_play_pause.setImageDrawable(resources.getColoredDrawableWithColor(drawableId, iconColor)) } diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/fragments/TimerFragment.kt b/app/src/main/kotlin/com/simplemobiletools/clock/fragments/TimerFragment.kt index 0c8eeebe..2709b901 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/fragments/TimerFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/clock/fragments/TimerFragment.kt @@ -199,7 +199,7 @@ class TimerFragment : Fragment() { } private fun updateIcons() { - val drawableId = if (isRunning) R.drawable.ic_pause else R.drawable.ic_play + val drawableId = if (isRunning) R.drawable.ic_pause_vector else R.drawable.ic_play_vector val iconColor = if (context!!.getAdjustedPrimaryColor() == Color.WHITE) Color.BLACK else context!!.config.textColor view.timer_play_pause.setImageDrawable(resources.getColoredDrawableWithColor(drawableId, iconColor)) } diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/helpers/MyWidgetDateTimeProvider.kt b/app/src/main/kotlin/com/simplemobiletools/clock/helpers/MyWidgetDateTimeProvider.kt index 39b76087..b64a6147 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/helpers/MyWidgetDateTimeProvider.kt +++ b/app/src/main/kotlin/com/simplemobiletools/clock/helpers/MyWidgetDateTimeProvider.kt @@ -81,7 +81,7 @@ class MyWidgetDateTimeProvider : AppWidgetProvider() { val bitmap = getMultiplyColoredBitmap(R.drawable.ic_clock_shadowed, widgetTextColor, context) setImageViewBitmap(R.id.widget_next_alarm_image, bitmap) } else { - setImageViewBitmap(R.id.widget_next_alarm_image, context.resources.getColoredBitmap(R.drawable.ic_clock, widgetTextColor)) + setImageViewBitmap(R.id.widget_next_alarm_image, context.resources.getColoredBitmap(R.drawable.ic_clock_vector, widgetTextColor)) } } } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 3895a204..d559d139 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -20,7 +20,7 @@ android:id="@+id/tab_clock" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:icon="@drawable/ic_clock"/> + android:icon="@drawable/ic_clock_vector"/> @@ -57,7 +57,7 @@ android:layout_height="wrap_content" android:layout_below="@+id/edit_alarm_vibrate_holder" android:background="?attr/selectableItemBackground" - android:drawableLeft="@drawable/ic_bell" + android:drawableLeft="@drawable/ic_bell_vector" android:drawablePadding="@dimen/normal_margin" android:paddingLeft="@dimen/tiny_margin" android:paddingTop="@dimen/normal_margin" @@ -75,7 +75,7 @@ android:layout_marginLeft="@dimen/tiny_margin" android:layout_marginRight="@dimen/tiny_margin" android:scaleType="fitCenter" - android:src="@drawable/ic_label"/> + android:src="@drawable/ic_label_vector"/> + android:src="@drawable/ic_plus_vector"/> diff --git a/app/src/main/res/layout/fragment_clock.xml b/app/src/main/res/layout/fragment_clock.xml index 41373739..21285c1e 100644 --- a/app/src/main/res/layout/fragment_clock.xml +++ b/app/src/main/res/layout/fragment_clock.xml @@ -37,7 +37,7 @@ android:layout_below="@+id/clock_date" android:layout_centerHorizontal="true" android:layout_marginTop="@dimen/medium_margin" - android:drawableLeft="@drawable/ic_clock" + android:drawableLeft="@drawable/ic_clock_vector" android:drawablePadding="@dimen/small_margin" android:gravity="center_horizontal" android:textSize="@dimen/big_text_size" @@ -63,6 +63,6 @@ android:layout_height="wrap_content" android:layout_gravity="bottom|end" android:layout_margin="@dimen/activity_margin" - android:src="@drawable/ic_plus"/> + android:src="@drawable/ic_plus_vector"/> diff --git a/app/src/main/res/layout/fragment_stopwatch.xml b/app/src/main/res/layout/fragment_stopwatch.xml index 51e4e9a7..1664327f 100644 --- a/app/src/main/res/layout/fragment_stopwatch.xml +++ b/app/src/main/res/layout/fragment_stopwatch.xml @@ -79,7 +79,7 @@ android:layout_centerHorizontal="true" android:layout_marginBottom="@dimen/big_margin" android:padding="@dimen/normal_margin" - android:src="@drawable/ic_play" + android:src="@drawable/ic_play_vector" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" @@ -92,7 +92,7 @@ android:layout_toLeftOf="@+id/stopwatch_play_pause" android:background="?attr/selectableItemBackgroundBorderless" android:padding="@dimen/normal_margin" - android:src="@drawable/ic_reset" + android:src="@drawable/ic_reset_vector" android:visibility="gone" app:layout_constraintBottom_toBottomOf="@+id/stopwatch_play_pause" app:layout_constraintEnd_toStartOf="@+id/stopwatch_play_pause" diff --git a/app/src/main/res/layout/fragment_timer.xml b/app/src/main/res/layout/fragment_timer.xml index f36c4413..9d5190bd 100644 --- a/app/src/main/res/layout/fragment_timer.xml +++ b/app/src/main/res/layout/fragment_timer.xml @@ -48,7 +48,7 @@ android:layout_height="wrap_content" android:background="@null" android:clickable="false" - android:drawableLeft="@drawable/ic_vibrate" + android:drawableLeft="@drawable/ic_vibrate_vector" android:drawablePadding="@dimen/normal_margin" android:text="@string/vibrate" android:textSize="@dimen/bigger_text_size"/> @@ -60,7 +60,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="?attr/selectableItemBackground" - android:drawableLeft="@drawable/ic_bell" + android:drawableLeft="@drawable/ic_bell_vector" android:drawablePadding="@dimen/normal_margin" android:padding="@dimen/activity_margin" android:textSize="@dimen/bigger_text_size" @@ -75,7 +75,7 @@ android:layout_centerHorizontal="true" android:layout_marginBottom="@dimen/big_margin" android:padding="@dimen/normal_margin" - android:src="@drawable/ic_play" + android:src="@drawable/ic_play_vector" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" @@ -89,7 +89,7 @@ android:layout_toLeftOf="@+id/timer_play_pause" android:background="?attr/selectableItemBackgroundBorderless" android:padding="@dimen/normal_margin" - android:src="@drawable/ic_reset" + android:src="@drawable/ic_reset_vector" android:visibility="gone" app:layout_constraintBottom_toBottomOf="@+id/timer_play_pause" app:layout_constraintEnd_toStartOf="@+id/timer_play_pause" diff --git a/app/src/main/res/menu/cab_alarms.xml b/app/src/main/res/menu/cab_alarms.xml index af34568b..642b5e42 100644 --- a/app/src/main/res/menu/cab_alarms.xml +++ b/app/src/main/res/menu/cab_alarms.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> diff --git a/app/src/main/res/menu/cab_timezones.xml b/app/src/main/res/menu/cab_timezones.xml index af34568b..642b5e42 100644 --- a/app/src/main/res/menu/cab_timezones.xml +++ b/app/src/main/res/menu/cab_timezones.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> diff --git a/build.gradle b/build.gradle index b4fdb49c..37c3ac06 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.41' + ext.kotlin_version = '1.3.50' repositories { google() @@ -9,7 +9,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.4.2' + classpath 'com.android.tools.build:gradle:3.5.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c72f7dfc..cc0d328d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Jul 06 15:31:40 CEST 2019 +#Wed Oct 09 21:19:09 CEST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip