From cd16d21fe54c9014d777163cc3fbed3b5b1ec538 Mon Sep 17 00:00:00 2001
From: Keith Irwin <mail@keithirwin.us>
Date: Fri, 21 Apr 2017 18:29:11 -0400
Subject: [PATCH] #7 Added new layout

---
 .../us/keithirwin/tracman/LoginActivity.java  |  6 +++--
 app/src/main/res/layout/activity_login.xml    | 27 +++++++++++++------
 app/src/main/res/values-de/strings.xml        |  2 +-
 app/src/main/res/values-es/strings.xml        |  2 +-
 app/src/main/res/values/strings.xml           |  2 +-
 5 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/us/keithirwin/tracman/LoginActivity.java b/app/src/main/java/us/keithirwin/tracman/LoginActivity.java
index e1995a8..544ab6a 100644
--- a/app/src/main/java/us/keithirwin/tracman/LoginActivity.java
+++ b/app/src/main/java/us/keithirwin/tracman/LoginActivity.java
@@ -62,8 +62,10 @@ public class LoginActivity extends AppCompatActivity implements
 		// Set up layout
 		setContentView(R.layout.activity_login);
 		setTitle(R.string.login_name);
-		TextView tv = (TextView) findViewById(R.id.login_description);
-		tv.setMovementMethod(LinkMovementMethod.getInstance());
+		TextView loginDescription = (TextView) findViewById(R.id.login_description);
+        TextView forgotPassword = (TextView) findViewById(R.id.login_forgot_password);
+        loginDescription.setMovementMethod(LinkMovementMethod.getInstance());
+        forgotPassword.setMovementMethod(LinkMovementMethod.getInstance());
 
 		// Configure sign-in to request the user's ID and basic profile, included in DEFAULT_SIGN_IN.
 		GoogleSignInOptions gso = new GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index bc75670..edb5205 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -52,6 +52,7 @@
 			android:id="@+id/login_description"
 			android:text="@string/login_description"
 			android:textSize="20sp"
+			android:autoLink="web"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"/>
 	</LinearLayout>
@@ -59,30 +60,38 @@
 	<!-- Social login buttons -->
 	<LinearLayout android:layout_width="match_parent"
 				  android:layout_height="wrap_content"
-				  android:layout_weight="3"
+				  android:layout_weight="2"
 				  android:layout_marginBottom="30px" >
 
 		<!-- Google -->
 		<ImageButton
 			android:layout_width="wrap_content"
 			android:layout_weight="1"
-			android:layout_height="match_parent" />
-			<!--android:src="@drawable/social_google" />-->
+			android:layout_height="match_parent"
+			android:background="#ce4d39"
+			android:layout_marginLeft="30px"
+			android:layout_marginRight="30px"
+			android:src="@drawable/social_google" />
 
 		<!-- Facebook -->
 		<ImageButton
 			android:layout_width="wrap_content"
 			android:layout_weight="1"
-			android:layout_height="match_parent" />
-		<!--android:src="@drawable/social_facebook" />-->
+			android:layout_height="match_parent"
+			android:background="#305891"
+			android:layout_marginLeft="30px"
+			android:layout_marginRight="30px"
+			android:src="@drawable/social_facebook" />
 
 		<!-- Twitter -->
 		<ImageButton
 			android:layout_width="wrap_content"
 			android:layout_weight="1"
-			android:layout_height="match_parent" />
-			<!--android:src="@drawable/social_twitter" />-->
-
+			android:layout_height="match_parent"
+			android:background="#2ca8d2"
+			android:layout_marginLeft="30px"
+			android:layout_marginRight="30px"
+			android:src="@drawable/social_twitter" />
 	</LinearLayout>
 
 	<!-- Login form -->
@@ -121,11 +130,13 @@
 	<LinearLayout android:layout_height="wrap_content"
 				  android:layout_width="match_parent"
 				  android:orientation="vertical"
+				  android:layout_marginTop="20px"
 				  android:layout_weight="1">
 
 		<!-- Forgot password link -->
 		<TextView android:id="@+id/login_forgot_password"
 				  android:text="@string/login_forgot_password"
+				  android:autoLink="web"
 				  android:layout_width="match_parent"
 				  android:layout_height="wrap_content"
 				  android:textColor="@color/Yellow"
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index d355afa..ff213f2 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -10,7 +10,7 @@
 	<string name="google_connection_error">FEHLER: Könnte nicht zum Google API Server verbinden. </string>
 	<string name="help_name">Hilfe</string>
 	<string name="loading">Ladet…</string>
-	<string name="login_description">"Zu Tracman einloggen.  Wenn Sie kein Konto haben, können Sie <a href="https://tracman.org/login#join">einen neuen machen</a>.  "</string>
+	<string name="login_description">Zu Tracman einloggen.  Wenn Sie kein Konto haben, können Sie <a href="https://tracman.org/login#join">einen neuen machen</a>.  </string>
 	<string name="login_name">Einloggen</string>
 	<string name="login_no_user_error">FEHLER: Nutzer nicht gefunden. </string>
 	<string name="logout_name">Ausloggen</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 87573ed..085d4e7 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -16,7 +16,7 @@
 	<string name="broadcast_disabled">Transmisiónes apagado</string>
 	<string name="google_connection_error">ERROR: No se puede conectar al Google API servidor. </string>
 	<string name="help_name">Ayuda</string>
-	<string name="login_description">"Iniciar una sesión. Si no tiene una cuenta de Tracman, puede <a href="https://tracman.org/login">participar</a>. "</string>
+	<string name="login_description">Iniciar una sesión. Si no tiene una cuenta de Tracman, puede <a href="https://tracman.org/login">participar</a>.  </string>
 	<string name="login_name">Iniciar sesión</string>
 	<string name="login_no_user_error">ERROR: Usario no encontrado</string>
 	<string name="logout_name">Cerrar sesión</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 72ae05d..18ec874 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -12,7 +12,7 @@
 	<!-- Strings related to login -->
 	<string name="login_name">Login</string>
 	<string name="logout_name">Logout</string>
-	<string name="login_description">"Log in to Tracman.  If you don't have one an account, you can <a href="https://tracman.org/login#join">create one</a>.  "</string>
+	<string name="login_description">Log in to Tracman.  If you don\'t have an account, you can <a href="https://tracman.org/login#join">create one</a>.  </string>
 	<string name="server_connection_error">ERROR: Unable to connect to Tracman server.  </string>
 
 	<!-- Strings related to notifications -->