From 52ecf12576cefcd85f3ec0cc0607641bf7b9ff15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Sch=C3=A4ttgen?= <michael@schattgen.me>
Date: Fri, 15 Mar 2024 21:34:59 +0100
Subject: [PATCH] Fix copied text visibility

---
 .../aegis/ui/views/EntryHolder.java           |  8 -------
 app/src/main/res/anim/slide_down_fade_in.xml  |  4 ++--
 app/src/main/res/layout/card_entry.xml        | 24 +++++++++----------
 .../main/res/layout/card_entry_compact.xml    |  4 ++--
 app/src/main/res/layout/card_entry_small.xml  |  4 ++--
 5 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryHolder.java b/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryHolder.java
index 7eebe93f..575ece4f 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryHolder.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryHolder.java
@@ -161,10 +161,6 @@ public class EntryHolder extends RecyclerView.ViewHolder {
                 profileNameLayoutParams.setMarginStart(0);
                 _profileName.setLayoutParams(profileNameLayoutParams);
                 _profileName.setVisibility(View.VISIBLE);
-
-                copiedLayoutParams = (RelativeLayout.LayoutParams) _profileCopied.getLayoutParams();
-                copiedLayoutParams.addRule(RelativeLayout.ABOVE, R.id.profile_account_name);
-                _profileCopied.setLayoutParams(copiedLayoutParams);
                 break;
 
             case END:
@@ -175,10 +171,6 @@ public class EntryHolder extends RecyclerView.ViewHolder {
                 profileNameLayoutParams.removeRule(RelativeLayout.BELOW);
                 _profileName.setLayoutParams(profileNameLayoutParams);
                 _profileName.setVisibility(View.VISIBLE);
-
-                copiedLayoutParams = (RelativeLayout.LayoutParams) _profileCopied.getLayoutParams();
-                copiedLayoutParams.addRule(RelativeLayout.ABOVE, R.id.description);
-                _profileCopied.setLayoutParams(copiedLayoutParams);
                 break;
         }
     }
diff --git a/app/src/main/res/anim/slide_down_fade_in.xml b/app/src/main/res/anim/slide_down_fade_in.xml
index 92cc4842..82b9e0a6 100644
--- a/app/src/main/res/anim/slide_down_fade_in.xml
+++ b/app/src/main/res/anim/slide_down_fade_in.xml
@@ -5,8 +5,8 @@
 
     <translate
         android:duration="300"
-        android:fromYDelta="0"
-        android:toYDelta="100%" />
+        android:fromYDelta="-200%"
+        android:toYDelta="-100%" />
 
     <alpha
         android:fromAlpha="0.0"
diff --git a/app/src/main/res/layout/card_entry.xml b/app/src/main/res/layout/card_entry.xml
index 824cc775..a0240535 100644
--- a/app/src/main/res/layout/card_entry.xml
+++ b/app/src/main/res/layout/card_entry.xml
@@ -65,18 +65,6 @@
             android:paddingRight="16dp"
             android:paddingStart="16dp">
 
-            <TextView
-                android:id="@+id/profile_copied"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:includeFontPadding="false"
-                android:maxLines="1"
-                android:text="@string/copied"
-                android:layout_above="@+id/description"
-                android:layout_alignStart="@+id/profile_code"
-                android:textSize="16sp"
-                android:visibility="invisible" />
-
             <RelativeLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -107,6 +95,18 @@
 
             </RelativeLayout>
 
+            <TextView
+                android:id="@+id/profile_copied"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:includeFontPadding="false"
+                android:maxLines="1"
+                android:text="@string/copied"
+                android:layout_alignStart="@+id/description"
+                android:layout_below="@id/description"
+                android:textSize="16sp"
+                android:visibility="invisible" />
+
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/card_entry_compact.xml b/app/src/main/res/layout/card_entry_compact.xml
index 4bdb80ec..a5a1e562 100644
--- a/app/src/main/res/layout/card_entry_compact.xml
+++ b/app/src/main/res/layout/card_entry_compact.xml
@@ -72,8 +72,8 @@
             android:includeFontPadding="false"
             android:maxLines="1"
             android:text="@string/copied"
-            android:layout_above="@+id/description"
-            android:layout_alignStart="@+id/profile_code"
+            android:layout_alignStart="@+id/description"
+            android:layout_below="@id/description"
             android:textSize="13sp"
             android:visibility="invisible" />
 
diff --git a/app/src/main/res/layout/card_entry_small.xml b/app/src/main/res/layout/card_entry_small.xml
index cc2ca6d9..92a8ad71 100644
--- a/app/src/main/res/layout/card_entry_small.xml
+++ b/app/src/main/res/layout/card_entry_small.xml
@@ -73,8 +73,8 @@
             android:includeFontPadding="false"
             android:maxLines="1"
             android:text="@string/copied"
-            android:layout_above="@+id/description"
-            android:layout_alignStart="@+id/profile_code"
+            android:layout_alignStart="@+id/description"
+            android:layout_below="@id/description"
             android:textSize="13sp"
             android:visibility="invisible" />