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

Switch from Appcompat to Material Components theme

Browse source 
Close #354.
This commit is contained in:
Alexander Bakker 2021-01-17 13:12:43 +01:00
parent 29ea2df696
commit eae31ef94b
70 changed files with 818 additions and 760 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4,17 +4,24 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:background="?attr/background"
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:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorAppBar" />
</com.google.android.material.appbar.AppBarLayout>
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipToPadding="false"
android:isScrollContainer="true">
android:isScrollContainer="true"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<include layout="@layout/content_about" />
</ScrollView>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@ -4,7 +4,6 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:background="?attr/background"
tools:context="com.beemdevelopment.aegis.ui.AuthActivity">
@ -68,6 +67,7 @@
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"

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

@ -1,323 +1,301 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout
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:background="?attr/background"
android:layout_height="match_parent"
android:background="?attr/background"
android:orientation="vertical"
tools:context="com.beemdevelopment.aegis.ui.EditEntryActivity">
<LinearLayout
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:descendantFocusability="beforeDescendants"
android:focusableInTouchMode="true">
<RelativeLayout
android:theme="@style/ThemeOverlay.Aegis.AppBar">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:background="?attr/background"
android:layout_height="250dp">
<de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/profile_drawable"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true" />
<com.avito.android.krop.KropView
android:id="@+id/krop_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:visibility="invisible"
app:krop_aspectX="1"
app:krop_aspectY="1"
app:krop_offset="70dp"
app:krop_overlayColor="#aadddddd" >
<ImageView
android:id="@+id/iv_saveImage"
android:layout_width="wrap_content"
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" />
</com.avito.android.krop.KropView>
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/divider" />
<TableLayout
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorAppBar" />
</com.google.android.material.appbar.AppBarLayout>
<ScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:stretchColumns="1"
android:layout_marginEnd="35dp">
android:descendantFocusability="beforeDescendants"
android:focusableInTouchMode="true">
<TableRow
android:layout_marginTop="10dp"
android:layout_marginBottom="5dp">
<ImageView android:layout_column="0"
<RelativeLayout
android:layout_width="match_parent"
android:background="?attr/background"
android:layout_height="250dp">
<de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/profile_drawable"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true" />
<com.avito.android.krop.KropView
android:id="@+id/krop_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_person_black_24dp"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:visibility="invisible"
app:krop_aspectX="1"
app:krop_aspectY="1"
app:krop_offset="70dp"
app:krop_overlayColor="#aadddddd" >
<ImageView
android:id="@+id/iv_saveImage"
android:layout_width="wrap_content"
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" />
</com.avito.android.krop.KropView>
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/divider" />
<TableLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:stretchColumns="1"
android:layout_marginEnd="15dp">
<TableRow
android:layout_marginTop="10dp"
app:tint="?attr/iconColorPrimary"
android:layout_marginStart="15dp"
android:layout_marginEnd="20dp"/>
android:layout_marginBottom="5dp">
<ImageView
android:layout_column="0"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_person_black_24dp"
app:tint="?attr/iconColorPrimary"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:layout_gravity="center_vertical"/>
<EditText android:layout_column="1"
android:id="@+id/text_name"
android:hint="@string/name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:backgroundTint="#949494"
android:layout_weight="1"/>
</TableRow>
<TableRow
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp">
<LinearLayout android:layout_column="1"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="horizontal"
android:gravity="center_vertical">
<EditText
android:id="@+id/text_issuer"
android:hint="@string/issuer"
<com.google.android.material.textfield.TextInputLayout
android:layout_column="1"
android:hint="@string/name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:backgroundTint="#949494"
android:layout_weight="1"/>
<androidx.appcompat.widget.AppCompatSpinner
android:id="@+id/spinner_group"
android:layout_weight="1">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/text_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="text"/>
</com.google.android.material.textfield.TextInputLayout>
</TableRow>
<TableRow
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp">
<LinearLayout android:layout_column="1"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:backgroundTint="#949494"
style="@style/Base.Widget.AppCompat.Spinner.Underlined"/>
</LinearLayout>
</TableRow>
</TableLayout>
android:orientation="horizontal"
android:gravity="center_vertical">
<com.google.android.material.textfield.TextInputLayout
android:hint="@string/issuer"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="5dp"
android:layout_weight="1">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/text_issuer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="text"/>
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:hint="@string/group"
style="?attr/dropdownStyle">
<AutoCompleteTextView
android:id="@+id/dropdown_group"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="none"/>
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
</TableRow>
</TableLayout>
<RelativeLayout
android:foreground="?android:attr/selectableItemBackground"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/accordian_header"
android:focusable="true"
android:clickable="true">
<ImageView
android:id="@+id/down_btn"
android:layout_width="wrap_content"
<RelativeLayout
android:foreground="?android:attr/selectableItemBackground"
android:layout_width="match_parent"
android:layout_height="wrap_content"
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:id="@+id/accordian_header"
android:focusable="true"
android:clickable="true">
<TextView
android:id="@+id/accordian_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_marginStart="12dp"
android:layout_toEndOf="@+id/down_btn"
android:padding="16dp"
android:text="@string/advanced"
android:textStyle="bold" />
<ImageView
android:id="@+id/down_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
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"/>
</RelativeLayout>
<TextView
android:id="@+id/accordian_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_toEndOf="@+id/down_btn"
android:padding="16dp"
android:text="@string/advanced"
android:textStyle="bold" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/expandableLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="invisible">
<TableLayout
<TableLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:stretchColumns="1"
android:layout_marginEnd="35dp">
<TableRow
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp">
<ImageView android:layout_column="0"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_info_outline_black_24dp"
android:layout_marginTop="10dp"
app:tint="?attr/iconColorPrimary"
android:layout_marginStart="15dp"
android:layout_marginEnd="20dp"/>
<LinearLayout android:layout_column="1"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="horizontal"
android:gravity="center_vertical">
<androidx.appcompat.widget.AppCompatSpinner
android:id="@+id/spinner_type"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="4"
android:paddingEnd="6dp"
android:gravity="start"
android:layout_gravity="start"
android:backgroundTint="#949494"
style="@style/Base.Widget.AppCompat.Spinner.Underlined"/>
<androidx.appcompat.widget.AppCompatSpinner
android:id="@+id/spinner_algo"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="4"
android:paddingEnd="6dp"
android:backgroundTint="#949494"
style="@style/Base.Widget.AppCompat.Spinner.Underlined"/>
<EditText
android:id="@+id/text_digits"
android:hint="@string/digits"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:paddingEnd="6dp"
android:layout_weight="3"
android:backgroundTint="#949494"/>
</LinearLayout>
</TableRow>
<TableRow
android:id="@+id/row_period"
android:visibility="gone"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp">
<ImageView android:layout_column="0"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_timelapse_black_24dp"
android:layout_marginTop="10dp"
app:tint="?attr/iconColorPrimary"
android:layout_marginStart="15dp"
android:layout_marginEnd="20dp"/>
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="horizontal">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
<EditText
android:id="@+id/text_period"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:backgroundTint="#949494"
android:layout_alignParentStart="true"
android:layout_gravity="center"
android:inputType="numberDecimal"/>
<TextView
android:id="@+id/text_hint"
android:layout_marginEnd="15dp">
<TableRow
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp">
<ImageView android:layout_column="0"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:backgroundTint="#949494"
android:layout_centerVertical="true"
android:text="@string/seconds"
android:textSize="18sp"
android:layout_marginEnd="10dp"
android:textColor="#808080"/>
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"/>
</LinearLayout>
</TableRow>
android:src="@drawable/ic_info_outline_black_24dp"
app:tint="?attr/iconColorPrimary"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:layout_gravity="center_vertical"/>
<TableRow
android:id="@+id/row_counter"
android:visibility="gone"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp">
<ImageView android:layout_column="0"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_counter_black_24dp"
android:layout_marginTop="10dp"
app:tint="?attr/iconColorPrimary"
android:layout_marginStart="15dp"
android:layout_marginEnd="20dp"/>
<LinearLayout android:layout_column="1"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="horizontal"
android:gravity="center_vertical">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="horizontal">
<EditText
android:id="@+id/text_counter"
android:hint="@string/counter"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:backgroundTint="#949494"
android:layout_gravity="center"
android:inputType="numberDecimal"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"/>
</LinearLayout>
</TableRow>
<com.google.android.material.textfield.TextInputLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="4"
android:layout_marginEnd="5dp"
android:gravity="start"
android:layout_gravity="start"
android:hint="@string/type"
style="?attr/dropdownStyle">
<AutoCompleteTextView
android:id="@+id/dropdown_type"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="none"/>
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="4"
android:hint="@string/algorithm_hint"
style="?attr/dropdownStyle">
<AutoCompleteTextView
android:id="@+id/dropdown_algo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="none" />
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
</TableRow>
<TableRow
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp">
<ImageView android:layout_column="0"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_vpn_key_black_24dp"
android:layout_marginTop="10dp"
app:tint="?attr/iconColorPrimary"
android:layout_marginStart="15dp"
android:layout_marginEnd="20dp"/>
<TableRow
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp">
<LinearLayout android:layout_column="1"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="horizontal"
android:gravity="center_vertical">
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/text_period_counter_layout"
android:hint="@string/period_hint"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="4"
android:layout_marginEnd="5dp"
android:gravity="start"
android:layout_gravity="start">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/text_period_counter"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="text"/>
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
android:hint="@string/digits"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="4">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/text_digits"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="text"/>
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
</TableRow>
<com.google.android.material.textfield.TextInputLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
app:passwordToggleTint="#949494"
android:backgroundTint="#949494"
app:hintEnabled="false"
app:passwordToggleEnabled="true">
<TableRow
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp">
<ImageView android:layout_column="0"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_vpn_key_black_24dp"
app:tint="?attr/iconColorPrimary"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:layout_gravity="center_vertical"/>
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/text_secret"
android:layout_width="match_parent"
android:layout_height="wrap_content"
<com.google.android.material.textfield.TextInputLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
app:passwordToggleTint="#949494"
app:passwordToggleEnabled="true">
android:backgroundTint="#949494"
android:hint="@string/secret"
android:inputType="textPassword"/>
</com.google.android.material.textfield.TextInputLayout>
</TableRow>
</TableLayout>
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/text_secret"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/secret"
android:inputType="textPassword"/>
</com.google.android.material.textfield.TextInputLayout>
</TableRow>
</TableLayout>
</RelativeLayout>
</LinearLayout>
</ScrollView>
</LinearLayout>
</ScrollView>
</LinearLayout>

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

