From 6ee86a20e12338473e61acb931281cca0e6bb4cb Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Wed, 6 Dec 2017 17:23:29 -0800
Subject: [PATCH] Fix GridLayout on Android 4.4

---
 .../shadowsocks/widget/BoundedGridLayout.kt   |  2 +-
 mobile/src/main/res/layout/layout_main.xml    | 26 +++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/mobile/src/main/java/com/github/shadowsocks/widget/BoundedGridLayout.kt b/mobile/src/main/java/com/github/shadowsocks/widget/BoundedGridLayout.kt
index 19a6efab..cd5d94ea 100644
--- a/mobile/src/main/java/com/github/shadowsocks/widget/BoundedGridLayout.kt
+++ b/mobile/src/main/java/com/github/shadowsocks/widget/BoundedGridLayout.kt
@@ -21,8 +21,8 @@
 package com.github.shadowsocks.widget
 
 import android.content.Context
+import android.support.v7.widget.GridLayout
 import android.util.AttributeSet
-import android.widget.GridLayout
 import com.github.shadowsocks.R
 
 /**
diff --git a/mobile/src/main/res/layout/layout_main.xml b/mobile/src/main/res/layout/layout_main.xml
index e995094d..70a3877e 100644
--- a/mobile/src/main/res/layout/layout_main.xml
+++ b/mobile/src/main/res/layout/layout_main.xml
@@ -30,39 +30,39 @@
         <com.github.shadowsocks.widget.BoundedGridLayout android:layout_width="match_parent"
                                                          android:layout_height="wrap_content"
                                                          app:bounded_width="288dp"
-                                                         android:columnCount="4">
-            <TextView android:layout_column="0" style="@style/TextAppearance.AppCompat.Body2"
+                                                         app:columnCount="4">
+            <TextView app:layout_column="0" style="@style/TextAppearance.AppCompat.Body2"
                       android:ellipsize="marquee" android:text="@string/sent"
                       android:layout_width="wrap_content" android:layout_height="wrap_content"
                       android:layout_marginEnd="24dp"
                       android:gravity="end"/>
-            <TextView android:layout_column="1" android:id="@+id/tx" android:textSize="14sp"
+            <TextView app:layout_column="1" android:id="@+id/tx" android:textSize="14sp"
                       android:textColor="?android:attr/textColorSecondary" android:ellipsize="marquee"
                       android:layout_width="0dp" android:layout_height="wrap_content"
-                      android:layout_columnWeight="1" android:layout_gravity="fill_horizontal"/>
-            <TextView android:layout_column="2" android:textSize="14sp"
+                      app:layout_columnWeight="1" android:layout_gravity="fill_horizontal"/>
+            <TextView app:layout_column="2" android:textSize="14sp"
                       android:textColor="?android:attr/textColorSecondary"
                       android:ellipsize="marquee" android:text="▲"
                       android:layout_width="wrap_content" android:layout_height="wrap_content"/>
-            <TextView android:layout_column="3" android:id="@+id/txRate" android:textSize="14sp"
+            <TextView app:layout_column="3" android:id="@+id/txRate" android:textSize="14sp"
                       android:textColor="?android:attr/textColorSecondary" android:ellipsize="marquee"
-                      android:layout_width="0dp" android:layout_height="wrap_content" android:layout_columnWeight="1"
+                      android:layout_width="0dp" android:layout_height="wrap_content" app:layout_columnWeight="1"
                       android:layout_gravity="fill_horizontal" android:gravity="end"/>
-            <TextView android:layout_row="1" android:layout_column="0" style="@style/TextAppearance.AppCompat.Body2"
+            <TextView app:layout_row="1" app:layout_column="0" style="@style/TextAppearance.AppCompat.Body2"
                       android:layout_width="wrap_content" android:layout_height="wrap_content"
                       android:layout_marginEnd="24dp"
                       android:gravity="end"
                       android:ellipsize="marquee" android:text="@string/received"/>
-            <TextView android:layout_row="1" android:layout_column="1" android:id="@+id/rx" android:textSize="14sp"
+            <TextView app:layout_row="1" app:layout_column="1" android:id="@+id/rx" android:textSize="14sp"
                       android:textColor="?android:attr/textColorSecondary" android:ellipsize="marquee"
-                      android:layout_width="0dp" android:layout_height="wrap_content" android:layout_columnWeight="1"
+                      android:layout_width="0dp" android:layout_height="wrap_content" app:layout_columnWeight="1"
                       android:layout_gravity="fill_horizontal" />
-            <TextView android:layout_row="1" android:layout_column="2" android:textSize="14sp"
+            <TextView app:layout_row="1" app:layout_column="2" android:textSize="14sp"
                       android:textColor="?android:attr/textColorSecondary" android:ellipsize="marquee"
                       android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="▼"/>
-            <TextView android:layout_row="1" android:layout_column="3" android:id="@+id/rxRate" android:textSize="14sp"
+            <TextView app:layout_row="1" app:layout_column="3" android:id="@+id/rxRate" android:textSize="14sp"
                       android:textColor="?android:attr/textColorSecondary" android:ellipsize="marquee"
-                      android:layout_width="0dp" android:layout_height="wrap_content" android:layout_columnWeight="1"
+                      android:layout_width="0dp" android:layout_height="wrap_content" app:layout_columnWeight="1"
                       android:layout_gravity="fill_horizontal" android:gravity="end"/>
         </com.github.shadowsocks.widget.BoundedGridLayout>
     </LinearLayout>