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

Material 3

Browse source 
Co-authored-by: Michael Schättgen <michael@schattgen.me>
This commit is contained in:
Alexander Bakker 2022-10-14 16:42:43 +02:00
parent f7bac4331e
commit fcde086ae3
205 changed files with 1935 additions and 1723 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/res/layout/activity_about.xml
View file

@ -4,17 +4,16 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/background"
android:fitsSystemWindows="true"
tools:context="com.beemdevelopment.aegis.ui.AboutActivity">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/ThemeOverlay.Aegis.AppBar">
<androidx.appcompat.widget.Toolbar
android:fitsSystemWindows="true">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorAppBar" />
android:layout_height="?attr/actionBarSize" />
</com.google.android.material.appbar.AppBarLayout>
<ScrollView
android:layout_width="match_parent"

7
app/src/main/res/layout/activity_assign_icons.xml
View file

@ -4,18 +4,17 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/background"
android:fitsSystemWindows="true"
tools:context="com.beemdevelopment.aegis.ui.AssignIconsActivity">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/ThemeOverlay.Aegis.AppBar">
android:fitsSystemWindows="true">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorAppBar" />
android:layout_height="?attr/actionBarSize" />
</com.google.android.material.appbar.AppBarLayout>
<androidx.recyclerview.widget.RecyclerView

24
app/src/main/res/layout/activity_auth.xml
View file

@ -9,11 +9,9 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/background"
android:orientation="vertical">
<LinearLayout
android:id="@+id/linearLayout2"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
@ -22,22 +20,19 @@
android:orientation="vertical">
<ImageView
android:id="@+id/imageView2"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_marginBottom="20dp"
app:srcCompat="@drawable/ic_aegis_iconx" />
<TextView
android:id="@+id/textView2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="sans-serif-light"
android:singleLine="false"
android:text="@string/authentication_multiline"
android:textStyle="bold"
android:textSize="@dimen/auth_leader_text_size"
android:textColor="?attr/authText" />
android:textSize="32sp"/>
<LinearLayout
android:layout_width="match_parent"
@ -51,7 +46,7 @@
android:paddingBottom="25dp"
app:hintEnabled="false"
app:passwordToggleEnabled="true"
app:passwordToggleTint="#949494">
app:passwordToggleTint="?attr/colorOnSurface">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/text_password"
@ -71,12 +66,8 @@
android:id="@+id/button_decrypt"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/button_rounded_corners"
android:backgroundTint="@color/colorPrimary"
android:minWidth="125dp"
android:text="@string/unlock"
android:textColor="@color/primary_text_inverted"
android:textStyle="bold" />
android:text="@string/unlock" />
</LinearLayout>
@ -109,10 +100,11 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|center"
android:textStyle="bold"
android:textAllCaps="true"
android:text="@string/app_name_full"
android:paddingVertical="50dp"
android:textColor="@color/divider" />
android:textSize="15sp"
android:textAllCaps="true"
android:textStyle="bold"
android:textColor="?attr/colorOnSurfaceDim"
android:paddingVertical="50dp" />
</LinearLayout>
</ScrollView>

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

@ -1,27 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/background"
android:orientation="vertical"
android:fitsSystemWindows="true"
tools:context="com.beemdevelopment.aegis.ui.EditEntryActivity">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/ThemeOverlay.Aegis.AppBar">
<androidx.appcompat.widget.Toolbar
android:fitsSystemWindows="true">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorAppBar" />
android:layout_height="?attr/actionBarSize" />
</com.google.android.material.appbar.AppBarLayout>
<ScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1">
android:layout_height="wrap_content"
android:clipToPadding="false"
android:isScrollContainer="true"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -31,7 +31,6 @@
<RelativeLayout
android:layout_width="match_parent"
android:background="?attr/background"
android:layout_height="250dp">
<de.hdodenhof.circleimageview.CircleImageView
@ -58,16 +57,15 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="15dp"
android:src="@drawable/ic_check_black_24dp"
app:tint="?attr/iconColorPrimary" />
android:src="@drawable/ic_outline_check_24"
app:tint="?attr/colorOnSurface" />
</com.avito.android.krop.KropView>
</RelativeLayout>
<View
<com.google.android.material.divider.MaterialDivider
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/divider" />
android:layout_height="wrap_content" />
<LinearLayout
android:id="@+id/layout_basic"
android:layout_width="match_parent"
@ -81,8 +79,8 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_person_black_24dp"
app:tint="?attr/iconColorPrimary"
android:src="@drawable/ic_outline_person_24"
app:tint="?attr/colorOnSurface"
android:layout_marginStart="5dp"
android:layout_marginEnd="15dp"
android:layout_gravity="center_vertical"/>
@ -138,8 +136,8 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_baseline_notes_black_24"
app:tint="?attr/iconColorPrimary"
android:src="@drawable/ic_outline_notes_24"
app:tint="?attr/colorOnSurface"
android:layout_marginStart="5dp"
android:layout_marginEnd="15dp"
android:layout_gravity="center_vertical"/>
@ -164,8 +162,8 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_vpn_key_black_24dp"
app:tint="?attr/iconColorPrimary"
android:src="@drawable/ic_outline_key_24"
app:tint="?attr/colorOnSurface"
android:layout_marginStart="5dp"
android:layout_marginEnd="15dp"
android:layout_gravity="center_vertical"/>
@ -174,7 +172,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
app:passwordToggleTint="#949494"
app:passwordToggleTint="?attr/colorOnSurface"
app:passwordToggleEnabled="true">
<com.google.android.material.textfield.TextInputEditText
@ -196,8 +194,8 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_baseline_fiber_pin_24"
app:tint="?attr/iconColorPrimary"
android:src="@drawable/ic_outline_fiber_pin_24"
app:tint="?attr/colorOnSurface"
android:layout_marginStart="5dp"
android:layout_marginEnd="15dp"
android:layout_gravity="center_vertical"/>
@ -206,7 +204,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
app:passwordToggleTint="#949494"
app:passwordToggleTint="?attr/colorOnSurface"
app:passwordToggleEnabled="true">
<com.google.android.material.textfield.TextInputEditText
@ -234,8 +232,8 @@
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
android:layout_marginStart="14dp"
android:src="@drawable/ic_keyboard_arrow_down_black_24dp"
app:tint="?attr/iconColorPrimary"/>
android:src="@drawable/ic_outline_expand_more_24"
app:tint="?attr/colorOnSurface" />
<TextView
android:id="@+id/accordian_title"
@ -268,8 +266,8 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_info_outline_black_24dp"
app:tint="?attr/iconColorPrimary"
android:src="@drawable/ic_outline_info_24"
app:tint="?attr/colorOnSurface"
android:layout_marginStart="5dp"
android:layout_marginEnd="15dp"
android:layout_gravity="center_vertical"/>
@ -352,8 +350,8 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_counter_black_24dp"
app:tint="?attr/iconColorPrimary"
android:src="@drawable/ic_counter_black_24"
app:tint="?attr/colorOnSurface"
android:layout_marginStart="5dp"
android:layout_marginEnd="15dp"
android:layout_gravity="center_vertical"/>
@ -382,4 +380,4 @@
</RelativeLayout>
</LinearLayout>
</ScrollView>
</LinearLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

