diff options
Diffstat (limited to 'app/src/main/res/layout')
22 files changed, 115 insertions, 62 deletions
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index 739c9c33f..67c7a900c 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -1,9 +1,9 @@ <?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" + xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - xmlns:tools="http://schemas.android.com/tools" android:orientation="vertical"> <com.google.android.material.appbar.AppBarLayout @@ -15,15 +15,16 @@ android:layout_width="match_parent" android:layout_height="?android:actionBarSize" app:navigationIcon="@drawable/ic_arrow_back_white_24dp" - app:titleTextColor="@android:color/white" tools:title="@string/about" /> <com.google.android.material.tabs.TabLayout android:id="@+id/tab_layout" android:layout_width="match_parent" android:layout_height="wrap_content" - android:theme="@style/ThemeOverlay.AppCompat.Dark" - app:tabIndicatorColor="@color/accent" /> + app:tabBackground="?attr/colorPrimary" + app:tabIndicatorColor="@color/defaultBrand" + app:tabMode="fixed" + app:tabTextColor="?attr/colorAccent" /> </com.google.android.material.appbar.AppBarLayout> <androidx.viewpager2.widget.ViewPager2 diff --git a/app/src/main/res/layout/activity_archived.xml b/app/src/main/res/layout/activity_archived.xml index fd03521fd..6dd7024dc 100644 --- a/app/src/main/res/layout/activity_archived.xml +++ b/app/src/main/res/layout/activity_archived.xml @@ -15,7 +15,6 @@ android:layout_width="match_parent" android:layout_height="?android:actionBarSize" app:navigationIcon="@drawable/ic_arrow_back_white_24dp" - app:titleTextColor="@android:color/white" tools:title="@string/archived_cards" /> </com.google.android.material.appbar.AppBarLayout> diff --git a/app/src/main/res/layout/activity_attachments.xml b/app/src/main/res/layout/activity_attachments.xml index 2e9f68414..5a820f9d3 100644 --- a/app/src/main/res/layout/activity_attachments.xml +++ b/app/src/main/res/layout/activity_attachments.xml @@ -16,7 +16,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" app:navigationIcon="@drawable/ic_arrow_back_white_24dp" - app:titleTextColor="@android:color/white" tools:title="@string/attachments" /> </com.google.android.material.appbar.AppBarLayout> diff --git a/app/src/main/res/layout/activity_edit.xml b/app/src/main/res/layout/activity_edit.xml index 16f310fb8..4d59b296f 100644 --- a/app/src/main/res/layout/activity_edit.xml +++ b/app/src/main/res/layout/activity_edit.xml @@ -16,16 +16,15 @@ android:layout_height="wrap_content" app:navigationIcon="@drawable/ic_close_white_24dp"> - <EditText - android:id="@+id/title" - android:layout_width="match_parent" - android:layout_height="wrap_content" - app:theme="@style/EditTextOnPrimaryBackground" - android:layout_marginEnd="16dp" - android:importantForAutofill="no" - android:inputType="textMultiLine" - android:maxLines="5" - tools:text="@tools:sample/lorem" /> + <EditText + android:id="@+id/title" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginEnd="16dp" + android:importantForAutofill="no" + android:inputType="textMultiLine" + android:maxLines="5" + tools:text="@tools:sample/lorem" /> </androidx.appcompat.widget.Toolbar> @@ -34,10 +33,12 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:theme="@style/ThemeOverlay.AppCompat.Dark" + app:tabBackground="?attr/colorPrimary" app:tabGravity="center" - app:tabIconTint="@android:color/white" - app:tabIndicatorColor="@color/accent" - app:tabMode="fixed" /> + app:tabIconTint="?attr/colorAccent" + app:tabIndicatorColor="@color/defaultBrand" + app:tabMode="fixed" + app:tabTextColor="?attr/colorAccent" /> </com.google.android.material.appbar.AppBarLayout> <androidx.viewpager2.widget.ViewPager2 diff --git a/app/src/main/res/layout/activity_exception.xml b/app/src/main/res/layout/activity_exception.xml index 782b401e8..881c8fa85 100644 --- a/app/src/main/res/layout/activity_exception.xml +++ b/app/src/main/res/layout/activity_exception.xml @@ -14,7 +14,6 @@ android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="?android:actionBarSize" - app:titleTextColor="@android:color/white" tools:title="@string/simple_exception" /> </com.google.android.material.appbar.AppBarLayout> @@ -36,23 +35,53 @@ </LinearLayout> - <HorizontalScrollView + <ScrollView android:layout_width="match_parent" android:layout_height="0dp" - android:layout_marginStart="@dimen/spacer_2x" - android:layout_marginEnd="@dimen/spacer_2x" - android:layout_weight="1" - android:background="@color/bg_highlighted"> + android:layout_weight="1"> - <TextView - android:id="@+id/stacktrace" - android:layout_width="wrap_content" + <LinearLayout + android:layout_width="match_parent" android:layout_height="wrap_content" - android:padding="@dimen/spacer_1x" - android:textIsSelectable="true" - android:typeface="monospace" - tools:text="@string/android_get_accounts_permission_not_granted_exception_message" /> - </HorizontalScrollView> + android:orientation="vertical"> + + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/tips" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingStart="@dimen/spacer_2x" + android:paddingEnd="@dimen/spacer_2x" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" + tools:itemCount="2" + tools:listitem="@layout/item_tip" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:padding="@dimen/spacer_2x" + android:text="@string/error_dialog_we_need_info" + android:textAppearance="?attr/textAppearanceBody2" /> + + <HorizontalScrollView + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_marginStart="@dimen/spacer_2x" + android:layout_marginEnd="@dimen/spacer_2x" + android:layout_weight="1" + android:background="@color/bg_highlighted"> + + <TextView + android:id="@+id/stacktrace" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:padding="@dimen/spacer_1x" + android:textIsSelectable="true" + android:typeface="monospace" + tools:text="@string/android_get_accounts_permission_not_granted_exception_message" /> + </HorizontalScrollView> + </LinearLayout> + </ScrollView> <LinearLayout android:layout_width="match_parent" @@ -69,7 +98,8 @@ android:layout_height="wrap_content" android:layout_marginEnd="@dimen/spacer_1x" android:layout_weight=".5" - android:text="@string/simple_close" /> + android:text="@string/simple_close" + android:textColor="@color/defaultBrand" /> <com.google.android.material.button.MaterialButton android:id="@+id/copy" @@ -78,7 +108,8 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/spacer_1x" android:layout_weight=".5" - android:text="@string/simple_copy" /> + android:text="@string/simple_copy" + app:backgroundTint="@color/defaultBrand" /> </LinearLayout> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/activity_import_account.xml b/app/src/main/res/layout/activity_import_account.xml index b4294db7b..088c26426 100644 --- a/app/src/main/res/layout/activity_import_account.xml +++ b/app/src/main/res/layout/activity_import_account.xml @@ -48,7 +48,8 @@ android:paddingTop="24dp" android:paddingEnd="32dp" android:paddingBottom="24dp" - android:text="@string/choose_account" /> + android:text="@string/choose_account" + app:backgroundTint="@color/defaultBrand" /> <TextView android:id="@+id/status" @@ -70,6 +71,7 @@ android:layout_below="@id/add_button" android:layout_centerHorizontal="true" android:layout_marginTop="32dp" + android:indeterminateTint="@color/defaultBrand" android:visibility="gone" /> <Button @@ -81,6 +83,7 @@ android:layout_centerHorizontal="true" android:layout_marginTop="16dp" android:text="@string/simple_update" + android:textColor="@color/defaultBrand" android:visibility="gone" tools:visibility="visible" /> </RelativeLayout> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index d3b024d98..5413b6219 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -5,6 +5,7 @@ android:id="@+id/drawer_layout" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/bg_card_wrapper" android:fitsSystemWindows="true"> <androidx.coordinatorlayout.widget.CoordinatorLayout @@ -107,9 +108,6 @@ android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" - android:background="?attr/colorPrimary" - android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" - app:titleTextColor="@android:color/white" tools:title="Deck"> <ImageView @@ -132,6 +130,7 @@ android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/simple_filter" android:padding="12dp" + android:tint="?attr/colorAccent" android:tooltipText="@string/simple_filter" android:translationX="6dp" app:srcCompat="@drawable/ic_filter_list_white_24dp" @@ -145,6 +144,7 @@ android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/action_archived_cards" android:padding="12dp" + android:tint="?attr/colorAccent" android:tooltipText="@string/action_archived_cards" android:translationX="12dp" android:visibility="gone" @@ -163,19 +163,20 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" + app:tabBackground="?attr/colorPrimary" app:tabGravity="center" - app:tabIndicatorColor="@color/accent" + app:tabIndicatorColor="@color/defaultBrand" app:tabMode="fixed" - app:tabTextColor="@android:color/white" /> + app:tabTextColor="?attr/colorAccent" /> <androidx.appcompat.widget.AppCompatImageButton android:id="@+id/list_menu_button" android:layout_width="48dp" android:layout_height="match_parent" - android:background="@android:color/transparent" + android:background="?attr/colorPrimary" android:contentDescription="@string/add_list" android:foreground="?attr/selectableItemBackgroundBorderless" - android:tint="@android:color/white" + android:tint="?attr/colorAccent" android:tooltipText="@string/manage_list" app:srcCompat="@drawable/ic_menu" tools:ignore="UnusedAttribute" /> @@ -190,7 +191,7 @@ android:layout_gravity="bottom|end" android:layout_margin="@dimen/fab_margin" android:contentDescription="@string/add_card" - app:backgroundTint="@color/primary" + app:backgroundTint="@color/defaultBrand" app:srcCompat="@drawable/ic_add_white_24dp" /> </androidx.coordinatorlayout.widget.CoordinatorLayout> @@ -202,6 +203,7 @@ android:layout_gravity="start" android:fitsSystemWindows="false" android:theme="@style/NavigationView" + android:background="?attr/colorPrimary" app:headerLayout="@layout/nav_header_main" /> </androidx.drawerlayout.widget.DrawerLayout> diff --git a/app/src/main/res/layout/activity_manage_accounts.xml b/app/src/main/res/layout/activity_manage_accounts.xml index 4cd084a88..bbf1b75c4 100644 --- a/app/src/main/res/layout/activity_manage_accounts.xml +++ b/app/src/main/res/layout/activity_manage_accounts.xml @@ -14,12 +14,10 @@ android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" - android:background="?attr/colorPrimary" app:contentInsetStartWithNavigation="0dp" app:navigationIcon="@drawable/ic_arrow_back_white_24dp" app:title="@string/manage_accounts" - app:titleMarginStart="0dp" - app:titleTextColor="@android:color/white" /> + app:titleMarginStart="0dp" /> </com.google.android.material.appbar.AppBarLayout> <androidx.recyclerview.widget.RecyclerView diff --git a/app/src/main/res/layout/activity_prepare_create.xml b/app/src/main/res/layout/activity_prepare_create.xml index f4aff7cb8..1128f04f4 100644 --- a/app/src/main/res/layout/activity_prepare_create.xml +++ b/app/src/main/res/layout/activity_prepare_create.xml @@ -15,8 +15,7 @@ android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="?android:actionBarSize" - app:title="@string/add_card" - app:titleTextColor="@android:color/white" /> + app:title="@string/add_card" /> </com.google.android.material.appbar.AppBarLayout> <ScrollView @@ -73,7 +72,8 @@ android:layout_height="wrap_content" android:layout_marginEnd="@dimen/spacer_1x" android:layout_weight=".5" - android:text="@android:string/cancel" /> + android:text="@android:string/cancel" + android:textColor="@color/defaultBrand" /> <com.google.android.material.button.MaterialButton android:id="@+id/submit" @@ -82,6 +82,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/spacer_1x" android:layout_weight=".5" - android:text="@string/simple_add" /> + android:text="@string/simple_add" + app:backgroundTint="@color/defaultBrand" /> </LinearLayout> </RelativeLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/activity_push_notification.xml b/app/src/main/res/layout/activity_push_notification.xml index 6fb41be3a..eb14f38d1 100644 --- a/app/src/main/res/layout/activity_push_notification.xml +++ b/app/src/main/res/layout/activity_push_notification.xml @@ -21,8 +21,7 @@ android:layout_width="match_parent" android:layout_height="?android:actionBarSize" app:navigationIcon="@drawable/ic_arrow_back_white_24dp" - app:title="@string/app_name" - app:titleTextColor="@android:color/white" /> + app:title="@string/app_name" /> </com.google.android.material.appbar.AppBarLayout> <ProgressBar diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index e5c8b0214..07f7a62fe 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -15,8 +15,7 @@ android:layout_width="match_parent" android:layout_height="?android:actionBarSize" app:navigationIcon="@drawable/ic_arrow_back_white_24dp" - app:title="@string/simple_settings" - app:titleTextColor="@android:color/white" /> + app:title="@string/simple_settings" /> </com.google.android.material.appbar.AppBarLayout> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/dialog_board_manage_labels.xml b/app/src/main/res/layout/dialog_board_manage_labels.xml index 0792d8094..ccd4481bc 100644 --- a/app/src/main/res/layout/dialog_board_manage_labels.xml +++ b/app/src/main/res/layout/dialog_board_manage_labels.xml @@ -29,7 +29,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:contentDescription="@string/add_comment" - android:tint="@android:color/white" + app:backgroundTint="@color/defaultBrand" app:fabSize="mini" app:srcCompat="@drawable/ic_send_white_24dp" /> </LinearLayout> diff --git a/app/src/main/res/layout/dialog_filter.xml b/app/src/main/res/layout/dialog_filter.xml index e7d9ebd6a..8741e7e36 100644 --- a/app/src/main/res/layout/dialog_filter.xml +++ b/app/src/main/res/layout/dialog_filter.xml @@ -9,7 +9,10 @@ android:id="@+id/tab_layout" android:layout_width="match_parent" android:layout_height="wrap_content" + app:tabIndicatorColor="@color/defaultBrand" app:tabInlineLabel="true" + app:tabMode="fixed" + app:tabTextColor="?attr/colorAccent" app:tabUnboundedRipple="true" /> <androidx.viewpager2.widget.ViewPager2 diff --git a/app/src/main/res/layout/fragment_about_license_tab.xml b/app/src/main/res/layout/fragment_about_license_tab.xml index aac8e79a0..e6730390b 100644 --- a/app/src/main/res/layout/fragment_about_license_tab.xml +++ b/app/src/main/res/layout/fragment_about_license_tab.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <ScrollView 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"> @@ -26,7 +27,8 @@ style="@style/Widget.MaterialComponents.Button" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/about_app_license_button" /> + android:text="@string/about_app_license_button" + app:backgroundTint="@color/defaultBrand" /> <TextView style="?android:attr/listSeparatorTextViewStyle" diff --git a/app/src/main/res/layout/fragment_card_edit_tab_attachments.xml b/app/src/main/res/layout/fragment_card_edit_tab_attachments.xml index b2e5df74a..5aa23961d 100644 --- a/app/src/main/res/layout/fragment_card_edit_tab_attachments.xml +++ b/app/src/main/res/layout/fragment_card_edit_tab_attachments.xml @@ -32,7 +32,7 @@ android:layout_gravity="bottom|end" android:layout_margin="@dimen/fab_margin" android:visibility="gone" - app:backgroundTint="@color/primary" + app:backgroundTint="@color/defaultBrand" app:srcCompat="@drawable/ic_file_upload_white_24dp" tools:visibility="visible" /> </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/fragment_card_edit_tab_comments.xml b/app/src/main/res/layout/fragment_card_edit_tab_comments.xml index da76e2a50..3350480cb 100644 --- a/app/src/main/res/layout/fragment_card_edit_tab_comments.xml +++ b/app/src/main/res/layout/fragment_card_edit_tab_comments.xml @@ -114,7 +114,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:contentDescription="@string/add_comment" - android:tint="@android:color/white" + app:backgroundTint="@color/defaultBrand" app:fabSize="mini" app:srcCompat="@drawable/ic_send_white_24dp" /> </LinearLayout> diff --git a/app/src/main/res/layout/item_autocomplete_label.xml b/app/src/main/res/layout/item_autocomplete_label.xml index adfa5bd93..49b98db0b 100644 --- a/app/src/main/res/layout/item_autocomplete_label.xml +++ b/app/src/main/res/layout/item_autocomplete_label.xml @@ -1,5 +1,6 @@ <?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" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -12,11 +13,15 @@ android:id="@+id/label" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginTop="@dimen/spacer_1x" + android:layout_marginBottom="@dimen/spacer_1x" android:clickable="false" android:ellipsize="middle" android:focusable="false" + android:padding="@dimen/spacer_1x" + app:ensureMinTouchTargetSize="false" tools:backgroundTint="@color/board_default_color" - tools:text="@tools:sample/lorem" + tools:text="@tools:sample/cities" tools:textColor="@android:color/white" /> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/item_card.xml b/app/src/main/res/layout/item_card.xml index a3ae195fc..c0457f5e4 100644 --- a/app/src/main/res/layout/item_card.xml +++ b/app/src/main/res/layout/item_card.xml @@ -9,6 +9,7 @@ android:layout_marginTop="@dimen/spacer_1x" android:layout_marginEnd="@dimen/spacer_2x" android:layout_marginBottom="@dimen/spacer_1x" + app:cardBackgroundColor="@color/bg_card" android:focusable="true"> <LinearLayout @@ -32,6 +33,7 @@ android:layout_marginTop="4sp" android:layout_weight="1" android:textSize="18sp" + android:textColor="?attr/colorAccent" tools:ignore="RtlSymmetry" tools:text="Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut l" /> @@ -146,6 +148,7 @@ android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/label_menu" android:padding="@dimen/spacer_1hx" + android:tint="?attr/colorAccent" app:srcCompat="@drawable/ic_menu" /> </LinearLayout> </LinearLayout> diff --git a/app/src/main/res/layout/item_comment.xml b/app/src/main/res/layout/item_comment.xml index 9769f681d..754e989fe 100644 --- a/app/src/main/res/layout/item_comment.xml +++ b/app/src/main/res/layout/item_comment.xml @@ -22,7 +22,7 @@ android:id="@+id/parentBorder" android:layout_width="2dp" android:layout_height="match_parent" - android:background="@color/primary" /> + android:background="?attr/colorPrimary" /> <TextView android:id="@+id/parent" diff --git a/app/src/main/res/layout/item_manage_label.xml b/app/src/main/res/layout/item_manage_label.xml index fc5c86a07..7bc7a7194 100644 --- a/app/src/main/res/layout/item_manage_label.xml +++ b/app/src/main/res/layout/item_manage_label.xml @@ -17,7 +17,12 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" + android:layout_marginStart="@dimen/spacer_1hx" + android:layout_marginTop="@dimen/spacer_1x" + android:layout_marginEnd="@dimen/spacer_1hx" + android:layout_marginBottom="@dimen/spacer_1x" android:ellipsize="middle" + app:ensureMinTouchTargetSize="false" tools:text="@tools:sample/cities" /> </LinearLayout> diff --git a/app/src/main/res/layout/item_tip.xml b/app/src/main/res/layout/item_tip.xml index 96df0e431..2177d013c 100644 --- a/app/src/main/res/layout/item_tip.xml +++ b/app/src/main/res/layout/item_tip.xml @@ -27,6 +27,7 @@ android:layout_height="wrap_content" android:layout_marginStart="40dp" android:layout_marginEnd="@dimen/spacer_1x" + android:textColor="@color/defaultBrand" android:visibility="visible" tools:text="@string/error_action_open_deck_info" tools:visibility="visible" /> diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml index 6f65fba00..34d7cdc7a 100644 --- a/app/src/main/res/layout/nav_header_main.xml +++ b/app/src/main/res/layout/nav_header_main.xml @@ -4,7 +4,7 @@ android:id="@+id/header_view" android:layout_width="match_parent" android:layout_height="@dimen/drawer_header_height" - android:background="@color/primary"> + android:background="@color/defaultBrand"> <androidx.appcompat.widget.AppCompatImageView android:id="@+id/logo" @@ -14,6 +14,7 @@ android:layout_margin="@dimen/spacer_2x" android:gravity="center" android:padding="@dimen/spacer_1hx" + android:tint="@android:color/white" app:srcCompat="@drawable/ic_app_logo" /> <TextView |