From 60c7316742dbbe39b305aa158d1f7832b8493c7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Borcz?= Date: Thu, 29 Nov 2018 19:07:44 +0100 Subject: [PATCH] Add version text to login form (#188) --- app/build.gradle | 1 + .../modules/login/form/LoginFormFragment.kt | 13 +++++++++++ .../modules/login/form/LoginFormPresenter.kt | 1 + .../ui/modules/login/form/LoginFormView.kt | 4 ++++ .../main/res/layout/fragment_login_form.xml | 22 ++++++++++++++----- .../main/res/layout/item_widget_timetable.xml | 6 ++--- app/src/main/res/values/colors.xml | 3 +-- 7 files changed, 39 insertions(+), 11 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index bc3365a82..1f244f907 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -80,6 +80,7 @@ configurations.all { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" implementation('com.github.wulkanowy:api:0ac961607b') { exclude module: "threetenbp" } implementation "androidx.legacy:legacy-support-v4:1.0.0" diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt index 0a66666f6..7985ef6e4 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt @@ -1,5 +1,6 @@ package io.github.wulkanowy.ui.modules.login.form +import android.annotation.SuppressLint import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -9,6 +10,8 @@ import android.view.ViewGroup import android.view.inputmethod.EditorInfo.IME_ACTION_DONE import android.view.inputmethod.EditorInfo.IME_NULL import android.widget.ArrayAdapter +import io.github.wulkanowy.BuildConfig.DEBUG +import io.github.wulkanowy.BuildConfig.VERSION_NAME import io.github.wulkanowy.R import io.github.wulkanowy.ui.base.BaseFragment import io.github.wulkanowy.ui.modules.login.LoginActivity @@ -26,6 +29,8 @@ class LoginFormFragment : BaseFragment(), LoginFormView { fun newInstance() = LoginFormFragment() } + override val isDebug = DEBUG + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { return inflater.inflate(R.layout.fragment_login_form, container, false) } @@ -66,6 +71,14 @@ class LoginFormFragment : BaseFragment(), LoginFormView { showSoftKeyboard() } + @SuppressLint("SetTextI18n") + override fun showVersion() { + loginVersion.apply { + visibility = VISIBLE + text = "${getString(R.string.app_name)} $VERSION_NAME" + } + } + override fun switchOptionsView() { (activity as? LoginActivity)?.onChildFragmentSwitchOptions() } diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt index 41d1fc5e7..29537d265 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt @@ -21,6 +21,7 @@ class LoginFormPresenter @Inject constructor( super.onAttachView(view) view.run { initView() + if (isDebug) showVersion() errorHandler.onBadCredentials = { setErrorPassIncorrect() showSoftKeyboard() diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt index a25593301..4d5402267 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt @@ -4,6 +4,8 @@ import io.github.wulkanowy.ui.base.BaseView interface LoginFormView : BaseView { + val isDebug: Boolean + fun initView() fun switchOptionsView() @@ -22,6 +24,8 @@ interface LoginFormView : BaseView { fun resetViewErrors() + fun showVersion() + fun showSoftKeyboard() fun hideSoftKeyboard() diff --git a/app/src/main/res/layout/fragment_login_form.xml b/app/src/main/res/layout/fragment_login_form.xml index 43e558444..a2ee86474 100644 --- a/app/src/main/res/layout/fragment_login_form.xml +++ b/app/src/main/res/layout/fragment_login_form.xml @@ -8,8 +8,8 @@ android:id="@+id/loginFormProgressContainer" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_alignParentLeft="true" android:layout_alignParentStart="true" + android:layout_alignParentLeft="true" android:layout_alignParentTop="true" android:gravity="center" android:visibility="gone"> @@ -21,8 +21,8 @@ android:layout_below="@id/loginFormProgressText" android:layout_centerHorizontal="true" android:indeterminate="true" - android:minHeight="30dp" - android:minWidth="220dp" /> + android:minWidth="220dp" + android:minHeight="30dp" /> @@ -126,12 +126,22 @@ style="?android:textAppearanceSmall" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="30dp" android:layout_marginTop="20dp" + android:layout_marginBottom="30dp" android:text="@string/login_sign_in" android:textColor="@android:color/white" android:textStyle="bold" app:backgroundTint="@color/colorPrimary" /> + + diff --git a/app/src/main/res/layout/item_widget_timetable.xml b/app/src/main/res/layout/item_widget_timetable.xml index 810f06e0e..2351e0b62 100644 --- a/app/src/main/res/layout/item_widget_timetable.xml +++ b/app/src/main/res/layout/item_widget_timetable.xml @@ -24,7 +24,7 @@ android:layout_toEndOf="@id/timetableWidgetItemNumber" android:layout_toRightOf="@id/timetableWidgetItemNumber" android:text="@string/app_name" - android:textColor="@color/second_text_color" + android:textColor="@color/second_text" android:textSize="13sp" /> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 61685de65..db5139764 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -14,8 +14,7 @@ #d65757 #3d5f9c - #4c4c4c - #333 + #474747 #303030 #ffffff