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

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

diff --git a/app/src/main/res/layout/appbar_spinner_item.xml b/app/src/main/res/layout/appbar_spinner_item.xml
index 3e7cc3c3a9ea62bcc02ab52b60fb75570d9d5227..6b3cdd42f8a8ebd371ce29e1dc75dfdc5cad046e 100644 (file)
--- a/app/src/main/res/layout/appbar_spinner_item.xml
+++ b/app/src/main/res/layout/appbar_spinner_item.xml
@@ -1,31 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright © 2017-2018 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2017-2020,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/>. -->
 
-<TextView
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/spinner_item_textview"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_height="wrap_content"
     android:layout_width="match_parent"
-    android:maxLines="1"
-    android:ellipsize="end"
-    android:paddingStart="10dp"
-    android:paddingEnd="10dp"
-    android:textSize="18sp"
-    android:textColor="?attr/spinnerHeaderTextColor" />
\ No newline at end of file
+    android:orientation="horizontal"
+    tools:ignore="UseCompoundDrawables" >
+
+    <ImageView
+        android:id="@+id/spinner_item_imageview"
+        android:layout_height="30dp"
+        android:layout_width="30dp"
+        android:layout_gravity="center_vertical"
+        android:layout_marginStart="10dp"
+        tools:ignore="contentDescription" />
+
+    <TextView
+        android:id="@+id/spinner_item_textview"
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:lines="1"
+        android:ellipsize="end"
+        android:paddingStart="10dp"
+        android:paddingEnd="10dp"
+        android:textSize="18sp"
+        android:textColor="?android:attr/textColorPrimary" />
+</LinearLayout>
\ No newline at end of file