13
app/src/main/res/layout/activity_groups.xml
View file

@ -4,18 +4,17 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/background"
android:fitsSystemWindows="true"
tools:context="com.beemdevelopment.aegis.ui.GroupManagerActivity">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/ThemeOverlay.Aegis.AppBar">
<androidx.appcompat.widget.Toolbar
android:fitsSystemWindows="true">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorAppBar" />
android:layout_height="?attr/actionBarSize" />
</com.google.android.material.appbar.AppBarLayout>
<androidx.recyclerview.widget.RecyclerView
@ -44,8 +43,7 @@
android:id="@+id/imageView"
android:layout_width="50dp"
android:layout_height="50dp"
android:src="@drawable/ic_layers_black_24dp"
app:tint="?attr/primaryText" />
android:src="@drawable/ic_outline_layers_24" />
<TextView
android:id="@+id/textView"
@ -53,7 +51,6 @@
android:layout_height="wrap_content"
android:text="@string/empty_group_list_title"
android:paddingTop="17dp"
android:textColor="?attr/primaryText"
android:textSize="18sp" />
<TextView

13
app/src/main/res/layout/activity_import_entries.xml
View file

@ -4,26 +4,24 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/background"
android:fitsSystemWindows="true"
android:id="@+id/importEntriesRootView"
tools:context="com.beemdevelopment.aegis.ui.ImportEntriesActivity">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/ThemeOverlay.Aegis.AppBar">
<androidx.appcompat.widget.Toolbar
android:fitsSystemWindows="true">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorAppBar" />
android:layout_height="?attr/actionBarSize" />
</com.google.android.material.appbar.AppBarLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/list_entries"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:foreground="?android:attr/selectableItemBackground"
android:paddingBottom="60dp"
android:clipToPadding="false"
android:scrollbars="vertical"
@ -35,6 +33,5 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin"
android:src="@drawable/ic_check_black_24dp"
app:tint="@color/icon_primary_dark" />
android:src="@drawable/ic_outline_check_24" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

32
app/src/main/res/layout/activity_intro.xml
View file

@ -5,7 +5,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/background"
android:fitsSystemWindows="true"
tools:context="com.beemdevelopment.aegis.ui.IntroActivity">
<androidx.viewpager2.widget.ViewPager2
android:id="@+id/pager"
@ -14,17 +14,20 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toTopOf="@+id/btnPrevious" />
<ImageButton
<com.google.android.material.button.MaterialButton
android:id="@+id/btnPrevious"
android:layout_width="65dp"
android:layout_height="65dp"
android:layout_margin="10dp"
android:src="@drawable/circular_button_prev"
app:tint="?attr/iconColorPrimary"
android:background="?selectableItemBackgroundBorderless"
android:layout_marginVertical="10dp"
android:layout_marginHorizontal="20dp"
android:visibility="invisible"
app:icon="@drawable/ic_outline_arrow_left_alt_24"
app:iconSize="30dp"
app:iconGravity="textStart"
app:iconPadding="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" />
app:layout_constraintStart_toStartOf="parent"
style="@style/Widget.Material3.Button.IconButton.Filled.Tonal" />
<com.beemdevelopment.aegis.ui.intro.SlideIndicator
android:id="@+id/slideIndicator"
android:layout_width="0dp"
@ -33,14 +36,17 @@
app:layout_constraintStart_toEndOf="@+id/btnPrevious"
app:layout_constraintEnd_toStartOf="@+id/btnNext"
app:layout_constraintBottom_toBottomOf="parent" />
<ImageButton
<com.google.android.material.button.MaterialButton
android:id="@+id/btnNext"
android:layout_width="65dp"
android:layout_height="65dp"
android:layout_margin="10dp"
android:src="@drawable/circular_button_next"
app:tint="?attr/iconColorPrimary"
android:background="?selectableItemBackgroundBorderless"
android:layout_marginVertical="10dp"
android:layout_marginHorizontal="20dp"
app:icon="@drawable/ic_outline_arrow_right_alt_24"
app:iconSize="30dp"
app:iconGravity="textStart"
app:iconPadding="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
app:layout_constraintEnd_toEndOf="parent"
style="@style/Widget.Material3.Button.IconButton.Filled.Tonal" />
</androidx.constraintlayout.widget.ConstraintLayout>

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

@ -5,17 +5,20 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context="com.beemdevelopment.aegis.ui.MainActivity">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/app_bar_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/ThemeOverlay.Aegis.AppBar">
<androidx.appcompat.widget.Toolbar
android:fitsSystemWindows="true"
app:liftOnScroll="true"
app:liftOnScrollTargetViewId="@+id/rvKeyProfiles">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorAppBar" />
android:layout_height="?attr/actionBarSize" />
</com.google.android.material.appbar.AppBarLayout>
<LinearLayout
@ -23,32 +26,6 @@
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
android:orientation="vertical">
<LinearLayout
android:id="@+id/btn_error_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:visibility="gone"
android:clickable="true"
android:focusable="true"
android:paddingHorizontal="10dp"
android:paddingVertical="10dp"
android:background="@color/colorAccent"
android:foreground="?android:selectableItemBackground"
android:gravity="center">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:tint="@color/icon_primary_inverted"
android:src="@drawable/ic_info_outline_black_24dp" />
<TextView
android:id="@+id/text_error_bar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/primary_text_inverted"
android:textStyle="bold"
android:layout_marginStart="5dp" />
</LinearLayout>
<com.google.android.material.chip.ChipGroup
android:id="@+id/groupChipGroup"
@ -62,7 +39,7 @@
android:id="@+id/key_profiles"
android:layout_height="fill_parent"
android:layout_width="match_parent"
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"/>
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
</LinearLayout>
<com.google.android.material.floatingactionbutton.FloatingActionButton
@ -71,7 +48,6 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin"
android:src="@drawable/ic_add_black_24dp"
app:tint="@color/icon_primary_dark" />
android:src="@drawable/ic_outline_add_24" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

21
app/src/main/res/layout/activity_preferences.xml
View file

@ -1,22 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:fitsSystemWindows="true">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/ThemeOverlay.Aegis.AppBar">
<androidx.appcompat.widget.Toolbar
android:fitsSystemWindows="true">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorAppBar" />
android:layout_height="?attr/actionBarSize" />
</com.google.android.material.appbar.AppBarLayout>
<FrameLayout
android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1" />
</LinearLayout>
android:layout_height="match_parent"
android:isScrollContainer="true"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

