changed Login layout

BIDL/BIDL/app/src/main/java/de/uni_oldenburg/bidl/guest_view/LoginActivity.java

@@ -22,6 +22,7 @@ public class LoginActivity extends AppCompatActivity {
     private ImageView unilogo;
     private EditText etEmail;
     private EditText etPassword;
+    private TextView forgotPassword;
     private CheckBox stayLoggedIn;
     private Button btLogin;
     private TextView tvRegister;
@@ -43,18 +44,11 @@ public class LoginActivity extends AppCompatActivity {
         unilogo = (ImageView) findViewById(R.id.uniLogo);
         etEmail = (EditText) findViewById(R.id.email);
         etPassword = (EditText) findViewById(R.id.password);
+        forgotPassword = (TextView) findViewById(R.id.toForgotPassword);
         stayLoggedIn = (CheckBox) findViewById(R.id.keepingLoggedIn);
         btLogin = (Button) findViewById(R.id.loginButton);
         tvRegister = (TextView) findViewById(R.id.register);
 
-        /** Fullscreen modus **/
-        getWindow().getDecorView().setSystemUiVisibility(
-                View.SYSTEM_UI_FLAG_LAYOUT_STABLE
-                        | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
-                        | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-                        | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
-                        | View.SYSTEM_UI_FLAG_FULLSCREEN);
-
         /** Login **/
         btLogin.setOnClickListener(new View.OnClickListener() {
             @Override

BIDL/BIDL/app/src/main/res/layout/activity_login.xml

 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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:id="@+id/activity_login"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="de.uni_oldenburg.bidl.guest_view.LoginActivity"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:weightSum="1"
+    android:background="@color/white"
+    android:padding="12dp">
     
     <ImageView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content" 
         android:id="@+id/uniLogo"
         android:src="@drawable/unilogo"
-        android:layout_margin="10dp"/>
-    
-    <EditText
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:inputType="textEmailAddress"
-        android:layout_gravity="center"
-        android:id="@+id/email"
-        android:hint="@string/hintTextEmail"
-        android:layout_marginTop="30dp"/>
+        android:layout_margin="10dp"
+        android:contentDescription="@string/imageViewDescription"/>
 
-    <EditText
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:inputType="textPassword"
-        android:layout_gravity="center"
-        android:id="@+id/password"
-        android:hint="@string/hintTextPass"
-        android:layout_marginTop="10dp"/>
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <EditText
+            android:layout_width="200dp"
+            android:layout_height="wrap_content"
+            android:inputType="textPassword"
+            android:layout_gravity="center"
+            android:id="@+id/password"
+            android:hint="@string/hintTextPass"
+            android:ems="10"
+            android:layout_below="@+id/email"
+            android:layout_alignStart="@+id/email"
+            android:layout_marginTop="19dp" />
+
+        <EditText
+            android:layout_width="200dp"
+            android:layout_height="wrap_content"
+            android:inputType="textEmailAddress"
+            android:layout_gravity="center"
+            android:id="@+id/email"
+            android:hint="@string/hintTextEmail"
+            android:layout_marginStart="11dp"
+            android:layout_alignParentTop="true"
+            android:layout_alignParentStart="true" />
+
+        <TextView
+            android:text="@string/forgotPassword"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/email"
+            android:layout_toEndOf="@+id/password"
+            android:layout_marginStart="25dp"
+            android:id="@+id/toForgotPassword" />
+    </RelativeLayout>
 
     <CheckBox
         android:layout_width="wrap_content"
@@ -41,6 +63,7 @@
         android:id="@+id/keepingLoggedIn"
         android:checked="true"
         android:layout_marginTop="10dp"/>
+
     <Button
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -57,6 +80,6 @@
         android:textColor="@color/colorPrimary"
         android:layout_gravity="center"
         android:id="@+id/register"
-        android:layout_marginTop="5dp"/>
+        android:layout_marginTop="30dp"/>
 
 </LinearLayout>

BIDL/BIDL/app/src/main/res/values/strings.xml

@@ -15,6 +15,7 @@
     <string name="checkBoxDescription">Eingeloggt bleiben</string>
     <string name="buttonDescription">Login</string>
     <string name="registerDescription">Registrieren</string>
+    <string name="forgotPassword">Passwort vergessen?</string>
 
 
 </resources>