From 1a7a4eb1d513cde9c3befef4260a7aebd648dc20 Mon Sep 17 00:00:00 2001 From: tibbi Date: Wed, 14 Aug 2019 22:53:25 +0200 Subject: [PATCH] updating Commons to the new vector icons --- app/build.gradle | 2 +- .../calendar/pro/activities/EventActivity.kt | 4 ++-- .../calendar/pro/extensions/Context.kt | 2 +- .../calendar/pro/helpers/MyWidgetListProvider.kt | 2 +- .../pro/helpers/MyWidgetMonthlyProvider.kt | 2 +- .../res/drawable/attendee_circular_background.xml | 2 +- app/src/main/res/layout/activity_day.xml | 2 +- app/src/main/res/layout/activity_event.xml | 14 +++++++------- app/src/main/res/layout/activity_main.xml | 2 +- app/src/main/res/layout/dialog_set_reminders.xml | 2 +- app/src/main/res/layout/fragment_month_widget.xml | 2 +- app/src/main/res/layout/item_attendee.xml | 2 +- app/src/main/res/layout/week_grid_item.xml | 2 +- app/src/main/res/layout/widget_event_list.xml | 2 +- app/src/main/res/menu/cab_day.xml | 4 ++-- app/src/main/res/menu/cab_event_list.xml | 4 ++-- app/src/main/res/menu/cab_event_type.xml | 2 +- app/src/main/res/menu/menu_event.xml | 6 +++--- app/src/main/res/menu/menu_event_types.xml | 2 +- app/src/main/res/menu/menu_main.xml | 6 +++--- 20 files changed, 33 insertions(+), 33 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index e95b4d8b7..b10ca4bdc 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -57,7 +57,7 @@ android { } dependencies { - implementation 'com.simplemobiletools:commons:5.15.23' + implementation 'com.simplemobiletools:commons:5.16.7' implementation 'joda-time:joda-time:2.10.1' implementation 'androidx.multidex:multidex:2.0.1' implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta2' diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt index 9b6baf9df..004c9aea7 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt @@ -95,7 +95,7 @@ class EventActivity : SimpleActivity() { return } - supportActionBar?.setHomeAsUpIndicator(R.drawable.ic_cross) + supportActionBar?.setHomeAsUpIndicator(R.drawable.ic_cross_vector) val intent = intent ?: return mDialogTheme = getDialogTheme() mWasContactsPermissionChecked = hasPermission(PERMISSION_READ_CONTACTS) @@ -716,7 +716,7 @@ class EventActivity : SimpleActivity() { private fun updateReminderTypeImage(view: ImageView, reminder: Reminder) { view.beVisibleIf(reminder.minutes != REMINDER_OFF && mEventCalendarId != STORED_LOCALLY_ONLY) - val drawable = if (reminder.type == REMINDER_NOTIFICATION) R.drawable.ic_bell else R.drawable.ic_email + val drawable = if (reminder.type == REMINDER_NOTIFICATION) R.drawable.ic_bell_vector else R.drawable.ic_email_vector val icon = resources.getColoredDrawableWithColor(drawable, config.textColor) view.setImageDrawable(icon) } diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/extensions/Context.kt index f73c05670..c48ce8fa0 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/extensions/Context.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/extensions/Context.kt @@ -257,7 +257,7 @@ fun Context.getNotification(pendingIntent: PendingIntent, event: Event, content: .setAutoCancel(true) .setSound(Uri.parse(soundUri), config.reminderAudioStream) .setChannelId(channelId) - .addAction(R.drawable.ic_snooze, getString(R.string.snooze), getSnoozePendingIntent(this, event)) + .addAction(R.drawable.ic_snooze_vector, getString(R.string.snooze), getSnoozePendingIntent(this, event)) if (config.vibrateOnReminder) { val vibrateArray = LongArray(2) { 500 } diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/MyWidgetListProvider.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/MyWidgetListProvider.kt index d117eba31..5f03fd6b8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/MyWidgetListProvider.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/MyWidgetListProvider.kt @@ -44,7 +44,7 @@ class MyWidgetListProvider : AppWidgetProvider() { val todayText = Formatter.getLongestDate(getNowSeconds()) views.setText(R.id.widget_event_list_today, todayText) - views.setImageViewBitmap(R.id.widget_event_new_event, context.resources.getColoredBitmap(R.drawable.ic_plus, textColor)) + views.setImageViewBitmap(R.id.widget_event_new_event, context.resources.getColoredBitmap(R.drawable.ic_plus_vector, textColor)) setupIntent(context, views, NEW_EVENT, R.id.widget_event_new_event) setupIntent(context, views, LAUNCH_CAL, R.id.widget_event_list_today) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/MyWidgetMonthlyProvider.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/MyWidgetMonthlyProvider.kt index 474eafded..0e0aeeb63 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/MyWidgetMonthlyProvider.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/MyWidgetMonthlyProvider.kt @@ -181,7 +181,7 @@ class MyWidgetMonthlyProvider : AppWidgetProvider() { bmp = resources.getColoredBitmap(R.drawable.ic_today, textColor) views.setImageViewBitmap(R.id.top_go_to_today, bmp) - bmp = resources.getColoredBitmap(R.drawable.ic_plus, textColor) + bmp = resources.getColoredBitmap(R.drawable.ic_plus_vector, textColor) views.setImageViewBitmap(R.id.top_new_event, bmp) val shouldGoToTodayBeVisible = currTargetDate.withTime(0, 0, 0, 0) != DateTime.now().withDayOfMonth(1).withTime(0, 0, 0, 0) diff --git a/app/src/main/res/drawable/attendee_circular_background.xml b/app/src/main/res/drawable/attendee_circular_background.xml index 4b622c6eb..8101204b6 100644 --- a/app/src/main/res/drawable/attendee_circular_background.xml +++ b/app/src/main/res/drawable/attendee_circular_background.xml @@ -8,7 +8,7 @@ diff --git a/app/src/main/res/layout/activity_day.xml b/app/src/main/res/layout/activity_day.xml index 84de6d093..8f6045c82 100644 --- a/app/src/main/res/layout/activity_day.xml +++ b/app/src/main/res/layout/activity_day.xml @@ -18,7 +18,7 @@ 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" app:backgroundTint="@color/color_primary" app:rippleColor="@color/pressed_item_foreground"/> diff --git a/app/src/main/res/layout/activity_event.xml b/app/src/main/res/layout/activity_event.xml index f1d3cf14c..cf4d2385f 100644 --- a/app/src/main/res/layout/activity_event.xml +++ b/app/src/main/res/layout/activity_event.xml @@ -54,7 +54,7 @@ android:background="?attr/selectableItemBackgroundBorderless" android:paddingStart="@dimen/small_margin" android:paddingEnd="@dimen/small_margin" - android:src="@drawable/ic_place"/> + android:src="@drawable/ic_place_vector"/> + android:src="@drawable/ic_clock_vector"/> + android:src="@drawable/ic_bell_vector"/> + android:src="@drawable/ic_bell_vector"/> + android:src="@drawable/ic_bell_vector"/> + android:src="@drawable/ic_bell_vector"/> + android:src="@drawable/ic_repeat_vector"/> diff --git a/app/src/main/res/layout/dialog_set_reminders.xml b/app/src/main/res/layout/dialog_set_reminders.xml index 09b8597af..83295b799 100644 --- a/app/src/main/res/layout/dialog_set_reminders.xml +++ b/app/src/main/res/layout/dialog_set_reminders.xml @@ -17,7 +17,7 @@ android:layout_marginStart="@dimen/normal_margin" android:alpha="0.8" android:padding="@dimen/medium_margin" - android:src="@drawable/ic_bell"/> + android:src="@drawable/ic_bell_vector"/> + android:src="@drawable/ic_plus_vector"/> + android:src="@drawable/ic_cross_vector"/> + android:src="@drawable/ic_plus_vector"/> diff --git a/app/src/main/res/layout/widget_event_list.xml b/app/src/main/res/layout/widget_event_list.xml index d1f62d1c7..9994ff342 100644 --- a/app/src/main/res/layout/widget_event_list.xml +++ b/app/src/main/res/layout/widget_event_list.xml @@ -47,7 +47,7 @@ android:paddingEnd="@dimen/medium_margin" android:paddingBottom="@dimen/small_margin" android:scaleType="fitCenter" - android:src="@drawable/ic_plus"/> + android:src="@drawable/ic_plus_vector"/> diff --git a/app/src/main/res/menu/cab_event_list.xml b/app/src/main/res/menu/cab_event_list.xml index 6da3de415..096697b44 100644 --- a/app/src/main/res/menu/cab_event_list.xml +++ b/app/src/main/res/menu/cab_event_list.xml @@ -3,12 +3,12 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> diff --git a/app/src/main/res/menu/cab_event_type.xml b/app/src/main/res/menu/cab_event_type.xml index af34568ba..642b5e421 100644 --- a/app/src/main/res/menu/cab_event_type.xml +++ b/app/src/main/res/menu/cab_event_type.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> diff --git a/app/src/main/res/menu/menu_event.xml b/app/src/main/res/menu/menu_event.xml index 801cf45bc..550370dc3 100644 --- a/app/src/main/res/menu/menu_event.xml +++ b/app/src/main/res/menu/menu_event.xml @@ -3,12 +3,12 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> diff --git a/app/src/main/res/menu/menu_event_types.xml b/app/src/main/res/menu/menu_event_types.xml index 22289485b..035fbcacd 100644 --- a/app/src/main/res/menu/menu_event_types.xml +++ b/app/src/main/res/menu/menu_event_types.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml index 2adc71e60..004babae7 100644 --- a/app/src/main/res/menu/menu_main.xml +++ b/app/src/main/res/menu/menu_main.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> @@ -19,12 +19,12 @@ app:showAsAction="ifRoom"/>