diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountPreferenceFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountPreferenceFragment.kt index bcc8e629b..d4c66e6ff 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountPreferenceFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountPreferenceFragment.kt @@ -185,14 +185,7 @@ class AccountPreferenceFragment : "APIToken" -> { ApiTokenBottomSheetFragment( - apiToken = hostConfig.apiKey, { copiedToken -> - (activity as? SnackbarActivity)?.showSnackbar( - content = getString(R.string.copied_to_clipboard, copiedToken), - displayType = HabiticaSnackbar.SnackbarDisplayType.SUCCESS, - ) - }, - - ).show(childFragmentManager, ApiTokenBottomSheetFragment.TAG) + apiToken = hostConfig.apiKey).show(childFragmentManager, ApiTokenBottomSheetFragment.TAG) return true } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/ApiTokenBottomSheetFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/ApiTokenBottomSheetFragment.kt index 16b0325e7..15a2bd82e 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/ApiTokenBottomSheetFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/ApiTokenBottomSheetFragment.kt @@ -6,11 +6,13 @@ import android.view.View import android.view.ViewGroup import androidx.compose.ui.platform.ComposeView import com.google.android.material.bottomsheet.BottomSheetDialogFragment +import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.ui.views.ApiTokenBottomSheet +import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar +import com.habitrpg.android.habitica.ui.views.SnackbarActivity class ApiTokenBottomSheetFragment( - private val apiToken: String, - private val onCopyToken: (String) -> Unit, + private val apiToken: String ) : BottomSheetDialogFragment() { override fun onCreateView( inflater: LayoutInflater, @@ -19,7 +21,13 @@ class ApiTokenBottomSheetFragment( ): View { return ComposeView(requireContext()).apply { setContent { - ApiTokenBottomSheet(apiToken = apiToken, onCopyToken = onCopyToken) + ApiTokenBottomSheet(apiToken = apiToken, onCopyToken = { copiedToken -> + (activity as? SnackbarActivity)?.showSnackbar( + content = getString(R.string.copied_to_clipboard, copiedToken), + displayType = HabiticaSnackbar.SnackbarDisplayType.SUCCESS, + ) + dismiss() + }) } } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/ApiTokenBottomSheet.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/ApiTokenBottomSheet.kt index 9d4fafd4d..2a93bebb8 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/ApiTokenBottomSheet.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/ApiTokenBottomSheet.kt @@ -16,6 +16,7 @@ import androidx.compose.ui.unit.* import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.ui.theme.colors import com.habitrpg.common.habitica.theme.HabiticaTheme +import androidx.compose.ui.res.colorResource @Composable fun ApiTokenBottomSheet( @@ -29,7 +30,7 @@ fun ApiTokenBottomSheet( val fieldBackground = colors.contentBackground val mainText = colors.textPrimary val secondaryText = colors.textSecondary - val buttonBg = colors.tintedUiMain + val buttonBg = colorResource(id = R.color.yellow_100) val buttonText = colors.tintedUiDetails val lockIconColor = colors.textSecondary