From ce1756db625b4d7d99351ea0fa84af6e6ba1759c Mon Sep 17 00:00:00 2001
From: dkanada <dkanada@users.noreply.github.com>
Date: Thu, 27 Sep 2018 12:05:01 +0900
Subject: [PATCH] use new design for other badge instances

---
 .../drawable/app_version_item_status_new.xml  |  5 +++++
 .../app_version_item_status_suggested.xml     |  2 +-
 .../main/res/layout-v14/app_status_new.xml    | 19 ++++---------------
 .../res/layout-v14/app_status_suggested.xml   |  6 ++++++
 .../res/layout/app_details2_version_item.xml  |  7 ++-----
 app/src/main/res/layout/app_status_new.xml    | 16 ----------------
 6 files changed, 18 insertions(+), 37 deletions(-)
 create mode 100644 app/src/main/res/drawable/app_version_item_status_new.xml
 create mode 100644 app/src/main/res/layout-v14/app_status_suggested.xml
 delete mode 100644 app/src/main/res/layout/app_status_new.xml

diff --git a/app/src/main/res/drawable/app_version_item_status_new.xml b/app/src/main/res/drawable/app_version_item_status_new.xml
new file mode 100644
index 000000000..95ed5d276
--- /dev/null
+++ b/app/src/main/res/drawable/app_version_item_status_new.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <stroke android:width="1dp" android:color="#429fff" />
+    <corners android:radius="2dp" />
+</shape>
diff --git a/app/src/main/res/drawable/app_version_item_status_suggested.xml b/app/src/main/res/drawable/app_version_item_status_suggested.xml
index 95ed5d276..6f6f0410f 100644
--- a/app/src/main/res/drawable/app_version_item_status_suggested.xml
+++ b/app/src/main/res/drawable/app_version_item_status_suggested.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <stroke android:width="1dp" android:color="#429fff" />
+    <stroke android:width="1dp" android:color="#777777" />
     <corners android:radius="2dp" />
 </shape>
diff --git a/app/src/main/res/layout-v14/app_status_new.xml b/app/src/main/res/layout-v14/app_status_new.xml
index 0b0e68f04..ade122b9e 100644
--- a/app/src/main/res/layout-v14/app_status_new.xml
+++ b/app/src/main/res/layout-v14/app_status_new.xml
@@ -1,17 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:background="@drawable/app_version_item_status_new"
     android:text="@string/app__newly_added"
-    android:textSize="12sp"
-    android:paddingTop="4dp"
-    android:paddingBottom="4dp"
-    android:paddingStart="10dp"
-    android:paddingLeft="10dp"
-    android:paddingEnd="10dp"
-    android:paddingRight="10dp"
-    android:textAllCaps="true"
-    android:textColor="@color/fdroid_blue"
-    android:background="@drawable/app_tag_new_background"
-    />
\ No newline at end of file
+    android:textColor="#429fff"
+    style="@style/AppVersionStatus" />
\ No newline at end of file
diff --git a/app/src/main/res/layout-v14/app_status_suggested.xml b/app/src/main/res/layout-v14/app_status_suggested.xml
new file mode 100644
index 000000000..e96aa7255
--- /dev/null
+++ b/app/src/main/res/layout-v14/app_status_suggested.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:background="@drawable/app_version_item_status_suggested"
+    android:text="@string/app_suggested"
+    android:textColor="#777777"
+    style="@style/AppVersionStatus" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/app_details2_version_item.xml b/app/src/main/res/layout/app_details2_version_item.xml
index f0e2b7945..794110c1e 100644
--- a/app/src/main/res/layout/app_details2_version_item.xml
+++ b/app/src/main/res/layout/app_details2_version_item.xml
@@ -41,11 +41,8 @@
                     android:layout_height="match_parent"
                     android:paddingTop="3dp">
 
-                    <TextView android:id="@+id/status_suggested"
-                        style="@style/AppVersionStatus"
-                        android:background="@drawable/app_version_item_status_suggested"
-                        android:textColor="#429fff"
-                        android:text="@string/app_suggested" />
+                    <include layout="@layout/app_status_suggested"
+                        android:id="@+id/status_suggested" />
 
                     <TextView android:id="@+id/status_installed"
                         style="@style/AppVersionStatus"
diff --git a/app/src/main/res/layout/app_status_new.xml b/app/src/main/res/layout/app_status_new.xml
deleted file mode 100644
index 796aa6229..000000000
--- a/app/src/main/res/layout/app_status_new.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:text="@string/app__newly_added"
-    android:textSize="12sp"
-    android:paddingTop="4dp"
-    android:paddingBottom="4dp"
-    android:paddingStart="10dp"
-    android:paddingLeft="10dp"
-    android:paddingEnd="10dp"
-    android:paddingRight="10dp"
-    android:textColor="@color/fdroid_blue"
-    android:background="@drawable/app_tag_new_background"
-    />
\ No newline at end of file