From 302f41085f460e67934166a3da55fa746eeaf7e2 Mon Sep 17 00:00:00 2001
From: akuma <n3k0@pc.localdomain>
Date: Fri, 9 Aug 2019 00:00:36 +0200
Subject: Select Apps option

---
 .../main/res/layout/allowed_application_layout.xml | 61 ++++++++++++++++++
 app/src/main/res/layout/allowed_vpn_apps.xml       | 75 ++++++++++++++++++++++
 app/src/main/res/layout/s_layout.xml               | 12 ++++
 3 files changed, 148 insertions(+)
 create mode 100644 app/src/main/res/layout/allowed_application_layout.xml
 create mode 100644 app/src/main/res/layout/allowed_vpn_apps.xml
 create mode 100644 app/src/main/res/layout/s_layout.xml

(limited to 'app/src/main/res/layout')

diff --git a/app/src/main/res/layout/allowed_application_layout.xml b/app/src/main/res/layout/allowed_application_layout.xml
new file mode 100644
index 00000000..d8d846f9
--- /dev/null
+++ b/app/src/main/res/layout/allowed_application_layout.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2012-2016 Arne Schwabe
+  ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+  -->
+
+<GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:paddingTop="8dip"
+    android:paddingBottom="8dip"
+    android:columnCount="4"
+    tools:ignore="RtlCompat">
+
+    <ImageView
+        android:id="@+id/app_icon"
+        android:layout_width="@android:dimen/app_icon_size"
+        android:layout_height="@android:dimen/app_icon_size"
+        android:layout_rowSpan="1"
+        android:layout_marginEnd="8dip"
+        android:scaleType="centerInside"
+        tools:background="@drawable/icon"
+        android:contentDescription="@null" />
+
+    <TextView
+        tools:text="@string/app"
+        android:id="@+id/app_name"
+        android:layout_width="0dip"
+        android:layout_columnSpan="2"
+        android:layout_rowSpan="1"
+        android:layout_gravity="fill_horizontal|center_vertical"
+        android:layout_marginTop="2dip"
+        android:singleLine="true"
+        android:ellipsize="marquee"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textAlignment="viewStart" />
+
+    <CheckBox android:id="@+id/app_selected"
+        android:layout_marginStart="8dip"
+        android:layout_gravity="center_vertical"
+        android:layout_rowSpan="1"
+        android:visibility="visible" />
+
+<!--    <TextView
+        android:id="@+id/app_size"
+        android:layout_width="0dip"
+        android:layout_gravity="fill_horizontal|top"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textAlignment="viewStart" /> -->
+
+    <!-- <TextView
+        android:id="@+id/app_disabled"
+        android:layout_marginStart="8dip"
+        android:layout_gravity="top"
+        android:textAppearance="?android:attr/textAppearanceSmall" /> -->
+
+</GridLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/allowed_vpn_apps.xml b/app/src/main/res/layout/allowed_vpn_apps.xml
new file mode 100644
index 00000000..0883f4b8
--- /dev/null
+++ b/app/src/main/res/layout/allowed_vpn_apps.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2012-2016 Arne Schwabe
+  ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    tools:ignore="RtlCompat"
+    android:layout_height="match_parent">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
+        android:background="@drawable/bg_switchbar"
+        android:paddingStart="@dimen/switchbar_pad"
+        android:elevation="1dp"
+        android:paddingEnd="@dimen/switchbar_pad"
+        tools:ignore="NewApi">
+
+        <Switch
+            android:id="@+id/default_allow"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+             />
+        <TextView
+            android:id="@+id/default_allow_text"
+            style="@android:style/TextAppearance.Medium.Inverse"
+            tools:text="@string/vpn_disallow_radio"
+            android:layout_toStartOf="@id/default_allow"
+            android:layout_width="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_height="wrap_content" />
+        </RelativeLayout>
+
+    <ListView
+        android:visibility="gone"
+        android:id="@android:id/list"
+        android:drawSelectorOnTop="false"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:clipToPadding="false"
+        android:scrollbarStyle="outsideOverlay" />
+
+
+
+    <LinearLayout
+        android:id="@+id/loading_container"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="visible"
+        android:gravity="center">
+
+        <ProgressBar
+            style="?android:attr/progressBarStyleLarge"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:text="@string/loading"
+            android:paddingTop="4dip"
+            android:singleLine="true" />
+
+    </LinearLayout>
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/s_layout.xml b/app/src/main/res/layout/s_layout.xml
new file mode 100644
index 00000000..d5717a5b
--- /dev/null
+++ b/app/src/main/res/layout/s_layout.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <Button
+        android:id="@+id/buttontest"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:text="A"/>
+
+</ScrollView>
-- 
cgit v1.2.3


