Refactor MediaPlayerControlsWidgetConfigureActivity to Compose and Material 3 #7018
+1,546
−356
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,38 +5,27 @@ import android.content.Context | |
| import android.content.Intent | ||
| import android.os.Build | ||
| import android.os.Bundle | ||
| import androidx.activity.compose.setContent | ||
| import androidx.activity.viewModels | ||
| import androidx.lifecycle.lifecycleScope | ||
| import com.google.android.material.color.DynamicColors | ||
| import dagger.hilt.android.AndroidEntryPoint | ||
| import dagger.hilt.android.lifecycle.withCreationCallback | ||
| import io.homeassistant.companion.android.BaseActivity | ||
| import io.homeassistant.companion.android.common.R as commonR | ||
| import io.homeassistant.companion.android.common.compose.theme.HATheme | ||
| import io.homeassistant.companion.android.common.util.SdkVersion | ||
| import io.homeassistant.companion.android.settings.widgets.ManageWidgetsViewModel | ||
| import io.homeassistant.companion.android.widgets.mediaplayer.MediaPlayerControlsWidgetConfigureViewModel.Factory | ||
| import kotlinx.coroutines.launch | ||
| import timber.log.Timber | ||
|
|
||
| @AndroidEntryPoint | ||
| class MediaPlayerControlsWidgetConfigureActivity : BaseActivity() { | ||
|
|
||
| companion object { | ||
| private const val FOR_ENTITY = "for_entity" | ||
|
|
||
| fun newInstance(context: Context, entityId: String): Intent { | ||
| return Intent(context, MediaPlayerControlsWidgetConfigureActivity::class.java).apply { | ||
| putExtra(FOR_ENTITY, entityId) | ||
|
|
@@ -46,198 +35,80 @@ class MediaPlayerControlsWidgetConfigureActivity : | |
| } | ||
| } | ||
|
|
||
| private val viewModel: MediaPlayerControlsWidgetConfigureViewModel by viewModels( | ||
| extrasProducer = { | ||
| defaultViewModelCreationExtras.withCreationCallback<Factory> { factory -> | ||
| factory.create(intent.getStringExtra(FOR_ENTITY)) | ||
| } | ||
| }, | ||
| ) | ||
|
|
||
| private val requestLauncherSetup: Boolean | ||
| get() = intent.extras?.getBoolean(ManageWidgetsViewModel.CONFIGURE_REQUEST_LAUNCHER, false) == true | ||
|
|
||
| override fun onCreate(savedInstanceState: Bundle?) { | ||
| super.onCreate(savedInstanceState) | ||
|
|
||
| // Set the result to CANCELED. This will cause the widget host to cancel out of the widget | ||
| // placement if the user closes the screen or presses the back button. | ||
| setResult(RESULT_CANCELED) | ||
|
|
||
| val widgetId = intent.extras?.getInt( | ||
| AppWidgetManager.EXTRA_APPWIDGET_ID, | ||
| AppWidgetManager.INVALID_APPWIDGET_ID, | ||
| ) ?: AppWidgetManager.INVALID_APPWIDGET_ID | ||
|
|
||
|
TimoPtr marked this conversation as resolved.
Outdated
|
||
| if (widgetId == AppWidgetManager.INVALID_APPWIDGET_ID && !requestLauncherSetup) { | ||
| finish() | ||
| return | ||
| } | ||
|
|
||
| viewModel.onSetup(widgetId) | ||
|
Member
There was a problem hiding this comment. I think we could potentially directly pass the widgetId in the factory of the ViewModel like we already do for the Entity
Author
There was a problem hiding this comment. #7007's |
||
|
|
||
| setContent { | ||
| HATheme { | ||
| MediaPlayerControlsWidgetConfigureScreen( | ||
| viewModel = viewModel, | ||
| dynamicColorAvailable = DynamicColors.isDynamicColorAvailable(), | ||
| onActionClick = ::onActionClick, | ||
| onClose = ::finish, | ||
| ) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private fun onActionClick() { | ||
| lifecycleScope.launch { | ||
| if (requestLauncherSetup) { | ||
| if (SdkVersion.isAtLeast(Build.VERSION_CODES.O) && viewModel.isValidSelection()) { | ||
| requestPinWidget() | ||
| } else { | ||
| viewModel.onUserMessage(commonR.string.widget_creation_error) | ||
| } | ||
| } else { | ||
| updateWidget() | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private suspend fun requestPinWidget() { | ||
| try { | ||
| viewModel.requestWidgetCreation(this) | ||
| finish() | ||
| } catch (e: IllegalStateException) { | ||
| Timber.e(e, "Unable to request widget pin") | ||
| viewModel.onUserMessage(commonR.string.widget_creation_error) | ||
| } | ||
| } | ||
|
|
||
| private suspend fun updateWidget() { | ||
| // The view model surfaces a user message itself when the selection is invalid. | ||
| if (!viewModel.updateWidgetConfiguration()) return | ||
| viewModel.updateWidget(this) | ||
| setResult( | ||
| RESULT_OK, | ||
| Intent().putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, viewModel.widgetId), | ||
| ) | ||
| finish() | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.