half login screen

Author: =

app/src/main/AndroidManifest.xml

@@ -24,8 +24,15 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".activities.RegisterActivity" />
-        <activity android:name=".activities.LoginActivity"></activity>
+
+        <!--This was difficult for me to find; that's what happens when you abandon a work for too long-->
+        <activity
+            android:name=".activities.RegisterActivity"
+            android:theme="@style/NoActionBarTheme"/>
+
+        <activity
+            android:name=".activities.LoginActivity"
+            android:theme="@style/NoActionBarTheme"/>
     </application>
 
 </manifest>

app/src/main/java/com/example/abeeb/alat/activities/LoginActivity.java

@@ -5,7 +5,7 @@
 
 import com.example.abeeb.alat.R;
 
-public class LoginActivity extends AppCompatActivity {
+public class LoginActivity extends AbstractActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {

app/src/main/java/com/example/abeeb/alat/activities/RegisterActivity.java

@@ -5,7 +5,7 @@
 
 import com.example.abeeb.alat.R;
 
-public class RegisterActivity extends AppCompatActivity {
+public class RegisterActivity extends AbstractActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {

app/src/main/java/com/example/abeeb/alat/models/User.java

@@ -5,4 +5,5 @@
  */
 
 public class User {
+
 }

app/src/main/res/drawable-hdpi/24_hour_support.png

@@ -1,9 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="com.example.abeeb.alat.activities.LoginActivity">
 
-</android.support.constraint.ConstraintLayout>
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/24_hour_support"/>
+        <!--the name of the resource needs to be changed; also export all images used in the mock-ups-->
+
+
+
+        <Button
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/login"
+            android:id="@+id/login"
+            android:background="@drawable/rounded_button"
+            android:textColor="@color/dark_wine"
+            android:layout_weight="0.5"
+            android:textSize="@dimen/login_btn_size"
+            android:layout_marginBottom="20dp"
+            android:textAlignment="center"/>
+
+
+    </RelativeLayout>
+
+
+</LinearLayout>

app/src/main/res/drawable-hdpi/alat_coloured_copy_3.png

@@ -26,11 +26,11 @@
     </RelativeLayout>
 
     <ImageView
-        android:layout_width="wrap_content"
+        android:layout_width="85dp"
         android:layout_height="wrap_content"
         android:scaleType="center"
-        android:src="@mipmap/logo_white"
-        android:layout_weight="8"
+        android:src="@drawable/alat_coloured_copy_3"
+        android:layout_weight="3.47"
         android:layout_marginBottom="150dp"
         android:layout_gravity="center_horizontal"
         android:contentDescription="@string/alat_logo" />

app/src/main/res/drawable-mdpi/24_hour_support.png

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.2'
+        classpath 'com.android.tools.build:gradle:2.3.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files