Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'add-padding-to-last-app-redo' into 'master'

Browse Source 
Add padding to last app in Category

See merge request fdroid/fdroidclient!625
This commit is contained in:
Hans-Christoph Steiner 2018-01-26 13:30:26 +01:00
commit c61024e070
3 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/fdroid/fdroid/views/categories/CategoryController.java
View File

@ -44,6 +44,7 @@ public class CategoryController extends RecyclerView.ViewHolder implements Loade
private final Activity activity;
private final LoaderManager loaderManager;
private final DisplayImageOptions displayImageOptions;
private static int categoryItemCount = 20;
private String currentCategory;
@ -150,7 +151,7 @@ public class CategoryController extends RecyclerView.ViewHolder implements Loade
} else {
return new CursorLoader(
activity,
AppProvider.getTopFromCategoryUri(currentCategory, 20),
AppProvider.getTopFromCategoryUri(currentCategory, categoryItemCount),
new String[]{
Schema.AppMetadataTable.Cols.NAME,
Schema.AppMetadataTable.Cols.Package.PACKAGE_NAME,
@ -225,14 +226,17 @@ public class CategoryController extends RecyclerView.ViewHolder implements Loade
int horizontalPadding = (int) r.getDimension(R.dimen.category_preview__app_list__padding__horizontal);
int horizontalPaddingFirst = (int) r.getDimension(
R.dimen.category_preview__app_list__padding__horizontal__first);
int horizontalPaddingLast = (int) r.getDimension(
R.dimen.category_preview__app_list__padding__horizontal__last);
boolean isLtr = ViewCompat.getLayoutDirection(parent) == ViewCompat.LAYOUT_DIRECTION_LTR;
int itemPosition = parent.getChildLayoutPosition(view);
boolean first = itemPosition == 0;
boolean end = itemPosition == categoryItemCount - 1;
// Leave this "paddingEnd" local variable here for clarity when converting from
// left/right to start/end for RTL friendly layout.
// noinspection UnnecessaryLocalVariable
int paddingEnd = horizontalPadding;
int paddingEnd = end ? horizontalPaddingLast : horizontalPadding;
int paddingStart = first ? horizontalPaddingFirst : horizontalPadding;
int paddingLeft = isLtr ? paddingStart : paddingEnd;

16
app/src/main/res/layout/category_item.xml
View File

@ -68,18 +68,18 @@
<android.support.v7.widget.RecyclerView
android:id="@+id/app_cards"
tools:listitem="@layout/app_card_normal"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent"
android:clipToPadding="false"
android:orientation="horizontal"
android:paddingBottom="@dimen/category_preview__app_list__padding__vertical"
android:paddingTop="@dimen/category_preview__app_list__padding__vertical"
app:layoutManager="LinearLayoutManager"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layoutManager="LinearLayoutManager"
android:orientation="horizontal"
android:paddingTop="@dimen/category_preview__app_list__padding__vertical"
android:paddingBottom="@dimen/category_preview__app_list__padding__vertical"
android:clipToPadding="false" />
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button"
tools:listitem="@layout/app_card_normal"/>
</android.support.constraint.ConstraintLayout>

1
app/src/main/res/values/dimens.xml
View File

@ -26,6 +26,7 @@
<dimen name="category_preview__app_list__padding__horizontal">4dp</dimen>
<dimen name="category_preview__app_list__padding__horizontal__first">72dp</dimen>
<dimen name="category_preview__app_list__padding__horizontal__last">90dp</dimen>
<dimen name="category_preview__app_list__padding__vertical">18dp</dimen>
<dimen name="banner__padding">4dp</dimen>