aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/src/main
diff options
context:
space:
mode:
authorMarvin Borner2018-09-09 13:01:16 +0200
committerMarvin Borner2018-09-09 13:01:16 +0200
commitbd0c9e48638e1706cc0f5201dc1182773d9196de (patch)
tree97246a9ccf95c7a0c02394916844ee8043cc6f1a /app/src/main
parent3749208a5332e3618753d770da9296602c82239f (diff)
Started redesign of login screen :lipstick: :construction:
Diffstat (limited to 'app/src/main')
-rw-r--r--app/src/main/java/me/texx/Texx/LoginActivity.kt7
-rw-r--r--app/src/main/res/layout/activity_login.xml52
-rw-r--r--app/src/main/res/values/strings.xml2
-rw-r--r--app/src/main/res/values/styles.xml1
4 files changed, 35 insertions, 27 deletions
diff --git a/app/src/main/java/me/texx/Texx/LoginActivity.kt b/app/src/main/java/me/texx/Texx/LoginActivity.kt
index 2950454..c575331 100644
--- a/app/src/main/java/me/texx/Texx/LoginActivity.kt
+++ b/app/src/main/java/me/texx/Texx/LoginActivity.kt
@@ -18,6 +18,8 @@ import android.support.design.widget.Snackbar
import android.support.v7.app.AppCompatActivity
import android.text.TextUtils
import android.view.View
+import android.view.Window
+import android.view.WindowManager
import android.view.inputmethod.EditorInfo
import android.widget.ArrayAdapter
import android.widget.TextView
@@ -50,6 +52,9 @@ class LoginActivity : AppCompatActivity(), LoaderCallbacks<Cursor> {
matchDressCode()
super.onCreate(savedInstanceState)
dressCodeName = getThemeName(this)
+ // set fullscreen
+ requestWindowFeature(Window.FEATURE_NO_TITLE)
+ window.setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN)
setContentView(R.layout.activity_login)
populateAutoComplete()
@@ -61,7 +66,7 @@ class LoginActivity : AppCompatActivity(), LoaderCallbacks<Cursor> {
false
})
- email_sign_in_button.setOnClickListener { attemptLogin() }
+ button_sign_in.setOnClickListener { attemptLogin() }
}
private fun populateAutoComplete() {
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 5e156f3..6410385 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
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:gravity="center_horizontal"
- android:orientation="vertical"
+ android:padding="0dp"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
@@ -13,9 +13,16 @@
tools:context=".LoginActivity">
<!-- Login progress -->
+
+ <ImageView
+ android:id="@+id/image_background"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:scaleType="centerCrop"
+ app:srcCompat="@drawable/img_login_portrait" />
+
<ProgressBar
android:id="@+id/login_progress"
- style="?android:attr/progressBarStyleLarge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
@@ -24,13 +31,18 @@
<android.support.constraint.ConstraintLayout
android:id="@+id/login_form"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:layout_alignParentBottom="@id/image_background"
+ android:layout_alignParentLeft="@id/image_background"
+ android:layout_alignParentRight="@id/image_background"
+ android:layout_alignParentTop="@id/image_background">
<AutoCompleteTextView
android:id="@+id/email"
android:layout_width="0dp"
android:layout_height="wrap_content"
+ android:layout_marginBottom="8dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:hint="@string/prompt_email"
@@ -39,16 +51,15 @@
android:singleLine="true"
app:layout_constraintBottom_toTopOf="@+id/password"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.5"
+ app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="packed" />
<EditText
android:id="@+id/password"
android:layout_width="0dp"
android:layout_height="wrap_content"
- android:layout_marginBottom="15dp"
+ android:layout_marginBottom="8dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:hint="@string/prompt_password"
@@ -58,32 +69,25 @@
android:inputType="textPassword"
android:maxLines="1"
android:singleLine="true"
- app:layout_constraintBottom_toTopOf="@+id/email_sign_in_button"
- app:layout_constraintEnd_toEndOf="@+id/email_sign_in_button"
- app:layout_constraintStart_toStartOf="@+id/email_sign_in_button"
- app:layout_constraintTop_toBottomOf="@+id/email" />
+ app:layout_constraintBottom_toTopOf="@+id/button_sign_in"
+ app:layout_constraintEnd_toEndOf="@+id/button_sign_in"
+ app:layout_constraintHorizontal_bias="0.0"
+ app:layout_constraintStart_toStartOf="@+id/button_sign_in" />
<Button
- android:id="@+id/email_sign_in_button"
+ android:id="@+id/button_sign_in"
style="?android:textAppearanceSmall"
android:layout_width="0dp"
android:layout_height="wrap_content"
- android:layout_marginBottom="16dp"
+ android:layout_marginBottom="100dp"
android:text="@string/action_sign_in"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.5"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/password" />
-
- <android.support.constraint.Guideline
- android:id="@+id/guideline"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- app:layout_constraintGuide_begin="20dp" />
+ app:layout_constraintHorizontal_bias="0.0"
+ app:layout_constraintStart_toStartOf="parent" />
</android.support.constraint.ConstraintLayout>
-</LinearLayout> \ No newline at end of file
+
+</RelativeLayout> \ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 23030bc..78b42cb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -5,7 +5,7 @@
<string name="title_activity_login">Sign in</string>
<!-- Strings related to login -->
- <string name="prompt_email">Email</string>
+ <string name="prompt_email">Enter your Email</string>
<string name="prompt_password">Password</string>
<string name="action_sign_in">Sign in</string>
<string name="action_sign_in_short">Sign in</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 749dc4f..957102f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -19,7 +19,6 @@
<item name="coordinatorLayoutStyle">@style/Widget.Support.CoordinatorLayout</item>
</style>
-
<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />