From d2dc6fa6fc12ca876bb3dcf099ec6694dc7ef061 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Sun, 13 Oct 2013 17:07:30 +0200
Subject: Add Seekbar with ticks, make a better layout for large screens of the
 log screen

--HG--
rename : res/layout/logwindow.xml => res/layout-w720dp/logwindow.xml
---
 res/layout-w720dp/logwindow.xml | 73 +++++++++++++++++++++++++++++++++++++++++
 res/layout/log_silders.xml      | 61 ++++++++++++++++++++++++++++++++++
 res/layout/logwindow.xml        | 56 ++-----------------------------
 res/values-w600dp/dimens.xml    |  5 +++
 res/values/dimens.xml           |  7 ++++
 res/values/styles.xml           | 13 +++++++-
 6 files changed, 160 insertions(+), 55 deletions(-)
 create mode 100644 res/layout-w720dp/logwindow.xml
 create mode 100644 res/layout/log_silders.xml
 create mode 100644 res/values-w600dp/dimens.xml
 create mode 100644 res/values/dimens.xml

(limited to 'res')

diff --git a/res/layout-w720dp/logwindow.xml b/res/layout-w720dp/logwindow.xml
new file mode 100644
index 00000000..07502e15
--- /dev/null
+++ b/res/layout-w720dp/logwindow.xml
@@ -0,0 +1,73 @@
+<?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_silders.xml b/res/layout/log_silders.xml
new file mode 100644
index 00000000..9aadd4d1
--- /dev/null
+++ b/res/layout/log_silders.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+
+<LinearLayout
+        xmlns:tools="http://schemas.android.com/tools"
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
+        android:id="@+id/logOptionsLayout"
+        android:visibility="gone"
+        tools:visibility="visible"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+    <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/log_verbosity_level"/>
+
+
+    <de.blinkt.openvpn.fragments.SeekBarTicks
+            android:id="@+id/LogLevelSlider"
+            android:layout_width="300dp"
+            android:layout_height="wrap_content"
+            tools:max="5"
+            android:indeterminate="false"/>
+
+    <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Timestamps"/>
+
+    <RadioGroup
+            android:id="@+id/timeFormatRadioGroup"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+        <RadioButton
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="None"
+                android:id="@+id/radioNone"
+                />
+
+        <RadioButton
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Short"
+                android:id="@+id/radioShort"
+                />
+
+        <RadioButton
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="ISO"
+                android:id="@+id/radioISO"
+                />
+
+
+    </RadioGroup>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/logwindow.xml b/res/layout/logwindow.xml
index d7281346..d1e467b1 100644
--- a/res/layout/logwindow.xml
+++ b/res/layout/logwindow.xml
@@ -1,63 +1,11 @@
 <?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">
 
-    <LinearLayout
-            android:orientation="vertical"
-            android:id="@+id/logOptionsLayout"
-            android:visibility="gone"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-        <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/log_verbosity_level"/>
-
-        <SeekBar
-                android:id="@+id/LogLevelSlider"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:max="5"
-                android:indeterminate="false"/>
-
-        <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="Timestamps"/>
-
-        <RadioGroup
-                android:id="@+id/timeFormatRadioGroup"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-            <RadioButton
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="None"
-                    android:id="@+id/radioNone"
-                    />
-
-            <RadioButton
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="Short"
-                    android:id="@+id/radioShort"
-                />
-            <RadioButton
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="ISO"
-                    android:id="@+id/radioISO"
-                    />
-
-
-        </RadioGroup>
-    </LinearLayout>
+    <include layout="@layout/log_silders"/>
 
     <TextView
             android:text="@string/speed_waiting"
diff --git a/res/values-w600dp/dimens.xml b/res/values-w600dp/dimens.xml
new file mode 100644
index 00000000..b83bb856
--- /dev/null
+++ b/res/values-w600dp/dimens.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="logSildersAlwaysVisible">true</bool>
+
+</resources>
\ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
new file mode 100644
index 00000000..4f325078
--- /dev/null
+++ b/res/values/dimens.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="paddingItemsSidebarLog">20dp</dimen>
+    <dimen name="stdpadding">8dp</dimen>
+    <bool name="logSildersAlwaysVisible">false</bool>
+
+</resources>
\ No newline at end of file
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 6614719c..95e709b3 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -48,6 +48,17 @@
 
     <style name="Theme.CreateShortCut" parent="android:Theme.Holo.DialogWhenLarge" />
 
-    <dimen name="stdpadding">8dp</dimen>
+    <style name="logWindowStatusText">
+        <item name="android:paddingLeft">@dimen/paddingItemsSidebarLog</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textAppearance">?android:attr/textAppearanceLarge</item>
+    </style>
+
+    <style name="logWindowStatusTitle">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+    </style>
+
 
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3