From fc73b80221004743cbb10fe7f289d6a87324951f Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Mon, 13 Jan 2020 23:42:56 +0100 Subject: [PATCH] Better server entry view Signed-off-by: Mario Danic --- .../nextcloud/talk/activities/MainActivity.kt | 3 +- .../application/NextcloudTalkApplication.kt | 3 +- .../talk/controllers/SettingsController.kt | 4 +- .../newarch/di/module/ConversationsModule.kt | 1 - .../talk/newarch/di/module/ServerModule.kt | 16 +++++ .../ServerEntryCapabilitiesCheckState.kt | 7 ++- .../features/account/ServerEntryView.kt | 59 +++++++++++++++++-- .../features/account/ServerEntryViewModel.kt | 11 ++-- ...tory.kt => ServerEntryViewModelFactory.kt} | 2 +- .../account/di/module/AccountModule.kt | 24 ++++++++ app/src/main/res/layout/server_entry_view.xml | 1 - app/src/main/res/values-b+en+001/strings.xml | 2 +- app/src/main/res/values-ca/strings.xml | 2 +- app/src/main/res/values-cs-rCZ/strings.xml | 2 +- app/src/main/res/values-da/strings.xml | 2 +- app/src/main/res/values-de/strings.xml | 2 +- app/src/main/res/values-el/strings.xml | 2 +- app/src/main/res/values-es-rAR/strings.xml | 2 +- app/src/main/res/values-es-rCL/strings.xml | 2 +- app/src/main/res/values-es-rCO/strings.xml | 2 +- app/src/main/res/values-es-rCR/strings.xml | 2 +- app/src/main/res/values-es-rDO/strings.xml | 2 +- app/src/main/res/values-es-rEC/strings.xml | 2 +- app/src/main/res/values-es-rGT/strings.xml | 2 +- app/src/main/res/values-es-rMX/strings.xml | 2 +- app/src/main/res/values-es-rSV/strings.xml | 2 +- app/src/main/res/values-es/strings.xml | 2 +- app/src/main/res/values-fi-rFI/strings.xml | 2 +- app/src/main/res/values-fr/strings.xml | 2 +- app/src/main/res/values-gl/strings.xml | 2 +- app/src/main/res/values-hr/strings.xml | 2 +- app/src/main/res/values-hu-rHU/strings.xml | 2 +- app/src/main/res/values-is/strings.xml | 2 +- app/src/main/res/values-it/strings.xml | 2 +- app/src/main/res/values-iw/strings.xml | 2 +- app/src/main/res/values-ja-rJP/strings.xml | 2 +- app/src/main/res/values-ko/strings.xml | 2 +- app/src/main/res/values-lt-rLT/strings.xml | 2 +- app/src/main/res/values-nb-rNO/strings.xml | 2 +- app/src/main/res/values-nl/strings.xml | 2 +- app/src/main/res/values-pl/strings.xml | 2 +- app/src/main/res/values-pt-rBR/strings.xml | 2 +- app/src/main/res/values-pt-rPT/strings.xml | 2 +- app/src/main/res/values-ru/strings.xml | 2 +- app/src/main/res/values-sk-rSK/strings.xml | 2 +- app/src/main/res/values-sl/strings.xml | 2 +- app/src/main/res/values-sq/strings.xml | 2 +- app/src/main/res/values-sr/strings.xml | 2 +- app/src/main/res/values-sv/strings.xml | 2 +- app/src/main/res/values-tr/strings.xml | 2 +- app/src/main/res/values-vi/strings.xml | 2 +- app/src/main/res/values-zh-rCN/strings.xml | 2 +- app/src/main/res/values-zh-rTW/strings.xml | 2 +- app/src/main/res/values/strings.xml | 3 +- 54 files changed, 156 insertions(+), 62 deletions(-) create mode 100644 app/src/main/java/com/nextcloud/talk/newarch/di/module/ServerModule.kt rename app/src/main/java/com/nextcloud/talk/newarch/features/account/{ServerEntryVideModelFactory.kt => ServerEntryViewModelFactory.kt} (95%) create mode 100644 app/src/main/java/com/nextcloud/talk/newarch/features/account/di/module/AccountModule.kt diff --git a/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt index f0880cbad..436c91f3e 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt @@ -43,6 +43,7 @@ import com.nextcloud.talk.controllers.LockedController import com.nextcloud.talk.controllers.ServerSelectionController import com.nextcloud.talk.controllers.base.providers.ActionBarProvider import com.nextcloud.talk.newarch.domain.repository.offline.UsersRepository +import com.nextcloud.talk.newarch.features.account.ServerEntryView import com.nextcloud.talk.newarch.features.conversationsList.ConversationsListView import com.nextcloud.talk.newarch.local.models.UserNgEntity import com.nextcloud.talk.utils.ConductorRemapping @@ -90,7 +91,7 @@ class MainActivity : BaseActivity(), ActionBarProvider { } else { runOnUiThread { router!!.setRoot( - RouterTransaction.with(ServerSelectionController()) + RouterTransaction.with(ServerEntryView()) .pushChangeHandler(HorizontalChangeHandler()) .popChangeHandler(HorizontalChangeHandler()) ) diff --git a/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.kt b/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.kt index c827a3c17..827277521 100644 --- a/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.kt +++ b/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.kt @@ -47,6 +47,7 @@ import com.nextcloud.talk.models.database.UserEntity import com.nextcloud.talk.models.json.capabilities.Capabilities import com.nextcloud.talk.models.json.push.PushConfigurationState import com.nextcloud.talk.newarch.di.module.* +import com.nextcloud.talk.newarch.features.account.di.module.AccountModule import com.nextcloud.talk.newarch.features.conversationsList.di.module.ConversationsListModule import com.nextcloud.talk.newarch.local.dao.UsersDao import com.nextcloud.talk.newarch.local.models.UserNgEntity @@ -180,7 +181,7 @@ class NextcloudTalkApplication : Application(), LifecycleObserver { startKoin { androidContext(this@NextcloudTalkApplication) androidLogger() - modules(listOf(CommunicationModule, StorageModule, NetworkModule, ConversationsModule, ConversationsListModule, ServiceModule)) + modules(listOf(CommunicationModule, StorageModule, NetworkModule, ConversationsModule, ConversationsListModule, ServiceModule, AccountModule, ServerModule)) } } diff --git a/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.kt b/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.kt index a5edecd00..0393dd4e1 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.kt +++ b/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.kt @@ -640,12 +640,12 @@ class SettingsController : BaseController() { messageText!!.text = resources!!.getString(R.string.nc_settings_wrong_account) messageView!!.visibility = View.VISIBLE messageText!!.setTextColor(resources!!.getColor(R.color.colorPrimary)) - messageText!!.text = resources!!.getString(R.string.nc_Server_account_imported) + messageText!!.text = resources!!.getString(R.string.nc_server_account_imported) messageView!!.visibility = View.VISIBLE } ApplicationWideMessageHolder.MessageType.ACCOUNT_WAS_IMPORTED -> { messageText!!.setTextColor(resources!!.getColor(R.color.colorPrimary)) - messageText!!.text = resources!!.getString(R.string.nc_Server_account_imported) + messageText!!.text = resources!!.getString(R.string.nc_server_account_imported) messageView!!.visibility = View.VISIBLE } ApplicationWideMessageHolder.MessageType.FAILED_TO_IMPORT_ACCOUNT -> { diff --git a/app/src/main/java/com/nextcloud/talk/newarch/di/module/ConversationsModule.kt b/app/src/main/java/com/nextcloud/talk/newarch/di/module/ConversationsModule.kt index a2eec7c37..dcd2ddaa7 100644 --- a/app/src/main/java/com/nextcloud/talk/newarch/di/module/ConversationsModule.kt +++ b/app/src/main/java/com/nextcloud/talk/newarch/di/module/ConversationsModule.kt @@ -18,7 +18,6 @@ val ConversationsModule = module { single { createDeleteConversationUseCase(get(), get()) } single { createJoinConversationUseCase(get(), get()) } single { createExitConversationUseCase(get(), get()) } - factory { createChatViewModelFactory(get(), get(), get(), get(), get(), get()) } } diff --git a/app/src/main/java/com/nextcloud/talk/newarch/di/module/ServerModule.kt b/app/src/main/java/com/nextcloud/talk/newarch/di/module/ServerModule.kt new file mode 100644 index 000000000..4ff155c04 --- /dev/null +++ b/app/src/main/java/com/nextcloud/talk/newarch/di/module/ServerModule.kt @@ -0,0 +1,16 @@ +package com.nextcloud.talk.newarch.di.module + +import com.nextcloud.talk.newarch.data.source.remote.ApiErrorHandler +import com.nextcloud.talk.newarch.domain.repository.online.NextcloudTalkRepository +import com.nextcloud.talk.newarch.domain.usecases.GetCapabilitiesUseCase +import org.koin.dsl.module + +val ServerModule = module { + single { createGetCapabilitiesUseCase(get(), get()) } +} + +fun createGetCapabilitiesUseCase(nextcloudTalkRepository: NextcloudTalkRepository, + apiErrorHandler: ApiErrorHandler +): GetCapabilitiesUseCase { + return GetCapabilitiesUseCase(nextcloudTalkRepository, apiErrorHandler) +} \ No newline at end of file diff --git a/app/src/main/java/com/nextcloud/talk/newarch/features/account/ServerEntryCapabilitiesCheckState.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/account/ServerEntryCapabilitiesCheckState.kt index 770f6ddb4..9338111a1 100644 --- a/app/src/main/java/com/nextcloud/talk/newarch/features/account/ServerEntryCapabilitiesCheckState.kt +++ b/app/src/main/java/com/nextcloud/talk/newarch/features/account/ServerEntryCapabilitiesCheckState.kt @@ -22,9 +22,14 @@ package com.nextcloud.talk.newarch.features.account +import kotlinx.serialization.Serializable + enum class ServerEntryCapabilitiesCheckState { WAITING_FOR_INPUT, CHECKING, SERVER_UNSUPPORTED, SERVER_SUPPORTED -} \ No newline at end of file +} + +@Serializable +data class ServerEntryCapabilitiesCheckStateWrapper(val checkState: ServerEntryCapabilitiesCheckState, val url: String?) \ No newline at end of file diff --git a/app/src/main/java/com/nextcloud/talk/newarch/features/account/ServerEntryView.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/account/ServerEntryView.kt index 3d3b48930..50273ef7e 100644 --- a/app/src/main/java/com/nextcloud/talk/newarch/features/account/ServerEntryView.kt +++ b/app/src/main/java/com/nextcloud/talk/newarch/features/account/ServerEntryView.kt @@ -22,19 +22,27 @@ package com.nextcloud.talk.newarch.features.account +import android.os.Bundle import android.view.LayoutInflater +import android.view.MotionEvent import android.view.View import android.view.ViewGroup import androidx.core.view.isVisible +import androidx.core.widget.doOnTextChanged import androidx.lifecycle.Observer +import com.bluelinelabs.conductor.RouterTransaction +import com.bluelinelabs.conductor.changehandler.HorizontalChangeHandler import com.nextcloud.talk.R import com.nextcloud.talk.newarch.conversationsList.mvp.BaseView +import com.nextcloud.talk.utils.bundle.BundleKeys import kotlinx.android.synthetic.main.server_entry_view.view.* +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext import org.koin.android.ext.android.inject class ServerEntryView : BaseView() { private lateinit var viewModel: ServerEntryViewModel - val factory: ServerEntryVideModelFactory by inject() + val factory: ServerEntryViewModelFactory by inject() override fun getLayoutId(): Int { return R.layout.server_entry_view @@ -46,32 +54,71 @@ class ServerEntryView : BaseView() { viewModel = viewModelProvider(factory).get(ServerEntryViewModel::class.java) val view = super.onCreateView(inflater, container) + view.serverEntryTextInputEditText.setCompoundDrawablesWithIntrinsicBounds(null, null, resources?.getDrawable(R.drawable.ic_arrow_forward_white_24px), null) + view.serverEntryTextInputEditText.compoundDrawables[2].alpha = 99 + viewModel.apply { checkState.observe(this@ServerEntryView, Observer { - when(it) { + when(it.checkState) { ServerEntryCapabilitiesCheckState.WAITING_FOR_INPUT -> { view.serverEntryTextInputLayout.isEnabled = true view.serverEntryProgressBar.isVisible = false - view.serverEntryTextInputEditText.setCompoundDrawablesRelative(null, null, resources?.getDrawable(R.drawable.ic_arrow_forward_white_24px), null) } ServerEntryCapabilitiesCheckState.CHECKING -> { view.serverEntryTextInputLayout.isEnabled = false - view.serverEntryTextInputEditText.setCompoundDrawablesRelative(null, null, null, null) + view.serverEntryTextInputEditText.compoundDrawables[2].alpha = 0 view.serverEntryProgressBar.isVisible = true } ServerEntryCapabilitiesCheckState.SERVER_SUPPORTED -> { - + val bundle = Bundle() + bundle.putString(BundleKeys.KEY_BASE_URL, it.url) + //router.pushController(RouterTransaction.with(LoginEntryView(bundle)).popChangeHandler(HorizontalChangeHandler()).pushChangeHandler(HorizontalChangeHandler())) } // Unsupported else -> { view.serverEntryTextInputLayout.isEnabled = true view.serverEntryProgressBar.isVisible = false - view.serverEntryTextInputEditText.setCompoundDrawablesRelative(null, null, resources?.getDrawable(R.drawable.ic_arrow_forward_white_24px), null) + view.serverEntryTextInputLayout.error = resources?.getString(R.string.nc_server_unsupported) + view.serverEntryTextInputEditText.compoundDrawables[2].alpha = 99 } } }) } + view.serverEntryTextInputEditText.doOnTextChanged { text, start, count, after -> + view.serverEntryTextInputLayout.error = null + + if (text.isNullOrBlank()) { + view.serverEntryTextInputEditText.compoundDrawables[2].alpha = 99 + } else { + view.serverEntryTextInputEditText.compoundDrawables[2].alpha = 255 + } + } + + view.serverEntryTextInputEditText.setOnTouchListener { v, event -> + val drawableLeft = 0 + val drawableTop = 1 + val drawableRight = 2 + val drawableBottom = 3 + + if(event.action == MotionEvent.ACTION_UP) { + if(event.rawX >= (view.serverEntryTextInputEditText.right - view.serverEntryTextInputEditText.compoundDrawables[drawableRight].bounds.width())) { + if (view.serverEntryTextInputEditText.compoundDrawables[drawableRight].alpha == 255) { + view.serverEntryTextInputEditText?.text?.let { serverUrl -> + var baseUrl = serverUrl.toString() + if (!serverUrl.startsWith("http://") && !serverUrl.startsWith("https://")) { + baseUrl = "https://$serverUrl" + } + viewModel.fetchCapabilities(baseUrl) + true + } + } + } + } + + false + } + return view } } \ No newline at end of file diff --git a/app/src/main/java/com/nextcloud/talk/newarch/features/account/ServerEntryViewModel.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/account/ServerEntryViewModel.kt index 04005f066..286164612 100644 --- a/app/src/main/java/com/nextcloud/talk/newarch/features/account/ServerEntryViewModel.kt +++ b/app/src/main/java/com/nextcloud/talk/newarch/features/account/ServerEntryViewModel.kt @@ -24,6 +24,7 @@ package com.nextcloud.talk.newarch.features.account import android.app.Application import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.distinctUntilChanged import androidx.lifecycle.viewModelScope import com.nextcloud.talk.models.json.capabilities.CapabilitiesOverall import com.nextcloud.talk.newarch.conversationsList.mvp.BaseViewModel @@ -36,22 +37,22 @@ class ServerEntryViewModel constructor( application: Application, private val getCapabilitiesUseCase: GetCapabilitiesUseCase ) : BaseViewModel(application) { - val checkState: MutableLiveData = MutableLiveData(ServerEntryCapabilitiesCheckState.WAITING_FOR_INPUT) + val checkState: MutableLiveData = MutableLiveData(ServerEntryCapabilitiesCheckStateWrapper(ServerEntryCapabilitiesCheckState.WAITING_FOR_INPUT, null)) fun fetchCapabilities(url: String) { - checkState.postValue(ServerEntryCapabilitiesCheckState.CHECKING) + checkState.postValue(ServerEntryCapabilitiesCheckStateWrapper(ServerEntryCapabilitiesCheckState.CHECKING, url)) getCapabilitiesUseCase.invoke(viewModelScope, parametersOf(url), object : UseCaseResponse { override suspend fun onSuccess(result: CapabilitiesOverall) { val hasSupportedTalkVersion = result.ocs?.data?.capabilities?.spreedCapability?.features?.contains("no-ping") == true if (hasSupportedTalkVersion) { - checkState.postValue(ServerEntryCapabilitiesCheckState.SERVER_SUPPORTED) + checkState.postValue(ServerEntryCapabilitiesCheckStateWrapper(ServerEntryCapabilitiesCheckState.SERVER_SUPPORTED, url)) } else { - checkState.postValue(ServerEntryCapabilitiesCheckState.SERVER_UNSUPPORTED) + checkState.postValue(ServerEntryCapabilitiesCheckStateWrapper(ServerEntryCapabilitiesCheckState.SERVER_UNSUPPORTED, url)) } } override suspend fun onError(errorModel: ErrorModel?) { - checkState.postValue(ServerEntryCapabilitiesCheckState.SERVER_UNSUPPORTED) + checkState.postValue(ServerEntryCapabilitiesCheckStateWrapper(ServerEntryCapabilitiesCheckState.SERVER_UNSUPPORTED, url)) } }) diff --git a/app/src/main/java/com/nextcloud/talk/newarch/features/account/ServerEntryVideModelFactory.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/account/ServerEntryViewModelFactory.kt similarity index 95% rename from app/src/main/java/com/nextcloud/talk/newarch/features/account/ServerEntryVideModelFactory.kt rename to app/src/main/java/com/nextcloud/talk/newarch/features/account/ServerEntryViewModelFactory.kt index 82630f9bb..90958933d 100644 --- a/app/src/main/java/com/nextcloud/talk/newarch/features/account/ServerEntryVideModelFactory.kt +++ b/app/src/main/java/com/nextcloud/talk/newarch/features/account/ServerEntryViewModelFactory.kt @@ -27,7 +27,7 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import com.nextcloud.talk.newarch.domain.usecases.GetCapabilitiesUseCase -class ServerEntryVideModelFactory constructor(private val application: Application, private val getCapabilitiesUseCase: GetCapabilitiesUseCase): ViewModelProvider.Factory { +class ServerEntryViewModelFactory constructor(private val application: Application, private val getCapabilitiesUseCase: GetCapabilitiesUseCase): ViewModelProvider.Factory { override fun create(modelClass: Class): T { return ServerEntryViewModel(application, getCapabilitiesUseCase) as T } diff --git a/app/src/main/java/com/nextcloud/talk/newarch/features/account/di/module/AccountModule.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/account/di/module/AccountModule.kt new file mode 100644 index 000000000..4771ee0a0 --- /dev/null +++ b/app/src/main/java/com/nextcloud/talk/newarch/features/account/di/module/AccountModule.kt @@ -0,0 +1,24 @@ +package com.nextcloud.talk.newarch.features.account.di.module + +import android.app.Application +import com.nextcloud.talk.newarch.domain.usecases.GetCapabilitiesUseCase +import com.nextcloud.talk.newarch.features.account.ServerEntryViewModelFactory +import org.koin.android.ext.koin.androidApplication +import org.koin.dsl.module + +val AccountModule = module { + factory { + createServerEntryViewModelFactory( + androidApplication(), get() + ) + } +} + +fun createServerEntryViewModelFactory( + application: Application, + getCapabilitiesUseCase: GetCapabilitiesUseCase +): ServerEntryViewModelFactory { + return ServerEntryViewModelFactory( + application, getCapabilitiesUseCase + ) +} \ No newline at end of file diff --git a/app/src/main/res/layout/server_entry_view.xml b/app/src/main/res/layout/server_entry_view.xml index 85d110c4e..a2ec25105 100644 --- a/app/src/main/res/layout/server_entry_view.xml +++ b/app/src/main/res/layout/server_entry_view.xml @@ -56,7 +56,6 @@ android:hint="@string/nc_server_url" android:imeOptions="actionDone" android:inputType="textUri" - android:drawableEnd="@drawable/ic_arrow_forward_white_24px" android:paddingTop="20dp" android:paddingBottom="20dp" android:singleLine="true" diff --git a/app/src/main/res/values-b+en+001/strings.xml b/app/src/main/res/values-b+en+001/strings.xml index 590d99ff0..072e37f84 100644 --- a/app/src/main/res/values-b+en+001/strings.xml +++ b/app/src/main/res/values-b+en+001/strings.xml @@ -33,7 +33,7 @@ Import account from the %1$s app Import accounts from the %1$s app Failed to import selected account - Selected account is now imported and available + Selected account is now imported and available Do you not have a server yet?\nClick here to get one from a provider diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index a8bf61a89..e3624110b 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -33,7 +33,7 @@ importa el compte des de l\'aplicació %1$s importa els comptes des de l\'aplicació %1$s Ha fallat la importació del compte seleccionat - El compte que heu seleccionat s\'ha importat i ja és disponible + El compte que heu seleccionat s\'ha importat i ja és disponible Encara no teniu cap servidor?\nFeu clic aquí per obtenir-ne un d\'un proveïdor diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml index 552131d05..1c8422189 100644 --- a/app/src/main/res/values-cs-rCZ/strings.xml +++ b/app/src/main/res/values-cs-rCZ/strings.xml @@ -33,7 +33,7 @@ Importovat účet z aplikace %1$s Importovat účty z aplikace %1$s Vyznačený účet se nepodařilo naimportovat - Vyznačený účet byl importován a je k dispozici + Vyznačený účet byl importován a je k dispozici Nemáte ještě server?\nKliknutím sem ho získejte od poskytovatele diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 5309d4474..c4d91344a 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -33,7 +33,7 @@ Importer konto fra %1$s appen Importer konti fra %1$s appen Den valgte konto kunne ikke importeres - Den valgte konto blev importeret og kan bruges nu + Den valgte konto blev importeret og kan bruges nu Har du ikke en server endnu?\nKlik her for at skaffe en udbyder diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 6d0d75d22..3406be8e3 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -33,7 +33,7 @@ Importieren Sie ein Konto aus der App %1$s Importieren Sie Konten aus der App %1$s Das Importieren des ausgewählten Kontos ist fehlgeschlagen - Das ausgewählte Konto ist nun importiert und verfügbar + Das ausgewählte Konto ist nun importiert und verfügbar Sie haben noch keinen Server?\nKlicken Sie hier um Server-Anbieter zu finden diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 0c5b48b34..90f09c812 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -32,7 +32,7 @@ Εισαγωγή λογαριασμού από την %1$s εφαρμογή Εισαγωγή λογαριασμών από την εφαρμογή %1$s Αποτυχία εισαγωγής επιλεγμένου λογαριασμού - Ο επιλεγμένος λογαριασμός έχει εισαχθεί και είναι διαθέσιμος + Ο επιλεγμένος λογαριασμός έχει εισαχθεί και είναι διαθέσιμος Δεν έχετε ακόμα διακομιστή;\nΚάντε κλικ εδώ για να αποκτήσετε έναν από κάποιον πάροχο diff --git a/app/src/main/res/values-es-rAR/strings.xml b/app/src/main/res/values-es-rAR/strings.xml index 4afe1c051..308fd8b2a 100644 --- a/app/src/main/res/values-es-rAR/strings.xml +++ b/app/src/main/res/values-es-rAR/strings.xml @@ -28,7 +28,7 @@ Importar cuenta Importar cuentas Error al importar la cuenta seleccionada - La cuenta seleccionada ahora está importada y disponible + La cuenta seleccionada ahora está importada y disponible Aún no tiene un servidor? \nHaga click aquí para obtener uno de un proveedor diff --git a/app/src/main/res/values-es-rCL/strings.xml b/app/src/main/res/values-es-rCL/strings.xml index 83ae8f2df..89377eb2c 100644 --- a/app/src/main/res/values-es-rCL/strings.xml +++ b/app/src/main/res/values-es-rCL/strings.xml @@ -33,7 +33,7 @@ Importar cuenta de la aplicación %1$s Importar cuentas de la aplicación %1$s Se presentó una falla al importar la cuenta seleccionada - La cuenta seleccionada ha sido importada y está disponible + La cuenta seleccionada ha sido importada y está disponible ¿Aún no cuentas con un servidor?\nHaz click aquí para obtener uno de un proveedor diff --git a/app/src/main/res/values-es-rCO/strings.xml b/app/src/main/res/values-es-rCO/strings.xml index d5c381503..6cd44e728 100644 --- a/app/src/main/res/values-es-rCO/strings.xml +++ b/app/src/main/res/values-es-rCO/strings.xml @@ -33,7 +33,7 @@ Importar cuenta de la aplicación %1$s Importar cuentas de la aplicación %1$s Se presentó una falla al importar la cuenta seleccionada - La cuenta seleccionada ha sido importada y está disponible + La cuenta seleccionada ha sido importada y está disponible ¿Aún no cuentas con un servidor?\nHaz click aquí para obtener uno de un proveedor diff --git a/app/src/main/res/values-es-rCR/strings.xml b/app/src/main/res/values-es-rCR/strings.xml index 714c48a80..7cd27c159 100644 --- a/app/src/main/res/values-es-rCR/strings.xml +++ b/app/src/main/res/values-es-rCR/strings.xml @@ -33,7 +33,7 @@ Importar cuenta de la aplicación %1$s Importar cuentas de la aplicación %1$s Se presentó una falla al importar la cuenta seleccionada - La cuenta seleccionada ha sido importada y está disponible + La cuenta seleccionada ha sido importada y está disponible ¿Aún no cuentas con un servidor?\nHaz click aquí para obtener uno de un proveedor diff --git a/app/src/main/res/values-es-rDO/strings.xml b/app/src/main/res/values-es-rDO/strings.xml index 714c48a80..7cd27c159 100644 --- a/app/src/main/res/values-es-rDO/strings.xml +++ b/app/src/main/res/values-es-rDO/strings.xml @@ -33,7 +33,7 @@ Importar cuenta de la aplicación %1$s Importar cuentas de la aplicación %1$s Se presentó una falla al importar la cuenta seleccionada - La cuenta seleccionada ha sido importada y está disponible + La cuenta seleccionada ha sido importada y está disponible ¿Aún no cuentas con un servidor?\nHaz click aquí para obtener uno de un proveedor diff --git a/app/src/main/res/values-es-rEC/strings.xml b/app/src/main/res/values-es-rEC/strings.xml index 714c48a80..7cd27c159 100644 --- a/app/src/main/res/values-es-rEC/strings.xml +++ b/app/src/main/res/values-es-rEC/strings.xml @@ -33,7 +33,7 @@ Importar cuenta de la aplicación %1$s Importar cuentas de la aplicación %1$s Se presentó una falla al importar la cuenta seleccionada - La cuenta seleccionada ha sido importada y está disponible + La cuenta seleccionada ha sido importada y está disponible ¿Aún no cuentas con un servidor?\nHaz click aquí para obtener uno de un proveedor diff --git a/app/src/main/res/values-es-rGT/strings.xml b/app/src/main/res/values-es-rGT/strings.xml index d5c381503..6cd44e728 100644 --- a/app/src/main/res/values-es-rGT/strings.xml +++ b/app/src/main/res/values-es-rGT/strings.xml @@ -33,7 +33,7 @@ Importar cuenta de la aplicación %1$s Importar cuentas de la aplicación %1$s Se presentó una falla al importar la cuenta seleccionada - La cuenta seleccionada ha sido importada y está disponible + La cuenta seleccionada ha sido importada y está disponible ¿Aún no cuentas con un servidor?\nHaz click aquí para obtener uno de un proveedor diff --git a/app/src/main/res/values-es-rMX/strings.xml b/app/src/main/res/values-es-rMX/strings.xml index 2a30e10f8..65da206ba 100644 --- a/app/src/main/res/values-es-rMX/strings.xml +++ b/app/src/main/res/values-es-rMX/strings.xml @@ -33,7 +33,7 @@ Importar cuenta de la aplicación %1$s Importar cuentas de la aplicación %1$s Se presentó una falla al importar la cuenta seleccionada - La cuenta seleccionada ha sido importada y está disponible + La cuenta seleccionada ha sido importada y está disponible ¿Aún no cuentas con un servidor?\nHaz click aquí para obtener uno de un proveedor diff --git a/app/src/main/res/values-es-rSV/strings.xml b/app/src/main/res/values-es-rSV/strings.xml index 714c48a80..7cd27c159 100644 --- a/app/src/main/res/values-es-rSV/strings.xml +++ b/app/src/main/res/values-es-rSV/strings.xml @@ -33,7 +33,7 @@ Importar cuenta de la aplicación %1$s Importar cuentas de la aplicación %1$s Se presentó una falla al importar la cuenta seleccionada - La cuenta seleccionada ha sido importada y está disponible + La cuenta seleccionada ha sido importada y está disponible ¿Aún no cuentas con un servidor?\nHaz click aquí para obtener uno de un proveedor diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index ef4e57ad3..6d09c4412 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -33,7 +33,7 @@ Importar cuenta desde la app %1$s Importar cuentas desde la app %1$s No se ha podido importar la cuenta seleccionada - La cuenta seleccionada ha sido importada y ya está disponible + La cuenta seleccionada ha sido importada y ya está disponible ¿No tienes todavía un servidor?\nClic aquí para conseguir uno de un proveedor diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml index d98016599..48d986fe9 100644 --- a/app/src/main/res/values-fi-rFI/strings.xml +++ b/app/src/main/res/values-fi-rFI/strings.xml @@ -30,7 +30,7 @@ Tuo tili Tuo tilejä Valitun tilin tuominen epäonnistui - Valittu tili on nyt tuotu ja käytettävissä + Valittu tili on nyt tuotu ja käytettävissä Sovellusta %1$s ei ole asennettu, keskeytetään Etsi Tarkista varmenne diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 0fbf5fdb9..7be7e152f 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -33,7 +33,7 @@ Importer le compte depuis l\'application %1$s Importer les comptes depuis l\'application %1$s Échec lors de l\'importation des comptes sélectionnés - Le compte sélectionné est maintenant importé et disponible + Le compte sélectionné est maintenant importé et disponible Vous n\'avez pas encore de serveur?\nCliquez-ici pour en obtenir un chez un fournisseur d\'accès. diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index b83aeb47f..60ee85944 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -33,7 +33,7 @@ Importar unha conta dende a aplicación %1$s Importar contas dende a aplicación%1$s Produciuse un fallo ao importar a conta seleccionada - A conta seleccionada foi importada e xa está dispoñíbel + A conta seleccionada foi importada e xa está dispoñíbel Aínda non ten un servidor? \nPrema aquí para obter un dun provedo diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 36b08cec3..bf5c34fc7 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -33,7 +33,7 @@ Uvezi račun iz %1$s aplikacije Uvezi račune iz %1$s aplikacije Uvoz odabranog računa nije uspio - Odabrani račun sad je uvezen i dostupan + Odabrani račun sad je uvezen i dostupan Nemate poslužitelj?\nKliknite ovdje kako biste ga dobili od davatelja usluge diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml index 9dc4291c5..98ca40b29 100644 --- a/app/src/main/res/values-hu-rHU/strings.xml +++ b/app/src/main/res/values-hu-rHU/strings.xml @@ -33,7 +33,7 @@ Fiók importálása a(z) %1$s alkalmazásból Fiókok importálása a(z) %1$s alkalmazásból A kiválasztott fiók importálása sikertelen - A kiválasztott fiók importálva lett és elérhető + A kiválasztott fiók importálva lett és elérhető Nincs még saját kiszolgálója?\nKattintson ide a beszerzéshez az egyik szolgáltatótól diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml index dd99166ac..52b81afcd 100644 --- a/app/src/main/res/values-is/strings.xml +++ b/app/src/main/res/values-is/strings.xml @@ -33,7 +33,7 @@ Flytja inn aðgang úr %1$s forritinu Flytja inn aðganga úr %1$s forritinu Mistókst að flytja inn valinn notandaaðgang - Valinn aðgangur er núna fluttur inn og tiltækur + Valinn aðgangur er núna fluttur inn og tiltækur Ertu ekki enn með skýjaþjón?\nSmelltu hér til að fá þér einn frá þjónustuaðila. diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 90f41f35f..9696aee3d 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -33,7 +33,7 @@ Importa account dall\'applicazione %1$s Importa account dall\'applicazione %1$s Importazione dell\'account selezionato non riuscita - L\'account selezionato è ora importato e disponibile + L\'account selezionato è ora importato e disponibile Non hai ancora un server?\nFai clic qui per ottenerne uno da un fornitore diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index 218aaa0c3..9d9ccd975 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -33,7 +33,7 @@ ייבוא חשבון מהיישומון %1$s ייבוא חשבונות מהיישומון %1$s ייבוא החשבון הנבחר נכשל - החשבון שנבחר עבר ייבוא והוא זמין + החשבון שנבחר עבר ייבוא והוא זמין עדיין אין לך שרת?\nניתן ללחוץ כאן ולקבל אחת מספק diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml index edd958b59..212afc5c5 100644 --- a/app/src/main/res/values-ja-rJP/strings.xml +++ b/app/src/main/res/values-ja-rJP/strings.xml @@ -33,7 +33,7 @@ %1$sアプリからアカウントをインポートする %1$sアプリからアカウントをインポートする 選択したアカウントのインポートに失敗しました - 選択したアカウントがインポートされ、使用可能になりました + 選択したアカウントがインポートされ、使用可能になりました まだサーバーがありませんか？\ nプロバイダーから取得するにはここをクリックしてください diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 1b5980e21..68d6c4f57 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -33,7 +33,7 @@ %1$s 앱에서 계정 가져오기 %1$s 앱에서 계정 가져오기 선택한 계정을 가져올 수 없음 - 선택한 계정을 가져왔고 사용할 수 있음 + 선택한 계정을 가져왔고 사용할 수 있음 서버가 없으신가요?\n공급자를 알아보려면 누르십시오 diff --git a/app/src/main/res/values-lt-rLT/strings.xml b/app/src/main/res/values-lt-rLT/strings.xml index 2363dbd36..6a9fa6382 100644 --- a/app/src/main/res/values-lt-rLT/strings.xml +++ b/app/src/main/res/values-lt-rLT/strings.xml @@ -33,7 +33,7 @@ Importuoti paskyrą iš programėlės %1$s Importuoti paskyras iš programėlės %1$s Nepavyko importuoti pasirinktą paskyrą - Dabar, pasirinkta paskyra yra importuota ir prieinama + Dabar, pasirinkta paskyra yra importuota ir prieinama Neturite serverio? Spauskite čia, kad galėtumėte pasirinkti vieną iš paslaugų teikėjų Ieškoti diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index 11c2d6e59..ec9717f2f 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -33,7 +33,7 @@ Importer konto fra %1$s-appen Importer kontoer fra %1$s-appen Klarte ikke å importere valgt konto - Valgt konto er nå importert og tilgjengelig + Valgt konto er nå importert og tilgjengelig Har du ingen server enda?\nKlikk her for å opprette en hos en tilbyder diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 4a367ae90..55330b0e6 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -33,7 +33,7 @@ Importeren account van de %1$sapp Importeren accounts van de %1$sapp Kon het geselecteerde account niet importeren - Het geselecteerde account is nu geïmporteerd en beschikbaar + Het geselecteerde account is nu geïmporteerd en beschikbaar Heb je nog geen server?\n Kies er eentje van een provider. diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index a018dd479..3bb092baa 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -33,7 +33,7 @@ Importuj konto z aplikacji %1$s Importuj konta z aplikacji %1$s Nie udało się zaimportować wybranego konta - Wybrane konto jest zaimportowane i dostępne + Wybrane konto jest zaimportowane i dostępne Nie masz jeszcze serwera?\nKliknij tutaj, aby uzyskać jeden od dostawcy diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 310091a14..11160befb 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -33,7 +33,7 @@ Importar conta do aplicativo %1$s Importar contas do aplicativo %1$s Falha ao importar a conta - A conta selecionada foi importada e está disponível + A conta selecionada foi importada e está disponível Não tem servidor ainda?\nClique aqui para obter um diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 9cc4e57b3..ffec5c7b9 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -29,7 +29,7 @@ Importar conta da aplicação %1$s Importar contas da aplicação %1$s Não foi possível importar a conta selecionada - A conta selecionada foi importada e está disponível + A conta selecionada foi importada e está disponível Ainda não tem um servidor?\nClique aqui para obter um de um fornecedor diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index c2d294591..531944cb3 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -33,7 +33,7 @@ Импортировать учётную запись из приложения %1$s Импортировать учётные записи из приложения %1$s Не удалось импортировать выбранную учётную запись - Выбранная учётная запись теперь доступна + Выбранная учётная запись теперь доступна Нет своего сервера?\nНажмите здесь чтобы заказать у провайдера diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml index d90506422..d55c684f4 100644 --- a/app/src/main/res/values-sk-rSK/strings.xml +++ b/app/src/main/res/values-sk-rSK/strings.xml @@ -33,7 +33,7 @@ Importovať účet z aplikácie %1$s Importovať účty z aplikácie %1$s Nepodarilo sa importovať vybrané kontá - Vybrané účty sú teraz importované a dostupné + Vybrané účty sú teraz importované a dostupné Ešte nemáte server? \nKliknite sem a získajte jeden od poskytovateľa diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index a30f0c4c6..62a8213ce 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -33,7 +33,7 @@ Uvozi račun iz %1$s Uvozi račune iz %1$s Uvoz izbranega računa je spodletel - Izbran račun je uvožen in na voljo za uporabo + Izbran račun je uvožen in na voljo za uporabo Še nimate izbranega oziroma nameščenega strežnika? Kliknite in si pridobite dostop. diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml index 3baf848b0..3f3842de7 100644 --- a/app/src/main/res/values-sq/strings.xml +++ b/app/src/main/res/values-sq/strings.xml @@ -33,7 +33,7 @@ Importoni llogarinë nga %1$s aplikacioni Importoni llogaritë nga %1$s aplikacioni Dështoi të importonte llogarinë e përzgjedhur - Llogaria e përzgjedhur është tani e importuar dhe në dispozicion + Llogaria e përzgjedhur është tani e importuar dhe në dispozicion Akoma nuk ke një server ?\nKliko këtu për të marrë një nga një ofrues Emri i shfaqur nuk mund të merret, ndërpritet diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index c3cc00653..e206e63be 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -33,7 +33,7 @@ Увези налог из апликације %1$s Увези налоге из апликације %1$s Грешка при учитавању одабраног налога - Одабрани налог је сада увезен и доступан + Одабрани налог је сада увезен и доступан Имате ли сервер?nКликните овде да направите један код провајдера diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index cfce4294e..e8259a8ca 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -33,7 +33,7 @@ Importera konton från %1$s-appen Importera konton från %1$s-appen Misslyckades att importera valt konto - Valt konto är nu importerat och tillgängligt + Valt konto är nu importerat och tillgängligt Har du inte en server än?\nKlicka här för att få en från en leverantör diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 85b37bbec..2b1a33612 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -33,7 +33,7 @@ %1$s uygulamasındaki hesabı içe aktar %1$s uygulamasındaki hesapları içe aktar Seçilmiş hesap içe aktarılamadı - Seçilmiş hesap içe aktarıldı ve kullanılabilir + Seçilmiş hesap içe aktarıldı ve kullanılabilir Henüz bir sunucunuz yok mu?\Listeden bir hizmet sağlayıcısı seçebilirsiniz diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index d34eaf410..20bf413a9 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -33,7 +33,7 @@ Thêm tài khoản từ ứng dụng %1$s Thêm tài khoản từ ứng dụng %1$s Lỗi thêm tài khoản đã chọn - Bây giờ chọn tài khoản thêm vào và đang cho phép + Bây giờ chọn tài khoản thêm vào và đang cho phép Bạn đã có một máy chủ chưa?\nBấm vào đây để tìm từ một nhà cung cấp. diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 240758cc2..7b5022b7e 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -33,7 +33,7 @@ 从 %1$s 应用导入账号 从 %1$s 应用导入账号 选择的账号导入失败 - 所选账号现已导入并可立即使用 + 所选账号现已导入并可立即使用 还没有服务器吗？\n点此查看供应商 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 1f02ed06b..d54cd075e 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -33,7 +33,7 @@ 從%1$s應用程式匯入帳戶 從%1$s應用程式匯入帳戶 無法匯入所選的帳戶 - 選擇已匯入且可用的帳戶 + 選擇已匯入且可用的帳戶 您沒有自己的伺服器嗎？\n點這裡向服務供應商購買 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0f59d7621..f8925f376 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -33,7 +33,8 @@ Import account from the %1$s app Import accounts from the %1$s app Failed to import selected account - Selected account is now imported and available + Selected account is now imported and available + Server does not have supported Talk app installed Do you not have a server yet?\nClick here to get one from a provider