21
app/src/main/res/layout/activity_scanner.xml
View file

@ -1,10 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context="com.beemdevelopment.aegis.ui.ScannerActivity">
<com.google.android.material.appbar.AppBarLayout
@ -14,23 +15,17 @@
android:background="@android:color/transparent"
android:translationZ="0.1dp"
app:elevation="0dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:theme="@style/ThemeOverlay.Aegis.AppBar">
<androidx.appcompat.widget.Toolbar
android:fitsSystemWindows="true">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize" />
android:layout_height="?attr/actionBarSize"
app:titleTextColor="?attr/colorOnDark" />
</com.google.android.material.appbar.AppBarLayout>
<androidx.camera.view.PreviewView
android:id="@+id/preview_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/toolbar_layout" />
android:layout_height="match_parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

215
app/src/main/res/layout/activity_share_entry.xml
View file

@ -1,132 +1,131 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/background"
android:fitsSystemWindows="true"
tools:context="com.beemdevelopment.aegis.ui.TransferEntriesActivity">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/toolbar_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
android:theme="@style/ThemeOverlay.Aegis.AppBar">
<androidx.appcompat.widget.Toolbar
android:fitsSystemWindows="true">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorAppBar" />
android:layout_height="?attr/actionBarSize" />
</com.google.android.material.appbar.AppBarLayout>
<ImageView
android:id="@+id/ivQrCode"
android:layout_width="250dp"
android:layout_height="250dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/toolbar_layout" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:id="@+id/tvTransfer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/transfer_entry"
android:textColor="?attr/primaryText"
android:textSize="22sp"
android:textStyle="bold"
android:layout_marginBottom="5dp"
app:layout_constraintBottom_toTopOf="@+id/tvDescription"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<ImageView
android:id="@+id/ivQrCode"
android:layout_width="250dp"
android:layout_height="250dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tvDescription"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:padding="10dp"
android:text="@string/transfer_entry_description"
app:layout_constraintBottom_toTopOf="@+id/ivQrCode"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<TextView
android:id="@+id/tvTransfer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/transfer_entry"
android:textSize="22sp"
android:textStyle="bold"
android:layout_marginBottom="5dp"
app:layout_constraintBottom_toTopOf="@+id/tvDescription"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<TextView
android:id="@+id/tvIssuer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
tools:text="Issuer"
android:textColor="?attr/primaryText"
android:textSize="18sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ivQrCode" />
<TextView
android:id="@+id/tvDescription"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:padding="10dp"
android:text="@string/transfer_entry_description"
app:layout_constraintBottom_toTopOf="@+id/ivQrCode"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<TextView
android:id="@+id/tvAccountName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
tools:text="Accountname"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tvIssuer" />
<TextView
android:id="@+id/tvIssuer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
tools:text="Issuer"
android:textSize="18sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ivQrCode" />
<Button
android:id="@+id/btnCopyClipboard"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="?attr/outlineButtonStyle"
android:text="@string/copy_uri"
android:textAllCaps="false"
android:visibility="invisible"
android:textColor="@color/code_primary_text"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvAccountName"
app:layout_constraintBottom_toTopOf="@id/tvEntriesCount" />
<TextView
android:id="@+id/tvAccountName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
tools:text="Accountname"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tvIssuer" />
<Button
android:id="@+id/btnNext"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="4dp"
android:layout_marginBottom="4dp"
style="@style/Widget.MaterialComponents.Button.TextButton"
android:text="@string/next"
android:textAllCaps="false"
android:textColor="@color/code_primary_text"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
<Button
android:id="@+id/btnCopyClipboard"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/copy_uri"
android:textAllCaps="false"
android:visibility="invisible"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvAccountName"
app:layout_constraintBottom_toTopOf="@id/tvEntriesCount" />
<Button
android:id="@+id/btnPrevious"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="4dp"
android:layout_marginBottom="4dp"
style="@style/Widget.MaterialComponents.Button.TextButton"
android:text="@string/previous"
android:textAllCaps="false"
android:visibility="invisible"
android:textColor="@color/code_primary_text"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<Button
android:id="@+id/btnNext"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="4dp"
android:layout_marginBottom="4dp"
style="@style/Widget.Material3.Button.TextButton"
android:text="@string/next"
android:textAllCaps="false"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
<TextView
android:id="@+id/tvEntriesCount"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="20dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/btnNext"
app:layout_constraintHorizontal_bias="0.506"
app:layout_constraintStart_toStartOf="@+id/btnPrevious" />
<Button
android:id="@+id/btnPrevious"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="4dp"
android:layout_marginBottom="4dp"
style="@style/Widget.Material3.Button.TextButton"
android:text="@string/previous"
android:textAllCaps="false"
android:visibility="invisible"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView
android:id="@+id/tvEntriesCount"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="20dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/btnNext"
app:layout_constraintHorizontal_bias="0.506"
app:layout_constraintStart_toStartOf="@+id/btnPrevious" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

24
app/src/main/res/layout/card_assign_icon_entry.xml
View file

@ -1,19 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
<com.google.android.material.card.MaterialCardView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:foreground="?android:attr/selectableItemBackground"
android:layout_height="wrap_content"
android:elevation="0dp"
android:clickable="true"
android:focusable="true"
android:layout_height="wrap_content"
android:background="@drawable/rounded_background"
android:elevation="4dp"
android:orientation="vertical">
app:checkedIcon="@null"
app:cardElevation="0dp"
style="@style/Widget.Aegis.EntryCardView">
<LinearLayout
android:layout_width="match_parent"
android:background="?attr/cardBackground"
android:background="?attr/colorSurfaceContainerLow"
android:id="@+id/rlCardEntry"
android:layout_height="wrap_content"
android:orientation="vertical"
@ -28,7 +28,6 @@
android:layout_height="wrap_content"
android:maxLines="1"
android:ellipsize="end"
android:textColor="?attr/primaryText"
android:text="Issuer"
android:textStyle="bold"
android:textSize="18sp"/>
@ -38,7 +37,6 @@
android:layout_height="wrap_content"
android:maxLines="1"
android:ellipsize="end"
android:textColor="@color/secondary_text"
android:text="AccountName"
android:textSize="14sp"
android:layout_marginBottom="8dp"/>
@ -58,7 +56,6 @@
<ImageView
android:layout_width="32dp"
android:layout_height="32dp"
app:tint="?attr/iconColorPrimary"
android:alpha="0.7"
android:src="@drawable/baseline_arrow_right_24"
android:layout_marginStart="5dp"
@ -82,8 +79,7 @@
android:layout_height="wrap_content"
android:clickable="true"
android:focusable="true"
android:src="@drawable/ic_reset_image"
app:tint="?attr/iconColorPrimary"
android:src="@drawable/ic_outline_reset_image_24"
android:paddingStart="15dp"
android:paddingEnd="15dp"
android:paddingTop="12.5dp"
@ -95,4 +91,4 @@
</LinearLayout>
</LinearLayout>
</com.google.android.material.card.MaterialCardView>

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

@ -1,20 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<com.google.android.material.card.MaterialCardView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:foreground="?android:attr/selectableItemBackground"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:elevation="0dp"
android:clickable="true"
android:focusable="true"
android:layout_height="wrap_content"
android:orientation="vertical">
android:checkable="true"
app:checkedIcon="@null"
app:cardElevation="0dp"
style="@style/Widget.Aegis.EntryCardView">
<LinearLayout
android:orientation="horizontal"
android:background="?attr/cardBackground"
android:id="@+id/rlCardEntry"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:layout_width="match_parent"
android:layout_height="match_parent">
@ -23,13 +26,13 @@
android:layout_width="15dp"
android:layout_height="match_parent"
android:layout_marginStart="-11dp"
android:backgroundTint="@color/colorFavorite"
android:background="@drawable/button_rounded_corners" />
android:backgroundTint="?attr/colorFavorite"
android:background="@drawable/favorite_indicator" />
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingStart="16dp">
android:paddingStart="14dp">
<de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/ivTextDrawable"
@ -46,7 +49,7 @@
android:layout_centerVertical="true"
android:src="@drawable/item_selected"
android:visibility="gone"
app:civ_circle_background_color="@color/colorPrimarySelected" />
app:civ_circle_background_color="?attr/colorPrimaryAlternative" />
</RelativeLayout>
<RelativeLayout
@ -71,7 +74,6 @@
android:text="@string/copied"
android:layout_above="@+id/description"
android:layout_alignStart="@+id/profile_code"
android:textColor="?attr/secondaryText"
android:textSize="16sp"
android:visibility="invisible" />
@ -87,7 +89,6 @@
android:id="@+id/profile_issuer"
android:text="@string/issuer"
android:textStyle="bold"
android:textColor="?attr/primaryText"
android:includeFontPadding="false"
android:textSize="16sp"
android:ellipsize="end"
@ -101,7 +102,6 @@
android:ellipsize="end"
android:includeFontPadding="false"
android:maxLines="1"
android:textColor="@color/secondary_text"
android:textSize="16sp"
tools:text=" - AccountName" />
@ -119,7 +119,7 @@
android:includeFontPadding="false"
android:fallbackLineSpacing="false"
android:textSize="34sp"
android:textColor="?attr/codePrimaryText"
android:textColor="?attr/colorPrimary"
android:layout_marginStart="6dp"
android:layout_alignParentStart="true"
android:layout_marginTop="0dp"
@ -143,8 +143,8 @@
android:padding="8dp"
android:clickable="true"
android:focusable="true"
android:src="@drawable/ic_refresh_black_24dp"
app:tint="?attr/iconColorPrimary"
android:src="@drawable/ic_outline_refresh_24"
app:tint="?attr/colorOnSurface"
android:background="?android:attr/selectableItemBackground" />
<ImageView
@ -155,7 +155,7 @@
android:layout_marginEnd="-12dp"
android:visibility="invisible"
android:scaleType="fitXY"
android:src="@drawable/ic_baseline_menu_black_32" />
android:src="@drawable/ic_outline_menu_24" />
</LinearLayout>
@ -170,6 +170,7 @@
<com.beemdevelopment.aegis.ui.views.TotpProgressBar
style="?android:attr/progressBarStyleHorizontal"
android:progressDrawable="@drawable/progress_horizontal"
android:layout_width="0dp"
android:layout_height="4dp"
android:id="@+id/progressBar"
@ -177,4 +178,4 @@
android:layout_weight="1"/>
</LinearLayout>
</LinearLayout>
</com.google.android.material.card.MaterialCardView>

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

@ -1,20 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<com.google.android.material.card.MaterialCardView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:foreground="?android:attr/selectableItemBackground"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:elevation="0dp"
android:clickable="true"
android:focusable="true"
android:layout_height="wrap_content"
android:orientation="vertical">
android:checkable="true"
app:checkedIcon="@null"
app:cardElevation="0dp"
style="@style/Widget.Aegis.CompactEntryCardView">
<LinearLayout
android:orientation="horizontal"
android:background="?attr/cardBackground"
android:id="@+id/rlCardEntry"
android:paddingTop="5dp"
android:paddingBottom="5dp"
android:paddingTop="3dp"
android:paddingBottom="3dp"
android:layout_width="match_parent"
android:layout_height="match_parent">
@ -23,13 +26,13 @@
android:layout_width="15dp"
android:layout_height="match_parent"
android:layout_marginStart="-11dp"
android:backgroundTint="@color/colorFavorite"
android:background="@drawable/button_rounded_corners" />
android:backgroundTint="?attr/colorFavorite"
android:background="@drawable/favorite_indicator" />
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingStart="16dp">
android:paddingStart="12dp">
<de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/ivTextDrawable"
@ -46,7 +49,7 @@
android:layout_centerVertical="true"
android:src="@drawable/item_selected"
android:visibility="gone"
app:civ_circle_background_color="@color/colorPrimarySelected" />
app:civ_circle_background_color="?attr/colorPrimaryAlternative" />
</RelativeLayout>
<RelativeLayout
@ -71,7 +74,6 @@
android:text="@string/copied"
android:layout_above="@+id/description"
android:layout_alignStart="@+id/profile_code"
android:textColor="?attr/secondaryText"
android:textSize="13sp"
android:visibility="invisible" />
@ -87,7 +89,6 @@
android:layout_height="wrap_content"
android:id="@+id/profile_issuer"
android:text="@string/issuer"
android:textColor="?attr/primaryText"
android:textStyle="bold"
android:includeFontPadding="false"
android:textSize="13sp"
@ -102,7 +103,6 @@
android:ellipsize="end"
android:includeFontPadding="false"
android:maxLines="1"
android:textColor="@color/extra_info_text"
android:textSize="13sp"
tools:text=" - AccountName" />
</RelativeLayout>
@ -120,7 +120,6 @@
android:includeFontPadding="false"
android:fallbackLineSpacing="false"
android:textSize="26sp"
android:textColor="?attr/codePrimaryText"
android:layout_marginStart="6dp"
android:layout_alignParentStart="true"
android:layout_marginTop="0dp"
@ -144,8 +143,7 @@
android:padding="8dp"
android:clickable="true"
android:focusable="true"
android:src="@drawable/ic_refresh_black_24dp"
app:tint="?attr/iconColorPrimary"
android:src="@drawable/ic_outline_refresh_24"
android:background="?android:attr/selectableItemBackground" />
<ImageView
@ -156,7 +154,7 @@
android:layout_marginEnd="-12dp"
android:visibility="invisible"
android:scaleType="fitXY"
android:src="@drawable/ic_baseline_menu_black_32" />
android:src="@drawable/ic_outline_menu_24" />
</LinearLayout>
@ -171,6 +169,7 @@
<com.beemdevelopment.aegis.ui.views.TotpProgressBar
style="?android:attr/progressBarStyleHorizontal"
android:progressDrawable="@drawable/progress_horizontal"
android:layout_width="0dp"
android:layout_height="3dp"
android:id="@+id/progressBar"
@ -178,4 +177,4 @@
android:layout_weight="1"/>
</LinearLayout>
</LinearLayout>
</com.google.android.material.card.MaterialCardView>

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

