From 4e5b04d9aa6e7a2a2699c7644c6e86ff892071be Mon Sep 17 00:00:00 2001
From: Karim Abou Zeid <karim23697@gmail.com>
Date: Sun, 6 Sep 2015 20:46:42 +0200
Subject: [PATCH] Added landscape and rtl support for the new about screen.

---
 app/build.gradle                              |  1 +
 .../layout-w640dp/activity_about_content.xml  | 55 +++++++++++++++++++
 app/src/main/res/layout/activity_about.xml    | 28 +---------
 .../res/layout/activity_about_content.xml     | 28 ++++++++++
 app/src/main/res/layout/card_author.xml       |  2 +-
 .../main/res/layout/card_special_thanks.xml   |  2 +-
 .../res/layout/card_support_development.xml   |  2 +-
 7 files changed, 88 insertions(+), 30 deletions(-)
 create mode 100644 app/src/main/res/layout-w640dp/activity_about_content.xml
 create mode 100644 app/src/main/res/layout/activity_about_content.xml

diff --git a/app/build.gradle b/app/build.gradle
index 8d158ec6..ef718750 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -90,6 +90,7 @@ dependencies {
     compile 'com.android.support:support-v13:23.0.1'
     compile 'com.android.support:appcompat-v7:23.0.1'
     compile 'com.android.support:recyclerview-v7:23.0.1'
+    compile 'com.android.support:gridlayout-v7:23.0.1'
     compile 'com.android.support:cardview-v7:23.0.1'
     compile 'com.android.support:palette-v7:23.0.1'
     compile 'com.android.support:design:23.0.1'
diff --git a/app/src/main/res/layout-w640dp/activity_about_content.xml b/app/src/main/res/layout-w640dp/activity_about_content.xml
new file mode 100644
index 00000000..ab207de1
--- /dev/null
+++ b/app/src/main/res/layout-w640dp/activity_about_content.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v7.widget.GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:grid="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="16dp"
+    grid:alignmentMode="alignBounds">
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        grid:layout_column="0"
+        grid:layout_columnWeight="1"
+        grid:layout_row="0">
+
+        <include
+            layout="@layout/card_about_app"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <include
+            layout="@layout/card_support_development"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp" />
+
+    </LinearLayout>
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingEnd="0dp"
+        android:paddingLeft="16dp"
+        android:paddingRight="0dp"
+        android:paddingStart="16dp"
+        grid:layout_column="1"
+        grid:layout_columnWeight="1"
+        grid:layout_row="0">
+
+        <include
+            layout="@layout/card_author"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <include
+            layout="@layout/card_special_thanks"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp" />
+
+    </LinearLayout>
+
+</android.support.v7.widget.GridLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index fcf0b1af..5795ba59 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -19,33 +19,7 @@
         android:clipToPadding="false"
         android:isScrollContainer="true">
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:padding="16dp">
-
-            <include layout="@layout/card_about_app" />
-
-            <include
-                layout="@layout/card_author"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp" />
-
-            <include
-                layout="@layout/card_support_development"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp" />
-
-            <include
-                layout="@layout/card_special_thanks"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp" />
-
-        </LinearLayout>
+        <include layout="@layout/activity_about_content" />
 
     </ScrollView>
 
diff --git a/app/src/main/res/layout/activity_about_content.xml b/app/src/main/res/layout/activity_about_content.xml
new file mode 100644
index 00000000..5cd875b8
--- /dev/null
+++ b/app/src/main/res/layout/activity_about_content.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:padding="16dp">
+
+    <include layout="@layout/card_about_app" />
+
+    <include
+        layout="@layout/card_author"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp" />
+
+    <include
+        layout="@layout/card_support_development"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp" />
+
+    <include
+        layout="@layout/card_special_thanks"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/card_author.xml b/app/src/main/res/layout/card_author.xml
index c3d55323..5fe7b120 100644
--- a/app/src/main/res/layout/card_author.xml
+++ b/app/src/main/res/layout/card_author.xml
@@ -16,7 +16,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
+            android:layout_gravity="start|center_vertical"
             android:paddingBottom="16dp"
             android:paddingLeft="16dp"
             android:paddingRight="16dp"
diff --git a/app/src/main/res/layout/card_special_thanks.xml b/app/src/main/res/layout/card_special_thanks.xml
index 82e1c3f7..813fb838 100644
--- a/app/src/main/res/layout/card_special_thanks.xml
+++ b/app/src/main/res/layout/card_special_thanks.xml
@@ -16,7 +16,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
+            android:layout_gravity="start|center_vertical"
             android:paddingBottom="16dp"
             android:paddingLeft="16dp"
             android:paddingRight="16dp"
diff --git a/app/src/main/res/layout/card_support_development.xml b/app/src/main/res/layout/card_support_development.xml
index 50611582..b8a2db4a 100644
--- a/app/src/main/res/layout/card_support_development.xml
+++ b/app/src/main/res/layout/card_support_development.xml
@@ -16,7 +16,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
+            android:layout_gravity="start|center_vertical"
             android:paddingBottom="16dp"
             android:paddingLeft="16dp"
             android:paddingRight="16dp"