Skip to content

Commit 2f18907

Browse files
authored
Merge pull request #1307 from michaelschattgen/fix/copied-text
Fix copied text visibility
2 parents ec01a4a + 52ecf12 commit 2f18907

File tree

5 files changed

+18
-26
lines changed

5 files changed

+18
-26
lines changed

app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryHolder.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -161,10 +161,6 @@ private void setAccountNameLayout(AccountNamePosition accountNamePosition) {
161161
profileNameLayoutParams.setMarginStart(0);
162162
_profileName.setLayoutParams(profileNameLayoutParams);
163163
_profileName.setVisibility(View.VISIBLE);
164-
165-
copiedLayoutParams = (RelativeLayout.LayoutParams) _profileCopied.getLayoutParams();
166-
copiedLayoutParams.addRule(RelativeLayout.ABOVE, R.id.profile_account_name);
167-
_profileCopied.setLayoutParams(copiedLayoutParams);
168164
break;
169165

170166
case END:
@@ -175,10 +171,6 @@ private void setAccountNameLayout(AccountNamePosition accountNamePosition) {
175171
profileNameLayoutParams.removeRule(RelativeLayout.BELOW);
176172
_profileName.setLayoutParams(profileNameLayoutParams);
177173
_profileName.setVisibility(View.VISIBLE);
178-
179-
copiedLayoutParams = (RelativeLayout.LayoutParams) _profileCopied.getLayoutParams();
180-
copiedLayoutParams.addRule(RelativeLayout.ABOVE, R.id.description);
181-
_profileCopied.setLayoutParams(copiedLayoutParams);
182174
break;
183175
}
184176
}

app/src/main/res/anim/slide_down_fade_in.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
<translate
77
android:duration="300"
8-
android:fromYDelta="0"
9-
android:toYDelta="100%" />
8+
android:fromYDelta="-200%"
9+
android:toYDelta="-100%" />
1010

1111
<alpha
1212
android:fromAlpha="0.0"

app/src/main/res/layout/card_entry.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -65,18 +65,6 @@
6565
android:paddingRight="16dp"
6666
android:paddingStart="16dp">
6767

68-
<TextView
69-
android:id="@+id/profile_copied"
70-
android:layout_width="wrap_content"
71-
android:layout_height="wrap_content"
72-
android:includeFontPadding="false"
73-
android:maxLines="1"
74-
android:text="@string/copied"
75-
android:layout_above="@+id/description"
76-
android:layout_alignStart="@+id/profile_code"
77-
android:textSize="16sp"
78-
android:visibility="invisible" />
79-
8068
<RelativeLayout
8169
android:layout_width="wrap_content"
8270
android:layout_height="wrap_content"
@@ -107,6 +95,18 @@
10795

10896
</RelativeLayout>
10997

98+
<TextView
99+
android:id="@+id/profile_copied"
100+
android:layout_width="wrap_content"
101+
android:layout_height="wrap_content"
102+
android:includeFontPadding="false"
103+
android:maxLines="1"
104+
android:text="@string/copied"
105+
android:layout_alignStart="@+id/description"
106+
android:layout_below="@id/description"
107+
android:textSize="16sp"
108+
android:visibility="invisible" />
109+
110110
<TextView
111111
android:layout_width="wrap_content"
112112
android:layout_height="wrap_content"

app/src/main/res/layout/card_entry_compact.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@
7272
android:includeFontPadding="false"
7373
android:maxLines="1"
7474
android:text="@string/copied"
75-
android:layout_above="@+id/description"
76-
android:layout_alignStart="@+id/profile_code"
75+
android:layout_alignStart="@+id/description"
76+
android:layout_below="@id/description"
7777
android:textSize="13sp"
7878
android:visibility="invisible" />
7979

app/src/main/res/layout/card_entry_small.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@
7373
android:includeFontPadding="false"
7474
android:maxLines="1"
7575
android:text="@string/copied"
76-
android:layout_above="@+id/description"
77-
android:layout_alignStart="@+id/profile_code"
76+
android:layout_alignStart="@+id/description"
77+
android:layout_below="@id/description"
7878
android:textSize="13sp"
7979
android:visibility="invisible" />
8080

0 commit comments

Comments
 (0)