@ -1,17 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<com.google.android.material.card.MaterialCardView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:foreground="?android:attr/selectableItemBackground"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:elevation="0dp"
android:clickable="true"
android:focusable="true"
android:layout_height="wrap_content"
android:orientation="vertical">
android:checkable="true"
app:checkedIcon="@null"
app:cardElevation="0dp"
style="@style/Widget.Aegis.EntryCardView">
<LinearLayout
android:orientation="horizontal"
android:background="?attr/cardBackground"
android:background="?attr/colorSurfaceContainerLow"
android:id="@+id/rlCardEntry"
android:paddingTop="5dp"
android:paddingBottom="5dp"
@ -23,13 +27,13 @@
android:layout_width="15dp"
android:layout_height="match_parent"
android:layout_marginStart="-11dp"
android:backgroundTint="@color/colorFavorite"
android:background="@drawable/button_rounded_corners" />
android:backgroundTint="?attr/colorFavorite"
android:background="@drawable/favorite_indicator" />
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingStart="16dp">
android:paddingStart="14dp">
<de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/ivTextDrawable"
@ -46,7 +50,7 @@
android:layout_centerVertical="true"
android:src="@drawable/item_selected"
android:visibility="gone"
app:civ_circle_background_color="@color/colorPrimarySelected" />
app:civ_circle_background_color="?attr/colorPrimaryAlternative" />
</RelativeLayout>
<RelativeLayout
@ -71,7 +75,6 @@
android:text="@string/copied"
android:layout_above="@+id/description"
android:layout_alignStart="@+id/profile_code"
android:textColor="?attr/secondaryText"
android:textSize="13sp"
android:visibility="invisible" />
@ -87,7 +90,6 @@
android:id="@+id/profile_issuer"
android:text="@string/issuer"
android:textStyle="bold"
android:textColor="?attr/primaryText"
android:includeFontPadding="false"
android:textSize="13sp"
android:ellipsize="end"
@ -101,7 +103,6 @@
android:ellipsize="end"
android:includeFontPadding="false"
android:maxLines="1"
android:textColor="@color/extra_info_text"
android:textSize="13sp"
tools:text=" - AccountName" />
</RelativeLayout>
@ -118,7 +119,6 @@
android:includeFontPadding="false"
android:fallbackLineSpacing="false"
android:textSize="26sp"
android:textColor="?attr/codePrimaryText"
android:layout_marginStart="6dp"
android:layout_alignParentStart="true"
android:layout_marginTop="0dp"
@ -142,8 +142,7 @@
android:padding="8dp"
android:clickable="true"
android:focusable="true"
android:src="@drawable/ic_refresh_black_24dp"
app:tint="?attr/iconColorPrimary"
android:src="@drawable/ic_outline_refresh_24"
android:background="?android:attr/selectableItemBackground" />
<ImageView
@ -154,7 +153,7 @@
android:layout_marginEnd="-12dp"
android:visibility="invisible"
android:scaleType="fitXY"
android:src="@drawable/ic_baseline_menu_black_32" />
android:src="@drawable/ic_outline_menu_24" />
</LinearLayout>
@ -169,10 +168,11 @@
<com.beemdevelopment.aegis.ui.views.TotpProgressBar
style="?android:attr/progressBarStyleHorizontal"
android:progressDrawable="@drawable/progress_horizontal"
android:layout_width="0dp"
android:layout_height="3dp"
android:id="@+id/progressBar"
android:max="5000"
android:layout_weight="1"/>
</LinearLayout>
</LinearLayout>
</com.google.android.material.card.MaterialCardView>

33
app/src/main/res/layout/card_entry_tile.xml
View file

@ -1,14 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
<com.google.android.material.card.MaterialCardView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:foreground="?android:attr/selectableItemBackground"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:elevation="0dp"
android:clickable="true"
android:focusable="true"
android:layout_height="wrap_content"
app:cardCornerRadius="6dp"
android:clipChildren="true">
android:checkable="true"
app:checkedIcon="@null"
app:cardElevation="0dp"
style="@style/Widget.Aegis.EntryCardView">
<LinearLayout
android:orientation="horizontal"
@ -21,8 +24,8 @@
android:layout_width="15dp"
android:layout_height="match_parent"
android:layout_marginStart="-11dp"
android:backgroundTint="@color/colorFavorite"
android:background="@drawable/button_rounded_corners" />
android:backgroundTint="?attr/colorFavorite"
android:background="@drawable/favorite_indicator" />
<RelativeLayout
android:layout_width="0dp"
@ -58,7 +61,7 @@
android:layout_alignParentStart="true"
android:src="@drawable/item_selected"
android:visibility="gone"
app:civ_circle_background_color="@color/colorPrimarySelected" />
app:civ_circle_background_color="?attr/colorPrimaryAlternative" />
</RelativeLayout>
<RelativeLayout
@ -72,7 +75,6 @@
android:layout_height="wrap_content"
android:id="@+id/profile_issuer"
android:text="@string/issuer"
android:textColor="?attr/primaryText"
android:textStyle="bold"
android:includeFontPadding="false"
android:textSize="11sp"
@ -89,7 +91,6 @@
android:includeFontPadding="false"
android:visibility="invisible"
android:text="@string/copied"
android:textColor="?attr/secondaryText"
android:textSize="9sp" />
<TextView
@ -100,7 +101,6 @@
android:ellipsize="end"
android:includeFontPadding="false"
android:maxLines="1"
android:textColor="@color/extra_info_text"
android:textSize="9sp"
tools:text=" - AccountName" />
</RelativeLayout>
@ -117,7 +117,6 @@
android:includeFontPadding="false"
android:fallbackLineSpacing="false"
android:textSize="26sp"
android:textColor="?attr/codePrimaryText"
android:layout_alignParentStart="true"
android:layout_marginTop="10dp"
android:textStyle="normal|bold"/>
@ -140,8 +139,7 @@
android:padding="8dp"
android:clickable="true"
android:focusable="true"
android:src="@drawable/ic_refresh_black_24dp"
app:tint="?attr/iconColorPrimary"
android:src="@drawable/ic_outline_refresh_24"
android:background="?android:attr/selectableItemBackground" />
<ImageView
@ -152,7 +150,7 @@
android:layout_marginEnd="-12dp"
android:visibility="invisible"
android:scaleType="fitXY"
android:src="@drawable/ic_baseline_menu_black_32" />
android:src="@drawable/ic_outline_menu_24" />
</LinearLayout>
@ -167,6 +165,7 @@
<com.beemdevelopment.aegis.ui.views.TotpProgressBar
style="?android:attr/progressBarStyleHorizontal"
android:progressDrawable="@drawable/progress_horizontal"
android:layout_width="0dp"
android:layout_height="3dp"
android:id="@+id/progressBar"
@ -174,4 +173,4 @@
android:layout_weight="1"/>
</LinearLayout>
</androidx.cardview.widget.CardView>
</com.google.android.material.card.MaterialCardView>

