From 72ae846ea9ce4c50441bdc347d86a39231176f3e Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Wed, 6 May 2020 17:42:12 +0200
Subject: Convert ListView in allowed apps to RecyclerView

Closes #693
---
 .../src/ui/res/layout/allowed_application_settings.xml |  2 +-
 main/src/ui/res/layout/allowed_vpn_apps.xml            | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

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

diff --git a/main/src/ui/res/layout/allowed_application_settings.xml b/main/src/ui/res/layout/allowed_application_settings.xml
index 96170965..1f04619c 100644
--- a/main/src/ui/res/layout/allowed_application_settings.xml
+++ b/main/src/ui/res/layout/allowed_application_settings.xml
@@ -6,7 +6,7 @@
 <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:layout_height="wrap_content"
     android:orientation="vertical"
     tools:ignore="RtlCompat"
     android:layout_marginTop="10dp">
diff --git a/main/src/ui/res/layout/allowed_vpn_apps.xml b/main/src/ui/res/layout/allowed_vpn_apps.xml
index 7f5e7b8b..8f343d04 100644
--- a/main/src/ui/res/layout/allowed_vpn_apps.xml
+++ b/main/src/ui/res/layout/allowed_vpn_apps.xml
@@ -4,16 +4,18 @@
   -->
 
 <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:ignore="RtlCompat">
-
-    <ListView
-        android:id="@android:id/list"
+        xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:orientation="vertical"
+        tools:ignore="RtlCompat">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/app_recycler_view"
+        android:layout_width="match_parent"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        android:layout_height="match_parent"
         android:clipToPadding="false"
         android:drawSelectorOnTop="false"
         android:scrollbarStyle="outsideOverlay"
-- 
cgit v1.2.3