@ -4,10 +4,20 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:background="?attr/background"
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:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorAppBar" />
</com.google.android.material.appbar.AppBarLayout>
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"

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

@ -5,12 +5,23 @@
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:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/ThemeOverlay.Aegis.AppBar">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorAppBar" />
</com.google.android.material.appbar.AppBarLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
android:orientation="vertical">
<LinearLayout
android:id="@+id/btn_backup_error"
@ -60,6 +71,6 @@
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin"
android:src="@drawable/ic_add_black_24dp"
android:tint="@color/icon_primary_dark" />
app:tint="@color/icon_primary_dark" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

22
app/src/main/res/layout/activity_preferences.xml Normal file
View file

@ -0,0 +1,22 @@
<?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="match_parent"
android:orientation="vertical">
<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:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorAppBar" />
</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>

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

@ -1,14 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout
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:fitsSystemWindows="true"
android:background="?attr/background"
android:id="@+id/importEntriesRootView"
tools:context="com.beemdevelopment.aegis.ui.SelectEntriesActivity">
<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:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorAppBar" />
</com.google.android.material.appbar.AppBarLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/list_entries"
android:layout_width="match_parent"
@ -16,7 +26,8 @@
android:foreground="?android:attr/selectableItemBackground"
android:paddingBottom="60dp"
android:clipToPadding="false"
android:scrollbars="vertical"/>
android:scrollbars="vertical"
app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab"
@ -25,5 +36,5 @@
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin"
android:src="@drawable/ic_check_black_24dp"
android:tint="@color/icon_primary_dark" />
app:tint="@color/icon_primary_dark" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@ -4,9 +4,24 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/cardBackground"
android:background="?attr/background"
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:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorAppBar" />
</com.google.android.material.appbar.AppBarLayout>
<ImageView
android:id="@+id/ivQrCode"
android:layout_width="250dp"
@ -15,7 +30,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.496"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintTop_toBottomOf="@+id/toolbar_layout"
app:layout_constraintVertical_bias="0.399" />
<TextView