33
app/src/main/res/layout/card_error.xml Normal file
View file

@ -0,0 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<com.google.android.material.card.MaterialCardView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/card_error"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:clickable="true"
android:focusable="true"
android:paddingHorizontal="10dp"
android:paddingVertical="10dp"
style="@style/Widget.Aegis.ErrorCardView">
<LinearLayout
android:paddingHorizontal="16dp"
android:paddingVertical="16dp"
android:gravity="center_vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:tint="?attr/colorOnErrorContainer"
android:src="@drawable/ic_outline_error_24" />
<TextView
android:id="@+id/text_error_bar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="?attr/colorOnErrorContainer"
android:textStyle="bold"
android:layout_marginStart="5dp" />
</LinearLayout>
</com.google.android.material.card.MaterialCardView>

1
app/src/main/res/layout/card_footer.xml
View file

@ -9,7 +9,6 @@
android:layout_height="wrap_content"
android:padding="4dp"
android:layout_centerInParent="true"
android:textColor="@color/extra_info_text"
android:textSize="14sp" />
</RelativeLayout>

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

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
@ -57,7 +56,6 @@
android:paddingTop="12.5dp"
android:paddingEnd="15dp"
android:paddingBottom="12.5dp"
android:src="@drawable/ic_delete_black_24dp"
app:tint="?attr/iconColorPrimary" />
android:src="@drawable/ic_outline_delete_24" />
</LinearLayout>

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

@ -19,7 +19,7 @@
android:id="@+id/icon_category_indicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_chevron_down_black_24dp"
app:tint="?attr/iconColorPrimary"
android:src="@drawable/ic_outline_expand_more_24"
app:tint="?attr/colorOnSurfaceVariant"
android:layout_gravity="center_vertical" />
</LinearLayout>

6
app/src/main/res/layout/card_icon_pack.xml
View file

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
@ -37,7 +36,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="14sp"
android:textAppearance="@style/TextAppearance.MaterialComponents.Caption" />
android:textAppearance="@style/TextAppearance.Material3.BodySmall" />
</LinearLayout>
@ -63,7 +62,6 @@
android:paddingTop="12.5dp"
android:paddingEnd="15dp"
android:paddingBottom="12.5dp"
android:src="@drawable/ic_delete_black_24dp"
app:tint="?attr/iconColorPrimary" />
android:src="@drawable/ic_outline_delete_24" />
</LinearLayout>

3
app/src/main/res/layout/card_import_entry.xml
View file

@ -4,7 +4,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:foreground="?android:attr/selectableItemBackground"
android:background="?attr/cardBackground"
android:clickable="true"
android:focusable="true"
android:orientation="horizontal">
@ -21,7 +20,6 @@
android:layout_height="wrap_content"
android:fontFamily="sans-serif-light"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?attr/primaryText"
android:textSize="18sp"
android:textStyle="normal|bold"
android:gravity="center_vertical"
@ -33,7 +31,6 @@
android:layout_marginTop="2dp"
android:ellipsize="end"
android:maxLines="1"
android:textColor="@color/extra_info_text"
android:textSize="14sp"
tools:text="AccountName" />
</LinearLayout>

2
app/src/main/res/layout/chip_material.xml → app/src/main/res/layout/chip_group_filter.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<com.google.android.material.chip.Chip xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/Widget.MaterialComponents.Chip.Choice"
style="@style/Widget.Material3.Chip.Filter"
android:layout_width="match_parent"
android:layout_height="match_parent" />

131
app/src/main/res/layout/content_about.xml
View file