From f510feb3130f7f28a5b9116c903a33e92d37ba5c Mon Sep 17 00:00:00 2001
From: akuma <n3k0@pc.localdomain>
Date: Fri, 9 Aug 2019 01:19:19 +0200
Subject: Commented allow apps switch. Allow app fragment title

---
 app/src/main/res/layout/allowed_vpn_apps.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/src/main/res/layout')

diff --git a/app/src/main/res/layout/allowed_vpn_apps.xml b/app/src/main/res/layout/allowed_vpn_apps.xml
index 0883f4b8..93327944 100644
--- a/app/src/main/res/layout/allowed_vpn_apps.xml
+++ b/app/src/main/res/layout/allowed_vpn_apps.xml
@@ -9,7 +9,7 @@
     android:layout_width="match_parent"
     tools:ignore="RtlCompat"
     android:layout_height="match_parent">
-
+<!--
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -35,7 +35,7 @@
             android:layout_width="wrap_content"
             android:layout_centerVertical="true"
             android:layout_height="wrap_content" />
-        </RelativeLayout>
+        </RelativeLayout>-->
 
     <ListView
         android:visibility="gone"
-- 
cgit v1.2.3


From 2e1c94d3f51dc6d667435b2a2bbd81a036d57bae Mon Sep 17 00:00:00 2001
From: akuma <akuma>
Date: Sun, 8 Sep 2019 20:40:29 +0200
Subject: New icon and text for Excluded Apps. Using PreferenceHelper. Test
 done.

---
 app/src/main/res/layout/allowed_vpn_apps.xml | 37 +++++++++-------------------
 1 file changed, 11 insertions(+), 26 deletions(-)

(limited to 'app/src/main/res/layout')

diff --git a/app/src/main/res/layout/allowed_vpn_apps.xml b/app/src/main/res/layout/allowed_vpn_apps.xml
index 93327944..1219da54 100644
--- a/app/src/main/res/layout/allowed_vpn_apps.xml
+++ b/app/src/main/res/layout/allowed_vpn_apps.xml
@@ -9,33 +9,20 @@
     android:layout_width="match_parent"
     tools:ignore="RtlCompat"
     android:layout_height="match_parent">
-<!--
-    <RelativeLayout
+
+    <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:minHeight="?android:attr/actionBarSize"
-        android:background="@drawable/bg_switchbar"
-        android:paddingStart="@dimen/switchbar_pad"
-        android:elevation="1dp"
-        android:paddingEnd="@dimen/switchbar_pad"
-        tools:ignore="NewApi">
+        android:gravity="center"
+        android:textStyle="bold"
+        android:textColor="@color/colorWarning"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:text="@string/warning_exclude_apps_message" />
 
-        <Switch
-            android:id="@+id/default_allow"
-            android:layout_alignParentEnd="true"
-            android:layout_centerVertical="true"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-             />
-        <TextView
-            android:id="@+id/default_allow_text"
-            style="@android:style/TextAppearance.Medium.Inverse"
-            tools:text="@string/vpn_disallow_radio"
-            android:layout_toStartOf="@id/default_allow"
-            android:layout_width="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_height="wrap_content" />
-        </RelativeLayout>-->
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="?android:attr/listDivider"/>
 
     <ListView
         android:visibility="gone"
@@ -46,8 +33,6 @@
         android:clipToPadding="false"
         android:scrollbarStyle="outsideOverlay" />
 
-
-
     <LinearLayout
         android:id="@+id/loading_container"
         android:orientation="vertical"
-- 
cgit v1.2.3