From 81b801a2d62dd62a364d9a0e95d0cc00b13bdfe1 Mon Sep 17 00:00:00 2001 From: wiiznokes <78230769+wiiznokes@users.noreply.github.com> Date: Wed, 3 Jul 2024 18:22:57 +0200 Subject: [PATCH] fix: provider dd --- .../github/wiiznokes/gitnote/ui/model/Init.kt | 14 +++++----- .../gitnote/ui/screen/init/RemoteScreen.kt | 27 +++++++------------ 2 files changed, 17 insertions(+), 24 deletions(-) diff --git a/app/src/main/java/io/github/wiiznokes/gitnote/ui/model/Init.kt b/app/src/main/java/io/github/wiiznokes/gitnote/ui/model/Init.kt index 9162aa1..c16ac55 100644 --- a/app/src/main/java/io/github/wiiznokes/gitnote/ui/model/Init.kt +++ b/app/src/main/java/io/github/wiiznokes/gitnote/ui/model/Init.kt @@ -9,7 +9,7 @@ interface ProviderLink { val mainPage: String? val createRepo: String? val createToken: String? - val checkOutRepo: String? + val listRepo: String? } enum class Provider : ProviderLink { @@ -17,13 +17,13 @@ enum class Provider : ProviderLink { override val mainPage: String = "https://github.com/" override val createRepo: String = "https://github.com/new" override val createToken: String = "https://github.com/settings/tokens" - override val checkOutRepo: String? = null + override val listRepo: String? = null }, - Other { - override val mainPage: String? = null - override val createRepo: String? = null - override val createToken: String? = null - override val checkOutRepo: String? = null + GitLab { + override val mainPage: String = "https://gitlab.com/" + override val createRepo: String = "https://gitlab.com/projects/new#blank_project" + override val createToken: String = "https://gitlab.com/-/user_settings/personal_access_tokens" + override val listRepo: String = "https://gitlab.com/dashboard/projects" }, } diff --git a/app/src/main/java/io/github/wiiznokes/gitnote/ui/screen/init/RemoteScreen.kt b/app/src/main/java/io/github/wiiznokes/gitnote/ui/screen/init/RemoteScreen.kt index 6a96ead..0a2b42b 100644 --- a/app/src/main/java/io/github/wiiznokes/gitnote/ui/screen/init/RemoteScreen.kt +++ b/app/src/main/java/io/github/wiiznokes/gitnote/ui/screen/init/RemoteScreen.kt @@ -145,6 +145,7 @@ private fun OpenLinks( Text(text = it.name) }, onClick = { + providerExpanded = false provider.value = it vm.viewModelScope.launch { vm.prefs.provider.update(it) @@ -164,39 +165,32 @@ private fun OpenLinks( verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(5.dp) ) { - - provider.value.mainPage?.let { + provider.value.listRepo?.let { OpenLinkButton( - text = stringResource(R.string.quick_links_home_page), + text = stringResource(R.string.quick_links_see_repos), url = it ) } - - provider.value.createRepo?.let { + provider.value.createToken?.let { OpenLinkButton( - text = stringResource(R.string.quick_links_create_repo), + text = stringResource(R.string.quick_links_create_token), url = it ) } - - provider.value.createToken?.let { + provider.value.createRepo?.let { OpenLinkButton( - text = stringResource(R.string.quick_links_create_token), + text = stringResource(R.string.quick_links_create_repo), url = it ) } - - provider.value.checkOutRepo?.let { + provider.value.mainPage?.let { OpenLinkButton( - text = stringResource(R.string.quick_links_see_repos), + text = stringResource(R.string.quick_links_home_page), url = it ) } } - } - - } } } @@ -217,8 +211,7 @@ private fun ElevatedCard( modifier = Modifier .fillMaxWidth() .padding( - vertical = 20.dp, - horizontal = 15.dp + vertical = 20.dp, horizontal = 15.dp ), horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(10.dp)