diff --git a/app/src/main/res/color/bottom_nav_items.xml b/app/src/main/res/color/bottom_nav_items.xml index ce3b9b1d1..e785610df 100644 --- a/app/src/main/res/color/bottom_nav_items.xml +++ b/app/src/main/res/color/bottom_nav_items.xml @@ -1,6 +1,6 @@ - - - + + + \ No newline at end of file diff --git a/app/src/main/res/drawable-anydpi-v21/ic_file_install.xml b/app/src/main/res/drawable-anydpi-v21/ic_file_install.xml index 644cb6070..11af9550a 100644 --- a/app/src/main/res/drawable-anydpi-v21/ic_file_install.xml +++ b/app/src/main/res/drawable-anydpi-v21/ic_file_install.xml @@ -1,6 +1,15 @@ - - - + + + diff --git a/app/src/main/res/drawable-v23/seekbar_background.xml b/app/src/main/res/drawable-v23/seekbar_background.xml index 87855cb5b..24c882cd6 100644 --- a/app/src/main/res/drawable-v23/seekbar_background.xml +++ b/app/src/main/res/drawable-v23/seekbar_background.xml @@ -1,6 +1,8 @@ - + diff --git a/app/src/main/res/drawable/app_list_item_divider.xml b/app/src/main/res/drawable/app_list_item_divider.xml index 43e49bab5..4b2c94fe0 100644 --- a/app/src/main/res/drawable/app_list_item_divider.xml +++ b/app/src/main/res/drawable/app_list_item_divider.xml @@ -1,10 +1,13 @@ + - + \ No newline at end of file diff --git a/app/src/main/res/drawable/app_version_item_status_incompatible.xml b/app/src/main/res/drawable/app_version_item_status_incompatible.xml index 57383ccb9..5277498b3 100644 --- a/app/src/main/res/drawable/app_version_item_status_incompatible.xml +++ b/app/src/main/res/drawable/app_version_item_status_incompatible.xml @@ -1,5 +1,8 @@ - - + + diff --git a/app/src/main/res/drawable/app_version_item_status_installed.xml b/app/src/main/res/drawable/app_version_item_status_installed.xml index 7a41f1043..3d4ff6756 100644 --- a/app/src/main/res/drawable/app_version_item_status_installed.xml +++ b/app/src/main/res/drawable/app_version_item_status_installed.xml @@ -1,5 +1,8 @@ - - + + diff --git a/app/src/main/res/drawable/app_version_item_status_new.xml b/app/src/main/res/drawable/app_version_item_status_new.xml index 95ed5d276..393c74738 100644 --- a/app/src/main/res/drawable/app_version_item_status_new.xml +++ b/app/src/main/res/drawable/app_version_item_status_new.xml @@ -1,5 +1,8 @@ - - + + diff --git a/app/src/main/res/drawable/app_version_item_status_suggested.xml b/app/src/main/res/drawable/app_version_item_status_suggested.xml index 6f6f0410f..08cd4615a 100644 --- a/app/src/main/res/drawable/app_version_item_status_suggested.xml +++ b/app/src/main/res/drawable/app_version_item_status_suggested.xml @@ -1,5 +1,8 @@ - - + + diff --git a/app/src/main/res/drawable/category_preview_app_card_background_dark.xml b/app/src/main/res/drawable/category_preview_app_card_background_dark.xml index fef43a2c1..e8fd2a618 100644 --- a/app/src/main/res/drawable/category_preview_app_card_background_dark.xml +++ b/app/src/main/res/drawable/category_preview_app_card_background_dark.xml @@ -1,4 +1,5 @@ + - + android:layout_marginStart="8dp"> + + + - + + android:id="@+id/app_bar" + android:layout_width="match_parent" + android:layout_height="@dimen/app_bar_height" + android:fitsSystemWindows="true" + app:layout_behavior="org.fdroid.fdroid.views.FixAppBarLayoutBehavior"> + android:layout_width="match_parent" + android:layout_height="match_parent" + android:fitsSystemWindows="true" + app:layout_scrollFlags="scroll|exitUntilCollapsed|snap" + app:contentScrim="?attr/colorPrimarySurface" + app:statusBarScrim="?attr/colorPrimarySurface" + app:expandedTitleTextAppearance="@style/TextAppearance.App.CollapsingToolbar.Expanded" + app:collapsedTitleTextAppearance="@style/TextAppearance.App.CollapsingToolbar.Collapsed" + app:expandedTitleMarginTop="24dp"> + android:id="@+id/feature_graphic" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:scaleType="centerCrop" + android:fitsSystemWindows="true" + app:layout_collapseMode="parallax" /> + android:id="@+id/toolbar" + android:layout_width="match_parent" + android:layout_height="?attr/actionBarSize" + app:navigationIcon="@drawable/ic_back" + android:background="@android:color/transparent" + app:layout_collapseMode="pin" + style="@style/Widget.MaterialComponents.Toolbar.PrimarySurface" + android:elevation="0dp" /> + android:id="@+id/rvDetails" + android:layout_width="match_parent" + android:layout_height="match_parent" + app:layout_behavior="@string/appbar_scrolling_view_behavior" + app:layoutManager="LinearLayoutManager" + tools:context="org.fdroid.fdroid.views.AppDetailsActivity" + tools:showIn="@layout/app_details2" /> diff --git a/app/src/main/res/layout-v21/app_details2_header.xml b/app/src/main/res/layout-v21/app_details2_header.xml index 106693c31..f6648f040 100644 --- a/app/src/main/res/layout-v21/app_details2_header.xml +++ b/app/src/main/res/layout-v21/app_details2_header.xml @@ -37,10 +37,10 @@ android:layout_width="72dp" android:layout_height="72dp" android:layout_alignParentStart="true" - + android:layout_alignParentTop="true" android:layout_marginEnd="8dp" - + android:scaleType="fitCenter" android:src="@drawable/ic_repo_app_default" android:transitionName="@string/transition_app_item_icon" /> @@ -51,10 +51,10 @@ android:layout_height="wrap_content" android:layout_alignParentTop="true" android:layout_alignParentEnd="true" - + android:layout_marginTop="8dp" android:layout_toEndOf="@id/icon" - + android:orientation="vertical"> @@ -104,7 +104,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentStart="true" - + android:contentDescription="@string/downloading" android:focusable="true" android:text="@string/downloading" @@ -115,7 +115,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_toStartOf="@id/progress_cancel" - + android:textAppearance="@style/TextAppearance.AppCompat.Small" tools:text="500%" /> @@ -126,9 +126,8 @@ android:layout_height="wrap_content" android:layout_below="@id/progress_label" android:layout_alignParentStart="true" - - android:layout_toStartOf="@id/progress_cancel" - /> + + android:layout_toStartOf="@id/progress_cancel" /> @@ -157,7 +156,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="8dp" - + android:layout_weight="0" android:ellipsize="marquee" tools:text="Open" /> @@ -223,7 +222,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:drawableStart="@drawable/ic_warning" - + android:drawablePadding="10dp" android:paddingLeft="8dp" android:paddingRight="8dp" @@ -249,7 +248,7 @@ android:id="@+id/anti_features_full_listing" android:layout_marginBottom="8dp" android:layout_width="match_parent" - android:layout_height="wrap_content"/> + android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/addrepo.xml b/app/src/main/res/layout/addrepo.xml index c9d2d6522..53d193574 100644 --- a/app/src/main/res/layout/addrepo.xml +++ b/app/src/main/res/layout/addrepo.xml @@ -47,7 +47,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:padding="10dp" - tools:text="This repo is already setup, this will add new key information."/> + tools:text="This repo is already setup, this will add new key information." /> @@ -60,7 +60,9 @@ android:layout_height="wrap_content" tools:text="Searching for repository at\nhttps://www.example.com/fdroid/repo/" /> - - diff --git a/app/src/main/res/layout/crash_report_dialog.xml b/app/src/main/res/layout/crash_report_dialog.xml index 6f0ebddb3..9079d3b94 100644 --- a/app/src/main/res/layout/crash_report_dialog.xml +++ b/app/src/main/res/layout/crash_report_dialog.xml @@ -1,9 +1,7 @@ - + android:layout_height="match_parent"> + android:paddingTop="20dp"> + android:text="@string/crash_dialog_text" /> + android:text="@string/crash_dialog_comment_prompt" /> + android:layout_marginTop="20dp" /> diff --git a/app/src/main/res/layout/donate_generic.xml b/app/src/main/res/layout/donate_generic.xml index b68c4d556..66b56c5e9 100644 --- a/app/src/main/res/layout/donate_generic.xml +++ b/app/src/main/res/layout/donate_generic.xml @@ -1,6 +1,5 @@ - +--> + + - false - 0dp + + false + + + 0dp + diff --git a/app/src/main/res/values-tt/strings.xml b/app/src/main/res/values-tt/strings.xml index e86b2f337..3a0906840 100644 --- a/app/src/main/res/values-tt/strings.xml +++ b/app/src/main/res/values-tt/strings.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/values-v16/styles.xml b/app/src/main/res/values-v16/styles.xml index ebbe249c9..b83a59632 100644 --- a/app/src/main/res/values-v16/styles.xml +++ b/app/src/main/res/values-v16/styles.xml @@ -4,7 +4,8 @@ - - -