diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout-sw600dp-port/log_fragment.xml | 42 | ||||
| -rw-r--r-- | res/layout-sw600dp/log_fragment.xml | 37 | ||||
| -rw-r--r-- | res/layout-w720dp/log_fragment.xml | 73 | ||||
| -rw-r--r-- | res/layout/log_fragment.xml | 7 | ||||
| -rw-r--r-- | res/layout/log_silders.xml | 2 | ||||
| -rw-r--r-- | res/layout/vpnstatus.xml | 46 | ||||
| -rw-r--r-- | res/values-sw600dp/dimens.xml (renamed from res/values-w600dp/dimens.xml) | 0 |
7 files changed, 132 insertions, 75 deletions
diff --git a/res/layout-sw600dp-port/log_fragment.xml b/res/layout-sw600dp-port/log_fragment.xml new file mode 100644 index 00000000..ddf0506b --- /dev/null +++ b/res/layout-sw600dp-port/log_fragment.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + tools:context=".LogWindow"> + + <LinearLayout + android:layout_height="wrap_content" + android:layout_width="match_parent"> + + <include layout="@layout/log_silders"/> + + <Space + android:layout_weight="5" + android:layout_height="wrap_content" + android:layout_width="wrap_content"/> + <LinearLayout + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:orientation="vertical"> + <include layout="@layout/vpnstatus"/> + </LinearLayout> + <Space + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:layout_weight="1"/> + </LinearLayout> + + <Space + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:minHeight="5dp"/> + + <ListView + android:id="@android:id/list" + android:transcriptMode="normal" + android:layout_width="fill_parent" + android:layout_height="fill_parent"/> + +</LinearLayout>
\ No newline at end of file diff --git a/res/layout-sw600dp/log_fragment.xml b/res/layout-sw600dp/log_fragment.xml new file mode 100644 index 00000000..d8e8562f --- /dev/null +++ b/res/layout-sw600dp/log_fragment.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + tools:context=".LogWindow"> + + <LinearLayout + android:padding="20dp" + android:layout_width="wrap_content" + android:orientation="horizontal" + android:layout_height="match_parent"> + + <LinearLayout + android:minWidth="300dp" + android:orientation="vertical" + android:layout_width="wrap_content" + android:layout_height="match_parent"> + + <include layout="@layout/log_silders"/> + + <include layout="@layout/vpnstatus"/> + </LinearLayout> + + <Space + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:minWidth="5dp"/> + + <ListView + android:id="@android:id/list" + android:transcriptMode="normal" + android:layout_width="fill_parent" + android:layout_height="match_parent"/> + </LinearLayout> +</LinearLayout>
\ No newline at end of file diff --git a/res/layout-w720dp/log_fragment.xml b/res/layout-w720dp/log_fragment.xml deleted file mode 100644 index 07502e15..00000000 --- a/res/layout-w720dp/log_fragment.xml +++ /dev/null @@ -1,73 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - tools:context=".LogWindow"> - - <LinearLayout - android:padding="20dp" - android:layout_width="wrap_content" - android:orientation="horizontal" - android:layout_height="match_parent"> - <LinearLayout - android:minWidth="300dp" - - android:orientation="vertical" - android:layout_width="wrap_content" - android:layout_height="match_parent"> - <include layout="@layout/log_silders"/> - - <Space - android:layout_weight="1" - android:layout_width="wrap_content" - android:layout_height="wrap_content"/> - - - - <TextView - android:text="Upload" - style="@style/logWindowStatusTitle"/> - - <TextView - style="@style/logWindowStatusText" - android:id="@+id/speedUp" - tools:text="4 Mbit/s 6.7 GB"/> - - <TextView - android:text="Download" - style="@style/logWindowStatusTitle"/> - - <TextView - style="@style/logWindowStatusText" - android:id="@+id/speedDown" - tools:text="2 Mbit/s 4.7 GB"/> - - - <Space - android:layout_weight="1" - android:layout_width="wrap_content" - android:layout_height="wrap_content"/> - - - <TextView - android:text="Vpn Status" - style="@style/logWindowStatusTitle"/> - - <TextView - android:id="@+id/speedStatus" - tools:text="Connected" - style="@style/logWindowStatusText"/>/ - - - </LinearLayout> - - - <ListView - android:id="@android:id/list" - android:transcriptMode="normal" - android:layout_width="fill_parent" - android:layout_height="match_parent"/> - </LinearLayout> -</LinearLayout>
\ No newline at end of file diff --git a/res/layout/log_fragment.xml b/res/layout/log_fragment.xml index d1e467b1..bcc3f9af 100644 --- a/res/layout/log_fragment.xml +++ b/res/layout/log_fragment.xml @@ -5,7 +5,12 @@ android:layout_height="match_parent" android:orientation="vertical"> - <include layout="@layout/log_silders"/> + <LinearLayout + android:layout_height="wrap_content" + android:layout_width="match_parent"> + + <include layout="@layout/log_silders"/> + </LinearLayout> <TextView android:text="@string/speed_waiting" diff --git a/res/layout/log_silders.xml b/res/layout/log_silders.xml index 9aadd4d1..5df97490 100644 --- a/res/layout/log_silders.xml +++ b/res/layout/log_silders.xml @@ -8,7 +8,7 @@ android:id="@+id/logOptionsLayout" android:visibility="gone" tools:visibility="visible" - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content"> <TextView diff --git a/res/layout/vpnstatus.xml b/res/layout/vpnstatus.xml new file mode 100644 index 00000000..0c765fe6 --- /dev/null +++ b/res/layout/vpnstatus.xml @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="utf-8"?> +<merge xmlns:tools="http://schemas.android.com/tools" + xmlns:android="http://schemas.android.com/apk/res/android"> + + <Space + android:layout_weight="1" + android:layout_width="wrap_content" + android:layout_height="wrap_content"/> + + + <TextView + android:text="Upload" + style="@style/logWindowStatusTitle"/> + + <TextView + style="@style/logWindowStatusText" + android:id="@+id/speedUp" + tools:text="4 Mbit/s 6.7 GB"/> + + <TextView + android:text="Download" + style="@style/logWindowStatusTitle"/> + + <TextView + style="@style/logWindowStatusText" + android:id="@+id/speedDown" + tools:text="2 Mbit/s 4.7 GB"/> + + + <Space + android:layout_weight="1" + android:layout_width="wrap_content" + android:layout_height="wrap_content"/> + + + <TextView + android:text="Vpn Status" + style="@style/logWindowStatusTitle"/> + + <TextView + android:id="@+id/speedStatus" + tools:text="Connected" + style="@style/logWindowStatusText"/> + + +</merge>
\ No newline at end of file diff --git a/res/values-w600dp/dimens.xml b/res/values-sw600dp/dimens.xml index b83bb856..b83bb856 100644 --- a/res/values-w600dp/dimens.xml +++ b/res/values-sw600dp/dimens.xml |