Merge pull request #89 from CSUMB-SP17-CST499/develop

Modified login layout
CSUMB-SP17-CST499 · Apr 18, 2017 · 2a55020 · 2a55020
2 parents 4f8b738 + 4762e3c
commit 2a55020
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 20 deletions.
diff --git a/app/src/main/java/alexandertech/mymonteuniversityhub/Activities/LoginActivity.java b/app/src/main/java/alexandertech/mymonteuniversityhub/Activities/LoginActivity.java
@@ -13,6 +13,7 @@
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.database.Cursor;
+import android.graphics.Color;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Build;
@@ -21,7 +22,9 @@
 import android.support.annotation.NonNull;
 import android.support.design.widget.Snackbar;
 import android.support.v7.app.AppCompatActivity;
+import android.text.Spannable;
 import android.text.TextUtils;
+import android.text.style.BackgroundColorSpan;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -130,6 +133,13 @@ public void onClick(DialogInterface dialog, int which) {
         mLoginFormView = findViewById(R.id.login_form);
         mProgressView = findViewById(R.id.login_progress);
 
+        TextView myTV = (TextView)findViewById(R.id.txtWelcome);
+        String  textString = "Welcome to myMonte! Please sign in below with your credentials.";
+        Spannable spanText = Spannable.Factory.getInstance().newSpannable(textString);
+        spanText.setSpan(new BackgroundColorSpan(Color.parseColor("#1f346b")), 0, 63, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        myTV.setText(spanText);
+
+
     }
 
     private void populateAutoComplete() {

diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
@@ -5,19 +5,11 @@
     android:layout_height="match_parent"
     android:gravity="center_horizontal"
     android:orientation="vertical"
-    android:background= "#01579B"
+    android:background= "@mipmap/back"
     tools:context="alexandertech.mymonteuniversityhub.Activities.LoginActivity"
     android:weightSum="1">
 
-    <ImageView
-        android:layout_width="300dp"
-        android:layout_height="100dp"
-        android:id="@+id/csumb"
-        android:layout_marginBottom="75dp"
-        android:adjustViewBounds="true"
-        android:scaleType="fitCenter"
-        android:src="@drawable/csumb2"
-        android:layout_marginTop="50dp"/>
+
 
     <ProgressBar
         android:id="@+id/login_progress"
@@ -27,16 +19,6 @@
         android:layout_marginBottom="8dp"
         android:visibility="gone" />
 
-
-    <TextView
-        android:id="@+id/textView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="Welcome to myMonte! Please sign in below with your credentials."
-        android:textAlignment="center"
-        android:textAppearance="@style/TextAppearance.AppCompat.Display1"
-        android:textColor="#ffffff" />
-
     <ScrollView
         android:id="@+id/login_form"
         android:layout_width="match_parent"
@@ -51,6 +33,28 @@
             android:orientation="vertical"
             android:padding="25dp">
 
+            <ImageView
+                android:layout_width="300dp"
+                android:layout_height="100dp"
+                android:id="@+id/csumb"
+                android:layout_marginBottom="5dp"
+                android:adjustViewBounds="true"
+                android:scaleType="fitCenter"
+                android:src="@drawable/csumb2"
+                android:layout_marginTop="25dp"/>
+
+
+            <TextView
+                android:id="@+id/txtWelcome"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text=""
+                android:textAlignment="center"
+                android:textAppearance="@style/TextAppearance.AppCompat.Headline"
+                android:textColor="#ffffff"
+                android:lineSpacingExtra="1dp"
+                android:layout_marginBottom="10dp"/>
+
 
             <android.support.design.widget.TextInputLayout
                 android:layout_width="match_parent"
@@ -68,6 +72,7 @@
 
                     android:drawableLeft="@mipmap/ic_account_circle_black_24dp"
                     android:drawablePadding="10dp"
+
                     android:gravity="center_vertical"
                     android:hint="Email"
                     android:inputType="textEmailAddress"