Merge pull request #192 from kruton/style-fix

Fix some styling on the HostListActivity

5 files changed, 131 insertions, 89 deletions

diff --git a/app/src/main/java/org/connectbot/ConsoleActivity.java b/app/src/main/java/org/connectbot/ConsoleActivity.java
index 95d21d8..7ed9076 100644
--- a/app/src/main/java/org/connectbot/ConsoleActivity.java
+++ b/app/src/main/java/org/connectbot/ConsoleActivity.java
@@ -154,7 +154,7 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne
 
 	private ImageView mKeyboardButton;
 
-	private ActionBar actionBar;
+	@Nullable private ActionBar actionBar;
 	private boolean inActionBarMenu = false;
 	private boolean titleBarHide;
 
@@ -380,7 +380,11 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne
 			autoHideEmulatedKeys();
 
 		terminal.bridge.tryKeyVibrate();
-		if (titleBarHide) {
+		hideActionBarIfRequested();
+	}
+
+	private void hideActionBarIfRequested() {
+		if (titleBarHide && actionBar != null) {
 			actionBar.hide();
 		}
 	}
@@ -436,9 +440,7 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne
 
 				keyboardGroup.startAnimation(keyboard_fade_out);
 				keyboardGroup.setVisibility(View.GONE);
-				if (titleBarHide) {
-					actionBar.hide();
-				}
+				hideActionBarIfRequested();
 				keyboardGroupHider = null;
 			}
 		};
@@ -449,9 +451,7 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne
 		if (keyboardGroupHider != null)
 			handler.removeCallbacks(keyboardGroupHider);
 		keyboardGroup.setVisibility(View.GONE);
-		if (titleBarHide) {
-			actionBar.hide();
-		}
+		hideActionBarIfRequested();
 	}
 
 	@Override
@@ -488,7 +488,10 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne
 		if (icicle == null) {
 			requested = getIntent().getData();
 		} else {
-			requested = Uri.parse(icicle.getString(STATE_SELECTED_URI));
+			String uri = icicle.getString(STATE_SELECTED_URI);
+			if (uri != null) {
+				requested = Uri.parse(uri);
+			}
 		}
 
 		inflater = LayoutInflater.from(this);
@@ -605,18 +608,20 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne
 
 
 		actionBar = getSupportActionBar();
-		actionBar.setDisplayHomeAsUpEnabled(true);
-		if (titleBarHide) {
-			actionBar.hide();
-		}
-		actionBar.addOnMenuVisibilityListener(new ActionBar.OnMenuVisibilityListener() {
-			public void onMenuVisibilityChanged(boolean isVisible) {
-				inActionBarMenu = isVisible;
-				if (isVisible == false) {
-					hideEmulatedKeys();
-				}
+		if (actionBar != null) {
+			actionBar.setDisplayHomeAsUpEnabled(true);
+			if (titleBarHide) {
+				actionBar.hide();
 			}
-		});
+			actionBar.addOnMenuVisibilityListener(new ActionBar.OnMenuVisibilityListener() {
+				public void onMenuVisibilityChanged(boolean isVisible) {
+					inActionBarMenu = isVisible;
+					if (isVisible == false) {
+						hideEmulatedKeys();
+					}
+				}
+			});
+		}
 
 		final HorizontalScrollView keyboardScroll = (HorizontalScrollView) findViewById(R.id.keyboard_hscroll);
 		if (!hardKeyboard) {
diff --git a/app/src/main/java/org/connectbot/HostListActivity.java b/app/src/main/java/org/connectbot/HostListActivity.java
index 1fe634e..0e6fa3e 100644
--- a/app/src/main/java/org/connectbot/HostListActivity.java
+++ b/app/src/main/java/org/connectbot/HostListActivity.java
@@ -43,6 +43,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.preference.PreferenceManager;
+import android.support.annotation.StyleRes;
 import android.text.format.DateUtils;
 import android.util.Log;
 import android.view.ContextMenu;
@@ -475,6 +476,9 @@ public class HostListActivity extends ListActivity implements OnHostStatusChange
 		intent.setData(uri);
 		startActivity(intent);
 
+		// Clear the input box for the next entry.
+		quickconnect.setText("");
+
 		return true;
 	}
 
@@ -617,26 +621,26 @@ public class HostListActivity extends ListActivity implements OnHostStatusChange
 				break;
 			}
 
