From fb5ab86b8458d30824e9f30ad2fbe402e66f20f1 Mon Sep 17 00:00:00 2001
From: tom79 <tschneider.ac@gmail.com>
Date: Mon, 11 Nov 2019 18:50:51 +0100
Subject: [PATCH] Improve translation view

---
 .../app/fedilab/android/drawers/StatusListAdapter.java    | 8 ++++++++
 app/src/main/res/drawable/translation_border.xml          | 2 +-
 app/src/main/res/drawable/translation_border_android4.xml | 7 +++++++
 app/src/main/res/layout/drawer_status.xml                 | 2 +-
 app/src/main/res/layout/drawer_status_compact.xml         | 4 ++--
 app/src/main/res/layout/drawer_status_console.xml         | 4 ++--
 app/src/main/res/layout/drawer_status_focused.xml         | 4 ++--
 7 files changed, 23 insertions(+), 8 deletions(-)
 create mode 100644 app/src/main/res/drawable/translation_border_android4.xml

diff --git a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
index 2be2cbfca..8b1d4a5e4 100644
--- a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
+++ b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
@@ -712,6 +712,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
         View status_reply_indicator_top, reply_indicator_dot, status_reply_indicator_bottom, status_reply_indicator_diag_top, status_reply_indicator_diag_bottom;
         CardView main_card_container;
         LinearLayout main_linear_container;
+        View translation_border_view;
         public View getView() {
             return itemView;
         }
@@ -839,6 +840,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
             int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK);
             main_card_container = itemView.findViewById(R.id.main_card_container);
             main_linear_container = itemView.findViewById(R.id.main_linear_container);
+            translation_border_view = itemView.findViewById(R.id.translation_border_view);
         }
 
         void updateAnimatedEmoji() {
@@ -2291,6 +2293,12 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
             if (status.isTranslationShown() && status.getContentSpanTranslated() != null) {
                 holder.status_content_translated.setText(status.getContentSpanTranslated(), TextView.BufferType.SPANNABLE);
                 holder.status_content_translated_container.setVisibility(View.VISIBLE);
+                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+                    holder.translation_border_view.setBackgroundResource(R.drawable.translation_border_android4);
+                }else{
+                    holder.translation_border_view.setBackgroundResource(R.drawable.translation_border);
+                }
+
             } else { //Toot is not translated
                 holder.status_content_translated_container.setVisibility(View.GONE);
             }
diff --git a/app/src/main/res/drawable/translation_border.xml b/app/src/main/res/drawable/translation_border.xml
index aa618de1a..68d47af65 100644
--- a/app/src/main/res/drawable/translation_border.xml
+++ b/app/src/main/res/drawable/translation_border.xml
@@ -2,6 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <stroke
         android:width="1dp"
-        android:color="@color/colorAccent" />
+        android:color="?colorAccent" />
     <corners android:radius="4dp" />
 </shape>
diff --git a/app/src/main/res/drawable/translation_border_android4.xml b/app/src/main/res/drawable/translation_border_android4.xml
new file mode 100644
index 000000000..4451631a8
--- /dev/null
+++ b/app/src/main/res/drawable/translation_border_android4.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <stroke
+        android:width="1dp"
+        android:color="@color/mastodonC4" />
+    <corners android:radius="4dp" />
+</shape>
diff --git a/app/src/main/res/layout/drawer_status.xml b/app/src/main/res/layout/drawer_status.xml
index 276a20fc6..4273e672b 100644
--- a/app/src/main/res/layout/drawer_status.xml
+++ b/app/src/main/res/layout/drawer_status.xml
@@ -403,9 +403,9 @@
                         android:visibility="gone">
 
                         <View
+                            android:id="@+id/translation_border_view"
                             android:layout_width="match_parent"
                             android:layout_height="0dp"
-                            android:background="@drawable/translation_border"
                             app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintTop_toBottomOf="@id/translation_border_top" />
 
diff --git a/app/src/main/res/layout/drawer_status_compact.xml b/app/src/main/res/layout/drawer_status_compact.xml
index 0e7072338..481a9416d 100644
--- a/app/src/main/res/layout/drawer_status_compact.xml
+++ b/app/src/main/res/layout/drawer_status_compact.xml
@@ -343,9 +343,9 @@
                         android:visibility="gone">
 
                         <View
+                            android:id="@+id/translation_border_view"
                             android:layout_width="match_parent"
                             android:layout_height="0dp"
-                            android:background="@drawable/translation_border"
                             app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintTop_toBottomOf="@id/translation_border_top" />
 
@@ -365,7 +365,7 @@
                             android:background="?attr/cardviewColor"
                             android:paddingStart="2dp"
                             android:paddingEnd="2dp"
-                            android:text="Translation"
+                            android:text="@string/translation"
                             app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintTop_toTopOf="parent" />
 
diff --git a/app/src/main/res/layout/drawer_status_console.xml b/app/src/main/res/layout/drawer_status_console.xml
index e6b1c1ab3..ef41b1ad0 100644
--- a/app/src/main/res/layout/drawer_status_console.xml
+++ b/app/src/main/res/layout/drawer_status_console.xml
@@ -299,9 +299,9 @@
             android:visibility="gone">
 
             <View
+                android:id="@+id/translation_border_view"
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
-                android:background="@drawable/translation_border"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/translation_border_top" />
 
@@ -321,7 +321,7 @@
                 android:background="?attr/backgroundColor"
                 android:paddingStart="2dp"
                 android:paddingEnd="2dp"
-                android:text="Translation"
+                android:text="@string/translation"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
diff --git a/app/src/main/res/layout/drawer_status_focused.xml b/app/src/main/res/layout/drawer_status_focused.xml
index a8028e47c..231b6a553 100644
--- a/app/src/main/res/layout/drawer_status_focused.xml
+++ b/app/src/main/res/layout/drawer_status_focused.xml
@@ -277,9 +277,9 @@
                 android:visibility="gone">
 
                 <View
+                    android:id="@+id/translation_border_view"
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
-                    android:background="@drawable/translation_border"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/translation_border_top" />
 
@@ -299,7 +299,7 @@
                     android:background="?attr/backgroundColor"
                     android:paddingStart="2dp"
                     android:paddingEnd="2dp"
-                    android:text="Translation"
+                    android:text="@string/translation"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />