First wrong button text in View Headers in night theme. https://redmine.stoutner...

[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 7911f31d9e790034d8b5bc915072e57a9e9a4bb2..9a09da349eb92ded1d60f4a41ef78d62ef6ebaf7 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,31 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright © 2016-2017, 2019 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2016-2017, 2019, 2022-2024 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_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:background="?attr/listSelectorDrawable" >
+    android:background="@drawable/list_selector" >
 
     <!-- First row. -->
     <LinearLayout
@@ -36,8 +35,9 @@
         android:layout_marginEnd="10dp"
         android:orientation="horizontal" >
 
+        <!-- Database ID. -->
         <TextView
-            android:id="@+id/bookmarks_databaseview_database_id"
+            android:id="@+id/database_id_textview"
             android:layout_height="wrap_content"
             android:layout_width="50dp"
             android:layout_marginEnd="10dp"
@@ -45,27 +45,39 @@
             android:textColor="@color/gray_500"
             android:textSize="22sp" />
 
+        <!-- Favorite icon. -->
         <ImageView
-            android:id="@+id/bookmarks_databaseview_favorite_icon"
+            android:id="@+id/favorite_icon_imageview"
             android:layout_width="30dp"
             android:layout_height="30dp"
             android:layout_gravity="center_vertical"
             android:layout_marginEnd="10dp"
             tools:ignore="ContentDescription" />
 
+        <!-- Name. -->
         <TextView
-            android:id='@+id/bookmarks_databaseview_bookmark_name'
+            android:id="@+id/name_textview"
             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" />
+
+        <!-- Folder ID. -->
+        <TextView
+            android:id="@+id/folder_id_textview"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:textColor="@color/gray_500"
+            android:textSize="22sp"
+            android:ellipsize="end"
+            android:lines="1" />
     </LinearLayout>
 
-    <!-- Second row. -->
+    <!-- Second row - URL. -->
     <TextView
-        android:id="@+id/bookmarks_databaseview_bookmark_url"
+        android:id="@+id/url_textview"
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
         android:layout_marginStart="13dp"
@@ -73,7 +85,7 @@
         android:textColor="?android:attr/textColorPrimary"
         android:textSize="22sp"
         android:ellipsize="end"
-        android:maxLines="1" />
+        android:lines="1" />
 
     <!-- Third row. -->
     <LinearLayout
@@ -84,8 +96,9 @@
         android:layout_marginBottom="10dp"
         android:orientation="horizontal" >
 
+        <!-- Display order. -->
         <TextView
-            android:id="@+id/bookmarks_databaseview_display_order"
+            android:id="@+id/display_order_textview"
             android:layout_height="wrap_content"
             android:layout_width="50dp"
             android:layout_marginEnd="10dp"
@@ -93,8 +106,9 @@
             android:textColor="?android:attr/textColorPrimary"
             android:textSize="22sp" />
 
+        <!-- Parent folder icon. -->
         <ImageView
-            android:id="@+id/bookmarks_databaseview_parent_folder_icon"
+            android:id="@+id/parent_folder_icon_imageview"
             android:layout_height="30dp"
             android:layout_width="30dp"
             android:layout_gravity="center_vertical"
@@ -102,13 +116,14 @@
             android:src="@drawable/folder_gray"
             tools:ignore="ContentDescription" />
 
+        <!-- Parent folder name. -->
         <TextView
-            android:id="@+id/bookmarks_databaseview_parent_folder"
+            android:id="@+id/parent_folder_textview"
             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>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>