-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #21467 from wordpress-mobile/feat/relocate-experim…
…ental-features-settings feat: Relocate experimental features settings
- Loading branch information
Showing
11 changed files
with
242 additions
and
72 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
This file contains 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
194 changes: 194 additions & 0 deletions
194
WordPress/src/main/java/org/wordpress/android/ui/prefs/ExperimentalFeaturesActivity.kt
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,194 @@ | ||
| package org.wordpress.android.ui.prefs | ||
|
|
||
| import android.annotation.SuppressLint | ||
| import android.content.Context | ||
| import android.content.res.Configuration.UI_MODE_NIGHT_YES | ||
| import android.os.Bundle | ||
| import androidx.activity.viewModels | ||
| import androidx.appcompat.app.AppCompatActivity | ||
| import androidx.compose.foundation.clickable | ||
| import androidx.compose.foundation.layout.Box | ||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.Row | ||
| import androidx.compose.foundation.layout.Spacer | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.foundation.layout.width | ||
| import androidx.compose.material.icons.Icons | ||
| import androidx.compose.material.icons.automirrored.filled.ArrowBack | ||
| import androidx.compose.material3.ExperimentalMaterial3Api | ||
| import androidx.compose.material3.Icon | ||
| import androidx.compose.material3.IconButton | ||
| import androidx.compose.material3.MaterialTheme | ||
| import androidx.compose.material3.Scaffold | ||
| import androidx.compose.material3.Switch | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.material3.TopAppBar | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.getValue | ||
| import androidx.compose.runtime.remember | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.platform.LocalContext | ||
| import androidx.compose.ui.res.stringResource | ||
| import androidx.compose.ui.tooling.preview.Preview | ||
| import androidx.lifecycle.ViewModel | ||
| import androidx.lifecycle.compose.collectAsStateWithLifecycle | ||
| import dagger.hilt.android.AndroidEntryPoint | ||
| import kotlinx.coroutines.flow.MutableStateFlow | ||
| import kotlinx.coroutines.flow.StateFlow | ||
| import kotlinx.coroutines.flow.asStateFlow | ||
| import kotlinx.coroutines.flow.update | ||
| import org.wordpress.android.R | ||
| import org.wordpress.android.ui.compose.theme.AppThemeM3 | ||
| import org.wordpress.android.ui.compose.unit.Margin | ||
| import org.wordpress.android.util.extensions.setContent | ||
|
|
||
| val experimentalFeatures = listOf( | ||
| Feature(key = "experimental_block_editor"), | ||
| Feature(key = "experimental_block_editor_theme_styles") | ||
| ) | ||
|
|
||
| data class Feature( | ||
| val enabled: Boolean = false, | ||
| val key: String, | ||
| ) | ||
|
|
||
| class FeatureViewModel : ViewModel() { | ||
| private val _switchStates = MutableStateFlow<Map<String, Feature>>(emptyMap()) | ||
| val switchStates: StateFlow<Map<String, Feature>> = _switchStates.asStateFlow() | ||
|
|
||
| init { | ||
| val initialStates = experimentalFeatures.associate { item -> | ||
| item.key to Feature(AppPrefs.getManualFeatureConfig(item.key), item.key) | ||
| } | ||
| _switchStates.value = initialStates | ||
| } | ||
|
|
||
| fun toggleFeature(key: String, enabled: Boolean) { | ||
| _switchStates.update { currentStates -> | ||
| currentStates.toMutableMap().apply { | ||
| this[key] = Feature(enabled, key) | ||
| AppPrefs.setManualFeatureConfig(enabled, key) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @AndroidEntryPoint | ||
| class ExperimentalFeaturesActivity : AppCompatActivity() { | ||
| private val viewModel: FeatureViewModel by viewModels() | ||
|
|
||
| override fun onCreate(savedInstanceState: Bundle?) { | ||
| super.onCreate(savedInstanceState) | ||
|
|
||
| setContent { | ||
| AppThemeM3 { | ||
| val features by viewModel.switchStates.collectAsStateWithLifecycle() | ||
|
|
||
| ExperimentalFeaturesScreen( | ||
| features = features, | ||
| onFeatureToggled = viewModel::toggleFeature, | ||
| onNavigateBack = onBackPressedDispatcher::onBackPressed | ||
| ) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @OptIn(ExperimentalMaterial3Api::class) | ||
| @Composable | ||
| fun ExperimentalFeaturesScreen( | ||
| features: Map<String, Feature>, | ||
| onFeatureToggled: (key: String, enabled: Boolean) -> Unit, | ||
| onNavigateBack: () -> Unit | ||
| ) { | ||
| Scaffold( | ||
| topBar = { | ||
| TopAppBar( | ||
| title = { | ||
| Text(text = stringResource(R.string.experimental_features_screen_title)) | ||
| }, | ||
| navigationIcon = { | ||
| IconButton(onClick = onNavigateBack) { | ||
| Icon( | ||
| Icons.AutoMirrored.Filled.ArrowBack, | ||
| stringResource(R.string.back) | ||
| ) | ||
| } | ||
| }, | ||
| ) | ||
| }, | ||
| ) { innerPadding -> | ||
| Box(modifier = Modifier.padding(innerPadding)) { | ||
| Column { | ||
| features.forEach { (key, feature) -> | ||
| val context = LocalContext.current | ||
| val label = remember(key) { | ||
| context.getStringResourceByName(key) | ||
| } | ||
|
|
||
| FeatureToggle( | ||
| key = key, | ||
| label = label, | ||
| enabled = feature.enabled, | ||
| onChange = onFeatureToggled, | ||
| ) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @SuppressLint("DiscouragedApi") | ||
| fun Context.getStringResourceByName(name: String): String { | ||
| val resourceId = resources.getIdentifier(name, "string", packageName) | ||
| return if (resourceId != 0) getString(resourceId) else name | ||
| } | ||
|
|
||
| @Composable | ||
| fun FeatureToggle( | ||
| key: String, | ||
| label: String, | ||
| enabled: Boolean, | ||
| onChange: (String, Boolean) -> Unit, | ||
| ) { | ||
| Row( | ||
| verticalAlignment = Alignment.CenterVertically, | ||
| modifier = Modifier | ||
| .clickable { onChange(key, !enabled) } | ||
| .padding(horizontal = Margin.ExtraLarge.value, vertical = Margin.MediumLarge.value) | ||
| ) { | ||
| Spacer(modifier = Modifier.width(Margin.ExtraLarge.value)) | ||
| Text( | ||
| text = label, | ||
| style = MaterialTheme.typography.bodyMedium, | ||
| color = MaterialTheme.colorScheme.onSurface, | ||
| ) | ||
| Spacer(modifier = Modifier.weight(1f)) | ||
| Switch( | ||
| checked = enabled, | ||
| onCheckedChange = { newValue -> | ||
| onChange(key, newValue) | ||
| }, | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| @Preview | ||
| @Preview(uiMode = UI_MODE_NIGHT_YES) | ||
| @Composable | ||
| fun ExperimentalFeaturesScreenPreview() { | ||
| AppThemeM3 { | ||
| val featuresStatusAlternated = remember { | ||
| experimentalFeatures.mapIndexed { index, feature -> | ||
| feature.key to feature.copy(enabled = index % 2 == 0) | ||
| }.toMap() | ||
| } | ||
|
|
||
| ExperimentalFeaturesScreen( | ||
| features = featuresStatusAlternated, | ||
| onFeatureToggled = { _, _ -> }, | ||
| onNavigateBack = {} | ||
| ) | ||
| } | ||
| } |
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp"> | ||
|
|
||
| <path android:fillColor="@android:color/white" android:pathData="M19.8,18.4L14,10.67V6.5l1.35,-1.69C15.61,4.48 15.38,4 14.96,4H9.04C8.62,4 8.39,4.48 8.65,4.81L10,6.5v4.17L4.2,18.4C3.71,19.06 4.18,20 5,20h14C19.82,20 20.29,19.06 19.8,18.4z"/> | ||
|
|
||
| </vector> |
This file contains 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
This file contains 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
Oops, something went wrong.