luckyimnotanigger/Aegis
1
0
Fork 0
mirror of https://github.com/beemdevelopment/Aegis.git synced 2025-04-30 02:28:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #462 from alexbakker/better-rtl

Browse source 
Improve RTL support
This commit is contained in:
Michael Schättgen 2020-07-04 11:44:43 +02:00 • committed by GitHub
commit b59a29cff4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 46 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -21,13 +21,11 @@
android:layout_height="250dp"> android:layout_height="250dp">
<de.hdodenhof.circleimageview.CircleImageView <de.hdodenhof.circleimageview.CircleImageView
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/profile_drawable" android:id="@+id/profile_drawable"
android:layout_width="100dp" android:layout_width="100dp"
android:layout_height="100dp" android:layout_height="100dp"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_centerVertical="true" android:layout_centerVertical="true" />
/>
<com.avito.android.krop.KropView <com.avito.android.krop.KropView
android:id="@+id/krop_view" android:id="@+id/krop_view"
@ -45,7 +43,7 @@
android:id="@+id/iv_saveImage" android:id="@+id/iv_saveImage"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom|right" android:layout_gravity="bottom|end"
android:layout_margin="15dp" android:layout_margin="15dp"
android:src="@drawable/ic_check_black_24dp" android:src="@drawable/ic_check_black_24dp"
android:tint="?attr/iconColorPrimary" /> android:tint="?attr/iconColorPrimary" />
@ -176,9 +174,9 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="4" android:layout_weight="4"
android:paddingRight="6dp" android:paddingEnd="6dp"
android:gravity="left" android:gravity="start"
android:layout_gravity="left" android:layout_gravity="start"
android:backgroundTint="#949494" android:backgroundTint="#949494"
style="@style/Base.Widget.AppCompat.Spinner.Underlined"/> style="@style/Base.Widget.AppCompat.Spinner.Underlined"/>
<androidx.appcompat.widget.AppCompatSpinner <androidx.appcompat.widget.AppCompatSpinner
@ -186,7 +184,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="4" android:layout_weight="4"
android:paddingRight="6dp" android:paddingEnd="6dp"
android:backgroundTint="#949494" android:backgroundTint="#949494"
style="@style/Base.Widget.AppCompat.Spinner.Underlined"/> style="@style/Base.Widget.AppCompat.Spinner.Underlined"/>
<EditText <EditText
@ -194,7 +192,7 @@
android:hint="@string/digits" android:hint="@string/digits"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingRight="6dp" android:paddingEnd="6dp"
android:layout_weight="3" android:layout_weight="3"
android:backgroundTint="#949494"/> android:backgroundTint="#949494"/>
</LinearLayout> </LinearLayout>

4
app/src/main/res/layout/activity_main.xml
View file

@ -49,6 +49,7 @@
<!-- note: the fab should always be the last element to be sure it's displayed on top --> <!-- note: the fab should always be the last element to be sure it's displayed on top -->
<com.getbase.floatingactionbutton.FloatingActionsMenu <com.getbase.floatingactionbutton.FloatingActionsMenu
android:id="@+id/fab" android:id="@+id/fab"
style="@style/FloatingActionButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom|end" android:layout_gravity="bottom|end"
@ -56,8 +57,7 @@
android:src="@drawable/ic_add_black_24dp" android:src="@drawable/ic_add_black_24dp"
app:fab_addButtonColorNormal="@color/colorAccent" app:fab_addButtonColorNormal="@color/colorAccent"
app:fab_addButtonColorPressed="@color/colorAccent" app:fab_addButtonColorPressed="@color/colorAccent"
app:fab_labelStyle="@style/fab_label_style" app:fab_labelStyle="@style/fab_label_style">
app:fab_labelsPosition="left">
<com.getbase.floatingactionbutton.FloatingActionButton <com.getbase.floatingactionbutton.FloatingActionButton
android:id="@+id/fab_scan" android:id="@+id/fab_scan"

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

