Commit 6ee86a20 authored by Mygod's avatar Mygod

Fix GridLayout on Android 4.4

parent 6c1fe774
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
package com.github.shadowsocks.widget package com.github.shadowsocks.widget
import android.content.Context import android.content.Context
import android.support.v7.widget.GridLayout
import android.util.AttributeSet import android.util.AttributeSet
import android.widget.GridLayout
import com.github.shadowsocks.R import com.github.shadowsocks.R
/** /**
......
...@@ -30,39 +30,39 @@ ...@@ -30,39 +30,39 @@
<com.github.shadowsocks.widget.BoundedGridLayout android:layout_width="match_parent" <com.github.shadowsocks.widget.BoundedGridLayout android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:bounded_width="288dp" app:bounded_width="288dp"
android:columnCount="4"> app:columnCount="4">
<TextView android:layout_column="0" style="@style/TextAppearance.AppCompat.Body2" <TextView app:layout_column="0" style="@style/TextAppearance.AppCompat.Body2"
android:ellipsize="marquee" android:text="@string/sent" android:ellipsize="marquee" android:text="@string/sent"
android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="24dp" android:layout_marginEnd="24dp"
android:gravity="end"/> 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:textColor="?android:attr/textColorSecondary" android:ellipsize="marquee"
android:layout_width="0dp" android:layout_height="wrap_content" android:layout_width="0dp" android:layout_height="wrap_content"
android:layout_columnWeight="1" android:layout_gravity="fill_horizontal"/> app:layout_columnWeight="1" android:layout_gravity="fill_horizontal"/>
<TextView android:layout_column="2" android:textSize="14sp" <TextView app:layout_column="2" android:textSize="14sp"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
android:ellipsize="marquee" android:text="▲" android:ellipsize="marquee" android:text="▲"
android:layout_width="wrap_content" android:layout_height="wrap_content"/> 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: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"/> 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_width="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="24dp" android:layout_marginEnd="24dp"
android:gravity="end" android:gravity="end"
android:ellipsize="marquee" android:text="@string/received"/> 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: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: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:textColor="?android:attr/textColorSecondary" android:ellipsize="marquee"
android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="▼"/> 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: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"/> android:layout_gravity="fill_horizontal" android:gravity="end"/>
</com.github.shadowsocks.widget.BoundedGridLayout> </com.github.shadowsocks.widget.BoundedGridLayout>
</LinearLayout> </LinearLayout>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment