Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-15 12:19:54 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '191-transport-icon-labels' into 'master'

Browse Source 
Put labels below transport icons

This prevents the labels from wrapping on small screens. Fixes #191.

See merge request !34
This commit is contained in:
Torsten Grote
2015-12-21 13:04:14 +00:00
parent 28b7fd96a9 c9e2bf7efb
commit 08caa527cd
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
briar-android/res/layout/list_item_transport.xml
View File

@@ -2,7 +2,7 @@
<LinearLayout <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:orientation="horizontal" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="@dimen/margin_small" android:padding="@dimen/margin_small"
@@ -19,7 +19,6 @@
android:id="@+id/textView" android:id="@+id/textView"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center_vertical"
android:padding="@dimen/margin_small" android:padding="@dimen/margin_small"
android:textColor="@android:color/tertiary_text_light" android:textColor="@android:color/tertiary_text_light"
tools:text="@string/transport_tor"/> tools:text="@string/transport_tor"/>

4
briar-android/res/layout/transports_list.xml
View File

@@ -2,7 +2,7 @@
<LinearLayout <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:orientation="vertical"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<View <View
@@ -12,7 +12,7 @@
<GridView <GridView
android:id="@+id/transportsView" android:id="@+id/transportsView"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="@dimen/margin_medium" android:padding="@dimen/margin_medium"
android:numColumns="3"/> android:numColumns="3"/>