From e341f22dc939090d6c74be45cd73d19026023a61 Mon Sep 17 00:00:00 2001
From: Kyle Horimoto <khorimoto@google.com>
Date: Fri, 4 Sep 2015 10:34:12 -0700
Subject: Style the host list items with material design.

This change updates the items to be in line with the guideline here: https://www.google.com/design/spec/components/lists.html#lists-specs.
---
 app/src/main/res/layout-land/item_host.xml | 27 ++++++++++-------
 app/src/main/res/layout-port/item_host.xml | 48 +++++++++++++++++++-----------
 app/src/main/res/values/styles.xml         | 10 ++++++-
 3 files changed, 55 insertions(+), 30 deletions(-)

diff --git a/app/src/main/res/layout-land/item_host.xml b/app/src/main/res/layout-land/item_host.xml
index cbccd91..58301fc 100644
--- a/app/src/main/res/layout-land/item_host.xml
+++ b/app/src/main/res/layout-land/item_host.xml
@@ -23,23 +23,28 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="fill_parent"
 	android:layout_height="wrap_content"
-	android:padding="10dip"
+	android:minHeight="72dp"
 	>
 
 	<ImageView
 		android:id="@android:id/icon"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
+		android:layout_width="40dp"
+		android:layout_height="40dp"
 		android:layout_alignParentRight="true"
+		android:layout_centerVertical="true"
+		android:layout_marginRight="16dp"
 		android:contentDescription="@string/image_description_connected"
-		android:paddingTop="5dip"
 		android:src="@drawable/connected"
 		/>
 
 	<LinearLayout
-		android:layout_width="fill_parent"
+		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:orientation="horizontal"
+		android:layout_alignWithParentIfMissing="true"
+		android:layout_centerVertical="true"
+		android:layout_marginLeft="16dp"
+		android:layout_marginRight="16dp"
+		android:orientation="vertical"
 		>
 
 		<TextView
@@ -48,18 +53,18 @@
 			android:layout_height="wrap_content"
 			android:ellipsize="end"
 			android:singleLine="true"
-			android:textAppearance="?android:attr/textAppearanceLarge"
+			android:paddingTop="20dp"
+			android:textAppearance="@style/ListItemFirstLineText"
 			/>
 
 		<TextView
 			android:id="@android:id/text2"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:paddingLeft="10dip"
-			android:textAppearance="?android:attr/textAppearanceSmall"
+			android:paddingBottom="20dp"
+			android:textAppearance="@style/ListItemSecondLineText"
 			/>
 
-
 	</LinearLayout>
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/app/src/main/res/layout-port/item_host.xml b/app/src/main/res/layout-port/item_host.xml
index 7ee7f0a..d653191 100644
--- a/app/src/main/res/layout-port/item_host.xml
+++ b/app/src/main/res/layout-port/item_host.xml
@@ -22,36 +22,48 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="fill_parent"
 	android:layout_height="wrap_content"
-	android:padding="10dip"
+	android:minHeight="72dp"
 	>
 
 	<ImageView
 		android:id="@android:id/icon"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
+		android:layout_width="40dp"
+		android:layout_height="40dp"
 		android:layout_alignParentRight="true"
+		android:layout_centerVertical="true"
+		android:layout_marginRight="16dp"
 		android:contentDescription="@string/image_description_connected"
-		android:paddingTop="5dip"
 		android:src="@drawable/connected"
 		/>
 
-	<TextView
-		android:id="@android:id/text1"
+	<LinearLayout
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:ellipsize="end"
-		android:paddingRight="20dip"
-		android:singleLine="true"
-		android:textAppearance="?android:attr/textAppearanceLarge"
-		/>
+		android:layout_alignWithParentIfMissing="true"
+		android:layout_centerVertical="true"
+		android:layout_marginLeft="16dp"
+		android:layout_marginRight="16dp"
+		android:orientation="vertical"
+		>
 
-	<TextView
-		android:id="@android:id/text2"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_below="@android:id/text1"
-		android:textAppearance="?android:attr/textAppearanceSmall"
-		/>
+		<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/text2"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:paddingBottom="20dp"
+			android:textAppearance="@style/ListItemSecondLineText"
+			/>
 
+	</LinearLayout>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 031d358..593af85 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -27,9 +27,17 @@
 		<item name="android:textSize">10sp</item>
 	</style>
 
