From 59dc5de21ad9a0c85295a361033aa2521694abc9 Mon Sep 17 00:00:00 2001 From: Tommaso Berlose Date: Fri, 2 Oct 2020 15:00:37 +0200 Subject: [PATCH] Fix #169 --- .idea/caches/build_file_checksums.ser | Bin 537 -> 537 bytes .../anotherwidget/db/EventRepository.kt | 7 +- .../anotherwidget/global/Preferences.kt | 3 + .../anotherwidget/helpers/CalendarHelper.kt | 11 +++ .../helpers/MediaPlayerHelper.kt | 3 +- .../anotherwidget/models/Event.kt | 3 +- .../services/BatteryListenerJob.kt | 2 +- .../services/UpdateCalendarJob.kt | 9 +-- .../ui/fragments/CalendarTabFragment.kt | 61 ++++++++++++---- .../ui/fragments/MainFragment.kt | 2 +- .../ui/viewmodels/MainViewModel.kt | 1 + .../anotherwidget/utils/Extensions.kt | 4 +- .../round_insert_invitation_white_18.png | Bin 0 -> 241 bytes .../round_insert_invitation_white_24.png | Bin 0 -> 259 bytes .../round_insert_invitation_white_36.png | Bin 0 -> 373 bytes .../round_insert_invitation_white_48.png | Bin 0 -> 384 bytes .../res/drawable-hdpi/round_work_outline.png | Bin 0 -> 240 bytes .../round_work_outline_white_24.png | Bin 0 -> 236 bytes .../round_work_outline_white_36.png | Bin 0 -> 347 bytes .../round_work_outline_white_48.png | Bin 0 -> 372 bytes .../round_insert_invitation_white_18.png | Bin 0 -> 190 bytes .../round_insert_invitation_white_24.png | Bin 0 -> 165 bytes .../round_insert_invitation_white_36.png | Bin 0 -> 259 bytes .../round_insert_invitation_white_48.png | Bin 0 -> 270 bytes .../res/drawable-mdpi/round_work_outline.png | Bin 0 -> 179 bytes .../round_work_outline_white_24.png | Bin 0 -> 160 bytes .../round_work_outline_white_36.png | Bin 0 -> 236 bytes .../round_work_outline_white_48.png | Bin 0 -> 255 bytes .../round_insert_invitation_white_18.png | Bin 0 -> 259 bytes .../round_insert_invitation_white_24.png | Bin 0 -> 270 bytes .../round_insert_invitation_white_36.png | Bin 0 -> 384 bytes .../round_insert_invitation_white_48.png | Bin 0 -> 507 bytes .../res/drawable-xhdpi/round_work_outline.png | Bin 0 -> 236 bytes .../round_work_outline_white_24.png | Bin 0 -> 255 bytes .../round_work_outline_white_36.png | Bin 0 -> 372 bytes .../round_work_outline_white_48.png | Bin 0 -> 473 bytes .../round_insert_invitation_white_18.png | Bin 0 -> 373 bytes .../round_insert_invitation_white_24.png | Bin 0 -> 384 bytes .../round_insert_invitation_white_36.png | Bin 0 -> 623 bytes .../round_insert_invitation_white_48.png | Bin 0 -> 732 bytes .../drawable-xxhdpi/round_work_outline.png | Bin 0 -> 347 bytes .../round_work_outline_white_24.png | Bin 0 -> 372 bytes .../round_work_outline_white_36.png | Bin 0 -> 547 bytes .../round_work_outline_white_48.png | Bin 0 -> 682 bytes .../round_insert_invitation_white_18.png | Bin 0 -> 384 bytes .../round_insert_invitation_white_24.png | Bin 0 -> 507 bytes .../round_insert_invitation_white_36.png | Bin 0 -> 732 bytes .../round_insert_invitation_white_48.png | Bin 0 -> 876 bytes .../drawable-xxxhdpi/round_work_outline.png | Bin 0 -> 372 bytes .../round_work_outline_white_24.png | Bin 0 -> 473 bytes .../round_work_outline_white_36.png | Bin 0 -> 682 bytes .../round_work_outline_white_48.png | Bin 0 -> 841 bytes .../res/drawable/round_access_alarm_24.xml | 3 +- app/src/main/res/drawable/round_add_24.xml | 3 +- .../main/res/drawable/round_add_circle.xml | 3 +- .../drawable/round_add_to_home_screen_24.xml | 3 +- app/src/main/res/drawable/round_alarm_24.xml | 3 +- .../res/drawable/round_all_inclusive_24.xml | 3 +- .../main/res/drawable/round_arrow_back.xml | 3 +- .../main/res/drawable/round_arrow_back_24.xml | 3 +- .../res/drawable/round_aspect_ratio_24.xml | 3 +- .../round_battery_charging_full_24.xml | 3 +- .../res/drawable/round_border_vertical.xml | 3 +- .../res/drawable/round_brightness_4_24.xml | 3 +- .../res/drawable/round_brightness_5_24.xml | 3 +- .../res/drawable/round_brightness_7_24.xml | 3 +- .../res/drawable/round_brightness_low_24.xml | 3 +- .../main/res/drawable/round_bug_report_24.xml | 3 +- app/src/main/res/drawable/round_cafe.xml | 3 +- .../drawable/round_cancel_presentation_24.xml | 3 +- .../main/res/drawable/round_category_24.xml | 3 +- app/src/main/res/drawable/round_check.xml | 3 +- .../res/drawable/round_chevron_left_24.xml | 3 +- .../res/drawable/round_chevron_right_24.xml | 3 +- .../main/res/drawable/round_cloud_circle.xml | 3 +- .../main/res/drawable/round_cloud_queue.xml | 3 +- app/src/main/res/drawable/round_code_24.xml | 3 +- .../round_collections_bookmark_24.xml | 3 +- .../main/res/drawable/round_compare_24.xml | 3 +- .../main/res/drawable/round_crop_3_2_24.xml | 3 +- .../res/drawable/round_crop_original_24.xml | 3 +- .../main/res/drawable/round_date_range_24.xml | 3 +- .../res/drawable/round_directions_walk_24.xml | 3 +- app/src/main/res/drawable/round_drag.xml | 3 +- .../res/drawable/round_drag_handle_24.xml | 3 +- .../res/drawable/round_dynamic_feed_24.xml | 3 +- app/src/main/res/drawable/round_error.xml | 3 +- .../main/res/drawable/round_event_busy_24.xml | 3 +- .../main/res/drawable/round_event_note_24.xml | 3 +- .../main/res/drawable/round_extension_24.xml | 3 +- .../main/res/drawable/round_favorite_24.xml | 3 +- .../res/drawable/round_favorite_border_24.xml | 3 +- .../res/drawable/round_filter_list_24.xml | 3 +- .../main/res/drawable/round_filter_none.xml | 3 +- .../main/res/drawable/round_flip_to_front.xml | 3 +- .../res/drawable/round_font_download_24.xml | 3 +- .../drawable/round_format_line_spacing.xml | 3 +- .../res/drawable/round_format_quote_24.xml | 3 +- .../res/drawable/round_format_size_24.xml | 3 +- .../main/res/drawable/round_gradient_24.xml | 3 +- .../main/res/drawable/round_group_work_24.xml | 3 +- .../res/drawable/round_help_outline_24.xml | 3 +- .../main/res/drawable/round_horizontal.xml | 3 +- .../res/drawable/round_hourglass_empty_24.xml | 3 +- .../res/drawable/round_insert_invitation.xml | 11 +++ .../drawable/round_keyboard_capslock_24.xml | 3 +- .../main/res/drawable/round_landscape_24.xml | 3 +- app/src/main/res/drawable/round_launch_24.xml | 3 +- app/src/main/res/drawable/round_layers_24.xml | 3 +- .../main/res/drawable/round_leak_add_24.xml | 3 +- .../main/res/drawable/round_library_books.xml | 3 +- .../res/drawable/round_library_music_24.xml | 3 +- .../res/drawable/round_local_activity_24.xml | 3 +- .../res/drawable/round_low_priority_24.xml | 3 +- .../main/res/drawable/round_more_vert_24.xml | 3 +- .../main/res/drawable/round_music_note_24.xml | 3 +- app/src/main/res/drawable/round_notes_24.xml | 3 +- .../res/drawable/round_offline_bolt_24.xml | 3 +- .../main/res/drawable/round_palette_24.xml | 3 +- app/src/main/res/drawable/round_place_24.xml | 3 +- app/src/main/res/drawable/round_publish.xml | 3 +- .../res/drawable/round_queue_music_24.xml | 3 +- app/src/main/res/drawable/round_redo_24.xml | 3 +- app/src/main/res/drawable/round_refresh.xml | 3 +- .../main/res/drawable/round_schedule_24.xml | 3 +- .../main/res/drawable/round_settings_24.xml | 3 +- .../main/res/drawable/round_short_text_24.xml | 3 +- app/src/main/res/drawable/round_sort_24.xml | 3 +- .../res/drawable/round_sort_by_alpha_24.xml | 3 +- app/src/main/res/drawable/round_style.xml | 3 +- .../main/res/drawable/round_swap_vert_24.xml | 3 +- .../res/drawable/round_text_fields_24.xml | 3 +- .../res/drawable/round_text_format_24.xml | 3 +- .../round_text_rotate_vertical_24.xml | 3 +- .../main/res/drawable/round_texture_24.xml | 3 +- app/src/main/res/drawable/round_timelapse.xml | 3 +- app/src/main/res/drawable/round_title_24.xml | 3 +- app/src/main/res/drawable/round_today_24.xml | 3 +- .../main/res/drawable/round_translate_24.xml | 3 +- app/src/main/res/drawable/round_update.xml | 3 +- .../round_vertical_align_center_24.xml | 3 +- app/src/main/res/drawable/round_vpn_key.xml | 3 +- app/src/main/res/drawable/round_wallpaper.xml | 3 +- .../main/res/drawable/round_wb_auto_24.xml | 3 +- .../main/res/drawable/round_wb_sunny_24.xml | 3 +- .../main/res/drawable/round_widgets_24.xml | 3 +- .../res/drawable/round_work_outline_24.xml | 11 +++ .../main/res/drawable/round_wrap_text_24.xml | 3 +- app/src/main/res/font/product_sans.xml | 2 +- .../layout/activity_choose_application.xml | 4 +- .../main/res/layout/activity_custom_date.xml | 2 +- .../res/layout/activity_custom_location.xml | 2 +- .../main/res/layout/activity_integrations.xml | 4 +- .../main/res/layout/activity_support_dev.xml | 2 +- .../res/layout/activity_weather_provider.xml | 2 +- .../res/layout/color_picker_menu_item.xml | 2 +- app/src/main/res/layout/fragment_app_main.xml | 2 +- .../res/layout/fragment_calendar_settings.xml | 67 ++++++++++++++---- .../res/layout/fragment_clock_settings.xml | 10 +-- .../res/layout/fragment_general_settings.xml | 18 ++--- .../res/layout/fragment_glance_settings.xml | 12 ++-- app/src/main/res/layout/fragment_settings.xml | 20 +++--- .../res/layout/fragment_weather_settings.xml | 14 ++-- .../main/res/layout/glance_provider_item.xml | 4 +- app/src/main/res/layout/the_widget.xml | 20 +++--- app/src/main/res/layout/the_widget_sans.xml | 4 +- app/src/main/res/navigation/nav_graph.xml | 1 - app/src/main/res/values-da/strings.xml | 6 -- app/src/main/res/values-es/strings.xml | 6 -- app/src/main/res/values-in/strings.xml | 1 - app/src/main/res/values-it/strings.xml | 12 +++- app/src/main/res/values-ru/strings.xml | 1 - app/src/main/res/values/strings.xml | 11 ++- app/src/main/res/values/styles.xml | 20 ++++++ 174 files changed, 440 insertions(+), 219 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/round_insert_invitation_white_18.png create mode 100644 app/src/main/res/drawable-hdpi/round_insert_invitation_white_24.png create mode 100644 app/src/main/res/drawable-hdpi/round_insert_invitation_white_36.png create mode 100644 app/src/main/res/drawable-hdpi/round_insert_invitation_white_48.png create mode 100644 app/src/main/res/drawable-hdpi/round_work_outline.png create mode 100644 app/src/main/res/drawable-hdpi/round_work_outline_white_24.png create mode 100644 app/src/main/res/drawable-hdpi/round_work_outline_white_36.png create mode 100644 app/src/main/res/drawable-hdpi/round_work_outline_white_48.png create mode 100644 app/src/main/res/drawable-mdpi/round_insert_invitation_white_18.png create mode 100644 app/src/main/res/drawable-mdpi/round_insert_invitation_white_24.png create mode 100644 app/src/main/res/drawable-mdpi/round_insert_invitation_white_36.png create mode 100644 app/src/main/res/drawable-mdpi/round_insert_invitation_white_48.png create mode 100644 app/src/main/res/drawable-mdpi/round_work_outline.png create mode 100644 app/src/main/res/drawable-mdpi/round_work_outline_white_24.png create mode 100644 app/src/main/res/drawable-mdpi/round_work_outline_white_36.png create mode 100644 app/src/main/res/drawable-mdpi/round_work_outline_white_48.png create mode 100644 app/src/main/res/drawable-xhdpi/round_insert_invitation_white_18.png create mode 100644 app/src/main/res/drawable-xhdpi/round_insert_invitation_white_24.png create mode 100644 app/src/main/res/drawable-xhdpi/round_insert_invitation_white_36.png create mode 100644 app/src/main/res/drawable-xhdpi/round_insert_invitation_white_48.png create mode 100644 app/src/main/res/drawable-xhdpi/round_work_outline.png create mode 100644 app/src/main/res/drawable-xhdpi/round_work_outline_white_24.png create mode 100644 app/src/main/res/drawable-xhdpi/round_work_outline_white_36.png create mode 100644 app/src/main/res/drawable-xhdpi/round_work_outline_white_48.png create mode 100644 app/src/main/res/drawable-xxhdpi/round_insert_invitation_white_18.png create mode 100644 app/src/main/res/drawable-xxhdpi/round_insert_invitation_white_24.png create mode 100644 app/src/main/res/drawable-xxhdpi/round_insert_invitation_white_36.png create mode 100644 app/src/main/res/drawable-xxhdpi/round_insert_invitation_white_48.png create mode 100644 app/src/main/res/drawable-xxhdpi/round_work_outline.png create mode 100644 app/src/main/res/drawable-xxhdpi/round_work_outline_white_24.png create mode 100644 app/src/main/res/drawable-xxhdpi/round_work_outline_white_36.png create mode 100644 app/src/main/res/drawable-xxhdpi/round_work_outline_white_48.png create mode 100644 app/src/main/res/drawable-xxxhdpi/round_insert_invitation_white_18.png create mode 100644 app/src/main/res/drawable-xxxhdpi/round_insert_invitation_white_24.png create mode 100644 app/src/main/res/drawable-xxxhdpi/round_insert_invitation_white_36.png create mode 100644 app/src/main/res/drawable-xxxhdpi/round_insert_invitation_white_48.png create mode 100644 app/src/main/res/drawable-xxxhdpi/round_work_outline.png create mode 100644 app/src/main/res/drawable-xxxhdpi/round_work_outline_white_24.png create mode 100644 app/src/main/res/drawable-xxxhdpi/round_work_outline_white_36.png create mode 100644 app/src/main/res/drawable-xxxhdpi/round_work_outline_white_48.png create mode 100644 app/src/main/res/drawable/round_insert_invitation.xml create mode 100644 app/src/main/res/drawable/round_work_outline_24.xml diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 59bb54a7c593165008d1123aa1bae33532d099b5..e3278ca784cc045eee78d3552c35a6c2bbd98475 100644 GIT binary patch delta 15 XcmbQqGLvP(43?J?6JBkcQ_BbdGVBJe delta 15 XcmbQqGLvP(43-ydzP20Z)G`79F!Kf~ diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/db/EventRepository.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/db/EventRepository.kt index 1177a22..aee091b 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/db/EventRepository.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/db/EventRepository.kt @@ -5,6 +5,7 @@ import android.provider.CalendarContract import android.util.Log import com.chibatching.kotpref.bulk import com.tommasoberlose.anotherwidget.global.Preferences +import com.tommasoberlose.anotherwidget.helpers.CalendarHelper.applyFilters import com.tommasoberlose.anotherwidget.models.Event import com.tommasoberlose.anotherwidget.receivers.UpdatesReceiver import com.tommasoberlose.anotherwidget.ui.widgets.MainWidget @@ -131,8 +132,7 @@ class EventRepository(val context: Context) { .where(Event::class.java) .greaterThan("endDate", now) .findAll() - .filter { (Preferences.showDeclinedEvents || it.selfAttendeeStatus != CalendarContract.Attendees.ATTENDEE_STATUS_DECLINED) } - .filter { (Preferences.calendarAllDay || !it.allDay) } + .applyFilters() } private fun getEvents(): List { @@ -157,8 +157,7 @@ class EventRepository(val context: Context) { .greaterThan("endDate", now) .lessThanOrEqualTo("startDate", limit.timeInMillis) .findAll() - .filter { (Preferences.showDeclinedEvents || it.selfAttendeeStatus != CalendarContract.Attendees.ATTENDEE_STATUS_DECLINED) } - .filter { (Preferences.calendarAllDay || !it.allDay) } + .applyFilters() } fun getEventsCount(): Int = getEvents().size diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/global/Preferences.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/global/Preferences.kt index 1bc691b..3d59d32 100755 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/global/Preferences.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/global/Preferences.kt @@ -71,6 +71,9 @@ object Preferences : KotprefModel() { var textShadow by intPref(key = "PREF_TEXT_SHADOW", default = 1) var showDiffTime by booleanPref(key = "PREF_SHOW_DIFF_TIME", default = true) var showDeclinedEvents by booleanPref(key = "PREF_SHOW_DECLINED_EVENTS", default = false) + var showInvitedEvents by booleanPref(default = false) + var showAcceptedEvents by booleanPref(default = true) + var showOnlyBusyEvents by booleanPref(default = false) var secondRowInformation by intPref(key = "PREF_SECOND_ROW_INFORMATION", default = 0) var customFont by intPref(key = "PREF_CUSTOM_FONT", default = Constants.CUSTOM_FONT_PRODUCT_SANS) var customFontFile by stringPref(key = "PREF_CUSTOM_FONT_FILE") diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/CalendarHelper.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/CalendarHelper.kt index d95db56..c183781 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/CalendarHelper.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/CalendarHelper.kt @@ -69,4 +69,15 @@ object CalendarHelper { fun removeEventUpdatesAndroidN(context: Context) { EventListenerJob.remove(context) } + + fun List.applyFilters() : List { + return this + .asSequence() + .filter { (Preferences.showDeclinedEvents || it.selfAttendeeStatus != CalendarContract.Attendees.ATTENDEE_STATUS_DECLINED) } + .filter { (Preferences.showAcceptedEvents || it.selfAttendeeStatus != CalendarContract.Attendees.ATTENDEE_STATUS_ACCEPTED) } + .filter { (Preferences.showInvitedEvents || it.selfAttendeeStatus != CalendarContract.Attendees.ATTENDEE_STATUS_INVITED) } + .filter { (Preferences.calendarAllDay || !it.allDay) } + .filter { (!Preferences.showOnlyBusyEvents || it.availability != CalendarContract.EventsEntity.AVAILABILITY_FREE) } + .toList() + } } \ No newline at end of file diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/MediaPlayerHelper.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/MediaPlayerHelper.kt index baf5fc3..e4d74cd 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/MediaPlayerHelper.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/MediaPlayerHelper.kt @@ -10,6 +10,7 @@ import android.media.session.MediaSessionManager import android.media.session.PlaybackState import android.util.Log import androidx.core.app.NotificationManagerCompat +import com.chibatching.kotpref.blockingBulk import com.chibatching.kotpref.bulk import com.tommasoberlose.anotherwidget.global.Preferences import com.tommasoberlose.anotherwidget.receivers.MusicNotificationListener @@ -78,7 +79,7 @@ object MediaPlayerHelper { } private fun removeMediaInfo() { - Preferences.bulk { + Preferences.blockingBulk { remove(Preferences::mediaPlayerTitle) remove(Preferences::mediaPlayerArtist) remove(Preferences::mediaPlayerAlbum) diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/models/Event.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/models/Event.kt index 5517774..34575d9 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/models/Event.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/models/Event.kt @@ -17,7 +17,8 @@ open class Event( var calendarID: Int = 0, var allDay: Boolean = false, var address: String = "", - var selfAttendeeStatus: Int = CalendarContract.Attendees.ATTENDEE_STATUS_NONE + var selfAttendeeStatus: Int = CalendarContract.Attendees.ATTENDEE_STATUS_NONE, + var availability: Int = CalendarContract.EventsEntity.AVAILABILITY_BUSY ) : RealmObject() { override fun toString(): String { return "Event:\nEVENT ID: " + eventID + "\nTITLE: " + title + "\nSTART DATE: " + Date(startDate) + "\nEND DATE: " + Date(endDate) + "\nCAL ID: " + calendarID + "\nADDRESS: " + address diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/services/BatteryListenerJob.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/services/BatteryListenerJob.kt index a726a99..19e6e0e 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/services/BatteryListenerJob.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/services/BatteryListenerJob.kt @@ -52,7 +52,7 @@ class BatteryListenerJob : JobService() { } } - fun remove(context: Context) { + private fun remove(context: Context) { val js = context.getSystemService(JobScheduler::class.java) js?.cancel(chargingJobId) js?.cancel(notChargingJobId) diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/services/UpdateCalendarJob.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/services/UpdateCalendarJob.kt index d7a463d..3a263f6 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/services/UpdateCalendarJob.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/services/UpdateCalendarJob.kt @@ -9,6 +9,7 @@ import androidx.core.app.JobIntentService import com.tommasoberlose.anotherwidget.db.EventRepository import com.tommasoberlose.anotherwidget.global.Preferences import com.tommasoberlose.anotherwidget.helpers.CalendarHelper +import com.tommasoberlose.anotherwidget.helpers.CalendarHelper.applyFilters import com.tommasoberlose.anotherwidget.models.Event import com.tommasoberlose.anotherwidget.receivers.UpdatesReceiver import com.tommasoberlose.anotherwidget.ui.fragments.MainFragment @@ -23,7 +24,7 @@ import kotlin.collections.ArrayList class UpdateCalendarJob : JobIntentService() { companion object { - val jobId = 1200 + private const val jobId = 1200 fun enqueueWork(context: Context, work: Intent) { enqueueWork(context, UpdateCalendarJob::class.java, jobId, work) @@ -84,7 +85,8 @@ class UpdateCalendarJob : JobIntentService() { calendarID = e.calendarId.toInt(), allDay = e.allDay, address = e.eventLocation ?: "", - selfAttendeeStatus = e.selfAttendeeStatus.toInt() + selfAttendeeStatus = e.selfAttendeeStatus.toInt(), + availability = e.availability ) ) } @@ -94,8 +96,7 @@ class UpdateCalendarJob : JobIntentService() { } val filteredEventList = eventList - .filter { (Preferences.showDeclinedEvents || it.selfAttendeeStatus != CalendarContract.Attendees.ATTENDEE_STATUS_DECLINED) } - .filter { (Preferences.calendarAllDay || !it.allDay) } + .applyFilters() if (filteredEventList.isEmpty()) { eventRepository.resetNextEventData() diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/CalendarTabFragment.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/CalendarTabFragment.kt index 510aa4f..b443d5c 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/CalendarTabFragment.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/CalendarTabFragment.kt @@ -4,7 +4,7 @@ import android.Manifest import android.app.Activity import android.content.Intent import android.os.Bundle -import android.util.Log +import android.provider.CalendarContract import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -31,10 +31,8 @@ import com.tommasoberlose.anotherwidget.ui.activities.ChooseApplicationActivity import com.tommasoberlose.anotherwidget.ui.activities.MainActivity import com.tommasoberlose.anotherwidget.ui.viewmodels.MainViewModel import com.tommasoberlose.anotherwidget.helpers.CalendarHelper -import com.tommasoberlose.anotherwidget.helpers.DateHelper import com.tommasoberlose.anotherwidget.helpers.IntentHelper import com.tommasoberlose.anotherwidget.helpers.SettingsStringHelper -import com.tommasoberlose.anotherwidget.ui.activities.CustomDateActivity import com.tommasoberlose.anotherwidget.utils.checkGrantedPermission import com.tommasoberlose.anotherwidget.utils.isDefaultSet import com.tommasoberlose.anotherwidget.utils.toast @@ -42,7 +40,6 @@ import kotlinx.android.synthetic.main.fragment_calendar_settings.* import kotlinx.android.synthetic.main.fragment_calendar_settings.scrollView import kotlinx.coroutines.delay import kotlinx.coroutines.launch -import java.util.* import kotlin.Comparator class CalendarTabFragment : Fragment() { @@ -77,7 +74,7 @@ class CalendarTabFragment : Fragment() { super.onActivityCreated(savedInstanceState) show_all_day_toggle.isChecked = Preferences.calendarAllDay - show_declined_events_toggle.isChecked = Preferences.showDeclinedEvents + show_only_busy_events_toggle.isChecked = Preferences.showOnlyBusyEvents show_diff_time_toggle.isChecked = Preferences.showDiffTime show_multiple_events_toggle.isChecked = Preferences.showNextEvent @@ -113,12 +110,6 @@ class CalendarTabFragment : Fragment() { } }) - viewModel.showDeclinedEvents.observe(viewLifecycleOwner, Observer { - maintainScrollPosition { - show_declined_events_label?.text = if (it) getString(R.string.settings_visible) else getString(R.string.settings_not_visible) - } - }) - viewModel.secondRowInformation.observe(viewLifecycleOwner, Observer { maintainScrollPosition { second_row_info_label?.text = getString(SettingsStringHelper.getSecondRowInfoString(it)) @@ -258,18 +249,58 @@ class CalendarTabFragment : Fragment() { show_all_day_toggle.setOnCheckedChangeListener { _, isChecked -> if (Preferences.showEvents) { Preferences.calendarAllDay = isChecked + updateCalendar() } } - action_show_declined_events.setOnClickListener { + action_change_attendee_filter.setOnClickListener { if (Preferences.showEvents) { - show_declined_events_toggle.isChecked = !show_declined_events_toggle.isChecked + val selectedValues = emptyList().toMutableList() + if (Preferences.showDeclinedEvents) { + selectedValues.add(CalendarContract.Attendees.ATTENDEE_STATUS_DECLINED) + } + if (Preferences.showInvitedEvents) { + selectedValues.add(CalendarContract.Attendees.ATTENDEE_STATUS_INVITED) + } + if (Preferences.showAcceptedEvents) { + selectedValues.add(CalendarContract.Attendees.ATTENDEE_STATUS_ACCEPTED) + } + + val dialog = BottomSheetMenu(requireContext(), header = getString(R.string.settings_attendee_status_title), isMultiSelection = true) + .setSelectedValues(selectedValues) + + dialog.addItem( + getString(R.string.attendee_status_invited), + CalendarContract.Attendees.ATTENDEE_STATUS_INVITED + ) + dialog.addItem( + getString(R.string.attendee_status_accepted), + CalendarContract.Attendees.ATTENDEE_STATUS_ACCEPTED + ) + dialog.addItem( + getString(R.string.attendee_status_declined), + CalendarContract.Attendees.ATTENDEE_STATUS_DECLINED + ) + + dialog.addOnMultipleSelectItemListener { values -> + Preferences.showDeclinedEvents = values.contains(CalendarContract.Attendees.ATTENDEE_STATUS_DECLINED) + Preferences.showAcceptedEvents = values.contains(CalendarContract.Attendees.ATTENDEE_STATUS_ACCEPTED) + Preferences.showInvitedEvents = values.contains(CalendarContract.Attendees.ATTENDEE_STATUS_INVITED) + updateCalendar() + }.show() } } - show_declined_events_toggle.setOnCheckedChangeListener { _, isChecked -> + action_show_only_busy_events.setOnClickListener { if (Preferences.showEvents) { - Preferences.showDeclinedEvents = isChecked + show_only_busy_events_toggle.isChecked = !show_only_busy_events_toggle.isChecked + } + } + + show_only_busy_events_toggle.setOnCheckedChangeListener { _, isChecked -> + if (Preferences.showEvents) { + Preferences.showOnlyBusyEvents = isChecked + updateCalendar() } } diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/MainFragment.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/MainFragment.kt index 21fd688..66b8fc8 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/MainFragment.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/MainFragment.kt @@ -372,7 +372,7 @@ class MainFragment : Fragment(), SharedPreferences.OnSharedPreferenceChangeList super.onPause() } - var delayJob: Job? = null + private var delayJob: Job? = null override fun onSharedPreferenceChanged(preferences: SharedPreferences, p1: String) { delayJob?.cancel() diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/viewmodels/MainViewModel.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/viewmodels/MainViewModel.kt index 5dd84a0..1d5d949 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/viewmodels/MainViewModel.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/viewmodels/MainViewModel.kt @@ -30,6 +30,7 @@ class MainViewModel : ViewModel() { val openEventDetails = Preferences.asLiveData(Preferences::openEventDetails) val calendarAppName = Preferences.asLiveData(Preferences::calendarAppName) val widgetUpdateFrequency = Preferences.asLiveData(Preferences::widgetUpdateFrequency) + val showOnlyBusyEvents = Preferences.asLiveData(Preferences::showOnlyBusyEvents) // Clock Settings val showClock = Preferences.asLiveData(Preferences::showClock) diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/utils/Extensions.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/utils/Extensions.kt index cac6b43..a7600b7 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/utils/Extensions.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/utils/Extensions.kt @@ -143,11 +143,11 @@ fun Context.isTablet(): Boolean { } fun String.md5(): String { - val MD5 = "MD5" + val mD5 = "MD5" try { // Create MD5 Hash val digest = java.security.MessageDigest - .getInstance(MD5) + .getInstance(mD5) digest.update(toByteArray()) val messageDigest = digest.digest() diff --git a/app/src/main/res/drawable-hdpi/round_insert_invitation_white_18.png b/app/src/main/res/drawable-hdpi/round_insert_invitation_white_18.png new file mode 100644 index 0000000000000000000000000000000000000000..d94768aef1fb43c0235aefe736ed98da9e5e0919 GIT binary patch literal 241 zcmV0mUEghO-EaHbyFKz2 zKND7%x4fNW)fK7%*OvEJK>Z0)VT+Skc)QpMYfRD*Gx@qDLG0yiox*~=h5yDv@kI!~ zhYc8(*od3t$0Bs|+!Vh>Wiw>bg(*`?;H3%Kn ri0x9?Lbl?=q(Ke{Uu=)M=%b-KrL~|pZk)P400000NkvXXu0mjfp=fCv literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/round_insert_invitation_white_24.png b/app/src/main/res/drawable-hdpi/round_insert_invitation_white_24.png new file mode 100644 index 0000000000000000000000000000000000000000..496ea6065e74b8e284b07884ef4bf09553f12580 GIT binary patch literal 259 zcmV+e0sQ`nP)UI)xlW4>|HjZsR_On2&( zpwON8_@ELL)r%oYPzicO2||s%YYhf{1Rb@T_7Oz8C_yFY7VNb9>m%p~bA-zqfAo)W zl_6;JOwb7{#EWkI$RmHE8%GRNg1*qmZ&BR?Bg_#Q?!PLEOwJ)4^tY2)0jB@}002ov JPDHLkV1kNvYFYpQ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/round_insert_invitation_white_36.png b/app/src/main/res/drawable-hdpi/round_insert_invitation_white_36.png new file mode 100644 index 0000000000000000000000000000000000000000..9f121a7eb3f040a9e4f08e5c3e7b54d8ae83bbd7 GIT binary patch literal 373 zcmV-*0gC>KP)U9X zy*6P<`RY>*OA!`forWuL!k)0SS%cxx-HJFv+A!yF1ZNDp?J(?qpJDGEhK=_bw!k}X zkq$I>7@@K5rcKyD`TA8Gm@C(`Y6}m_)S#|*fd|Z$W0v*X!2qe_xvWA6A++!V!2`lK T&lDnj00000NkvXXu0mjf@_(ou literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/round_insert_invitation_white_48.png b/app/src/main/res/drawable-hdpi/round_insert_invitation_white_48.png new file mode 100644 index 0000000000000000000000000000000000000000..cdd2ccef216f6cfeaf42d87164a6d35dcd10972f GIT binary patch literal 384 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@Zgyv2V08C%aSW+oe0!(S&Bal|{o@9X zZU$}+fvWxu4I3H+4zac{bPF)CaCFN(RBGAKP*5m%NXdbNn`1e9#71A^Z9m^x>VJ67 zepq62xN90)PlM$JW?ci`9kb;wY={&tHdkDbzFF^Cp3|RzEwPO(TJ=eDnEelQRlRDc zey~L4981N*e_{uAuv{=MtUA+M?6}9Tm}%>g)n_@sIPM9vY;;na;K0PGGQpu$$U~v= zo0g|SBMXQHBNoKlcHCMfHiM6Ih2q*Y4F}uIQf5XkeKV*ou-5ELQGBc!j!~NzGW0fT zCmb!SW!io~!(zgBM<&iKHxpSc+;_9=TFH>H&wGJs0b9?1#WRKl>@`!_yKZLtEiixd zb%OAVSruoCm}D8=A6cne8dG*9p54c*o_Qn7wJV|gF-*Vf+YF3>;5XaPt*VC>2WtBO PLzcnQ)z4*}Q$iB}VikEMMhcgz=rPk6SwySvssZEfA(_Lo0^%9e)V`0000|k1|%Oc%$NbBHha1_hEy=Vy)3xF$x)*1A@jkn zI|btAcPHv4POyF^%;G5UM5ZNiLhuZK0k*^sE$L0ST5Y+%+8bwczkhS?dP{%1oSH?& z+m6h&3%1rQmU0aLSti;P^|Sm`_ku4?r@ZwAy}$Ne;$Ee^*X4ZJk6bQidFiN~j`p&A zi|2E!vcJyJwE%+Fb03OtH#~f2!R~9E#b>zYv!09EUhWwE^=+_!W%zm4<}3gIC3i(0 fPw$Bfj^N<83a;N`!?XJs(D@9Wu6{1-oD!M<78_p3 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/round_work_outline_white_36.png b/app/src/main/res/drawable-hdpi/round_work_outline_white_36.png new file mode 100644 index 0000000000000000000000000000000000000000..cbe28b58d0fc4d4e67a9db79a059676a759443c7 GIT binary patch literal 347 zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL1|)l2v+go5Fe-VvIEGX(zP-Wd;_N7M{9}6} zhvESS#zO`z1_>O81sD<}+7w&ZIhb1*7!?>;Bp4K07!n(Rk~K^T{CBrymj9~%$;c-! z_dZ6{H8AoaOZbdM|5Ag$TsS9ddf?Kxy^E)7uj<}Y&vMw(ZH4f*n@SJQIBm8{bS^2|Yio0Ix9PKtT;}R9zt168mTrntubnnS zYkeZunrm-(&5!SCUEFJEXR^Aym3NiTp&tnwv=(2`6P^}u0BBwVt4;zVcLap_#vjPK zaEha}%HxKH@{KnWHmK%ZwEy((6U~RURdEtes(3j^Tx?{0={Fu>+0a3TXJZ7i=Jq1v49+sW4}o z#PeSQ4u8d%_sTG3bPJw~W+`rCe>02ameo8nRfqh(<&~TlE_^JBXS#CK>#uIXB~4E8 x8!NV#f0?diTpzU@GJ O89ZJ6T-G@yGywp=xUI)xlW4>|HjZsR_On2&( zpwON8_@ELL)r%oYPzicO2||s%YYhf{1Rb@T_7Oz8C_yFY7VNb9>m%p~bA-zqfAo)W zl_6;JOwb7{#EWkI$RmHE8%GRNg1*qmZ&BR?Bg_#Q?!PLEOwJ)4^tY2)0jB@}002ov JPDHLkV1kNvYFYpQ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/round_insert_invitation_white_48.png b/app/src/main/res/drawable-mdpi/round_insert_invitation_white_48.png new file mode 100644 index 0000000000000000000000000000000000000000..f9981d50a39c5b4b358b15cbbbea99138415146c GIT binary patch literal 270 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUttDY{7Ar*{ouQ8@EJBl2CXzRo; z@P(mUCgJ^s#ZMV59T<-?H7T%jh_SK+98hX_q`hE@lw0{T(|hF&`+p`@9Il^i@UTZR zdBa{KoqcByemnJN!_zpngmz`Ix3Pr>g8x4LdEx$AEvEI4EUvJud9)*p<;Wz)+Ej;n zNduE_5{!})z^H*UegAAjH@=7|XD2cTY>RYYO97$-zBg5i4tOgj9sKfPxeMEa$_$pv zVvPB^N(PTUi8GcL?zzq~=Sbli&Kr+|>$S_AdEXQsimlH6d4K7Yp#1o68z(EY_O3bu P^dN($tDnm{r-UW|Cv3kP61+1(rYl|KHCckj`9a zE3%x~kl&Im_Fq4z+2lL{mMh91Upq1#$tYpaY)j_2!T;F#=KqUVW-O2v`ZK?#!GPx^ z>p_(YTZwnIJpU(iu-#b@*sS2t#Nw>7L2?SeXbq3oL6=9z18gt8u&lN7VC<|g5-2v{ c@nT>wyt<^-;@qY8Kvyt$y85}Sb4q9e0A*V}H~;_u literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/round_work_outline_white_24.png b/app/src/main/res/drawable-mdpi/round_work_outline_white_24.png new file mode 100644 index 0000000000000000000000000000000000000000..1080db2216d911fd558da44495473ff59f43f99a GIT binary patch literal 160 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gj>7Fi*Ar*|t68|3j|Nr02Vb6bi zwHrJ~tgdW$@TvYzg7H%^2S&z^joTRnuZb|a+!5f&KBaqb3j^aXO^$PQ6&EgQU2@Ys z!0x6iv6X@Glcs@<{Cw8$D|k1|%Oc%$NbBHha1_hEy=Vy)3xF$x)*1A@jkn zI|btAcPHv4POyF^%;G5UM5ZNiLhuZK0k*^sE$L0ST5Y+%+8bwczkhS?dP{%1oSH?& z+m6h&3%1rQmU0aLSti;P^|Sm`_ku4?r@ZwAy}$Ne;$Ee^*X4ZJk6bQidFiN~j`p&A zi|2E!vcJyJwE%+Fb03OtH#~f2!R~9E#b>zYv!09EUhWwE^=+_!W%zm4<}3gIC3i(0 fPw$Bfj^N<83a;N`!?XJs(D@9Wu6{1-oD!M<78_p3 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/round_work_outline_white_48.png b/app/src/main/res/drawable-mdpi/round_work_outline_white_48.png new file mode 100644 index 0000000000000000000000000000000000000000..07d84590c9c7cf3373de2a7b3a8ade92562134b2 GIT binary patch literal 255 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUtW1cRKAr*{ouP$snUI)xlW4>|HjZsR_On2&( zpwON8_@ELL)r%oYPzicO2||s%YYhf{1Rb@T_7Oz8C_yFY7VNb9>m%p~bA-zqfAo)W zl_6;JOwb7{#EWkI$RmHE8%GRNg1*qmZ&BR?Bg_#Q?!PLEOwJ)4^tY2)0jB@}002ov JPDHLkV1kNvYFYpQ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/round_insert_invitation_white_24.png b/app/src/main/res/drawable-xhdpi/round_insert_invitation_white_24.png new file mode 100644 index 0000000000000000000000000000000000000000..f9981d50a39c5b4b358b15cbbbea99138415146c GIT binary patch literal 270 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUttDY{7Ar*{ouQ8@EJBl2CXzRo; z@P(mUCgJ^s#ZMV59T<-?H7T%jh_SK+98hX_q`hE@lw0{T(|hF&`+p`@9Il^i@UTZR zdBa{KoqcByemnJN!_zpngmz`Ix3Pr>g8x4LdEx$AEvEI4EUvJud9)*p<;Wz)+Ej;n zNduE_5{!})z^H*UegAAjH@=7|XD2cTY>RYYO97$-zBg5i4tOgj9sKfPxeMEa$_$pv zVvPB^N(PTUi8GcL?zzq~=Sbli&Kr+|>$S_AdEXQsimlH6d4K7Yp#1o68z(EY_O3bu P^dN($tDnm{r-UW|CvVJ67 zepq62xN90)PlM$JW?ci`9kb;wY={&tHdkDbzFF^Cp3|RzEwPO(TJ=eDnEelQRlRDc zey~L4981N*e_{uAuv{=MtUA+M?6}9Tm}%>g)n_@sIPM9vY;;na;K0PGGQpu$$U~v= zo0g|SBMXQHBNoKlcHCMfHiM6Ih2q*Y4F}uIQf5XkeKV*ou-5ELQGBc!j!~NzGW0fT zCmb!SW!io~!(zgBM<&iKHxpSc+;_9=TFH>H&wGJs0b9?1#WRKl>@`!_yKZLtEiixd zb%OAVSruoCm}D8=A6cne8dG*9p54c*o_Qn7wJV|gF-*Vf+YF3>;5XaPt*VC>2WtBO PLzcnQ)z4*}Q$iB}VikU_9jM;uuoF`1X$A1g1clhL5cV z9Q;iR78WO7rhT$}Ud(mafa8$Cd<6?2X~7}hbXb9->Al9wcfQ;2zRSM7Z~o!>fAV|G zKc~e7sd!FmP%~h(Ycw@rk~$~Oc!8Fr)a@(Wrmi1yAPi1)gI` zXmR>w$dnUs!pN6A#z7uL)X^*wE7;`BPF-K{>&_?i$;PjyaOpwJx~A`0Yu0GEh0| z&zTYm$_tofe(smOU~=HApxA+br;eU)nC3s}X&S`p9c$tqKDEE^+>qDGyaz~`2CRPY zN&3LH8pcC{yBzi^b=NZoH59R5Fmr3rciPe=nBdjHX2`VXleBDOnGmzV^EqvvIu5co z3KpflS^Zt}kWBAlJ^KPRANe|k1|%Oc%$NbBHha1_hEy=Vy)3xF$x)*1A@jkn zI|btAcPHv4POyF^%;G5UM5ZNiLhuZK0k*^sE$L0ST5Y+%+8bwczkhS?dP{%1oSH?& z+m6h&3%1rQmU0aLSti;P^|Sm`_ku4?r@ZwAy}$Ne;$Ee^*X4ZJk6bQidFiN~j`p&A zi|2E!vcJyJwE%+Fb03OtH#~f2!R~9E#b>zYv!09EUhWwE^=+_!W%zm4<}3gIC3i(0 fPw$Bfj^N<83a;N`!?XJs(D@9Wu6{1-oD!M<78_p3 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/round_work_outline_white_24.png b/app/src/main/res/drawable-xhdpi/round_work_outline_white_24.png new file mode 100644 index 0000000000000000000000000000000000000000..07d84590c9c7cf3373de2a7b3a8ade92562134b2 GIT binary patch literal 255 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUtW1cRKAr*{ouP$sn~RURdEtes(3j^Tx?{0={Fu>+0a3TXJZ7i=Jq1v49+sW4}o z#PeSQ4u8d%_sTG3bPJw~W+`rCe>02ameo8nRfqh(<&~TlE_^JBXS#CK>#uIXB~4E8 x8!NV#f0Z1xPi%>q>Z$J50zq=ND7 z)tyC$90Xb(vXzxIt28I_KKu0Beu=XBu46~b62iZV=Y0xSxBek37`fK`Ae+-P@dp~K zZ>gDDN^F~X_EzJ9t*kA)b9FPhzA^l3xhIzDk$Rd*_rZSc1qbZ;EdK91zEgN{y?tZ3 z`YH3pHxr#wT`b*p-RhXtWPf1x2J=-s&b@)HKM!A$zxQ#`yNXTnn;QitK6w0u?VLwZ z3A3Q5m3e~;m&SqyCM4nmleo&y66SCf%N>o;oh%#6nag&^eOOe%_lzZ@isx=`R`bI4 zz_o^7OqNx(PSjUkWgzz5ZSvF^0-4gcbeGx6mwR8^F8fbHaAJOzyW#nL0cB5t;lSYO L>gTe~DWM4f0bcu% literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/round_insert_invitation_white_18.png b/app/src/main/res/drawable-xxhdpi/round_insert_invitation_white_18.png new file mode 100644 index 0000000000000000000000000000000000000000..9f121a7eb3f040a9e4f08e5c3e7b54d8ae83bbd7 GIT binary patch literal 373 zcmV-*0gC>KP)U9X zy*6P<`RY>*OA!`forWuL!k)0SS%cxx-HJFv+A!yF1ZNDp?J(?qpJDGEhK=_bw!k}X zkq$I>7@@K5rcKyD`TA8Gm@C(`Y6}m_)S#|*fd|Z$W0v*X!2qe_xvWA6A++!V!2`lK T&lDnj00000NkvXXu0mjf@_(ou literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/round_insert_invitation_white_24.png b/app/src/main/res/drawable-xxhdpi/round_insert_invitation_white_24.png new file mode 100644 index 0000000000000000000000000000000000000000..cdd2ccef216f6cfeaf42d87164a6d35dcd10972f GIT binary patch literal 384 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@Zgyv2V08C%aSW+oe0!(S&Bal|{o@9X zZU$}+fvWxu4I3H+4zac{bPF)CaCFN(RBGAKP*5m%NXdbNn`1e9#71A^Z9m^x>VJ67 zepq62xN90)PlM$JW?ci`9kb;wY={&tHdkDbzFF^Cp3|RzEwPO(TJ=eDnEelQRlRDc zey~L4981N*e_{uAuv{=MtUA+M?6}9Tm}%>g)n_@sIPM9vY;;na;K0PGGQpu$$U~v= zo0g|SBMXQHBNoKlcHCMfHiM6Ih2q*Y4F}uIQf5XkeKV*ou-5ELQGBc!j!~NzGW0fT zCmb!SW!io~!(zgBM<&iKHxpSc+;_9=TFH>H&wGJs0b9?1#WRKl>@`!_yKZLtEiixd zb%OAVSruoCm}D8=A6cne8dG*9p54c*o_Qn7wJV|gF-*Vf+YF3>;5XaPt*VC>2WtBO PLzcnQ)z4*}Q$iB}Vik`wc$it71$i794=&WGW8SdhThYn# z^7!|a6^s@3_VexcY>wKyYL%AE!|FXpWZK{ES^Q9B`@j3vXKq&>Kg4PGtEAi_@3|~j z{g0ab+m-Ey=AJLVd(L`_Xx4K(yA21JxO1Wt`-*i8?#vFA+Gf{(zp~NT=6>iBXPzCQ z-*+F>mU+W<%`-r|v^T$uF?(g$+rQT?eBjysYGLf-1nGq4sO{mik69g<8?}A5Z}Z;; za<@PGHvL^Bcl+j+d+VcoxYx7+&DYt$r318QH4;;^iFdOtuX92pt5^h#FnbD83RZ+d z@UTZb;3~iNS}MO#=EjeR`l?;;4ES@R+MV7PNZjCfDF4`mKc}VVy3&TsMqXs|5GI3I zxtcn?mn##LTlV){-rm?N5LfX_&stEz@K4XuSmo5Q;A^_kqHx1vyI ziC6P{yDf5X-8YFhX9hH!Ut8Oj+aR0#a^cne7ISiy=R8^*x?0sQ?KaQyh+jda z-9K~04;kuxJoq=OliOzY+bD}elJ^pBe6H-3-~S^n6aoIShs;=ZvGQb~C@>*0c)I$z JtaD0e0svYL2y6fV literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/round_insert_invitation_white_48.png b/app/src/main/res/drawable-xxhdpi/round_insert_invitation_white_48.png new file mode 100644 index 0000000000000000000000000000000000000000..506a8e0a989e659867c94f96c42d2be2a67b9804 GIT binary patch literal 732 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q8Ax83A=Cw=Rs{HjxB}__LjfpXx6K8*)uJTG zFPMQPdH4PEv)v_5|DVsZe|viH=Jz7;tB)UE96tH?=laJc+0$iiUvC!BD8F3HVdLCx zpy2SlTBTpdn^SguF9QSPYEKu(kP61Pw?a4FaS(91xXFFSVV&c*S z=}&*skNnM@V9zYLx9TqEAq}$|uT(VcUVP)(CRJNwWN<@^=i|{6f5R3w>mPf!olCez zaL0YE2hwYEC66eu`KEt%Wngc5nss;e{LLpH1jJqO=~6FPb7!JdnX$$6eiz+y2@3ZG zm#VaPZc?|ZHVEoCRmY}W>2K0zuvx6v@XQ*Q#|&xH7EL_tqabAfG|upZCYxc0Bbx+} z-O0?8B+v|E0YyN}FA_%^Y0Z})(CaV<&-vmq? zTMsx3XaRLhMbgP<%Obnr&?)B&f?8{UO!gaDI&w`FLkK>o1n_ z0IgdvZ%f|(zza*ayjvA`Ve1yXERiX9Jx-Txa&xrUGd1k)-NlgtYW)3|rafN0*Z$Ax za80T22Ac(XMbe%v3OsPe$0RR7b#~V&3AcGJ&n=rfPlils+c4qiqHie|H*1^n7+Xx+ z@1c7>dB>E}?@QOsR@&Px{Pfe8zzz_oJ0CqUO7T%`-H~=+)H8Ux`njxgN@xNA4WpQ? literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/round_work_outline.png b/app/src/main/res/drawable-xxhdpi/round_work_outline.png new file mode 100644 index 0000000000000000000000000000000000000000..cbe28b58d0fc4d4e67a9db79a059676a759443c7 GIT binary patch literal 347 zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL1|)l2v+go5Fe-VvIEGX(zP-Wd;_N7M{9}6} zhvESS#zO`z1_>O81sD<}+7w&ZIhb1*7!?>;Bp4K07!n(Rk~K^T{CBrymj9~%$;c-! z_dZ6{H8AoaOZbdM|5Ag$TsS9ddf?Kxy^E)7uj<}Y&vMw(ZH4f*n@SJQIBm8{bS^2|Yio0Ix9PKtT;}R9zt168mTrntubnnS zYkeZunrm-(&5!SCUEFJEXR^Aym3NiTp&tnwv=(2`6P^}u0BBwVt4;zVcLap_#vjPK zaEha}%HxKH@{KnWHmK%ZwEy((6U~RURdEtes(3j^Tx?{0={Fu>+0a3TXJZ7i=Jq1v49+sW4}o z#PeSQ4u8d%_sTG3bPJw~W+`rCe>02ameo8nRfqh(<&~TlE_^JBXS#CK>#uIXB~4E8 x8!NV#f0D!gf=ja&-`l)*`MYlW z2J!9BTkm^JQt_OmlFfI!qHDW_+1%tk2a|Jp?S*v;UVM7<_}Gd3{i}kfzh{}9TzOE< zZnu^CwEE10(c$^~g}e{Me%@$WWVpvbzTaK1t^e8MvnP(8IbG*BkzjXE(T>P|zfP^VaE&T08of zXP%N<*Bg4cR_14HW&7O1n;Tl&Z@ithi#?*}y(%zDK%>W)gE3y0E~PFPgg&e IbxsLQ0OeuvlmGw# literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/round_work_outline_white_48.png b/app/src/main/res/drawable-xxhdpi/round_work_outline_white_48.png new file mode 100644 index 0000000000000000000000000000000000000000..42fc3cc7e91b022760cb8752119666705b48ff25 GIT binary patch literal 682 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q8Ax83A=Cw=<^=eJxB}__gB46xxR3&LpGirO zUoeA6^6Jy~{~uo*%_A}W_xEN2|Ig2D@`J-wst-^0o-LEU`L?ry!FH2)2X~F-@2|J( zbU%LGzt8eCKLZ0}r>Bc!NCo5D+sDH;Gf1>N^qd`Hbz}FF_o46q-@9`wVBgV(=N9M9 z81KCeNJvZj=IOg^^Uo$(vC~(pniX@)Iqy$Qvt$dN@@C;G!wGGFRoEqtDE{`!a(KTY zB|nsJuPC$830Xs>yAE$>C}yviYmmaawM)@^g<+auM!*AmE54!$%`#6E*h_QuCjKb9 zJx}dQXa4rhlbk-jy{0141!T5VHNM@ZyHfmS-t#NnIorEiswTcI^W1x(Z1_W>I@?zFi<=d9~eD{T08MX0A`Q>A0`(#a3=h^A#PL66Teg3j+97-YyV0 z0VJ67 zepq62xN90)PlM$JW?ci`9kb;wY={&tHdkDbzFF^Cp3|RzEwPO(TJ=eDnEelQRlRDc zey~L4981N*e_{uAuv{=MtUA+M?6}9Tm}%>g)n_@sIPM9vY;;na;K0PGGQpu$$U~v= zo0g|SBMXQHBNoKlcHCMfHiM6Ih2q*Y4F}uIQf5XkeKV*ou-5ELQGBc!j!~NzGW0fT zCmb!SW!io~!(zgBM<&iKHxpSc+;_9=TFH>H&wGJs0b9?1#WRKl>@`!_yKZLtEiixd zb%OAVSruoCm}D8=A6cne8dG*9p54c*o_Qn7wJV|gF-*Vf+YF3>;5XaPt*VC>2WtBO PLzcnQ)z4*}Q$iB}VikU_9jM;uuoF`1X$A1g1clhL5cV z9Q;iR78WO7rhT$}Ud(mafa8$Cd<6?2X~7}hbXb9->Al9wcfQ;2zRSM7Z~o!>fAV|G zKc~e7sd!FmP%~h(Ycw@rk~$~Oc!8Fr)a@(Wrmi1yAPi1)gI` zXmR>w$dnUs!pN6A#z7uL)X^*wE7;`BPF-K{>&_?i$;PjyaOpwJx~A`0Yu0GEh0| z&zTYm$_tofe(smOU~=HApxA+br;eU)nC3s}X&S`p9c$tqKDEE^+>qDGyaz~`2CRPY zN&3LH8pcC{yBzi^b=NZoH59R5Fmr3rciPe=nBdjHX2`VXleBDOnGmzV^EqvvIu5co z3KpflS^Zt}kWBAlJ^KPRANe&c*S z=}&*skNnM@V9zYLx9TqEAq}$|uT(VcUVP)(CRJNwWN<@^=i|{6f5R3w>mPf!olCez zaL0YE2hwYEC66eu`KEt%Wngc5nss;e{LLpH1jJqO=~6FPb7!JdnX$$6eiz+y2@3ZG zm#VaPZc?|ZHVEoCRmY}W>2K0zuvx6v@XQ*Q#|&xH7EL_tqabAfG|upZCYxc0Bbx+} z-O0?8B+v|E0YyN}FA_%^Y0Z})(CaV<&-vmq? zTMsx3XaRLhMbgP<%Obnr&?)B&f?8{UO!gaDI&w`FLkK>o1n_ z0IgdvZ%f|(zza*ayjvA`Ve1yXERiX9Jx-Txa&xrUGd1k)-NlgtYW)3|rafN0*Z$Ax za80T22Ac(XMbe%v3OsPe$0RR7b#~V&3AcGJ&n=rfPlils+c4qiqHie|H*1^n7+Xx+ z@1c7>dB>E}?@QOsR@&Px{Pfe8zzz_oJ0CqUO7T%`-H~=+)H8Ux`njxgN@xNA4WpQ? literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/round_insert_invitation_white_48.png b/app/src/main/res/drawable-xxxhdpi/round_insert_invitation_white_48.png new file mode 100644 index 0000000000000000000000000000000000000000..bd19d153ceafe092d1f479d35dd32a3d4ac2cc10 GIT binary patch literal 876 zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE8Azrw%`pX1^8~L+h+aY)%7C%uQ|%!KTlrHqjCGZfWz*~kFU#EL<|Bxj4O|B{wat-SX!DYj(z2DUt6&e(5Y& zowqRJnYW9}lP6mq#R$0hRLeb5IjVkD>ioQRiv#ARvuyc!|15CZ@O)*be5i7ht-bCa z6_p#GAAgwKkZ_*A?pfD8ZEJ>{YOVl>haw9YShq~}JGwAs-R;-rYZ;m!a=1VKm3-UZ zX6B<6X~nmXD;&6}J8jzSEMBJBCyJyj0&eJhp1-CjB0{hB!i;FX+nO0?jy=ogP^$eb z*6(m+=62Z?CTGK$v}!+>vT50VF6GmT{cOr4n!eA$jgc#$feB=th6956z(OQJRhbuy z43Z)TM!EaF2jX`q^qgP@`qMr%`wC-W!~a#r>?RW&d(9Vg>Z}sXb>N=avW1avCd(Ga z6UX*`V?eeA$*c#yY%v$u&P?!ZHCxc<{m$Ao zCcD2dFz(pBb<&;X7A_0|cU;N}_&@Uo6fiV$e>P>F+V%5RgV*tzuMSTy*4%CIx?PhS zEHHECe!dQ#v-h=FdtY8Fs$lBve7Z5V*+n2)Z?$zm0rTmVzJUcBtM1w_dg->U-BJ5! zV5ooc?enXOkF>lBPWdf;=Zl%~ly{GQzD&(gf`R%kawTOtZ@ApI2?5h2gQu&X%Q~lo FCIBs}z(N23 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/round_work_outline.png b/app/src/main/res/drawable-xxxhdpi/round_work_outline.png new file mode 100644 index 0000000000000000000000000000000000000000..2c896014b9dde28d97ea766f3e8235388f652010 GIT binary patch literal 372 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@Zgyv2V6^shaSW+oe0yCm;BX+r@sExM z9ETDmSbjbgYI$fN!}748?yvzzTXTW|M^l1<1m81p9`^Y$tM2{X{_g*`-@j~s+}U0I z{`yZ}&81U~RURdEtes(3j^Tx?{0={Fu>+0a3TXJZ7i=Jq1v49+sW4}o z#PeSQ4u8d%_sTG3bPJw~W+`rCe>02ameo8nRfqh(<&~TlE_^JBXS#CK>#uIXB~4E8 x8!NV#f0Z1xPi%>q>Z$J50zq=ND7 z)tyC$90Xb(vXzxIt28I_KKu0Beu=XBu46~b62iZV=Y0xSxBek37`fK`Ae+-P@dp~K zZ>gDDN^F~X_EzJ9t*kA)b9FPhzA^l3xhIzDk$Rd*_rZSc1qbZ;EdK91zEgN{y?tZ3 z`YH3pHxr#wT`b*p-RhXtWPf1x2J=-s&b@)HKM!A$zxQ#`yNXTnn;QitK6w0u?VLwZ z3A3Q5m3e~;m&SqyCM4nmleo&y66SCf%N>o;oh%#6nag&^eOOe%_lzZ@isx=`R`bI4 zz_o^7OqNx(PSjUkWgzz5ZSvF^0-4gcbeGx6mwR8^F8fbHaAJOzyW#nL0cB5t;lSYO L>gTe~DWM4f0bcu% literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/round_work_outline_white_36.png b/app/src/main/res/drawable-xxxhdpi/round_work_outline_white_36.png new file mode 100644 index 0000000000000000000000000000000000000000..42fc3cc7e91b022760cb8752119666705b48ff25 GIT binary patch literal 682 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q8Ax83A=Cw=<^=eJxB}__gB46xxR3&LpGirO zUoeA6^6Jy~{~uo*%_A}W_xEN2|Ig2D@`J-wst-^0o-LEU`L?ry!FH2)2X~F-@2|J( zbU%LGzt8eCKLZ0}r>Bc!NCo5D+sDH;Gf1>N^qd`Hbz}FF_o46q-@9`wVBgV(=N9M9 z81KCeNJvZj=IOg^^Uo$(vC~(pniX@)Iqy$Qvt$dN@@C;G!wGGFRoEqtDE{`!a(KTY zB|nsJuPC$830Xs>yAE$>C}yviYmmaawM)@^g<+auM!*AmE54!$%`#6E*h_QuCjKb9 zJx}dQXa4rhlbk-jy{0141!T5VHNM@ZyHfmS-t#NnIorEiswTcI^W1x(Z1_W>I@?zFi<=d9~eD{T08MX0A`Q>A0`(#a3=h^A#PL66Teg3j+97-YyV0 z0#fa7!ab{>Q0*A-;W=c|05AH4XzhV$;rx2r82eiuh4 z?_VvVGx^O&X$A%+4Nn)xkP61PH%+%`2MRa`N~UHQJx)&h@aOrr%jbEYK3(Ntoon+_ z)CCOQM7{Ofem%YOUxI~{@&c8!5s`5|0;jjk*f=fco|A%S|5n{;9LZbLm}l!Y-B^3` zL|Ui7v}&_08H!DO($>xl&&6|eW*@k(%FDGQI_`o(`)=)7JrCc`Qd6$DeL00AKYJF> zgI=@01&rH%%W60IP%5vn*u66p};9U|QUm$t<*^%8Y%_;j5D^9|+Hj>VL)% zckrV0TgJ`NJ1Q%e+BR&~wwSs9lLX_F=haPvgjWJro6k79LG9 + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_add_24.xml b/app/src/main/res/drawable/round_add_24.xml index 24877ee..acae39f 100644 --- a/app/src/main/res/drawable/round_add_24.xml +++ b/app/src/main/res/drawable/round_add_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_add_circle.xml b/app/src/main/res/drawable/round_add_circle.xml index 28bd03f..f1bc454 100644 --- a/app/src/main/res/drawable/round_add_circle.xml +++ b/app/src/main/res/drawable/round_add_circle.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_add_to_home_screen_24.xml b/app/src/main/res/drawable/round_add_to_home_screen_24.xml index d39c485..5e8c8e5 100644 --- a/app/src/main/res/drawable/round_add_to_home_screen_24.xml +++ b/app/src/main/res/drawable/round_add_to_home_screen_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_alarm_24.xml b/app/src/main/res/drawable/round_alarm_24.xml index 1aa074c..efffea6 100644 --- a/app/src/main/res/drawable/round_alarm_24.xml +++ b/app/src/main/res/drawable/round_alarm_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_all_inclusive_24.xml b/app/src/main/res/drawable/round_all_inclusive_24.xml index 67cc0a5..d1db1a9 100644 --- a/app/src/main/res/drawable/round_all_inclusive_24.xml +++ b/app/src/main/res/drawable/round_all_inclusive_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_arrow_back.xml b/app/src/main/res/drawable/round_arrow_back.xml index 26d33e0..6e3483d 100644 --- a/app/src/main/res/drawable/round_arrow_back.xml +++ b/app/src/main/res/drawable/round_arrow_back.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_arrow_back_24.xml b/app/src/main/res/drawable/round_arrow_back_24.xml index 26d33e0..6e3483d 100644 --- a/app/src/main/res/drawable/round_arrow_back_24.xml +++ b/app/src/main/res/drawable/round_arrow_back_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_aspect_ratio_24.xml b/app/src/main/res/drawable/round_aspect_ratio_24.xml index aed6621..3329981 100644 --- a/app/src/main/res/drawable/round_aspect_ratio_24.xml +++ b/app/src/main/res/drawable/round_aspect_ratio_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_battery_charging_full_24.xml b/app/src/main/res/drawable/round_battery_charging_full_24.xml index 94acced..6ee35be 100644 --- a/app/src/main/res/drawable/round_battery_charging_full_24.xml +++ b/app/src/main/res/drawable/round_battery_charging_full_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_border_vertical.xml b/app/src/main/res/drawable/round_border_vertical.xml index 7760718..f621ceb 100644 --- a/app/src/main/res/drawable/round_border_vertical.xml +++ b/app/src/main/res/drawable/round_border_vertical.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_brightness_4_24.xml b/app/src/main/res/drawable/round_brightness_4_24.xml index 549e035..acccbfd 100644 --- a/app/src/main/res/drawable/round_brightness_4_24.xml +++ b/app/src/main/res/drawable/round_brightness_4_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_brightness_5_24.xml b/app/src/main/res/drawable/round_brightness_5_24.xml index fe31e91..4a41088 100644 --- a/app/src/main/res/drawable/round_brightness_5_24.xml +++ b/app/src/main/res/drawable/round_brightness_5_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_brightness_7_24.xml b/app/src/main/res/drawable/round_brightness_7_24.xml index 93bb4ef..e811f5d 100644 --- a/app/src/main/res/drawable/round_brightness_7_24.xml +++ b/app/src/main/res/drawable/round_brightness_7_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_brightness_low_24.xml b/app/src/main/res/drawable/round_brightness_low_24.xml index 1c1ebb0..b898d63 100644 --- a/app/src/main/res/drawable/round_brightness_low_24.xml +++ b/app/src/main/res/drawable/round_brightness_low_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_bug_report_24.xml b/app/src/main/res/drawable/round_bug_report_24.xml index c0ee001..a0fb40a 100644 --- a/app/src/main/res/drawable/round_bug_report_24.xml +++ b/app/src/main/res/drawable/round_bug_report_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_cafe.xml b/app/src/main/res/drawable/round_cafe.xml index cb57dd5..3ef081f 100644 --- a/app/src/main/res/drawable/round_cafe.xml +++ b/app/src/main/res/drawable/round_cafe.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_cancel_presentation_24.xml b/app/src/main/res/drawable/round_cancel_presentation_24.xml index 5df715c..f731725 100644 --- a/app/src/main/res/drawable/round_cancel_presentation_24.xml +++ b/app/src/main/res/drawable/round_cancel_presentation_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_category_24.xml b/app/src/main/res/drawable/round_category_24.xml index d866e32..d5377ef 100644 --- a/app/src/main/res/drawable/round_category_24.xml +++ b/app/src/main/res/drawable/round_category_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_check.xml b/app/src/main/res/drawable/round_check.xml index d8372f6..21bb8e1 100644 --- a/app/src/main/res/drawable/round_check.xml +++ b/app/src/main/res/drawable/round_check.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_chevron_left_24.xml b/app/src/main/res/drawable/round_chevron_left_24.xml index 19d7e41..6c20469 100644 --- a/app/src/main/res/drawable/round_chevron_left_24.xml +++ b/app/src/main/res/drawable/round_chevron_left_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_chevron_right_24.xml b/app/src/main/res/drawable/round_chevron_right_24.xml index 005a561..cd547f3 100644 --- a/app/src/main/res/drawable/round_chevron_right_24.xml +++ b/app/src/main/res/drawable/round_chevron_right_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_cloud_circle.xml b/app/src/main/res/drawable/round_cloud_circle.xml index feaa819..b5bb10f 100644 --- a/app/src/main/res/drawable/round_cloud_circle.xml +++ b/app/src/main/res/drawable/round_cloud_circle.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_cloud_queue.xml b/app/src/main/res/drawable/round_cloud_queue.xml index 8f71d61..2259004 100644 --- a/app/src/main/res/drawable/round_cloud_queue.xml +++ b/app/src/main/res/drawable/round_cloud_queue.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_code_24.xml b/app/src/main/res/drawable/round_code_24.xml index 14302a8..2135ed7 100644 --- a/app/src/main/res/drawable/round_code_24.xml +++ b/app/src/main/res/drawable/round_code_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_collections_bookmark_24.xml b/app/src/main/res/drawable/round_collections_bookmark_24.xml index 6109c4c..57ecaef 100644 --- a/app/src/main/res/drawable/round_collections_bookmark_24.xml +++ b/app/src/main/res/drawable/round_collections_bookmark_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_compare_24.xml b/app/src/main/res/drawable/round_compare_24.xml index d03f133..850e11f 100644 --- a/app/src/main/res/drawable/round_compare_24.xml +++ b/app/src/main/res/drawable/round_compare_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_crop_3_2_24.xml b/app/src/main/res/drawable/round_crop_3_2_24.xml index aee22db..7d88a4c 100644 --- a/app/src/main/res/drawable/round_crop_3_2_24.xml +++ b/app/src/main/res/drawable/round_crop_3_2_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_crop_original_24.xml b/app/src/main/res/drawable/round_crop_original_24.xml index 06e9e2e..ae3e874 100644 --- a/app/src/main/res/drawable/round_crop_original_24.xml +++ b/app/src/main/res/drawable/round_crop_original_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_date_range_24.xml b/app/src/main/res/drawable/round_date_range_24.xml index ccabff0..02046f1 100644 --- a/app/src/main/res/drawable/round_date_range_24.xml +++ b/app/src/main/res/drawable/round_date_range_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_directions_walk_24.xml b/app/src/main/res/drawable/round_directions_walk_24.xml index 9460b5d..4151441 100644 --- a/app/src/main/res/drawable/round_directions_walk_24.xml +++ b/app/src/main/res/drawable/round_directions_walk_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_drag.xml b/app/src/main/res/drawable/round_drag.xml index 6dcde80..31a7a53 100644 --- a/app/src/main/res/drawable/round_drag.xml +++ b/app/src/main/res/drawable/round_drag.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_drag_handle_24.xml b/app/src/main/res/drawable/round_drag_handle_24.xml index 3f4f79c..40f3d6f 100644 --- a/app/src/main/res/drawable/round_drag_handle_24.xml +++ b/app/src/main/res/drawable/round_drag_handle_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_dynamic_feed_24.xml b/app/src/main/res/drawable/round_dynamic_feed_24.xml index 21925d6..70eb5d9 100644 --- a/app/src/main/res/drawable/round_dynamic_feed_24.xml +++ b/app/src/main/res/drawable/round_dynamic_feed_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_error.xml b/app/src/main/res/drawable/round_error.xml index 53237a2..3c76caa 100644 --- a/app/src/main/res/drawable/round_error.xml +++ b/app/src/main/res/drawable/round_error.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_event_busy_24.xml b/app/src/main/res/drawable/round_event_busy_24.xml index b0bda77..0a52d0a 100644 --- a/app/src/main/res/drawable/round_event_busy_24.xml +++ b/app/src/main/res/drawable/round_event_busy_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_event_note_24.xml b/app/src/main/res/drawable/round_event_note_24.xml index bb5a86b..9c503d8 100644 --- a/app/src/main/res/drawable/round_event_note_24.xml +++ b/app/src/main/res/drawable/round_event_note_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_extension_24.xml b/app/src/main/res/drawable/round_extension_24.xml index 91e53c3..7166b3f 100644 --- a/app/src/main/res/drawable/round_extension_24.xml +++ b/app/src/main/res/drawable/round_extension_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_favorite_24.xml b/app/src/main/res/drawable/round_favorite_24.xml index 1a4c5b7..65462ba 100644 --- a/app/src/main/res/drawable/round_favorite_24.xml +++ b/app/src/main/res/drawable/round_favorite_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_favorite_border_24.xml b/app/src/main/res/drawable/round_favorite_border_24.xml index b9d1912..ef5ba05 100644 --- a/app/src/main/res/drawable/round_favorite_border_24.xml +++ b/app/src/main/res/drawable/round_favorite_border_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_filter_list_24.xml b/app/src/main/res/drawable/round_filter_list_24.xml index 32f752b..c5b273a 100644 --- a/app/src/main/res/drawable/round_filter_list_24.xml +++ b/app/src/main/res/drawable/round_filter_list_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_filter_none.xml b/app/src/main/res/drawable/round_filter_none.xml index 9155d39..fc608c5 100644 --- a/app/src/main/res/drawable/round_filter_none.xml +++ b/app/src/main/res/drawable/round_filter_none.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_flip_to_front.xml b/app/src/main/res/drawable/round_flip_to_front.xml index 05c8520..db69480 100644 --- a/app/src/main/res/drawable/round_flip_to_front.xml +++ b/app/src/main/res/drawable/round_flip_to_front.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_font_download_24.xml b/app/src/main/res/drawable/round_font_download_24.xml index e437cc5..e293366 100644 --- a/app/src/main/res/drawable/round_font_download_24.xml +++ b/app/src/main/res/drawable/round_font_download_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_format_line_spacing.xml b/app/src/main/res/drawable/round_format_line_spacing.xml index 59e3804..c592717 100644 --- a/app/src/main/res/drawable/round_format_line_spacing.xml +++ b/app/src/main/res/drawable/round_format_line_spacing.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_format_quote_24.xml b/app/src/main/res/drawable/round_format_quote_24.xml index 0e95e5e..89ac301 100644 --- a/app/src/main/res/drawable/round_format_quote_24.xml +++ b/app/src/main/res/drawable/round_format_quote_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_format_size_24.xml b/app/src/main/res/drawable/round_format_size_24.xml index 90e46a3..ffad08b 100644 --- a/app/src/main/res/drawable/round_format_size_24.xml +++ b/app/src/main/res/drawable/round_format_size_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_gradient_24.xml b/app/src/main/res/drawable/round_gradient_24.xml index 3944cf0..4d7311c 100644 --- a/app/src/main/res/drawable/round_gradient_24.xml +++ b/app/src/main/res/drawable/round_gradient_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_group_work_24.xml b/app/src/main/res/drawable/round_group_work_24.xml index c4eb7d4..3a69e21 100644 --- a/app/src/main/res/drawable/round_group_work_24.xml +++ b/app/src/main/res/drawable/round_group_work_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_help_outline_24.xml b/app/src/main/res/drawable/round_help_outline_24.xml index 84a1a3e..f36c56d 100644 --- a/app/src/main/res/drawable/round_help_outline_24.xml +++ b/app/src/main/res/drawable/round_help_outline_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_horizontal.xml b/app/src/main/res/drawable/round_horizontal.xml index 5259e4b..23a64be 100644 --- a/app/src/main/res/drawable/round_horizontal.xml +++ b/app/src/main/res/drawable/round_horizontal.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_hourglass_empty_24.xml b/app/src/main/res/drawable/round_hourglass_empty_24.xml index c61c2da..43ac1b9 100644 --- a/app/src/main/res/drawable/round_hourglass_empty_24.xml +++ b/app/src/main/res/drawable/round_hourglass_empty_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_insert_invitation.xml b/app/src/main/res/drawable/round_insert_invitation.xml new file mode 100644 index 0000000..7d50de1 --- /dev/null +++ b/app/src/main/res/drawable/round_insert_invitation.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/drawable/round_keyboard_capslock_24.xml b/app/src/main/res/drawable/round_keyboard_capslock_24.xml index 5ccc102..963df51 100644 --- a/app/src/main/res/drawable/round_keyboard_capslock_24.xml +++ b/app/src/main/res/drawable/round_keyboard_capslock_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_landscape_24.xml b/app/src/main/res/drawable/round_landscape_24.xml index 515fe49..a62491e 100644 --- a/app/src/main/res/drawable/round_landscape_24.xml +++ b/app/src/main/res/drawable/round_landscape_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_launch_24.xml b/app/src/main/res/drawable/round_launch_24.xml index 1621a4f..572badf 100644 --- a/app/src/main/res/drawable/round_launch_24.xml +++ b/app/src/main/res/drawable/round_launch_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_layers_24.xml b/app/src/main/res/drawable/round_layers_24.xml index 14d93a1..93b2062 100644 --- a/app/src/main/res/drawable/round_layers_24.xml +++ b/app/src/main/res/drawable/round_layers_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_leak_add_24.xml b/app/src/main/res/drawable/round_leak_add_24.xml index 03f420d..50179c1 100644 --- a/app/src/main/res/drawable/round_leak_add_24.xml +++ b/app/src/main/res/drawable/round_leak_add_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_library_books.xml b/app/src/main/res/drawable/round_library_books.xml index e627201..a73f7b5 100644 --- a/app/src/main/res/drawable/round_library_books.xml +++ b/app/src/main/res/drawable/round_library_books.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_library_music_24.xml b/app/src/main/res/drawable/round_library_music_24.xml index f25c106..93d0346 100644 --- a/app/src/main/res/drawable/round_library_music_24.xml +++ b/app/src/main/res/drawable/round_library_music_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_local_activity_24.xml b/app/src/main/res/drawable/round_local_activity_24.xml index 8348734..c20458a 100644 --- a/app/src/main/res/drawable/round_local_activity_24.xml +++ b/app/src/main/res/drawable/round_local_activity_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_low_priority_24.xml b/app/src/main/res/drawable/round_low_priority_24.xml index 2cab168..a5919a7 100644 --- a/app/src/main/res/drawable/round_low_priority_24.xml +++ b/app/src/main/res/drawable/round_low_priority_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_more_vert_24.xml b/app/src/main/res/drawable/round_more_vert_24.xml index 34b93ec..1bb80fe 100644 --- a/app/src/main/res/drawable/round_more_vert_24.xml +++ b/app/src/main/res/drawable/round_more_vert_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_music_note_24.xml b/app/src/main/res/drawable/round_music_note_24.xml index 20ed3cc..e1a0caf 100644 --- a/app/src/main/res/drawable/round_music_note_24.xml +++ b/app/src/main/res/drawable/round_music_note_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_notes_24.xml b/app/src/main/res/drawable/round_notes_24.xml index fdf3ae1..582a6f4 100644 --- a/app/src/main/res/drawable/round_notes_24.xml +++ b/app/src/main/res/drawable/round_notes_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_offline_bolt_24.xml b/app/src/main/res/drawable/round_offline_bolt_24.xml index 0a6275f..9f2c6de 100644 --- a/app/src/main/res/drawable/round_offline_bolt_24.xml +++ b/app/src/main/res/drawable/round_offline_bolt_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_palette_24.xml b/app/src/main/res/drawable/round_palette_24.xml index 4bf1550..9ba269b 100644 --- a/app/src/main/res/drawable/round_palette_24.xml +++ b/app/src/main/res/drawable/round_palette_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_place_24.xml b/app/src/main/res/drawable/round_place_24.xml index 7c83d37..eef0be5 100644 --- a/app/src/main/res/drawable/round_place_24.xml +++ b/app/src/main/res/drawable/round_place_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_publish.xml b/app/src/main/res/drawable/round_publish.xml index 242565b..4d4ce19 100644 --- a/app/src/main/res/drawable/round_publish.xml +++ b/app/src/main/res/drawable/round_publish.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_queue_music_24.xml b/app/src/main/res/drawable/round_queue_music_24.xml index 23dd5f2..61066fd 100644 --- a/app/src/main/res/drawable/round_queue_music_24.xml +++ b/app/src/main/res/drawable/round_queue_music_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_redo_24.xml b/app/src/main/res/drawable/round_redo_24.xml index fad4283..82ae4f7 100644 --- a/app/src/main/res/drawable/round_redo_24.xml +++ b/app/src/main/res/drawable/round_redo_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_refresh.xml b/app/src/main/res/drawable/round_refresh.xml index 5cdbeb0..75f80f6 100644 --- a/app/src/main/res/drawable/round_refresh.xml +++ b/app/src/main/res/drawable/round_refresh.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_schedule_24.xml b/app/src/main/res/drawable/round_schedule_24.xml index 07b7ee3..6a08b2b 100644 --- a/app/src/main/res/drawable/round_schedule_24.xml +++ b/app/src/main/res/drawable/round_schedule_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_settings_24.xml b/app/src/main/res/drawable/round_settings_24.xml index 6da10fa..16822b9 100644 --- a/app/src/main/res/drawable/round_settings_24.xml +++ b/app/src/main/res/drawable/round_settings_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_short_text_24.xml b/app/src/main/res/drawable/round_short_text_24.xml index 29905ab..56547e7 100644 --- a/app/src/main/res/drawable/round_short_text_24.xml +++ b/app/src/main/res/drawable/round_short_text_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_sort_24.xml b/app/src/main/res/drawable/round_sort_24.xml index 839bc30..8e88ce9 100644 --- a/app/src/main/res/drawable/round_sort_24.xml +++ b/app/src/main/res/drawable/round_sort_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_sort_by_alpha_24.xml b/app/src/main/res/drawable/round_sort_by_alpha_24.xml index 5dd7bd1..ec542f0 100644 --- a/app/src/main/res/drawable/round_sort_by_alpha_24.xml +++ b/app/src/main/res/drawable/round_sort_by_alpha_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_style.xml b/app/src/main/res/drawable/round_style.xml index 8420955..2efa324 100644 --- a/app/src/main/res/drawable/round_style.xml +++ b/app/src/main/res/drawable/round_style.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_swap_vert_24.xml b/app/src/main/res/drawable/round_swap_vert_24.xml index 1af00b0..47386fd 100644 --- a/app/src/main/res/drawable/round_swap_vert_24.xml +++ b/app/src/main/res/drawable/round_swap_vert_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_text_fields_24.xml b/app/src/main/res/drawable/round_text_fields_24.xml index 9a62f73..6a41e19 100644 --- a/app/src/main/res/drawable/round_text_fields_24.xml +++ b/app/src/main/res/drawable/round_text_fields_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_text_format_24.xml b/app/src/main/res/drawable/round_text_format_24.xml index a4c6756..3935819 100644 --- a/app/src/main/res/drawable/round_text_format_24.xml +++ b/app/src/main/res/drawable/round_text_format_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_text_rotate_vertical_24.xml b/app/src/main/res/drawable/round_text_rotate_vertical_24.xml index 303272e..33db53f 100644 --- a/app/src/main/res/drawable/round_text_rotate_vertical_24.xml +++ b/app/src/main/res/drawable/round_text_rotate_vertical_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_texture_24.xml b/app/src/main/res/drawable/round_texture_24.xml index 47894fc..a62a329 100644 --- a/app/src/main/res/drawable/round_texture_24.xml +++ b/app/src/main/res/drawable/round_texture_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_timelapse.xml b/app/src/main/res/drawable/round_timelapse.xml index b03e05f..fc4a990 100644 --- a/app/src/main/res/drawable/round_timelapse.xml +++ b/app/src/main/res/drawable/round_timelapse.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_title_24.xml b/app/src/main/res/drawable/round_title_24.xml index 1daddf2..d29645c 100644 --- a/app/src/main/res/drawable/round_title_24.xml +++ b/app/src/main/res/drawable/round_title_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_today_24.xml b/app/src/main/res/drawable/round_today_24.xml index 5d633eb..e852bf5 100644 --- a/app/src/main/res/drawable/round_today_24.xml +++ b/app/src/main/res/drawable/round_today_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_translate_24.xml b/app/src/main/res/drawable/round_translate_24.xml index c8a3b46..c7f107e 100644 --- a/app/src/main/res/drawable/round_translate_24.xml +++ b/app/src/main/res/drawable/round_translate_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_update.xml b/app/src/main/res/drawable/round_update.xml index 2425d97..5acc7d4 100644 --- a/app/src/main/res/drawable/round_update.xml +++ b/app/src/main/res/drawable/round_update.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_vertical_align_center_24.xml b/app/src/main/res/drawable/round_vertical_align_center_24.xml index 997228f..0486c4a 100644 --- a/app/src/main/res/drawable/round_vertical_align_center_24.xml +++ b/app/src/main/res/drawable/round_vertical_align_center_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_vpn_key.xml b/app/src/main/res/drawable/round_vpn_key.xml index 7c52a71..33da164 100644 --- a/app/src/main/res/drawable/round_vpn_key.xml +++ b/app/src/main/res/drawable/round_vpn_key.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_wallpaper.xml b/app/src/main/res/drawable/round_wallpaper.xml index 07ff9cd..9b354e2 100644 --- a/app/src/main/res/drawable/round_wallpaper.xml +++ b/app/src/main/res/drawable/round_wallpaper.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_wb_auto_24.xml b/app/src/main/res/drawable/round_wb_auto_24.xml index dff90b8..e017ede 100644 --- a/app/src/main/res/drawable/round_wb_auto_24.xml +++ b/app/src/main/res/drawable/round_wb_auto_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_wb_sunny_24.xml b/app/src/main/res/drawable/round_wb_sunny_24.xml index 558f9ba..aefbb4d 100644 --- a/app/src/main/res/drawable/round_wb_sunny_24.xml +++ b/app/src/main/res/drawable/round_wb_sunny_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_widgets_24.xml b/app/src/main/res/drawable/round_widgets_24.xml index 1b7a115..586f1d6 100644 --- a/app/src/main/res/drawable/round_widgets_24.xml +++ b/app/src/main/res/drawable/round_widgets_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/drawable/round_work_outline_24.xml b/app/src/main/res/drawable/round_work_outline_24.xml new file mode 100644 index 0000000..d13b807 --- /dev/null +++ b/app/src/main/res/drawable/round_work_outline_24.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/drawable/round_wrap_text_24.xml b/app/src/main/res/drawable/round_wrap_text_24.xml index 289eb4d..f72ccf6 100644 --- a/app/src/main/res/drawable/round_wrap_text_24.xml +++ b/app/src/main/res/drawable/round_wrap_text_24.xml @@ -1,9 +1,10 @@ + app:tint="?attr/colorControlNormal"> diff --git a/app/src/main/res/font/product_sans.xml b/app/src/main/res/font/product_sans.xml index 8c58422..2b979b9 100644 --- a/app/src/main/res/font/product_sans.xml +++ b/app/src/main/res/font/product_sans.xml @@ -1,5 +1,5 @@ - diff --git a/app/src/main/res/layout/activity_custom_date.xml b/app/src/main/res/layout/activity_custom_date.xml index bb4fcf1..defba66 100644 --- a/app/src/main/res/layout/activity_custom_date.xml +++ b/app/src/main/res/layout/activity_custom_date.xml @@ -33,7 +33,7 @@ android:layout_centerVertical="true" android:id="@+id/action_back" android:layout_alignParentLeft="true" - android:tint="@color/colorPrimaryText" + app:tint="@color/colorPrimaryText" android:src="@drawable/round_arrow_back" /> diff --git a/app/src/main/res/layout/activity_support_dev.xml b/app/src/main/res/layout/activity_support_dev.xml index 721447e..e6816ed 100644 --- a/app/src/main/res/layout/activity_support_dev.xml +++ b/app/src/main/res/layout/activity_support_dev.xml @@ -40,7 +40,7 @@ android:layout_centerVertical="true" android:layout_alignParentLeft="true" android:id="@+id/action_back" - android:tint="@color/colorPrimaryText" + app:tint="@color/colorPrimaryText" android:src="@drawable/round_arrow_back" /> diff --git a/app/src/main/res/layout/fragment_app_main.xml b/app/src/main/res/layout/fragment_app_main.xml index 695783f..28bbe62 100644 --- a/app/src/main/res/layout/fragment_app_main.xml +++ b/app/src/main/res/layout/fragment_app_main.xml @@ -58,7 +58,7 @@ android:clickable="true" android:focusable="true" android:background="?attr/selectableItemBackgroundBorderless" - android:tint="@color/colorPrimaryText" + app:tint="@color/colorPrimaryText" android:layout_centerVertical="true" android:layout_alignParentRight="true" android:id="@+id/action_settings"/> diff --git a/app/src/main/res/layout/fragment_calendar_settings.xml b/app/src/main/res/layout/fragment_calendar_settings.xml index 728cec9..e0599da 100644 --- a/app/src/main/res/layout/fragment_calendar_settings.xml +++ b/app/src/main/res/layout/fragment_calendar_settings.xml @@ -121,7 +121,7 @@ android:layout_height="48dp" android:padding="12dp" android:src="@drawable/round_filter_list" - android:tint="@color/colorPrimaryText"/> + app:tint="@color/colorPrimaryText"/> + app:tint="@color/colorPrimaryText"/> + app:tint="@color/colorPrimaryText" /> + + + + + + + + android:text="@string/settings_busy_events_title"/> + style="@style/AnotherWidget.Settings.Subtitle" + android:text="@string/settings_busy_events_subtitle"/> + app:tint="@color/colorPrimaryText"/> + app:tint="@color/colorPrimaryText"/> + app:tint="@color/colorPrimaryText"/> + app:tint="@color/colorPrimaryText"/> + app:tint="@color/colorPrimaryText"/> + app:tint="@color/colorPrimaryText"/> + app:tint="@color/colorPrimaryText"/> + app:tint="@color/colorPrimaryText"/> + app:tint="@color/colorPrimaryText"/> + app:tint="@color/colorPrimaryText"/> + app:tint="@color/colorPrimaryText"/> + app:tint="@color/colorPrimaryText"/> + app:tint="@color/colorPrimaryText"/> + app:tint="@color/colorPrimaryText"/> + app:tint="@color/colorPrimaryText"/> + app:tint="@color/colorPrimaryText"/> + app:tint="@color/colorPrimaryText"/> + app:tint="@color/colorPrimaryText"/> + app:tint="@color/colorPrimaryText"/> + app:tint="@color/colorPrimaryText"/> + app:tint="@color/colorPrimaryText"/> + app:tint="@color/colorPrimaryText"/> + app:tint="@color/colorPrimaryText"/> + app:tint="@color/colorPrimaryText"/> + app:tint="@color/colorPrimaryText"/> + app:tint="@color/colorPrimaryText"/> + app:tint="@color/colorPrimaryText"/> + app:tint="@color/colorPrimaryText"/> + app:tint="@color/colorPrimaryText"/> + app:tint="@color/colorPrimaryText"/> + app:tint="@color/colorPrimaryText"/> + app:tint="@color/colorPrimaryText"/> + app:tint="@color/colorPrimaryText"/> + app:tint="@color/colorPrimaryText"/> + app:tint="@color/colorPrimaryText"/> + app:tint="@color/errorColorText"/> + app:tint="@color/colorPrimaryText"/> + app:tint="@color/errorColorText"/> + app:tint="@color/colorPrimaryText"/> + app:tint="@color/colorPrimaryText"/> + app:tint="@color/colorPrimaryText"/> + app:tint="@color/colorPrimaryText"/> + app:tint="@color/colorPrimaryText"/> + app:tint="@color/colorPrimaryText"/> + app:tint="@color/colorPrimaryText" /> \ No newline at end of file diff --git a/app/src/main/res/layout/the_widget.xml b/app/src/main/res/layout/the_widget.xml index 429a21d..4638ad1 100644 --- a/app/src/main/res/layout/the_widget.xml +++ b/app/src/main/res/layout/the_widget.xml @@ -21,7 +21,7 @@ android:ellipsize="end" android:text="@string/loading_text" android:includeFontPadding="false" - style="@style/AnotherWidget.Title"/> + style="@style/AnotherWidget.Widget.Title"/> + style="@style/AnotherWidget.Widget.Subtitle"/> @@ -83,7 +83,7 @@ android:ellipsize="end" android:includeFontPadding="false" android:layout_height="wrap_content" - style="@style/AnotherWidget.Title" /> + style="@style/AnotherWidget.Widget.Title" /> + style="@style/AnotherWidget.Widget.Title" /> + style="@style/AnotherWidget.Widget.Subtitle"/> @@ -161,7 +161,7 @@ android:maxLines="1" android:includeFontPadding="false" android:layout_height="wrap_content" - style="@style/AnotherWidget.Subtitle" /> + style="@style/AnotherWidget.Widget.Subtitle" /> + style="@style/AnotherWidget.Widget.Subtitle"/> + style="@style/AnotherWidget.Widget.Title"/> + style="@style/AnotherWidget.Widget.Title"/> - Another Widget Add Visning - | Tekstfarve Tekstfarve Baggrundsfarve @@ -78,8 +76,6 @@ Vis vejret Giv tilladelse til din lokation\nfor at se vejret i din widget. Måleenhed - °F - Fahrenheit - °C - Celsius Opdateringsfrekvens 30 minutter 1 time @@ -155,7 +151,6 @@ Feedback Om Genindlæs widget - toolbar Fejl ved åbning af URL: Link kopieret til udklipsholder. Indlæser data… Fejl ved åbning af app. @@ -181,7 +176,6 @@ Tving en genstart af widget-tjenesten Dette er et open-source projekt, du er velkommen til at hjælpe. Feedback og feature requests - xiaomi Xiaomi Enheder Aktiver tilladelsen til visning af popup-vinduer, når app\'en kører i baggrunden, som findes under "Andre tilladelser" i appindstillingerne. Ellers vil du ikke kunne åbne nogle applikationer ved tryk på widget\'en. Ignorér diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index a78c549..880e849 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -1,11 +1,9 @@ - Another Widget Añadir Pantalla - | Color del texto Color del texto Color del fondo @@ -78,8 +76,6 @@ Mostrar el clima Permite el acceso a tu ubicación\npara ver el clima en tu widget. Unidad de medición - °F - Fahrenheit - °C - Celsius Frecuencia de refresco 30 minutos 1 hora @@ -155,7 +151,6 @@ Comentarios Acerca de Refrescar widget - toolbar Error abriendo la URL: Link copiado al portapapeles. Cargando datos… Error abriendo la app. @@ -181,7 +176,6 @@ Forzar el reinicio del servicio del widget Este es un proyecto de código abierto, siéntete libre de ayudar. Comentarios y solicitudes de funciones - xiaomi Dispositivos Xiaomi Habilita el permiso para mostrar ventanas emergentes mientras está ejecutándose en segundo plano dentro de la sección "Otros permisos" en la app de ajustes. De lo contrario, no podrás abrir ninguna aplicación tocando en el widget. Ignorar diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index e8950ae..4c4c954 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -1,6 +1,5 @@ - Another Widget Tambahkan diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index a2a1e14..db7cca7 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -1,6 +1,5 @@ - Another Widget Aggiungi @@ -26,6 +25,7 @@ Widget Data maiuscola Formato data + Sfondo widget Calendario @@ -71,6 +71,13 @@ Alta Filtri Dettagli evento + Partecipazione eventi + Filtra eventi accettati o rifiutati + Eventi importanti + Mostra solo gli eventi\ndove risulti occupato + Eventi accettati + Inviti ad eventi + Eventi rifiutati Meteo @@ -141,7 +148,7 @@ Passi fatti Livello batteria basso %d passi fatti finora - In carica + Carica Providers Glance info will show up only when there are no events displayed and only when a few conditions are verified. @@ -201,4 +208,5 @@ Questo è un progetto sviluppato da una singola persona,\n grazie per il tuo supporto! Integrazioni %d integrazioni installate + Niente diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index fc9b472..88d4106 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -1,6 +1,5 @@ - Another Widget Добавить виджет diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index dc78137..dc9eded 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -27,6 +27,7 @@ Widget Capitalize the date Date format + Widget background Calendar @@ -72,6 +73,13 @@ High Filters Event detail + Attendee Status + Filter accepted or declined events + Relevant events + Show only the events\nthat keep you busy + Accepted events + Events invites + Declined events Weather @@ -144,7 +152,7 @@ Daily steps Low battery level %d steps so far - Charging + Charged Providers Glance info will show up only when there are no events displayed and only when a few conditions are verified. @@ -207,5 +215,4 @@ Integrations %d installed integrations Nothing - Widget background \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 5a6e555..50cccb9 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -115,6 +115,26 @@ 22sp @font/product_sans + + + + + + +