12
app/src/main/res/layout/activity_slots.xml
View file

@ -4,10 +4,20 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:background="?attr/background"
tools:context="com.beemdevelopment.aegis.ui.SlotManagerActivity">
<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:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorAppBar" />
</com.google.android.material.appbar.AppBarLayout>
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"

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

@ -38,7 +38,7 @@
android:layout_centerVertical="true"
android:src="@drawable/item_selected"
android:visibility="gone"
app:civ_circle_background_color="@color/colorSecondary" />
app:civ_circle_background_color="@color/colorPrimarySelected" />
</RelativeLayout>
<RelativeLayout

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

@ -39,7 +39,7 @@
android:layout_centerVertical="true"
android:src="@drawable/item_selected"
android:visibility="gone"
app:civ_circle_background_color="@color/colorSecondary" />
app:civ_circle_background_color="@color/colorPrimarySelected" />
</RelativeLayout>
<RelativeLayout

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

@ -38,7 +38,7 @@
android:layout_centerVertical="true"
android:src="@drawable/item_selected"
android:visibility="gone"
app:civ_circle_background_color="@color/colorSecondary" />
app:civ_circle_background_color="@color/colorPrimarySelected" />
</RelativeLayout>
<RelativeLayout

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

@ -49,6 +49,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/btn_app_version"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
@ -63,12 +64,11 @@
android:layout_width="20dp"
android:layout_height="20dp"
android:importantForAccessibility="no"
app:ico_color="@color/icon_about"
app:ico_color="?attr/iconColorPrimary"
app:ico_icon="gmi-info-outline"
app:ico_size="16dp" />
<LinearLayout
android:id="@+id/btn_app_version"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="32dp"
@ -109,7 +109,7 @@
android:layout_width="20dp"
android:layout_height="20dp"
android:importantForAccessibility="no"
app:ico_color="@color/icon_about"
app:ico_color="?attr/iconColorPrimary"
app:ico_icon="gmi-time-restore"
app:ico_size="16dp" />
@ -151,7 +151,7 @@
android:layout_width="20dp"
android:layout_height="20dp"
android:importantForAccessibility="no"
app:ico_color="@color/icon_about"
app:ico_color="?attr/iconColorPrimary"
app:ico_icon="gmi-github"
app:ico_size="16dp" />
@ -193,7 +193,7 @@
android:layout_width="20dp"
android:layout_height="20dp"
android:importantForAccessibility="no"
app:ico_color="@color/icon_about"
app:ico_color="?attr/iconColorPrimary"
app:ico_icon="gmi-file-text"
app:ico_size="16dp" />
@ -268,7 +268,7 @@
android:layout_width="20dp"
android:layout_height="20dp"
android:importantForAccessibility="no"
app:ico_color="@color/icon_about"
app:ico_color="?attr/iconColorPrimary"
app:ico_icon="gmi-account"
app:ico_size="16dp" />
@ -313,7 +313,7 @@
android:layout_width="20dp"
android:layout_height="20dp"
android:importantForAccessibility="no"
app:ico_color="@color/icon_about"
app:ico_color="?attr/iconColorPrimary"
app:ico_icon="gmi-account"
app:ico_size="16dp" />
@ -358,7 +358,7 @@
android:layout_width="20dp"
android:layout_height="20dp"
android:importantForAccessibility="no"
app:ico_color="@color/icon_about"
app:ico_color="?attr/iconColorPrimary"
app:ico_icon="gmi-email"
app:ico_size="16dp" />
@ -390,7 +390,7 @@
android:layout_width="20dp"
android:layout_height="20dp"
android:importantForAccessibility="no"
app:ico_color="@color/icon_about"
app:ico_color="?attr/iconColorPrimary"
app:ico_icon="gmi-globe"
app:ico_size="16dp" />
<TextView
@ -451,7 +451,7 @@
android:layout_width="20dp"
android:layout_height="20dp"
android:importantForAccessibility="no"
app:ico_color="@color/icon_about"
app:ico_color="?attr/iconColorPrimary"
app:ico_icon="gmi-star"
app:ico_size="16dp" />

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