-
 	<style name="KeyboardButton" parent="KeyboardKey">
 		<item name="android:background">@drawable/keyboard_button_selector</item>
 	</style>
 
+	<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>
-- 
cgit v1.2.3


From 11ff5ee21103b33dddbc808f468fe32f916937d3 Mon Sep 17 00:00:00 2001
From: Kyle Horimoto <khorimoto@google.com>
Date: Fri, 4 Sep 2015 10:34:12 -0700
Subject: Style the host list items with material design.

This change updates the items to be in line with the guideline here: https://www.google.com/design/spec/components/lists.html#lists-specs.
---
 app/src/main/res/layout-land/item_host.xml | 29 ++++++++++-------
 app/src/main/res/layout-port/item_host.xml | 50 +++++++++++++++++++-----------
 app/src/main/res/values/styles.xml         | 10 +++++-
 3 files changed, 59 insertions(+), 30 deletions(-)

diff --git a/app/src/main/res/layout-land/item_host.xml b/app/src/main/res/layout-land/item_host.xml
index cbccd91..a6e60d3 100644
--- a/app/src/main/res/layout-land/item_host.xml
+++ b/app/src/main/res/layout-land/item_host.xml
@@ -23,23 +23,30 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="fill_parent"
 	android:layout_height="wrap_content"
-	android:padding="10dip"
+	android:minHeight="72dp"
 	>
 
 	<ImageView
 		android:id="@android:id/icon"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
+		android:layout_width="40dp"
+		android:layout_height="40dp"
 		android:layout_alignParentRight="true"
+		android:layout_centerVertical="true"
+		android:layout_marginRight="16dp"
 		android:contentDescription="@string/image_description_connected"
-		android:paddingTop="5dip"
 		android:src="@drawable/connected"
 		/>
 
 	<LinearLayout
-		android:layout_width="fill_parent"
+		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:orientation="horizontal"
+		android:layout_alignParentLeft="true"
+		android:layout_alignWithParentIfMissing="true"
+		android:layout_centerVertical="true"
+		android:layout_marginLeft="16dp"
+		android:layout_marginRight="16dp"
+		android:orientation="vertical"
+		android:layout_toLeftOf="@android:id/icon"
 		>
 
 		<TextView
@@ -48,18 +55,18 @@
 			android:layout_height="wrap_content"
 			android:ellipsize="end"
 			android:singleLine="true"
-			android:textAppearance="?android:attr/textAppearanceLarge"
+			android:paddingTop="20dp"
+			android:textAppearance="@style/ListItemFirstLineText"
 			/>
 
 		<TextView
 			android:id="@android:id/text2"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:paddingLeft="10dip"
-			android:textAppearance="?android:attr/textAppearanceSmall"
+			android:paddingBottom="20dp"
+			android:textAppearance="@style/ListItemSecondLineText"
 			/>
 
-
 	</LinearLayout>
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/app/src/main/res/layout-port/item_host.xml b/app/src/main/res/layout-port/item_host.xml
index 7ee7f0a..c318d38 100644
--- a/app/src/main/res/layout-port/item_host.xml
+++ b/app/src/main/res/layout-port/item_host.xml
@@ -22,36 +22,50 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="fill_parent"
 	android:layout_height="wrap_content"
-	android:padding="10dip"
+	android:minHeight="72dp"
 	>
 
 	<ImageView
 		android:id="@android:id/icon"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
+		android:layout_width="40dp"
+		android:layout_height="40dp"
 		android:layout_alignParentRight="true"
+		android:layout_centerVertical="true"
+		android:layout_marginRight="16dp"
 		android:contentDescription="@string/image_description_connected"
-		android:paddingTop="5dip"
 		android:src="@drawable/connected"
 		/>
 
-	<TextView
-		android:id="@android:id/text1"
+	<LinearLayout
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:ellipsize="end"
-		android:paddingRight="20dip"
-		android:singleLine="true"
-		android:textAppearance="?android:attr/textAppearanceLarge"
-		/>
+		android:layout_alignParentLeft="true"
+		android:layout_alignWithParentIfMissing="true"
+		android:layout_centerVertical="true"
+		android:layout_marginLeft="16dp"
+		android:layout_marginRight="16dp"
+		android:orientation="vertical"
+		android:layout_toLeftOf="@android:id/icon"
+		>
 