-			ColorStateList chosen = null;
-			if (HostDatabase.COLOR_RED.equals(host.getColor()))
-				chosen = this.red;
-			else if (HostDatabase.COLOR_GREEN.equals(host.getColor()))
-				chosen = this.green;
-			else if (HostDatabase.COLOR_BLUE.equals(host.getColor()))
-				chosen = this.blue;
-
-			Context context = convertView.getContext();
-
-			if (chosen != null) {
-				// set color normally if not selected
-				holder.nickname.setTextColor(chosen);
-				holder.caption.setTextColor(chosen);
+			@StyleRes final int chosenStyleFirstLine;
+			@StyleRes final int chosenStyleSecondLine;
+			if (HostDatabase.COLOR_RED.equals(host.getColor())) {
+				chosenStyleFirstLine = R.style.ListItemFirstLineText_Red;
+				chosenStyleSecondLine = R.style.ListItemSecondLineText_Red;
+			} else if (HostDatabase.COLOR_GREEN.equals(host.getColor())) {
+				chosenStyleFirstLine = R.style.ListItemFirstLineText_Green;
+				chosenStyleSecondLine = R.style.ListItemSecondLineText_Green;
+			} else if (HostDatabase.COLOR_BLUE.equals(host.getColor())) {
+				chosenStyleFirstLine = R.style.ListItemFirstLineText_Blue;
+				chosenStyleSecondLine = R.style.ListItemSecondLineText_Blue;
 			} else {
-				// selected, so revert back to default black text
-				holder.nickname.setTextAppearance(context, android.R.style.TextAppearance_Large);
-				holder.caption.setTextAppearance(context, android.R.style.TextAppearance_Small);
+				chosenStyleFirstLine = R.style.ListItemFirstLineText;
+				chosenStyleSecondLine = R.style.ListItemSecondLineText;
 			}
 
+			holder.nickname.setTextAppearance(chosenStyleFirstLine);
+			holder.caption.setTextAppearance(chosenStyleSecondLine);
+
+			Context context = convertView.getContext();
 			CharSequence nice = context.getString(R.string.bind_never);
 			if (host.getLastConnect() > 0) {
 				nice = DateUtils.getRelativeTimeSpanString(host.getLastConnect() * 1000);
diff --git a/app/src/main/res/layout/item_host.xml b/app/src/main/res/layout/item_host.xml
index 56c3d34..8c9f9fc 100644
--- a/app/src/main/res/layout/item_host.xml
+++ b/app/src/main/res/layout/item_host.xml
@@ -17,60 +17,61 @@
   -->
 
 <RelativeLayout
-    android:id="@android:id/content"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="72dp"
-    >
+	android:id="@android:id/content"
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="fill_parent"
+	android:layout_height="wrap_content"
+	android:minHeight="72dp"
+	>
 
-    <ImageView
-        android:id="@android:id/icon"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:layout_centerVertical="true"
-        android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
-        android:contentDescription="@string/image_description_connected"
-        android:src="@drawable/connected"
-        />
+	<ImageView
+		android:id="@android:id/icon"
+		android:layout_width="40dp"
+		android:layout_height="40dp"
+		android:layout_alignParentEnd="true"
+		android:layout_alignParentRight="true"
+		android:layout_centerVertical="true"
+		android:layout_marginEnd="16dp"
+		android:layout_marginRight="16dp"
+		android:contentDescription="@string/image_description_connected"
+		android:src="@drawable/connected"
+		/>
 
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentLeft="true"
-        android:layout_alignWithParentIfMissing="true"
-        android:layout_centerVertical="true"
-        android:layout_marginStart="16dp"
-        android:layout_marginLeft="16dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
-        android:orientation="vertical"
-        android:layout_toStartOf="@android:id/icon"
-        android:layout_toLeftOf="@android:id/icon"
-        >
+	<LinearLayout
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_alignParentLeft="true"
+		android:layout_alignParentStart="true"
+		android:layout_alignWithParentIfMissing="true"
+		android:layout_centerVertical="true"
+		android:layout_marginEnd="16dp"
+		android:layout_marginLeft="16dp"
+		android:layout_marginRight="16dp"
+		android:layout_marginStart="16dp"
+		android:layout_toLeftOf="@android:id/icon"
+		android:layout_toStartOf="@android:id/icon"
+		android:orientation="vertical"
+		>
 
-        <TextView
-            android:id="@android:id/text1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:singleLine="true"
-            android:paddingTop="20dp"
-            android:textAppearance="@style/ListItemFirstLineText"
-            />
+		<TextView
+			android:id="@android:id/text1"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:ellipsize="end"
+			android:paddingTop="20dp"
+			android:singleLine="true"
+			android:textAppearance="@style/ListItemFirstLineText"
+			tools:text="shell.example.com"/>
 
-        <TextView
-            android:id="@android:id/text2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingBottom="20dp"
-            android:textAppearance="@style/ListItemSecondLineText"
-            />
+		<TextView
+			android:id="@android:id/text2"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:paddingBottom="20dp"
+			android:textAppearance="@style/ListItemSecondLineText"
+			tools:text="2 minutes ago"/>
 
-    </LinearLayout>
+	</LinearLayout>
 
 </RelativeLayout>
diff --git a/app/src/main/res/values-v11/styles.xml b/app/src/main/res/values-v11/styles.xml
index 9f8d6a0..8522aae 100644
--- a/app/src/main/res/values-v11/styles.xml
+++ b/app/src/main/res/values-v11/styles.xml
@@ -17,6 +17,14 @@
  */
 -->
 <resources>
-	<style name="ListItemFirstLineText" parent="TextAppearance.AppCompat" />
-	<style name="ListItemSecondLineText" parent="TextAppearance.AppCompat" />
+
+	<style name="ListItemFirstLineText" parent="TextAppearance.AppCompat">
+		<item name="android:textColor">?android:textColorPrimary</item>
+		<item name="android:textSize">16sp</item>
+	</style>
+
+	<style name="ListItemSecondLineText" parent="TextAppearance.AppCompat">
+		<item name="android:textColor">?android:textColorSecondary</item>
+		<item name="android:textSize">14sp</item>
+	</style>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a850d38..13a424f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -39,4 +39,28 @@
 		<item name="android:textColor">?android:textColorSecondary</item>
 		<item name="android:textSize">14sp</item>
 	</style>
+
+	<style name="ListItemFirstLineText.Red" parent="ListItemFirstLineText">
+		<item name="android:textColor">@color/red</item>
+	</style>
+
+	<style name="ListItemSecondLineText.Red" parent="ListItemSecondLineText">
+		<item name="android:textColor">@color/red</item>
+	</style>
+
+	<style name="ListItemFirstLineText.Green" parent="ListItemFirstLineText">
+		<item name="android:textColor">@color/green</item>
+	</style>
+
+	<style name="ListItemSecondLineText.Green" parent="ListItemSecondLineText">
+		<item name="android:textColor">@color/green</item>
+	</style>
+
+	<style name="ListItemFirstLineText.Blue" parent="ListItemFirstLineText">
+		<item name="android:textColor">@color/blue</item>
+	</style>
+
+	<style name="ListItemSecondLineText.Blue" parent="ListItemSecondLineText">
+		<item name="android:textColor">@color/blue</item>
+	</style>
 </resources>