From 4cc3e87d644d9ea4e38dcc7533dff6887e940a79 Mon Sep 17 00:00:00 2001 From: onurays Date: Thu, 23 Jul 2020 15:02:40 +0300 Subject: [PATCH] Fix rebranding assets on login screens. --- .../riotx/features/login/LoginActivity.kt | 9 ---- .../signout/soft/SoftLogoutController.kt | 4 -- .../signout/soft/epoxy/LoginHeaderItem.kt | 27 ------------ .../main/res/drawable/element_logotype.xml | 27 ------------ .../drawable/element_logotype_combined.xml | 43 +++++++++++++++++++ .../main/res/layout/activity_signed_out.xml | 5 --- vector/src/main/res/layout/fragment_login.xml | 5 --- .../res/layout/fragment_login_captcha.xml | 5 --- ...fragment_login_generic_text_input_form.xml | 5 --- .../layout/fragment_login_reset_password.xml | 5 --- ...login_reset_password_mail_confirmation.xml | 5 --- .../fragment_login_reset_password_success.xml | 5 --- .../fragment_login_server_selection.xml | 5 --- .../layout/fragment_login_server_url_form.xml | 5 --- ...fragment_login_signup_signin_selection.xml | 5 --- .../main/res/layout/fragment_login_splash.xml | 19 ++------ .../main/res/layout/fragment_login_terms.xml | 5 --- .../layout/fragment_login_wait_for_email.xml | 5 --- .../src/main/res/layout/item_login_header.xml | 9 ---- .../src/main/res/values-land/styles_login.xml | 15 ------- .../src/main/res/values-v21/styles_login.xml | 3 -- vector/src/main/res/values/styles_login.xml | 22 +--------- 22 files changed, 49 insertions(+), 189 deletions(-) delete mode 100644 vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginHeaderItem.kt delete mode 100644 vector/src/main/res/drawable/element_logotype.xml create mode 100644 vector/src/main/res/drawable/element_logotype_combined.xml delete mode 100644 vector/src/main/res/layout/item_login_header.xml diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginActivity.kt b/vector/src/main/java/im/vector/riotx/features/login/LoginActivity.kt index 845e628bc6..aa32c75ea6 100644 --- a/vector/src/main/java/im/vector/riotx/features/login/LoginActivity.kt +++ b/vector/src/main/java/im/vector/riotx/features/login/LoginActivity.kt @@ -73,14 +73,6 @@ open class LoginActivity : VectorBaseActivity(), ToolbarConfigurable { get() = supportFragmentManager.findFragmentById(R.id.loginFragmentContainer) private val commonOption: (FragmentTransaction) -> Unit = { ft -> - // Find the loginLogo on the current Fragment, this should not return null - (topFragment?.view as? ViewGroup) - // Find findViewById does not work, I do not know why - // findViewById(R.id.loginLogo) - ?.children - ?.firstOrNull { it.id == R.id.loginLogo } - ?.let { ft.addSharedElement(it, ViewCompat.getTransitionName(it) ?: "") } - // TODO ft.setCustomAnimations(enterAnim, exitAnim, popEnterAnim, popExitAnim) } @@ -145,7 +137,6 @@ open class LoginActivity : VectorBaseActivity(), ToolbarConfigurable { addFragmentToBackstack(R.id.loginFragmentContainer, LoginServerSelectionFragment::class.java, option = { ft -> - findViewById(R.id.loginSplashLogo)?.let { ft.addSharedElement(it, ViewCompat.getTransitionName(it) ?: "") } findViewById(R.id.loginSplashTitle)?.let { ft.addSharedElement(it, ViewCompat.getTransitionName(it) ?: "") } findViewById(R.id.loginSplashSubmit)?.let { ft.addSharedElement(it, ViewCompat.getTransitionName(it) ?: "") } // TODO Disabled because it provokes a flickering diff --git a/vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutController.kt b/vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutController.kt index 4711726a7b..fc428cf0ac 100644 --- a/vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutController.kt +++ b/vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutController.kt @@ -28,7 +28,6 @@ import im.vector.riotx.core.resources.StringProvider import im.vector.riotx.features.login.LoginMode import im.vector.riotx.features.signout.soft.epoxy.loginCenterButtonItem import im.vector.riotx.features.signout.soft.epoxy.loginErrorWithRetryItem -import im.vector.riotx.features.signout.soft.epoxy.loginHeaderItem import im.vector.riotx.features.signout.soft.epoxy.loginPasswordFormItem import im.vector.riotx.features.signout.soft.epoxy.loginRedButtonItem import im.vector.riotx.features.signout.soft.epoxy.loginTextItem @@ -65,9 +64,6 @@ class SoftLogoutController @Inject constructor( } private fun buildHeader(state: SoftLogoutViewState) { - loginHeaderItem { - id("header") - } loginTitleItem { id("title") text(stringProvider.getString(R.string.soft_logout_title)) diff --git a/vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginHeaderItem.kt b/vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginHeaderItem.kt deleted file mode 100644 index b4433b01f2..0000000000 --- a/vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginHeaderItem.kt +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright 2019 New Vector Ltd - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package im.vector.riotx.features.signout.soft.epoxy - -import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.VectorEpoxyHolder -import im.vector.riotx.core.epoxy.VectorEpoxyModel - -@EpoxyModelClass(layout = R.layout.item_login_header) -abstract class LoginHeaderItem : VectorEpoxyModel() { - class Holder : VectorEpoxyHolder() -} diff --git a/vector/src/main/res/drawable/element_logotype.xml b/vector/src/main/res/drawable/element_logotype.xml deleted file mode 100644 index 0419447b32..0000000000 --- a/vector/src/main/res/drawable/element_logotype.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/vector/src/main/res/drawable/element_logotype_combined.xml b/vector/src/main/res/drawable/element_logotype_combined.xml new file mode 100644 index 0000000000..7516bd63e1 --- /dev/null +++ b/vector/src/main/res/drawable/element_logotype_combined.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + diff --git a/vector/src/main/res/layout/activity_signed_out.xml b/vector/src/main/res/layout/activity_signed_out.xml index cfe9316677..20b03a6a2c 100644 --- a/vector/src/main/res/layout/activity_signed_out.xml +++ b/vector/src/main/res/layout/activity_signed_out.xml @@ -6,11 +6,6 @@ android:layout_height="match_parent" android:background="?riotx_background"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_chainStyle="packed" /> - - - - - - - diff --git a/vector/src/main/res/values-land/styles_login.xml b/vector/src/main/res/values-land/styles_login.xml index 29ddebedd2..d781ec5f1e 100644 --- a/vector/src/main/res/values-land/styles_login.xml +++ b/vector/src/main/res/values-land/styles_login.xml @@ -1,19 +1,4 @@ - - diff --git a/vector/src/main/res/values-v21/styles_login.xml b/vector/src/main/res/values-v21/styles_login.xml index 22eeec5528..78554f9ebb 100644 --- a/vector/src/main/res/values-v21/styles_login.xml +++ b/vector/src/main/res/values-v21/styles_login.xml @@ -1,8 +1,5 @@ - \ No newline at end of file diff --git a/vector/src/main/res/values/styles_login.xml b/vector/src/main/res/values/styles_login.xml index f1f067f623..c5180384a8 100644 --- a/vector/src/main/res/values/styles_login.xml +++ b/vector/src/main/res/values/styles_login.xml @@ -8,27 +8,9 @@ 36dp - - - - -