Merge branch 'remove_flow_mvi' into 'main'

#5444 Fix CPU consumption - remove flow-mvi dependency

See merge request e/os/advanced-privacy!74

2 files changed, 7 insertions, 7 deletions

diff --git a/app/src/main/java/foundation/e/privacycentralapp/widget/Widget.kt b/app/src/main/java/foundation/e/privacycentralapp/widget/Widget.kt
index 048b58c..62e279f 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/widget/Widget.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/widget/Widget.kt
@@ -26,6 +26,7 @@ import foundation.e.privacycentralapp.domain.usecases.TrackersStatisticsUseCase
 import foundation.e.privacycentralapp.widget.State
 import foundation.e.privacycentralapp.widget.render
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.GlobalScope
@@ -49,7 +50,7 @@ import java.time.temporal.ChronoUnit
  * Implementation of App Widget functionality.
  */
 class Widget : AppWidgetProvider() {
-    @FlowPreview
+
     override fun onUpdate(
         context: Context,
         appWidgetManager: AppWidgetManager,
@@ -66,7 +67,6 @@ class Widget : AppWidgetProvider() {
         // Enter relevant functionality for when the last widget is disabled
     }
 
-    @FlowPreview
     companion object {
         private var updateWidgetJob: Job? = null
 
@@ -75,6 +75,7 @@ class Widget : AppWidgetProvider() {
         private const val DARK_TEXT_KEY = "foundation.e.blisslauncher.WIDGET_OPTION_DARK_TEXT"
         var isDarkText = false
 
+        @OptIn(FlowPreview::class)
         private fun initState(
             getPrivacyStateUseCase: GetQuickPrivacyStateUseCase,
             trackersStatisticsUseCase: TrackersStatisticsUseCase,
@@ -120,6 +121,7 @@ class Widget : AppWidgetProvider() {
                 )
         }
 
+        @OptIn(DelicateCoroutinesApi::class)
         fun startListening(
             appContext: Context,
             getPrivacyStateUseCase: GetQuickPrivacyStateUseCase,
@@ -140,7 +142,7 @@ class Widget : AppWidgetProvider() {
         }
     }
 
-    @FlowPreview
+
     override fun onAppWidgetOptionsChanged(
         context: Context,
         appWidgetManager: AppWidgetManager,
diff --git a/app/src/main/java/foundation/e/privacycentralapp/widget/WidgetUI.kt b/app/src/main/java/foundation/e/privacycentralapp/widget/WidgetUI.kt
index f95083e..7b8ceb4 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/widget/WidgetUI.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/widget/WidgetUI.kt
@@ -29,10 +29,9 @@ import foundation.e.privacycentralapp.R
 import foundation.e.privacycentralapp.Widget
 import foundation.e.privacycentralapp.Widget.Companion.isDarkText
 import foundation.e.privacycentralapp.domain.entities.QuickPrivacyState
-import foundation.e.privacycentralapp.extensions.dpToPxF
+import foundation.e.privacycentralapp.common.extensions.dpToPxF
 import foundation.e.privacycentralapp.main.MainActivity
 import foundation.e.privacycentralapp.widget.WidgetCommandReceiver.Companion.ACTION_TOGGLE_PRIVACY
-import kotlinx.coroutines.FlowPreview
 
 data class State(
     val quickPrivacyState: QuickPrivacyState = QuickPrivacyState.DISABLED,
@@ -43,7 +42,7 @@ data class State(
     val activeTrackersCount: Int = 0,
 )
 
-@FlowPreview
+
 fun render(
     context: Context,
     state: State,
@@ -266,7 +265,6 @@ private const val REQUEST_CODE_TOGGLE = 2
 private const val REQUEST_CODE_TRACKERS = 3
 private const val REQUEST_CODE_HIGHLIGHT = 100
 
-@FlowPreview
 fun applyDarkText(context: Context, state: State, views: RemoteViews) {
     views.apply {
         listOf(