-
Notifications
You must be signed in to change notification settings - Fork 160
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 #236 from GuoXiCheng/dev
add custom config
- Loading branch information
Showing
15 changed files
with
442 additions
and
3 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
5 changes: 5 additions & 0 deletions
5
app/src/main/java/com/android/skip/data/network/api/MyApiService.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 |
|---|---|---|
| @@ -1,9 +1,14 @@ | ||
| package com.android.skip.data.network.api | ||
|
|
||
| import retrofit2.Call | ||
| import retrofit2.Response | ||
| import retrofit2.http.GET | ||
| import retrofit2.http.Url | ||
|
|
||
| interface MyApiService { | ||
| @GET("/skip_config_v3.yaml") | ||
| fun getSkipConfigV3(): Call<String> | ||
|
|
||
| @GET | ||
| suspend fun getConfigFromUrl(@Url url: String): Response<String> | ||
| } |
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
102 changes: 102 additions & 0 deletions
102
app/src/main/java/com/android/skip/ui/settings/custom/CustomButton.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,102 @@ | ||
| package com.android.skip.ui.settings.custom | ||
|
|
||
| import androidx.compose.foundation.background | ||
| import androidx.compose.foundation.layout.Arrangement | ||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.Row | ||
| import androidx.compose.foundation.layout.fillMaxWidth | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.material3.MaterialTheme | ||
| import androidx.compose.material3.OutlinedTextField | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.material3.TextButton | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.getValue | ||
| import androidx.compose.runtime.mutableStateOf | ||
| import androidx.compose.runtime.remember | ||
| import androidx.compose.runtime.saveable.rememberSaveable | ||
| import androidx.compose.runtime.setValue | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.res.stringResource | ||
| import androidx.compose.ui.unit.dp | ||
| import androidx.compose.ui.window.Dialog | ||
| import com.android.skip.R | ||
| import com.android.skip.data.config.ConfigViewModel | ||
| import com.android.skip.ui.components.FlatButton | ||
| import com.android.skip.ui.components.ResourceIcon | ||
| import com.android.skip.ui.components.RowContent | ||
| import com.android.skip.util.DataStoreUtils | ||
| import com.blankj.utilcode.util.StringUtils.getString | ||
|
|
||
| @Composable | ||
| fun CustomButton(configViewModel: ConfigViewModel) { | ||
| val showDialog = remember { | ||
| mutableStateOf(false) | ||
| } | ||
|
|
||
| var text by rememberSaveable { | ||
| mutableStateOf( | ||
| DataStoreUtils.getSyncData(getString(R.string.store_custom_config), "") | ||
| ) | ||
| } | ||
|
|
||
| FlatButton(content = { | ||
| RowContent( | ||
| title = R.string.settings_custom, | ||
| subTitle = R.string.settings_custom_subtitle, | ||
| icon = { | ||
| ResourceIcon( | ||
| iconResource = R.drawable.tune | ||
| ) | ||
| }) | ||
| }, onClick = { | ||
| showDialog.value = true | ||
| }) | ||
|
|
||
| if (showDialog.value) { | ||
| Dialog(onDismissRequest = { showDialog.value = false }) { | ||
| Column( | ||
| modifier = Modifier | ||
| .background(MaterialTheme.colorScheme.background) | ||
| .padding(16.dp), | ||
| verticalArrangement = Arrangement.Center, | ||
| horizontalAlignment = Alignment.CenterHorizontally, | ||
| ) { | ||
| Text(stringResource(id = R.string.dialog_edit_custom_config)) | ||
| OutlinedTextField(value = text, onValueChange = { | ||
| text = it | ||
| }, minLines = 3) | ||
| Row( | ||
| modifier = Modifier | ||
| .fillMaxWidth(), | ||
| horizontalArrangement = Arrangement.Center, | ||
| ) { | ||
| TextButton( | ||
| onClick = { showDialog.value = false }, | ||
| modifier = Modifier.padding(8.dp), | ||
| ) { | ||
| Text(stringResource(id = R.string.dialog_dismiss)) | ||
| } | ||
| TextButton( | ||
| onClick = { | ||
| showDialog.value = false | ||
| if (text.isEmpty()) { | ||
| DataStoreUtils.removeSync(getString(R.string.store_custom_config)) | ||
| } else { | ||
| DataStoreUtils.putSyncData( | ||
| getString(R.string.store_custom_config), | ||
| text | ||
| ) | ||
| } | ||
| configViewModel.readConfig() | ||
| }, | ||
| modifier = Modifier.padding(8.dp), | ||
| ) { | ||
| Text(stringResource(id = R.string.dialog_confirm)) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
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.