-	<TextView
-		android:id="@android:id/text2"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_below="@android:id/text1"
-		android:textAppearance="?android:attr/textAppearanceSmall"
-		/>
+		<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/text2"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:paddingBottom="20dp"
+			android:textAppearance="@style/ListItemSecondLineText"
+			/>
 
+	</LinearLayout>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 031d358..593af85 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -27,9 +27,17 @@
 		<item name="android:textSize">10sp</item>
 	</style>
 
-
 	<style name="KeyboardButton" parent="KeyboardKey">
 		<item name="android:background">@drawable/keyboard_button_selector</item>
 	</style>
 
+	<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>
-- 
cgit v1.2.3


From ecf0d1459a1544e989774fd9ddab32138905f28e Mon Sep 17 00:00:00 2001
From: Kyle Horimoto <khorimoto@gmail.com>
Date: Fri, 4 Sep 2015 14:16:32 -0700
Subject: Fix lint errors, make only one file.

---
 app/src/main/res/layout-land/item_host.xml | 72 ----------------------------
 app/src/main/res/layout-port/item_host.xml | 71 ----------------------------
 app/src/main/res/layout/item_host.xml      | 76 ++++++++++++++++++++++++++++++
 3 files changed, 76 insertions(+), 143 deletions(-)
 delete mode 100644 app/src/main/res/layout-land/item_host.xml
 delete mode 100644 app/src/main/res/layout-port/item_host.xml
 create mode 100644 app/src/main/res/layout/item_host.xml

diff --git a/app/src/main/res/layout-land/item_host.xml b/app/src/main/res/layout-land/item_host.xml
deleted file mode 100644
index a6e60d3..0000000
--- a/app/src/main/res/layout-land/item_host.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * ConnectBot: simple, powerful, open-source SSH client for Android
- * Copyright 2007 Kenny Root, Jeffrey Sharkey
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<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"
-	>
-
-	<ImageView
-		android:id="@android:id/icon"
-		android:layout_width="40dp"
-		android:layout_height="40dp"
-		android:layout_alignParentRight="true"
-		android:layout_centerVertical="true"
-		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_alignParentLeft="true"
-		android:layout_alignWithParentIfMissing="true"
-		android:layout_centerVertical="true"
-		android:layout_marginLeft="16dp"
-		android:layout_marginRight="16dp"
-		android:orientation="vertical"
-		android:layout_toLeftOf="@android:id/icon"
-		>
-
-		<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/text2"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:paddingBottom="20dp"
-			android:textAppearance="@style/ListItemSecondLineText"
-			/>
-
-	</LinearLayout>
-
-</RelativeLayout>
diff --git a/app/src/main/res/layout-port/item_host.xml b/app/src/main/res/layout-port/item_host.xml
deleted file mode 100644
index e9685b5..0000000
--- a/app/src/main/res/layout-port/item_host.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * ConnectBot: simple, powerful, open-source SSH client for Android
- * Copyright 2007 Kenny Root, Jeffrey Sharkey
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<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"
-	>
-
-	<ImageView
-		android:id="@android:id/icon"
-		android:layout_width="40dp"
-		android:layout_height="40dp"
-		android:layout_alignParentRight="true"
-		android:layout_centerVertical="true"
-		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_alignParentLeft="true"
-		android:layout_alignWithParentIfMissing="true"
-		android:layout_centerVertical="true"
-		android:layout_marginLeft="16dp"
-		android:layout_marginRight="16dp"
-		android:orientation="vertical"
-		android:layout_toLeftOf="@android:id/icon"
-		>
-
-		<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/text2"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:paddingBottom="20dp"
-			android:textAppearance="@style/ListItemSecondLineText"
-			/>
-
-	</LinearLayout>
-
-</RelativeLayout>
diff --git a/app/src/main/res/layout/item_host.xml b/app/src/main/res/layout/item_host.xml
new file mode 100644
index 0000000..56c3d34
--- /dev/null
+++ b/app/src/main/res/layout/item_host.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ ConnectBot: simple, powerful, open-source SSH client for Android
+  ~ Copyright 2015 Kenny Root, Jeffrey Sharkey
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<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"
+    >
+
+    <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"
+        >
+
+        <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/text2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingBottom="20dp"
+            android:textAppearance="@style/ListItemSecondLineText"
+            />
+
+    </LinearLayout>
+
+</RelativeLayout>
-- 
cgit v1.2.3