From 8dd5f88dbac8521370e2f268a4a638a0ed732002 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 7 May 2020 03:01:44 +0200 Subject: [PATCH] Identity: cleanup UI --- .../android/api/session/identity/IdentityService.kt | 6 ++++-- .../session/identity/DefaultIdentityService.kt | 4 ---- .../session/identity/db/RealmIdentityServerStore.kt | 2 ++ .../android/internal/session/profile/ProfileAPI.kt | 2 +- .../riotx/features/discovery/SettingsButtonItem.kt | 4 ++-- .../discovery/change/SetIdentityServerFragment.kt | 11 +++++------ .../main/res/layout/fragment_set_identity_server.xml | 5 +++-- vector/src/main/res/layout/item_settings_button.xml | 3 ++- .../res/layout/item_settings_button_single_line.xml | 6 +++--- .../src/main/res/layout/item_settings_edit_text.xml | 8 ++++---- .../src/main/res/layout/item_settings_helper_info.xml | 3 ++- .../res/layout/item_settings_radio_single_line.xml | 4 ++-- .../main/res/layout/item_settings_section_title.xml | 4 ++-- .../src/main/res/layout/item_settings_simple_item.xml | 4 ++-- ...menu_phone_number_addition.xml => menu_submit.xml} | 7 ++++--- 15 files changed, 38 insertions(+), 35 deletions(-) rename vector/src/main/res/menu/{menu_phone_number_addition.xml => menu_submit.xml} (54%) diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/identity/IdentityService.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/identity/IdentityService.kt index 668cae5e00..c5877cadeb 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/identity/IdentityService.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/identity/IdentityService.kt @@ -31,10 +31,12 @@ interface IdentityService { fun getCurrentIdentityServer(): String? + /** + * Update the identity server url. + * @param url the new url. Set to null to disconnect from the identity server + */ fun setNewIdentityServer(url: String?, callback: MatrixCallback): Cancelable - fun disconnect() - fun startBindSession(threePid: ThreePid, nothing: Nothing?, matrixCallback: MatrixCallback) fun finalizeBindSessionFor3PID(threePid: ThreePid, matrixCallback: MatrixCallback) fun submitValidationToken(pid: ThreePid, code: String, matrixCallback: MatrixCallback) diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/DefaultIdentityService.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/DefaultIdentityService.kt index 2c3447caa3..326b1fe595 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/DefaultIdentityService.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/DefaultIdentityService.kt @@ -114,10 +114,6 @@ internal class DefaultIdentityService @Inject constructor( return identityServiceStore.get()?.identityServerUrl } - override fun disconnect() { - TODO("Not yet implemented") - } - override fun startBindSession(threePid: ThreePid, nothing: Nothing?, matrixCallback: MatrixCallback) { TODO("Not yet implemented") } diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/db/RealmIdentityServerStore.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/db/RealmIdentityServerStore.kt index 7fc212a9eb..41a9f35016 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/db/RealmIdentityServerStore.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/db/RealmIdentityServerStore.kt @@ -17,11 +17,13 @@ package im.vector.matrix.android.internal.session.identity.db import im.vector.matrix.android.internal.di.IdentityDatabase +import im.vector.matrix.android.internal.session.SessionScope import im.vector.matrix.android.internal.session.identity.model.IdentityHashDetailResponse import io.realm.Realm import io.realm.RealmConfiguration import javax.inject.Inject +@SessionScope internal class RealmIdentityServerStore @Inject constructor( @IdentityDatabase private val realmConfiguration: RealmConfiguration diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/ProfileAPI.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/ProfileAPI.kt index a6b44efeb0..466c13d546 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/ProfileAPI.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/ProfileAPI.kt @@ -23,7 +23,7 @@ import retrofit2.Call import retrofit2.http.GET import retrofit2.http.Path -interface ProfileAPI { +internal interface ProfileAPI { /** * Get the combined profile information for this user. diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/SettingsButtonItem.kt b/vector/src/main/java/im/vector/riotx/features/discovery/SettingsButtonItem.kt index 8deb500e82..889d695b5f 100644 --- a/vector/src/main/java/im/vector/riotx/features/discovery/SettingsButtonItem.kt +++ b/vector/src/main/java/im/vector/riotx/features/discovery/SettingsButtonItem.kt @@ -55,10 +55,10 @@ abstract class SettingsButtonItem : EpoxyModelWithHolder { - holder.button.setTextColor(colorProvider.getColorFromAttribute(R.attr.colorAccent)) + holder.button.setTextColor(colorProvider.getColor(R.color.riotx_accent)) } SettingsTextButtonItem.ButtonStyle.DESTRUCTIVE -> { - holder.button.setTextColor(colorProvider.getColor(R.color.vector_error_color)) + holder.button.setTextColor(colorProvider.getColor(R.color.riotx_destructive_accent)) } } diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/change/SetIdentityServerFragment.kt b/vector/src/main/java/im/vector/riotx/features/discovery/change/SetIdentityServerFragment.kt index ea325810f2..0ea3f6ebe7 100644 --- a/vector/src/main/java/im/vector/riotx/features/discovery/change/SetIdentityServerFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/discovery/change/SetIdentityServerFragment.kt @@ -42,7 +42,7 @@ class SetIdentityServerFragment @Inject constructor( override fun getLayoutResId() = R.layout.fragment_set_identity_server - override fun getMenuRes() = R.menu.menu_phone_number_addition + override fun getMenuRes() = R.menu.menu_submit @BindView(R.id.discovery_identity_server_enter_til) lateinit var mKeyInputLayout: TextInputLayout @@ -73,17 +73,16 @@ class SetIdentityServerFragment @Inject constructor( } override fun onOptionsItemSelected(item: MenuItem): Boolean { - when (item.itemId) { - // TODO Create another menu - R.id.action_add_phone_number -> { + return when (item.itemId) { + R.id.action_submit -> { withState(viewModel) { state -> if (!state.isVerifyingServer) { viewModel.handle(SetIdentityServerAction.DoChangeServerName) } } - return true + true } - else -> return super.onOptionsItemSelected(item) + else -> super.onOptionsItemSelected(item) } } diff --git a/vector/src/main/res/layout/fragment_set_identity_server.xml b/vector/src/main/res/layout/fragment_set_identity_server.xml index 746346165f..336d89ebb6 100644 --- a/vector/src/main/res/layout/fragment_set_identity_server.xml +++ b/vector/src/main/res/layout/fragment_set_identity_server.xml @@ -3,8 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> + android:layout_height="match_parent">