From 8fc192016f2e9e7283304602cfb9abadda6b6d11 Mon Sep 17 00:00:00 2001 From: MacOS Date: Tue, 29 Apr 2025 09:35:44 +0200 Subject: [PATCH 1/7] style(DATPickupsRemoteViewService): delete empty line in method onGetViewFactory --- .../waste_calendar/medium_widget/DATPickupsRemoteViewService.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/com/telekom/citykey/view/widget/waste_calendar/medium_widget/DATPickupsRemoteViewService.kt b/app/src/main/java/com/telekom/citykey/view/widget/waste_calendar/medium_widget/DATPickupsRemoteViewService.kt index 22ba982b..d9b5cac7 100644 --- a/app/src/main/java/com/telekom/citykey/view/widget/waste_calendar/medium_widget/DATPickupsRemoteViewService.kt +++ b/app/src/main/java/com/telekom/citykey/view/widget/waste_calendar/medium_widget/DATPickupsRemoteViewService.kt @@ -51,7 +51,6 @@ class DATPickupsRemoteViewService : RemoteViewsService() { private val widgetInteractor: WidgetInteractor by inject() override fun onGetViewFactory(intent: Intent?): RemoteViewsFactory { - return WasteMediumItemViewsFactory(applicationContext, widgetInteractor.pickups) } From 2e0e240906513175913a9813fbad964eef4e33eb Mon Sep 17 00:00:00 2001 From: MacOS Date: Tue, 29 Apr 2025 09:51:05 +0200 Subject: [PATCH 2/7] style(DATPickupsRemoteViewService): add empty lines around if statement in method populateWastePickupData --- .../waste_calendar/medium_widget/DATPickupsRemoteViewService.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/java/com/telekom/citykey/view/widget/waste_calendar/medium_widget/DATPickupsRemoteViewService.kt b/app/src/main/java/com/telekom/citykey/view/widget/waste_calendar/medium_widget/DATPickupsRemoteViewService.kt index d9b5cac7..7786f92e 100644 --- a/app/src/main/java/com/telekom/citykey/view/widget/waste_calendar/medium_widget/DATPickupsRemoteViewService.kt +++ b/app/src/main/java/com/telekom/citykey/view/widget/waste_calendar/medium_widget/DATPickupsRemoteViewService.kt @@ -97,9 +97,11 @@ class DATPickupsRemoteViewService : RemoteViewsService() { private fun populateWastePickupData(view: RemoteViews, pickup: WasteItems.WasteItem) { view.setImageViewResource(R.id.pickupIcon, R.drawable.ic_waste_trash_icon) + val wasteIconColorInt = if (resources.isDarkMode) { ColorUtils.invertIfDark(pickup.wasteIconColorInt) } else pickup.wasteIconColorInt + view.setInt( R.id.pickupIcon, "setColorFilter", wasteIconColorInt From 22c7d313d3c81cde0fe2b755d5325d6e493db469 Mon Sep 17 00:00:00 2001 From: MacOS Date: Tue, 29 Apr 2025 10:05:27 +0200 Subject: [PATCH 3/7] style(populateWastePickupData): add curly braces and put else statement in new line in method populateWastePickupData --- .../medium_widget/DATPickupsRemoteViewService.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/telekom/citykey/view/widget/waste_calendar/medium_widget/DATPickupsRemoteViewService.kt b/app/src/main/java/com/telekom/citykey/view/widget/waste_calendar/medium_widget/DATPickupsRemoteViewService.kt index 7786f92e..655a041d 100644 --- a/app/src/main/java/com/telekom/citykey/view/widget/waste_calendar/medium_widget/DATPickupsRemoteViewService.kt +++ b/app/src/main/java/com/telekom/citykey/view/widget/waste_calendar/medium_widget/DATPickupsRemoteViewService.kt @@ -100,7 +100,9 @@ class DATPickupsRemoteViewService : RemoteViewsService() { val wasteIconColorInt = if (resources.isDarkMode) { ColorUtils.invertIfDark(pickup.wasteIconColorInt) - } else pickup.wasteIconColorInt + } else { + pickup.wasteIconColorInt + } view.setInt( R.id.pickupIcon, "setColorFilter", From 4b9a726b998f2e71056b72968a57c8ce8caefbb3 Mon Sep 17 00:00:00 2001 From: MacOS Date: Tue, 29 Apr 2025 10:07:32 +0200 Subject: [PATCH 4/7] style(populateWastePickupData): move method argument to separate --- .../medium_widget/DATPickupsRemoteViewService.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/telekom/citykey/view/widget/waste_calendar/medium_widget/DATPickupsRemoteViewService.kt b/app/src/main/java/com/telekom/citykey/view/widget/waste_calendar/medium_widget/DATPickupsRemoteViewService.kt index 655a041d..31f76eed 100644 --- a/app/src/main/java/com/telekom/citykey/view/widget/waste_calendar/medium_widget/DATPickupsRemoteViewService.kt +++ b/app/src/main/java/com/telekom/citykey/view/widget/waste_calendar/medium_widget/DATPickupsRemoteViewService.kt @@ -105,7 +105,8 @@ class DATPickupsRemoteViewService : RemoteViewsService() { } view.setInt( - R.id.pickupIcon, "setColorFilter", + R.id.pickupIcon, + "setColorFilter", wasteIconColorInt ) view.setInt( From 127703bcf1ee976bf9709380d42b0aaa0b7639aa Mon Sep 17 00:00:00 2001 From: MacOS Date: Tue, 29 Apr 2025 09:00:50 +0000 Subject: [PATCH 5/7] style(DATPickupsRemoteViewService): reorder imports lexicographically --- .../medium_widget/DATPickupsRemoteViewService.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/telekom/citykey/view/widget/waste_calendar/medium_widget/DATPickupsRemoteViewService.kt b/app/src/main/java/com/telekom/citykey/view/widget/waste_calendar/medium_widget/DATPickupsRemoteViewService.kt index 31f76eed..fecf2302 100644 --- a/app/src/main/java/com/telekom/citykey/view/widget/waste_calendar/medium_widget/DATPickupsRemoteViewService.kt +++ b/app/src/main/java/com/telekom/citykey/view/widget/waste_calendar/medium_widget/DATPickupsRemoteViewService.kt @@ -34,17 +34,17 @@ import android.net.Uri import android.view.View import android.widget.RemoteViews import android.widget.RemoteViewsService -import com.telekom.citykey.R import com.telekom.citykey.domain.widget.WidgetInteractor import com.telekom.citykey.networkinterface.models.waste_calendar.Pickups import com.telekom.citykey.networkinterface.models.waste_calendar.WasteItems +import com.telekom.citykey.R import com.telekom.citykey.utils.ColorUtils -import com.telekom.citykey.utils.NetworkConnection import com.telekom.citykey.utils.extensions.isInCurrentMonth import com.telekom.citykey.utils.isDarkMode +import com.telekom.citykey.utils.NetworkConnection import com.telekom.citykey.view.widget.waste_calendar.WasteCalendarWidgetConstants -import org.koin.android.ext.android.inject import java.util.Calendar +import org.koin.android.ext.android.inject class DATPickupsRemoteViewService : RemoteViewsService() { From 2a14327e5c6eeeaea0ce4bda15b8dda9496a33f9 Mon Sep 17 00:00:00 2001 From: MacOS Date: Tue, 29 Apr 2025 12:14:00 +0000 Subject: [PATCH 6/7] style(DATPickupsRemoteViewService): delete trailing spaces --- .../medium_widget/DATPickupsRemoteViewService.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/telekom/citykey/view/widget/waste_calendar/medium_widget/DATPickupsRemoteViewService.kt b/app/src/main/java/com/telekom/citykey/view/widget/waste_calendar/medium_widget/DATPickupsRemoteViewService.kt index fecf2302..b41266ba 100644 --- a/app/src/main/java/com/telekom/citykey/view/widget/waste_calendar/medium_widget/DATPickupsRemoteViewService.kt +++ b/app/src/main/java/com/telekom/citykey/view/widget/waste_calendar/medium_widget/DATPickupsRemoteViewService.kt @@ -97,13 +97,13 @@ class DATPickupsRemoteViewService : RemoteViewsService() { private fun populateWastePickupData(view: RemoteViews, pickup: WasteItems.WasteItem) { view.setImageViewResource(R.id.pickupIcon, R.drawable.ic_waste_trash_icon) - + val wasteIconColorInt = if (resources.isDarkMode) { ColorUtils.invertIfDark(pickup.wasteIconColorInt) } else { pickup.wasteIconColorInt } - + view.setInt( R.id.pickupIcon, "setColorFilter", From 4925df253aaea8171f84fbf0f038e7ee92435d10 Mon Sep 17 00:00:00 2001 From: MacOS Date: Tue, 29 Apr 2025 12:44:20 +0000 Subject: [PATCH 7/7] style(DATPickupsRemoteViewService): order imports lexicographically --- .../medium_widget/DATPickupsRemoteViewService.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/telekom/citykey/view/widget/waste_calendar/medium_widget/DATPickupsRemoteViewService.kt b/app/src/main/java/com/telekom/citykey/view/widget/waste_calendar/medium_widget/DATPickupsRemoteViewService.kt index b41266ba..c35a99af 100644 --- a/app/src/main/java/com/telekom/citykey/view/widget/waste_calendar/medium_widget/DATPickupsRemoteViewService.kt +++ b/app/src/main/java/com/telekom/citykey/view/widget/waste_calendar/medium_widget/DATPickupsRemoteViewService.kt @@ -34,14 +34,14 @@ import android.net.Uri import android.view.View import android.widget.RemoteViews import android.widget.RemoteViewsService +import com.telekom.citykey.R import com.telekom.citykey.domain.widget.WidgetInteractor import com.telekom.citykey.networkinterface.models.waste_calendar.Pickups import com.telekom.citykey.networkinterface.models.waste_calendar.WasteItems -import com.telekom.citykey.R import com.telekom.citykey.utils.ColorUtils +import com.telekom.citykey.utils.NetworkConnection import com.telekom.citykey.utils.extensions.isInCurrentMonth import com.telekom.citykey.utils.isDarkMode -import com.telekom.citykey.utils.NetworkConnection import com.telekom.citykey.view.widget.waste_calendar.WasteCalendarWidgetConstants import java.util.Calendar import org.koin.android.ext.android.inject