@ -21,23 +21,20 @@
<RelativeLayout <RelativeLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingLeft="16dp"> android:paddingStart="16dp">
<de.hdodenhof.circleimageview.CircleImageView <de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/ivTextDrawable" android:id="@+id/ivTextDrawable"
android:layout_width="60dp" android:layout_width="60dp"
android:layout_height="60dp" android:layout_height="60dp"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_alignParentLeft="true" android:layout_alignParentStart="true" />
android:layout_alignParentStart="true"
/>
<de.hdodenhof.circleimageview.CircleImageView <de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/ivSelected" android:id="@+id/ivSelected"
android:layout_width="60dp" android:layout_width="60dp"
android:layout_height="60dp" android:layout_height="60dp"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:src="@drawable/item_selected" android:src="@drawable/item_selected"
android:visibility="gone" android:visibility="gone"
@ -48,12 +45,8 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:layout_alignParentBottom="false"
android:layout_alignParentTop="false"
android:layout_alignWithParentIfMissing="false"
android:gravity="bottom" android:gravity="bottom"
android:id="@+id/relativeLayout" android:id="@+id/relativeLayout"
android:layout_alignParentStart="false"
android:paddingTop="18dp" android:paddingTop="18dp"
android:paddingBottom="16dp" android:paddingBottom="16dp"
android:paddingEnd="16dp" android:paddingEnd="16dp"
@ -69,7 +62,6 @@
android:maxLines="1" android:maxLines="1"
android:text="@string/copied" android:text="@string/copied"
android:layout_above="@+id/description" android:layout_above="@+id/description"
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="16sp" android:textSize="16sp"
@ -79,10 +71,8 @@
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_alignLeft="@+id/profile_code"
android:layout_alignStart="@+id/profile_code"> android:layout_alignStart="@+id/profile_code">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -95,21 +85,21 @@
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1"/> android:maxLines="1"/>
<TextView <TextView
android:id="@+id/profile_account_name" android:id="@+id/profile_account_name"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_toRightOf="@id/profile_issuer" android:layout_toEndOf="@id/profile_issuer"
android:ellipsize="end" android:layout_marginStart="2dp"
android:includeFontPadding="false" android:ellipsize="end"
android:maxLines="1" android:includeFontPadding="false"
android:textColor="@color/secondary_text" android:maxLines="1"
android:textSize="16sp" android:textColor="@color/secondary_text"
tools:text=" - AccountName" /> android:textSize="16sp"
tools:text=" - AccountName" />
</RelativeLayout> </RelativeLayout>
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -117,13 +107,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:layoutDirection="ltr"
android:layout_below="@id/description" 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_marginStart="6dp" android:layout_marginStart="6dp"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_marginTop="0dp" android:layout_marginTop="0dp"
android:textStyle="normal|bold"/> android:textStyle="normal|bold"/>
@ -154,7 +143,7 @@
<com.beemdevelopment.aegis.ui.views.TotpProgressBar <com.beemdevelopment.aegis.ui.views.TotpProgressBar
style="?android:attr/progressBarStyleHorizontal" style="?android:attr/progressBarStyleHorizontal"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="4dp" android:layout_height="4dp"
android:id="@+id/progressBar" android:id="@+id/progressBar"
android:max="5000" android:max="5000"

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

@ -21,14 +21,13 @@
<RelativeLayout <RelativeLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingLeft="16dp"> android:paddingStart="16dp">
<de.hdodenhof.circleimageview.CircleImageView <de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/ivTextDrawable" android:id="@+id/ivTextDrawable"
android:layout_width="45dp" android:layout_width="45dp"
android:layout_height="45dp" android:layout_height="45dp"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
/> />
@ -37,7 +36,6 @@
android:layout_width="45dp" android:layout_width="45dp"
android:layout_height="45dp" android:layout_height="45dp"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:src="@drawable/item_selected" android:src="@drawable/item_selected"
android:visibility="gone" android:visibility="gone"
@ -48,12 +46,8 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:layout_alignParentBottom="false"
android:layout_alignParentTop="false"
android:layout_alignWithParentIfMissing="false"
android:gravity="bottom" android:gravity="bottom"
android:id="@+id/relativeLayout" android:id="@+id/relativeLayout"
android:layout_alignParentStart="false"
android:paddingTop="12dp" android:paddingTop="12dp"
android:paddingBottom="8dp" android:paddingBottom="8dp"
android:paddingEnd="8dp" android:paddingEnd="8dp"
@ -69,7 +63,6 @@
android:maxLines="1" android:maxLines="1"
android:text="@string/copied" android:text="@string/copied"
android:layout_above="@+id/description" android:layout_above="@+id/description"
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="13sp" android:textSize="13sp"
@ -79,7 +72,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_alignLeft="@+id/profile_code"
android:layout_alignStart="@+id/profile_code"> android:layout_alignStart="@+id/profile_code">
@ -99,7 +91,8 @@
android:id="@+id/profile_account_name" android:id="@+id/profile_account_name"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_toRightOf="@id/profile_issuer" android:layout_toEndOf="@id/profile_issuer"
android:layout_marginStart="2dp"
android:ellipsize="end" android:ellipsize="end"
android:includeFontPadding="false" android:includeFontPadding="false"
android:maxLines="1" android:maxLines="1"
@ -116,13 +109,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:layoutDirection="ltr"
android:layout_below="@id/description" 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_marginStart="6dp" android:layout_marginStart="6dp"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_marginTop="0dp" android:layout_marginTop="0dp"
android:textStyle="normal|bold"/> android:textStyle="normal|bold"/>
@ -153,7 +145,7 @@
<com.beemdevelopment.aegis.ui.views.TotpProgressBar <com.beemdevelopment.aegis.ui.views.TotpProgressBar
style="?android:attr/progressBarStyleHorizontal" style="?android:attr/progressBarStyleHorizontal"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="3dp" android:layout_height="3dp"
android:id="@+id/progressBar" android:id="@+id/progressBar"
android:max="1000" android:max="1000"

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

