luckyimnotanigger/Aegis
1
0
Fork 0
mirror of https://github.com/beemdevelopment/Aegis.git synced 2025-06-22 09:00:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add minor card entry layout overhaul

Browse source
This commit is contained in:
Michael Schättgen 2020-05-09 16:55:27 +02:00
parent 499f930086
commit 3a85a05078
5 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -116,7 +116,7 @@ public class EntryHolder extends RecyclerView.ViewHolder {
String profileIssuer = entry.getIssuer(); String profileIssuer = entry.getIssuer();
String profileName = showAccountName ? entry.getName() : ""; String profileName = showAccountName ? entry.getName() : "";
if (!profileIssuer.isEmpty() && !profileName.isEmpty()) { if (!profileIssuer.isEmpty() && !profileName.isEmpty()) {
profileName = " - " + profileName; profileName = String.format(" (%s)", profileName);
} }
_profileIssuer.setText(profileIssuer); _profileIssuer.setText(profileIssuer);
_profileName.setText(profileName); _profileName.setText(profileName);

16
app/src/main/res/layout/card_entry.xml
View file

@ -54,7 +54,7 @@
android:gravity="bottom" android:gravity="bottom"
android:id="@+id/relativeLayout" android:id="@+id/relativeLayout"
android:layout_alignParentStart="false" android:layout_alignParentStart="false"
android:paddingTop="12dp" android:paddingTop="18dp"
android:paddingBottom="16dp" android:paddingBottom="16dp"
android:paddingEnd="16dp" android:paddingEnd="16dp"
android:paddingLeft="16dp" android:paddingLeft="16dp"
@ -72,14 +72,13 @@
android:layout_alignLeft="@+id/profile_code" android:layout_alignLeft="@+id/profile_code"
android:layout_alignStart="@+id/profile_code" android:layout_alignStart="@+id/profile_code"
android:textColor="?attr/secondaryText" android:textColor="?attr/secondaryText"
android:textSize="15sp" android:textSize="16sp"
android:visibility="invisible" /> android:visibility="invisible" />
<RelativeLayout <RelativeLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/description" android:id="@+id/description"
android:layout_below="@+id/profile_code"
android:layout_alignLeft="@+id/profile_code" android:layout_alignLeft="@+id/profile_code"
android:layout_alignStart="@+id/profile_code"> android:layout_alignStart="@+id/profile_code">
@ -89,9 +88,10 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/profile_issuer" android:id="@+id/profile_issuer"
android:text="@string/issuer" android:text="@string/issuer"
android:textColor="?attr/secondaryText" android:textStyle="bold"
android:textColor="?attr/primaryText"
android:includeFontPadding="false" android:includeFontPadding="false"
android:textSize="15sp" android:textSize="16sp"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1"/> android:maxLines="1"/>
@ -103,8 +103,8 @@
android:ellipsize="end" android:ellipsize="end"
android:includeFontPadding="false" android:includeFontPadding="false"
android:maxLines="1" android:maxLines="1"
android:textColor="@color/extra_info_text" android:textColor="@color/secondary_text"
android:textSize="15sp" android:textSize="16sp"
tools:text=" - AccountName" /> tools:text=" - AccountName" />
</RelativeLayout> </RelativeLayout>
@ -117,12 +117,12 @@
android:fontFamily="sans-serif-light" android:fontFamily="sans-serif-light"
tools:text="012 345" tools:text="012 345"
android:id="@+id/profile_code" android:id="@+id/profile_code"
android:layout_below="@id/description"
android:includeFontPadding="false" android:includeFontPadding="false"
android:textSize="34sp" android:textSize="34sp"
android:textColor="?attr/codePrimaryText" android:textColor="?attr/codePrimaryText"
android:layout_marginLeft="6dp" android:layout_marginLeft="6dp"
android:layout_marginStart="6dp" android:layout_marginStart="6dp"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_marginTop="0dp" android:layout_marginTop="0dp"

8
app/src/main/res/layout/card_entry_compact.xml
View file

@ -54,7 +54,7 @@
android:gravity="bottom" android:gravity="bottom"
android:id="@+id/relativeLayout" android:id="@+id/relativeLayout"
android:layout_alignParentStart="false" android:layout_alignParentStart="false"
android:paddingTop="6dp" android:paddingTop="12dp"
android:paddingBottom="8dp" android:paddingBottom="8dp"
android:paddingEnd="8dp" android:paddingEnd="8dp"
android:paddingLeft="8dp" android:paddingLeft="8dp"
@ -79,7 +79,6 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/description" android:id="@+id/description"
android:layout_below="@+id/profile_code"
android:layout_alignLeft="@+id/profile_code" android:layout_alignLeft="@+id/profile_code"
android:layout_alignStart="@+id/profile_code"> android:layout_alignStart="@+id/profile_code">
@ -89,7 +88,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/profile_issuer" android:id="@+id/profile_issuer"
android:text="@string/issuer" android:text="@string/issuer"
android:textColor="?attr/secondaryText" android:textColor="?attr/primaryText"
android:textStyle="bold"
android:includeFontPadding="false" android:includeFontPadding="false"
android:textSize="13sp" android:textSize="13sp"
android:ellipsize="end" android:ellipsize="end"
@ -116,12 +116,12 @@
android:fontFamily="sans-serif-light" android:fontFamily="sans-serif-light"
tools:text="012 345" tools:text="012 345"
android:id="@+id/profile_code" android:id="@+id/profile_code"
android:layout_below="@id/description"
android:includeFontPadding="false" android:includeFontPadding="false"
android:textSize="26sp" android:textSize="26sp"
android:textColor="?attr/codePrimaryText" android:textColor="?attr/codePrimaryText"
android:layout_marginLeft="6dp" android:layout_marginLeft="6dp"
android:layout_marginStart="6dp" android:layout_marginStart="6dp"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_marginTop="0dp" android:layout_marginTop="0dp"

8
app/src/main/res/layout/card_entry_small.xml
View file

@ -54,7 +54,7 @@
android:gravity="bottom" android:gravity="bottom"
android:id="@+id/relativeLayout" android:id="@+id/relativeLayout"
android:layout_alignParentStart="false" android:layout_alignParentStart="false"
android:paddingTop="6dp" android:paddingTop="8dp"
android:paddingBottom="8dp" android:paddingBottom="8dp"
android:paddingEnd="8dp" android:paddingEnd="8dp"
android:paddingLeft="8dp" android:paddingLeft="8dp"
@ -79,7 +79,6 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/description" android:id="@+id/description"
android:layout_below="@+id/profile_code"
android:layout_alignLeft="@+id/profile_code" android:layout_alignLeft="@+id/profile_code"
android:layout_alignStart="@+id/profile_code"> android:layout_alignStart="@+id/profile_code">
@ -89,7 +88,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/profile_issuer" android:id="@+id/profile_issuer"
android:text="@string/issuer" android:text="@string/issuer"
android:textColor="?attr/secondaryText" android:textStyle="bold"
android:textColor="?attr/primaryText"
android:includeFontPadding="false" android:includeFontPadding="false"
android:textSize="13sp" android:textSize="13sp"
android:ellipsize="end" android:ellipsize="end"
@ -115,12 +115,12 @@
android:fontFamily="sans-serif-light" android:fontFamily="sans-serif-light"
tools:text="012 345" tools:text="012 345"
android:id="@+id/profile_code" android:id="@+id/profile_code"
android:layout_below="@id/description"
android:includeFontPadding="false" android:includeFontPadding="false"
android:textSize="26sp" android:textSize="26sp"
android:textColor="?attr/codePrimaryText" android:textColor="?attr/codePrimaryText"
android:layout_marginLeft="6dp" android:layout_marginLeft="6dp"
android:layout_marginStart="6dp" android:layout_marginStart="6dp"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_marginTop="0dp" android:layout_marginTop="0dp"

4
app/src/main/res/values/colors.xml
View file

@ -8,7 +8,7 @@
<color name="colorAccent">#FF5252</color> <color name="colorAccent">#FF5252</color>
<color name="colorAccentPressed">#FF5252</color> <color name="colorAccentPressed">#FF5252</color>
<color name="primary_text">#212121</color> <color name="primary_text">#212121</color>
<color name="secondary_text">#757575</color> <color name="secondary_text">#A0A0A0</color>
<color name="icon_about">#757575</color> <color name="icon_about">#757575</color>
<color name="extra_info_text">#8e8e8e</color> <color name="extra_info_text">#8e8e8e</color>
<color name="primary_text_inverted">#ffffff</color> <color name="primary_text_inverted">#ffffff</color>
@ -24,7 +24,7 @@
<color name="icon_primary_dark">#ffffff</color> <color name="icon_primary_dark">#ffffff</color>
<color name="icon_primary_dark_inverted">#212121</color> <color name="icon_primary_dark_inverted">#212121</color>
<color name="code_primary_text">#0d47a1</color> <color name="code_primary_text">#1058C9</color>
<color name="code_primary_text_dark">#ffffff</color> <color name="code_primary_text_dark">#ffffff</color>
<color name="card_background_dark">#363636</color> <color name="card_background_dark">#363636</color>