diff --git a/app/build.gradle b/app/build.gradle index 0de0b439..6ed322cb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,6 +17,7 @@ android { versionCode 13 versionName "5.0.2" setProperty("archivesBaseName", "clock") + vectorDrawables.useSupportLibrary = true } signingConfigs { diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt b/app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt index 976ad44e..fb785a1d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt @@ -77,6 +77,9 @@ class ReminderActivity : SimpleActivity() { reminder_stop.beGone() reminder_draggable_background.startAnimation(AnimationUtils.loadAnimation(this, R.anim.pulsing_animation)) reminder_draggable_background.applyColorFilter(getAdjustedPrimaryColor()) + + reminder_dismiss.applyColorFilter(config.textColor) + reminder_draggable.applyColorFilter(config.textColor) reminder_snooze.applyColorFilter(config.textColor) var minDragX = 0f 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 b4072574..eae2f57c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt +++ b/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt @@ -336,7 +336,7 @@ fun Context.getAlarmNotification(pendingIntent: PendingIntent, alarm: Alarm): No val builder = NotificationCompat.Builder(this) .setContentTitle(label) .setContentText(getFormattedTime(getPassedSeconds(), false, false)) - .setSmallIcon(R.drawable.ic_alarm) + .setSmallIcon(R.drawable.ic_alarm_vector) .setContentIntent(pendingIntent) .setPriority(Notification.PRIORITY_HIGH) .setDefaults(Notification.DEFAULT_LIGHTS) diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/fragments/ClockFragment.kt b/app/src/main/kotlin/com/simplemobiletools/clock/fragments/ClockFragment.kt index b831684f..468e9e11 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/fragments/ClockFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/clock/fragments/ClockFragment.kt @@ -2,10 +2,10 @@ package com.simplemobiletools.clock.fragments import android.os.Bundle import android.os.Handler -import androidx.fragment.app.Fragment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import androidx.fragment.app.Fragment import com.simplemobiletools.clock.R import com.simplemobiletools.clock.activities.SimpleActivity import com.simplemobiletools.clock.adapters.TimeZonesAdapter diff --git a/app/src/main/res/drawable-hdpi/ic_alarm.png b/app/src/main/res/drawable-hdpi/ic_alarm.png deleted file mode 100644 index 6dc94d2b..00000000 Binary files a/app/src/main/res/drawable-hdpi/ic_alarm.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_alarm_big.png b/app/src/main/res/drawable-hdpi/ic_alarm_big.png deleted file mode 100644 index 21ed21a4..00000000 Binary files a/app/src/main/res/drawable-hdpi/ic_alarm_big.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_alarm.png b/app/src/main/res/drawable-xhdpi/ic_alarm.png deleted file mode 100644 index 280e09df..00000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_alarm.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_alarm_big.png b/app/src/main/res/drawable-xhdpi/ic_alarm_big.png deleted file mode 100644 index b45924d4..00000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_alarm_big.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_alarm.png b/app/src/main/res/drawable-xxhdpi/ic_alarm.png deleted file mode 100644 index 75e5a46e..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_alarm.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_alarm_big.png b/app/src/main/res/drawable-xxhdpi/ic_alarm_big.png deleted file mode 100644 index 602a7406..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_alarm_big.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_alarm.png b/app/src/main/res/drawable-xxxhdpi/ic_alarm.png deleted file mode 100644 index aa8102fd..00000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_alarm.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_alarm_big.png b/app/src/main/res/drawable-xxxhdpi/ic_alarm_big.png deleted file mode 100644 index e918305b..00000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_alarm_big.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_alarm_vector.xml b/app/src/main/res/drawable/ic_alarm_vector.xml new file mode 100644 index 00000000..a1ba6700 --- /dev/null +++ b/app/src/main/res/drawable/ic_alarm_vector.xml @@ -0,0 +1,11 @@ + + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 2a0ce1d7..3895a204 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -26,7 +26,7 @@ android:id="@+id/tab_alarm" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:icon="@drawable/ic_alarm"/> + android:icon="@drawable/ic_alarm_vector"/> + android:src="@drawable/ic_alarm_vector"/> + android:src="@drawable/ic_alarm_vector"/> + android:src="@drawable/ic_alarm_vector"/> + android:src="@drawable/ic_alarm_vector"/>