@ -21,23 +21,20 @@
<RelativeLayout <RelativeLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingLeft="16dp"> android:paddingStart="16dp">
<de.hdodenhof.circleimageview.CircleImageView <de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/ivTextDrawable" android:id="@+id/ivTextDrawable"
android:layout_width="45dp" android:layout_width="45dp"
android:layout_height="45dp" android:layout_height="45dp"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_alignParentLeft="true" android:layout_alignParentStart="true" />
android:layout_alignParentStart="true"
/>
<de.hdodenhof.circleimageview.CircleImageView <de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/ivSelected" android:id="@+id/ivSelected"
android:layout_width="45dp" android:layout_width="45dp"
android:layout_height="45dp" android:layout_height="45dp"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:src="@drawable/item_selected" android:src="@drawable/item_selected"
android:visibility="gone" android:visibility="gone"
@ -48,12 +45,8 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:layout_alignParentBottom="false"
android:layout_alignParentTop="false"
android:layout_alignWithParentIfMissing="false"
android:gravity="bottom" android:gravity="bottom"
android:id="@+id/relativeLayout" android:id="@+id/relativeLayout"
android:layout_alignParentStart="false"
android:paddingTop="8dp" android:paddingTop="8dp"
android:paddingBottom="8dp" android:paddingBottom="8dp"
android:paddingEnd="8dp" android:paddingEnd="8dp"
@ -69,7 +62,6 @@
android:maxLines="1" android:maxLines="1"
android:text="@string/copied" android:text="@string/copied"
android:layout_above="@+id/description" android:layout_above="@+id/description"
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="13sp" android:textSize="13sp"
@ -79,10 +71,8 @@
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_alignLeft="@+id/profile_code"
android:layout_alignStart="@+id/profile_code"> android:layout_alignStart="@+id/profile_code">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -99,7 +89,8 @@
android:id="@+id/profile_account_name" android:id="@+id/profile_account_name"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_toRightOf="@id/profile_issuer" android:layout_toEndOf="@id/profile_issuer"
android:layout_marginStart="2dp"
android:ellipsize="end" android:ellipsize="end"
android:includeFontPadding="false" android:includeFontPadding="false"
android:maxLines="1" android:maxLines="1"
@ -115,13 +106,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:layoutDirection="ltr"
android:layout_below="@id/description" 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_marginStart="6dp" android:layout_marginStart="6dp"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_marginTop="0dp" android:layout_marginTop="0dp"
android:textStyle="normal|bold"/> android:textStyle="normal|bold"/>
@ -152,7 +142,7 @@
<com.beemdevelopment.aegis.ui.views.TotpProgressBar <com.beemdevelopment.aegis.ui.views.TotpProgressBar
style="?android:attr/progressBarStyleHorizontal" style="?android:attr/progressBarStyleHorizontal"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="3dp" android:layout_height="3dp"
android:id="@+id/progressBar" android:id="@+id/progressBar"
android:max="1000" android:max="1000"

6
app/src/main/res/values-ldrtl/styles.xml Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="FloatingActionButton">
<item name="fab_labelsPosition">right</item>
</style>
</resources>

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

@ -204,4 +204,8 @@
<style name="AppTheme.NoActionBar.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" /> <style name="AppTheme.NoActionBar.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
<style name="FloatingActionButton">
<item name="fab_labelsPosition">left</item>
</style>
</resources> </resources>