@ -8,19 +8,17 @@
android:padding="8dp"
app:cardUseCompatPadding="true">
<androidx.cardview.widget.CardView
<com.google.android.material.card.MaterialCardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:cardUseCompatPadding="true"
android:background="?attr/cardBackground"
android:layout_marginBottom="8dp"
tools:ignore="MissingPrefix">
app:cardUseCompatPadding="true"
style="?attr/materialCardViewOutlinedStyle">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="8dp"
android:background="?attr/cardBackground"
android:orientation="vertical">
<LinearLayout
@ -61,17 +59,15 @@
android:focusable="true">
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:importantForAccessibility="no"
app:ico_color="?attr/iconColorPrimary"
app:ico_icon="gmi-info-outline"
app:ico_size="16dp" />
android:src="@drawable/ic_outline_info_24" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="32dp"
android:layout_marginStart="28dp"
android:orientation="vertical"
android:paddingTop="8dp"
android:paddingBottom="8dp">
@ -106,17 +102,15 @@
android:focusable="true">
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:importantForAccessibility="no"
app:ico_color="?attr/iconColorPrimary"
app:ico_icon="gmi-time-restore"
app:ico_size="16dp" />
android:src="@drawable/ic_outline_history_24" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="32dp"
android:layout_marginStart="28dp"
android:orientation="vertical"
android:paddingTop="8dp"
android:paddingBottom="8dp">
@ -148,17 +142,15 @@
android:focusable="true">
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:importantForAccessibility="no"
app:ico_color="?attr/iconColorPrimary"
app:ico_icon="gmi-github"
app:ico_size="16dp" />
android:src="@drawable/ic_outline_code_24" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="32dp"
android:layout_marginStart="28dp"
android:orientation="vertical"
android:paddingTop="8dp"
android:paddingBottom="8dp">
@ -190,17 +182,15 @@
android:focusable="true">
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:importantForAccessibility="no"
app:ico_color="?attr/iconColorPrimary"
app:ico_icon="gmi-file-text"
app:ico_size="16dp" />
android:src="@drawable/ic_outline_description_24" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="32dp"
android:layout_marginStart="28dp"
android:orientation="vertical"
android:paddingTop="8dp"
android:paddingBottom="8dp">
@ -233,17 +223,15 @@
android:focusable="true">
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:importantForAccessibility="no"
app:ico_color="?attr/iconColorPrimary"
app:ico_icon="gmi-file-text"
app:ico_size="16dp" />
android:src="@drawable/ic_outline_description_24" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="32dp"
android:layout_marginStart="28dp"
android:orientation="vertical"
android:paddingTop="8dp"
android:paddingBottom="8dp">
@ -265,21 +253,19 @@
</LinearLayout>
</androidx.cardview.widget.CardView>
</com.google.android.material.card.MaterialCardView>
<androidx.cardview.widget.CardView
<com.google.android.material.card.MaterialCardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:cardUseCompatPadding="true"
android:background="?attr/cardBackground"
android:layout_marginBottom="8dp"
tools:ignore="MissingPrefix">
app:cardUseCompatPadding="true"
style="?attr/materialCardViewOutlinedStyle">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="8dp"
android:background="?attr/cardBackground"
android:orientation="vertical">
<TextView
@ -308,17 +294,15 @@
android:focusable="true">
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:importantForAccessibility="no"
app:ico_color="?attr/iconColorPrimary"
app:ico_icon="gmi-account"
app:ico_size="16dp" />
android:src="@drawable/ic_outline_person_24" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="32dp"
android:layout_marginStart="28dp"
android:orientation="vertical"
android:paddingTop="8dp"
android:paddingBottom="8dp">
@ -353,17 +337,15 @@
android:focusable="true">
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:importantForAccessibility="no"
app:ico_color="?attr/iconColorPrimary"
app:ico_icon="gmi-account"
app:ico_size="16dp" />
android:src="@drawable/ic_outline_person_24" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="32dp"
android:layout_marginStart="28dp"
android:orientation="vertical"
android:paddingTop="8dp"
android:paddingBottom="8dp">
@ -398,17 +380,15 @@
android:focusable="true">
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:importantForAccessibility="no"
app:ico_color="?attr/iconColorPrimary"
app:ico_icon="gmi-email"
app:ico_size="16dp" />
android:src="@drawable/ic_outline_mail_24" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="32dp"
android:layout_marginStart="28dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:text="@string/email_us"
@ -430,16 +410,15 @@
android:focusable="true">
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:importantForAccessibility="no"
app:ico_color="?attr/iconColorPrimary"
app:ico_icon="gmi-globe"
app:ico_size="16dp" />
android:src="@drawable/ic_outline_public_24" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="32dp"
android:layout_marginStart="28dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:text="@string/visit_website"
@ -448,21 +427,19 @@
</LinearLayout>
</LinearLayout>
</androidx.cardview.widget.CardView>
</com.google.android.material.card.MaterialCardView>
<androidx.cardview.widget.CardView
<com.google.android.material.card.MaterialCardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:cardUseCompatPadding="true"
android:layout_marginBottom="8dp"
android:background="?attr/cardBackground"
tools:ignore="MissingPrefix">
app:cardUseCompatPadding="true"
style="?attr/materialCardViewOutlinedStyle">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="8dp"
android:background="?attr/cardBackground"
android:orientation="vertical">
<TextView
@ -491,17 +468,15 @@
android:focusable="true">
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:importantForAccessibility="no"
app:ico_color="?attr/iconColorPrimary"
app:ico_icon="gmi-star"
app:ico_size="16dp" />
android:src="@drawable/ic_outline_star_24" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="32dp"
android:layout_marginStart="28dp"
android:orientation="vertical"
android:paddingTop="8dp"
android:paddingBottom="8dp">
@ -523,6 +498,6 @@
</LinearLayout>
</LinearLayout>
</androidx.cardview.widget.CardView>
</com.google.android.material.card.MaterialCardView>
</LinearLayout>

23
app/src/main/res/layout/dialog_add_entry.xml
View file

@ -5,6 +5,16 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<com.google.android.material.bottomsheet.BottomSheetDragHandleView
android:id="@+id/drag_handle"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/add_new_entry"
android:textSize="20sp" />
<LinearLayout
android:id="@+id/fab_scan"
android:layout_width="match_parent"
@ -20,13 +30,12 @@
android:layout_width="25dp"
android:layout_height="match_parent"
android:src="@drawable/ic_qrcode_scan"
app:tint="?attr/iconColorPrimary" />
app:tint="?attr/colorOnSurfaceVariant" />
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:text="@string/scan"
android:textSize="17sp"
android:textColor="?attr/primaryText"
android:gravity="center_vertical"
android:layout_marginStart="20dp" />
</LinearLayout>
@ -44,14 +53,13 @@
<ImageView
android:layout_width="25dp"
android:layout_height="match_parent"
android:src="@drawable/ic_add_photo_24px"
app:tint="?attr/iconColorPrimary" />
android:src="@drawable/ic_outline_add_photo_alternate_24"
app:tint="?attr/colorOnSurfaceVariant" />
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:text="@string/scan_image"
android:textSize="17sp"
android:textColor="?attr/primaryText"
android:gravity="center_vertical"
android:layout_marginStart="20dp" />
</LinearLayout>
@ -69,14 +77,13 @@
<ImageView
android:layout_width="25dp"
android:layout_height="match_parent"
android:src="@drawable/ic_create_black_24dp"
app:tint="?attr/iconColorPrimary" />
android:src="@drawable/ic_outline_edit_24"
app:tint="?attr/colorOnSurfaceVariant" />
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:text="@string/enter_manually"
android:textSize="17sp"
android:textColor="?attr/primaryText"
android:gravity="center_vertical"
android:layout_marginStart="20dp" />
</LinearLayout>

2
app/src/main/res/layout/dialog_export.xml
View file

@ -52,7 +52,7 @@
android:layout_marginEnd="25dp"
android:layout_marginTop="5dp"
android:text="@string/export_warning_unencrypted"
android:textColor="#FF0000"
android:textColor="?attr/colorError"
android:visibility="gone" />
<CheckBox
android:id="@+id/checkbox_accept"

26
app/src/main/res/layout/dialog_icon_picker.xml
View file

@ -5,7 +5,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingTop="10dp"
app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
<RelativeLayout
android:layout_width="match_parent"
@ -14,19 +13,16 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<View
android:layout_width="16dp"
android:layout_height="2dp"
android:layout_gravity="center"
android:background="@drawable/drag_handle" />
<com.google.android.material.bottomsheet.BottomSheetDragHandleView
android:id="@+id/drag_handle"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:paddingTop="8dp"
android:textSize="17sp"
android:gravity="center"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="?attr/primaryText"
android:text="@string/pick_icon" />
android:gravity="center"
android:text="@string/pick_icon"
android:textSize="20sp" />
<TextView
android:id="@+id/text_icon_pack"
android:paddingTop="2dp"
@ -46,13 +42,9 @@
android:layout_marginTop="12dp"
android:scaleType="centerCrop"
android:background="?selectableItemBackgroundBorderless"
android:src="@drawable/ic_dots_vertical_black_24dp"
app:tint="?attr/iconColorPrimary"/>
android:src="@drawable/ic_outline_more_vert_24"
app:tint="?attr/colorOnSurfaceVariant" />
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/divider2" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"

