Combine drawable files. https://redmine.stoutner.com/issues/794

[PrivacyBrowserAndroid.git] / app / src / main / res / layout / bookmarks_databaseview_item_linearlayout.xml

diff --git a/app/src/main/res/layout/bookmarks_databaseview_item_linearlayout.xml b/app/src/main/res/layout/bookmarks_databaseview_item_linearlayout.xml
index 3c91b373a74870087ec8f55aec263564816bfb9b..171a1f4d39973023e1dc6ce91a782fdbb00082fd 100644 (file)
--- a/app/src/main/res/layout/bookmarks_databaseview_item_linearlayout.xml
+++ b/app/src/main/res/layout/bookmarks_databaseview_item_linearlayout.xml
@@ -1,30 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017,2019,2022 Soren Stoutner <soren@stoutner.com>.
 
-  This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
+  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
 
-  Privacy Browser is free software: you can redistribute it and/or modify
+  Privacy Browser Android is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
 
-  Privacy Browser is distributed in the hope that it will be useful,
+  Privacy Browser Android is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
 
   You should have received a copy of the GNU General Public License
-  along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>. -->
+  along with Privacy Browser Android.  If not, see <http://www.gnu.org/licenses/>. -->
 
 <LinearLayout
-    android:id="@+id/bookmarks_database_view_item_linearlayout"
+    android:id="@+id/bookmarks_databaseview_item_linearlayout"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_height="wrap_content"
     android:layout_width="match_parent"
-    android:orientation="vertical" >
+    android:orientation="vertical"
+    android:background="?attr/listSelectorDrawable" >
 
     <!-- First row. -->
     <LinearLayout
@@ -36,7 +37,7 @@
         android:orientation="horizontal" >
 
         <TextView
-            android:id="@+id/bookmarks_database_view_database_id"
+            android:id="@+id/bookmarks_databaseview_database_id"
             android:layout_height="wrap_content"
             android:layout_width="50dp"
             android:layout_marginEnd="10dp"
@@ -45,7 +46,7 @@
             android:textSize="22sp" />
 
         <ImageView
-            android:id="@+id/bookmarks_database_view_favorite_icon"
+            android:id="@+id/bookmarks_databaseview_favorite_icon"
             android:layout_width="30dp"
             android:layout_height="30dp"
             android:layout_gravity="center_vertical"
@@ -53,25 +54,38 @@
             tools:ignore="ContentDescription" />
 
         <TextView
-            android:id='@+id/bookmarks_database_view_bookmark_name'
+            android:id='@+id/bookmarks_databaseview_bookmark_name'
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
             android:textColor="?android:attr/textColorPrimary"
             android:textSize="22sp"
             android:ellipsize="end"
-            android:maxLines="1" />
+            android:lines="1" />
     </LinearLayout>
 
     <!-- Second row. -->
+    <TextView
+        android:id="@+id/bookmarks_databaseview_bookmark_url"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:layout_marginStart="13dp"
+        android:layout_marginEnd="10dp"
+        android:textColor="?android:attr/textColorPrimary"
+        android:textSize="22sp"
+        android:ellipsize="end"
+        android:lines="1" />
+
+    <!-- Third row. -->
     <LinearLayout
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
         android:layout_marginStart="10dp"
         android:layout_marginEnd="10dp"
+        android:layout_marginBottom="10dp"
         android:orientation="horizontal" >
 
         <TextView
-            android:id="@+id/bookmarks_database_view_display_order"
+            android:id="@+id/bookmarks_databaseview_display_order"
             android:layout_height="wrap_content"
             android:layout_width="50dp"
             android:layout_marginEnd="10dp"
@@ -80,7 +94,7 @@
             android:textSize="22sp" />
 
         <ImageView
-            android:id="@+id/bookmarks_database_view_parent_folder_icon"
+            android:id="@+id/bookmarks_databaseview_parent_folder_icon"
             android:layout_height="30dp"
             android:layout_width="30dp"
             android:layout_gravity="center_vertical"
@@ -89,25 +103,12 @@
             tools:ignore="ContentDescription" />
 
         <TextView
-            android:id="@+id/bookmarks_database_view_parent_folder"
+            android:id="@+id/bookmarks_databaseview_parent_folder"
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
             android:textSize="22sp"
             android:textStyle="italic"
             android:ellipsize="end"
-            android:maxLines="1" />
+            android:lines="1" />
     </LinearLayout>
-
-    <!-- Third row. -->
-    <TextView
-        android:id="@+id/bookmarks_database_view_bookmark_url"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:layout_marginBottom="10dp"
-        android:layout_marginStart="13dp"
-        android:layout_marginEnd="10dp"
-        android:textColor="?android:attr/textColorPrimary"
-        android:textSize="22sp"
-        android:ellipsize="end"
-        android:maxLines="1" />
 </LinearLayout>
\ No newline at end of file