diff options
Diffstat (limited to 'app/src/main/res/layout')
| -rw-r--r-- | app/src/main/res/layout/activity_custom_theme_listing.xml | 1 | ||||
| -rw-r--r-- | app/src/main/res/layout/activity_rules.xml | 3 | ||||
| -rw-r--r-- | app/src/main/res/layout/activity_search_result.xml | 19 | ||||
| -rw-r--r-- | app/src/main/res/layout/activity_subscribed_subreddits_multiselection.xml | 3 | ||||
| -rw-r--r-- | app/src/main/res/layout/activity_subscribed_thing_listing.xml | 3 | ||||
| -rw-r--r-- | app/src/main/res/layout/fragment_create_theme_bottom_sheet.xml (renamed from app/src/main/res/layout/fragment_select_base_theme_bottom_sheet.xml) | 24 | ||||
| -rw-r--r-- | app/src/main/res/layout/item_user_custom_theme.xml | 12 |
7 files changed, 48 insertions, 17 deletions
diff --git a/app/src/main/res/layout/activity_custom_theme_listing.xml b/app/src/main/res/layout/activity_custom_theme_listing.xml index 37b8f878..5b35b48c 100644 --- a/app/src/main/res/layout/activity_custom_theme_listing.xml +++ b/app/src/main/res/layout/activity_custom_theme_listing.xml @@ -4,6 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" + android:id="@+id/coordinator_layout_custom_theme_listing_activity" tools:context=".Activity.CustomThemeListingActivity"> <com.google.android.material.appbar.AppBarLayout diff --git a/app/src/main/res/layout/activity_rules.xml b/app/src/main/res/layout/activity_rules.xml index 36d057db..91f35cf2 100644 --- a/app/src/main/res/layout/activity_rules.xml +++ b/app/src/main/res/layout/activity_rules.xml @@ -27,7 +27,8 @@ android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" android:background="?attr/colorPrimary" - app:popupTheme="@style/AppTheme.PopupOverlay" /> + app:popupTheme="@style/AppTheme.PopupOverlay" + app:navigationIcon="?attr/homeAsUpIndicator" /> </com.google.android.material.appbar.CollapsingToolbarLayout> diff --git a/app/src/main/res/layout/activity_search_result.xml b/app/src/main/res/layout/activity_search_result.xml index c4b132c7..63c8212e 100644 --- a/app/src/main/res/layout/activity_search_result.xml +++ b/app/src/main/res/layout/activity_search_result.xml @@ -14,12 +14,21 @@ android:background="?attr/toolbarAndTabBackgroundColor" android:theme="@style/AppTheme.AppBarOverlay"> - <androidx.appcompat.widget.Toolbar - android:id="@+id/toolbar_search_result_activity" + <com.google.android.material.appbar.CollapsingToolbarLayout android:layout_width="match_parent" - android:layout_height="?attr/actionBarSize" - app:popupTheme="@style/AppTheme.PopupOverlay" - app:navigationIcon="?attr/homeAsUpIndicator" /> + android:layout_height="match_parent" + app:layout_scrollFlags="scroll|enterAlways" + app:titleEnabled="false" + app:toolbarId="@+id/toolbar_search_result_activity"> + + <androidx.appcompat.widget.Toolbar + android:id="@+id/toolbar_search_result_activity" + android:layout_width="match_parent" + android:layout_height="?attr/actionBarSize" + app:popupTheme="@style/AppTheme.PopupOverlay" + app:navigationIcon="?attr/homeAsUpIndicator" /> + + </com.google.android.material.appbar.CollapsingToolbarLayout> <com.google.android.material.tabs.TabLayout android:id="@+id/tab_layout_search_result_activity" diff --git a/app/src/main/res/layout/activity_subscribed_subreddits_multiselection.xml b/app/src/main/res/layout/activity_subscribed_subreddits_multiselection.xml index ee0ae427..d552fb84 100644 --- a/app/src/main/res/layout/activity_subscribed_subreddits_multiselection.xml +++ b/app/src/main/res/layout/activity_subscribed_subreddits_multiselection.xml @@ -28,7 +28,8 @@ android:layout_height="?attr/actionBarSize" app:layout_collapseMode="pin" app:layout_scrollFlags="scroll|enterAlways" - app:popupTheme="@style/AppTheme.PopupOverlay" /> + app:popupTheme="@style/AppTheme.PopupOverlay" + app:navigationIcon="?attr/homeAsUpIndicator" /> </com.google.android.material.appbar.CollapsingToolbarLayout> diff --git a/app/src/main/res/layout/activity_subscribed_thing_listing.xml b/app/src/main/res/layout/activity_subscribed_thing_listing.xml index 183a0b61..460b1ba6 100644 --- a/app/src/main/res/layout/activity_subscribed_thing_listing.xml +++ b/app/src/main/res/layout/activity_subscribed_thing_listing.xml @@ -28,7 +28,8 @@ android:layout_height="?attr/actionBarSize" app:layout_collapseMode="pin" app:layout_scrollFlags="scroll|enterAlways" - app:popupTheme="@style/AppTheme.PopupOverlay" /> + app:popupTheme="@style/AppTheme.PopupOverlay" + app:navigationIcon="?attr/homeAsUpIndicator" /> </com.google.android.material.appbar.CollapsingToolbarLayout> diff --git a/app/src/main/res/layout/fragment_select_base_theme_bottom_sheet.xml b/app/src/main/res/layout/fragment_create_theme_bottom_sheet.xml index d0adbd83..c5ac6fda 100644 --- a/app/src/main/res/layout/fragment_select_base_theme_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_create_theme_bottom_sheet.xml @@ -11,7 +11,25 @@ android:orientation="vertical"> <TextView - android:id="@+id/light_theme_text_view_select_base_theme_bottom_sheet_fragment" + android:id="@+id/import_theme_text_view_create_theme_bottom_sheet_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center_vertical" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="32dp" + android:paddingEnd="32dp" + android:text="@string/import_theme" + android:textColor="?attr/primaryTextColor" + android:textSize="?attr/font_default" + android:drawableStart="@drawable/ic_import_day_night_24dp" + android:drawablePadding="48dp" + android:clickable="true" + android:focusable="true" + android:background="?attr/selectableItemBackground" /> + + <TextView + android:id="@+id/light_theme_text_view_create_theme_bottom_sheet_fragment" android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_vertical" @@ -29,7 +47,7 @@ android:background="?attr/selectableItemBackground" /> <TextView - android:id="@+id/dark_theme_text_view_select_base_theme_bottom_sheet_fragment" + android:id="@+id/dark_theme_text_view_create_theme_bottom_sheet_fragment" android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_vertical" @@ -47,7 +65,7 @@ android:background="?attr/selectableItemBackground" /> <TextView - android:id="@+id/amoled_theme_text_view_select_base_theme_bottom_sheet_fragment" + android:id="@+id/amoled_theme_text_view_create_theme_bottom_sheet_fragment" android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_vertical" diff --git a/app/src/main/res/layout/item_user_custom_theme.xml b/app/src/main/res/layout/item_user_custom_theme.xml index 55891961..e8c4dc65 100644 --- a/app/src/main/res/layout/item_user_custom_theme.xml +++ b/app/src/main/res/layout/item_user_custom_theme.xml @@ -24,21 +24,21 @@ android:textColor="?attr/primaryTextColor" /> <ImageView - android:id="@+id/add_image_view_item_user_custom_theme" + android:id="@+id/share_image_view_item_user_custom_theme" android:layout_width="24dp" android:layout_height="24dp" android:layout_gravity="center_vertical" - android:layout_marginStart="32dp" - android:src="@drawable/ic_add_day_night_24dp" + android:layout_marginStart="16dp" + android:src="@drawable/ic_share_24dp" android:background="?attr/selectableItemBackgroundBorderless" /> <ImageView - android:id="@+id/share_image_view_item_user_custom_theme" + android:id="@+id/add_image_view_item_user_custom_theme" android:layout_width="24dp" android:layout_height="24dp" android:layout_gravity="center_vertical" - android:layout_marginStart="16dp" - android:src="@drawable/ic_share_24dp" + android:layout_marginStart="32dp" + android:src="@drawable/ic_add_day_night_24dp" android:background="?attr/selectableItemBackgroundBorderless" /> </LinearLayout>
\ No newline at end of file |