3
app/src/main/res/layout/dialog_password.xml
View file

@ -15,7 +15,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/authentication_method_password_explanation"
android:textColor="#FF0000"
android:textColor="?attr/colorError"
android:textStyle="bold"
android:layout_marginStart="5dp"
android:layout_marginEnd="5dp"
@ -52,6 +52,7 @@
<ProgressBar
android:id="@+id/progressBar"
android:progressDrawable="@drawable/progress_horizontal"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"

18
app/src/main/res/layout/dialog_progress.xml Normal file
View file

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:padding="20dp">
<com.google.android.material.progressindicator.CircularProgressIndicator
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:indeterminate="true" />
<TextView
android:id="@+id/text_progress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="15dp" />
</LinearLayout>

34
app/src/main/res/layout/dialog_select_groups.xml
View file

@ -4,36 +4,26 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="12dp"
android:orientation="vertical">
<View
android:layout_width="16dp"
android:layout_height="2dp"
android:layout_gravity="center"
android:background="@drawable/drag_handle" />
<com.google.android.material.bottomsheet.BottomSheetDragHandleView
android:id="@+id/drag_handle"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:paddingTop="8dp"
android:paddingBottom="16dp"
android:textSize="17sp"
android:gravity="center"
android:id="@+id/textView3"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="?attr/primaryText"
android:text="@string/groups" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/divider2" />
android:gravity="center"
android:text="@string/groups"
android:textSize="20sp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:minHeight="150dp"
android:orientation="vertical">
android:orientation="vertical"
android:layout_marginTop="15dp">
<com.google.android.material.chip.ChipGroup
android:id="@+id/groupChipGroup"
@ -53,19 +43,17 @@
android:id="@+id/btnSave"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/colorSecondary"
android:text="@string/save"
app:rippleColor="@color/dialog_button_ripple_color"
style="@style/Widget.MaterialComponents.Button.TextButton" />
style="@style/Widget.Material3.Button.TextButton" />
<Button
android:id="@+id/btnClear"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/colorSecondary"
android:text="@string/clear"
app:rippleColor="@color/dialog_button_ripple_color"
style="@style/Widget.MaterialComponents.Button.TextButton" />
style="@style/Widget.Material3.Button.TextButton" />
</LinearLayout>
</LinearLayout>

3
app/src/main/res/layout/dropdown_checkbox.xml
View file

@ -6,7 +6,6 @@
<CheckBox
android:id="@+id/checkbox_in_dropdown"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:buttonTint="@color/colorSecondary"/>
android:layout_height="wrap_content" />
</androidx.appcompat.widget.LinearLayoutCompat>

15
app/src/main/res/layout/fragment_entry_list_view.xml
View file

@ -3,7 +3,6 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/background"
android:orientation="vertical">
<com.beemdevelopment.aegis.ui.views.TotpProgressBar
@ -22,22 +21,20 @@
android:text="@string/groups"
android:layout_gravity="end"
android:layout_marginEnd="8dp"
android:textAppearance="@style/TextAppearance.Aegis.ActionChip"
android:textColor="?attr/primaryText"
android:visibility="gone"
app:chipBackgroundColor="?attr/cardBackground"
app:chipEndPadding="6dp"
app:chipIcon="@drawable/ic_baseline_filter_list_24dp"
app:chipIcon="@drawable/ic_outline_filter_list_24"
app:chipIconTint="?attr/colorOnSurface"
app:chipIconSize="18dp"
app:chipIconTint="?attr/primaryText"
app:chipStrokeColor="@color/hint_text_dark"
app:chipStrokeWidth="1dp"
app:iconStartPadding="6dp" />
<androidx.recyclerview.widget.RecyclerView
android:layout_width="match_parent"
android:layout_height="0dp"
android:paddingHorizontal="8dp"
android:scrollbars="vertical"
android:scrollbarStyle="outsideOverlay"
android:id="@+id/rvKeyProfiles"
android:layout_weight="1"/>
@ -60,8 +57,7 @@
android:id="@+id/imageView"
android:layout_width="50dp"
android:layout_height="50dp"
android:src="@drawable/ic_qrcode_scan"
app:tint="?attr/primaryText" />
android:src="@drawable/ic_qrcode_scan" />
<TextView
android:id="@+id/textView"
@ -69,7 +65,6 @@
android:layout_height="wrap_content"
android:text="@string/empty_list_title"
android:paddingTop="17dp"
android:textColor="?attr/primaryText"
android:textSize="18sp" />
<TextView

10
app/src/main/res/layout/fragment_icon_packs.xml
View file

@ -2,8 +2,7 @@
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/cardBackground">
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
@ -24,15 +23,13 @@
android:id="@+id/imageView"
android:layout_width="75dp"
android:layout_height="75dp"
android:src="@drawable/ic_package_variant_black_24dp"
app:tint="?attr/primaryText" />
android:src="@drawable/ic_outline_package_variant_24" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/no_icon_packs_title"
android:paddingTop="17dp"
android:textColor="?attr/primaryText"
android:textSize="18sp" />
<TextView
@ -59,8 +56,7 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin"
android:src="@drawable/ic_add_black_24dp"
app:tint="@color/icon_primary_dark">
android:src="@drawable/ic_outline_add_24">
</com.google.android.material.floatingactionbutton.FloatingActionButton>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

3
app/src/main/res/layout/fragment_security_setup_slide.xml
View file

@ -25,7 +25,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/authentication_method_password_explanation"
android:textColor="@color/warning_color"
android:textColor="?attr/colorError"
android:textStyle="bold"
android:layout_marginTop="24dp" />
@ -64,6 +64,7 @@
<ProgressBar
android:id="@+id/progressBar"
android:progressDrawable="@drawable/progress_horizontal"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"

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

@ -49,10 +49,10 @@
android:text="@string/import_vault"
android:textSize="11sp"
android:layout_marginVertical="10dp"
style="?attr/outlineButtonStyle"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toTopOf="@+id/txtImportHelp" />
app:layout_constraintBottom_toTopOf="@+id/txtImportHelp"
style="@style/Widget.Material3.Button.TonalButton" />
<TextView
android:id="@+id/txtImportHelp"

11
app/src/main/res/layout/popup_password.xml
View file

@ -1,12 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/cardBackground">
android:background="@drawable/rounded_popup">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:text="@string/password_reminder"/>
</LinearLayout>
android:text="@string/password_reminder"
android:textColor="?attr/colorOnSurface" />
</LinearLayout>

9
app/src/main/res/layout/view_preference_switch.xml Normal file
View file

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<com.google.android.material.materialswitch.MaterialSwitch
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/switchWidget"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:focusable="false"
android:clickable="false"
android:background="@null" />