@ -12,13 +12,20 @@
android:layout_marginStart="25dp"
android:layout_marginEnd="25dp"
android:text="@string/export_help" />
<androidx.appcompat.widget.AppCompatSpinner
android:id="@+id/spinner_export_format"
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:layout_marginTop="5dp" />
android:layout_marginStart="25dp"
android:layout_marginEnd="25dp"
android:layout_marginTop="5dp"
android:hint="@string/export_format_hint"
style="?attr/dropdownStyle">
<AutoCompleteTextView
android:id="@+id/dropdown_export_format"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="none" />
</com.google.android.material.textfield.TextInputLayout>
<CheckBox
android:id="@+id/checkbox_export_encrypt"
android:layout_width="match_parent"

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

@ -22,14 +22,14 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/text_password"
android:hint="@string/password"
android:inputType="textPassword"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<requestFocus/>
</EditText>
</com.google.android.material.textfield.TextInputEditText>
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
@ -38,7 +38,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="10dp">
<EditText
<com.google.android.material.textfield.TextInputEditText
android:hint="@string/confirm_password"
android:id="@+id/text_password_confirm"
android:inputType="textPassword"

12
app/src/main/res/layout/dialog_text_input.xml
View file

@ -6,10 +6,14 @@
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:paddingTop="20dp">
<EditText
android:id="@+id/text_input"
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/text_input_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<requestFocus/>
</EditText>
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/text_input"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="text"/>
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>

8
app/src/main/res/layout/dropdown_list_item.xml Normal file
View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="16dp"
android:ellipsize="end"
android:maxLines="1"
android:textAppearance="?attr/textAppearanceSubtitle1"/>

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

@ -22,7 +22,7 @@
android:text="@string/groups"
android:layout_gravity="end"
android:layout_marginEnd="8dp"
android:textAppearance="@style/AppTheme.ActionChip"
android:textAppearance="@style/TextAppearance.Aegis.ActionChip"
android:textColor="?attr/primaryText"
app:chipBackgroundColor="?attr/cardBackground"
app:chipEndPadding="6dp"

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

@ -40,7 +40,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/text_password"
android:hint="@string/set_password"
android:inputType="textPassword"
@ -54,7 +54,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="10dp">
<EditText
<com.google.android.material.textfield.TextInputEditText
android:hint="@string/set_password_confirm"
android:id="@+id/text_password_confirm"
android:inputType="textPassword"