From 0694c471c4ba39fa8235e1ecfcc4e8e40ad13ad2 Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Wed, 25 Mar 2020 18:06:43 +0800
Subject: Fix some bugs in CustomizeThemeActivity.

---
 app/src/main/res/layout/item_custom_theme.xml      | 22 -----------
 .../res/layout/item_predefined_custom_theme.xml    | 25 ++++++++++++
 app/src/main/res/layout/item_theme_name.xml        | 24 ++++++++++++
 app/src/main/res/layout/item_user_custom_theme.xml | 44 ++++++++++++++++++++++
 4 files changed, 93 insertions(+), 22 deletions(-)
 delete mode 100644 app/src/main/res/layout/item_custom_theme.xml
 create mode 100644 app/src/main/res/layout/item_predefined_custom_theme.xml
 create mode 100644 app/src/main/res/layout/item_theme_name.xml
 create mode 100644 app/src/main/res/layout/item_user_custom_theme.xml

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

diff --git a/app/src/main/res/layout/item_custom_theme.xml b/app/src/main/res/layout/item_custom_theme.xml
deleted file mode 100644
index 1aba3472..00000000
--- a/app/src/main/res/layout/item_custom_theme.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:padding="16dp"
-    android:clickable="true"
-    android:focusable="true"
-    android:background="?attr/selectableItemBackground">
-
-    <View
-        android:id="@+id/color_primary_item_custom_theme"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
-        android:background="@drawable/circular_background" />
-
-    <TextView
-        android:id="@+id/name_text_view_item_custom_theme"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="32dp" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_predefined_custom_theme.xml b/app/src/main/res/layout/item_predefined_custom_theme.xml
new file mode 100644
index 00000000..432628b1
--- /dev/null
+++ b/app/src/main/res/layout/item_predefined_custom_theme.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="16dp"
+    android:clickable="true"
+    android:focusable="true"
+    android:background="?attr/selectableItemBackground">
+
+    <View
+        android:id="@+id/color_primary_item_predefined_custom_theme"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_gravity="center_vertical"
+        android:background="@drawable/circular_background" />
+
+    <TextView
+        android:id="@+id/name_text_view_item_predefined_custom_theme"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="32dp"
+        android:layout_gravity="center_vertical"
+        android:textColor="?attr/primaryTextColor" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_theme_name.xml b/app/src/main/res/layout/item_theme_name.xml
new file mode 100644
index 00000000..84c49d7c
--- /dev/null
+++ b/app/src/main/res/layout/item_theme_name.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="16dp"
+    android:clickable="true"
+    android:focusable="true"
+    android:background="?attr/selectableItemBackground">
+
+    <TextView
+        android:id="@+id/theme_name_text_view_item_theme_name"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textColor="?attr/primaryTextColor" />
+
+    <TextView
+        android:id="@+id/description_text_view_item_theme_name"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        android:text="@string/theme_name_description"
+        android:textColor="?attr/secondaryTextColor" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_user_custom_theme.xml b/app/src/main/res/layout/item_user_custom_theme.xml
new file mode 100644
index 00000000..fe610557
--- /dev/null
+++ b/app/src/main/res/layout/item_user_custom_theme.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="16dp"
+    android:clickable="true"
+    android:focusable="true"
+    android:background="?attr/selectableItemBackground">
+
+    <View
+        android:id="@+id/color_primary_item_user_custom_theme"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_gravity="center_vertical"
+        android:background="@drawable/circular_background" />
+
+    <TextView
+        android:id="@+id/name_text_view_item_user_custom_theme"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:layout_marginStart="32dp"
+        android:layout_gravity="center_vertical"
+        android:textColor="?attr/primaryTextColor" />
+
+    <ImageView
+        android:id="@+id/delete_image_view_item_user_custom_theme"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_gravity="center_vertical"
+        android:layout_marginStart="32dp"
+        android:src="@drawable/ic_delete_24dp"
+        android:background="?attr/selectableItemBackgroundBorderless" />
+
+    <ImageView
+        android:id="@+id/share_image_view_item_user_custom_theme"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_gravity="center_vertical"
+        android:layout_marginStart="16dp"
+        android:src="@drawable/ic_share_24dp"
+        android:background="?attr/selectableItemBackgroundBorderless" />
+
+</LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3