From 0049a1f2342d9ccdb28e9f685fa4fb136557d23e Mon Sep 17 00:00:00 2001 From: ioTY Date: Sun, 18 Aug 2019 13:52:40 +0200 Subject: [PATCH] gold Classic --- .../org/fdroid/fdroid/views/main/WhatsNewViewBinder.java | 2 +- .../org/fdroid/fdroid/views/whatsnew/WhatsNewAdapter.java | 6 +++--- app/src/main/res/layout/app_card_horizontal.xml | 1 - app/src/main/res/layout/app_card_large.xml | 1 - app/src/main/res/layout/app_card_list_item.xml | 1 - app/src/main/res/layout/app_card_normal.xml | 1 - 6 files changed, 4 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/org/fdroid/fdroid/views/main/WhatsNewViewBinder.java b/app/src/main/java/org/fdroid/fdroid/views/main/WhatsNewViewBinder.java index d223d284e..ebfe817fc 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/main/WhatsNewViewBinder.java +++ b/app/src/main/java/org/fdroid/fdroid/views/main/WhatsNewViewBinder.java @@ -126,7 +126,7 @@ class WhatsNewViewBinder implements LoaderManager.LoaderCallbacks { activity, AppProvider.getRecentlyUpdatedUri(), AppMetadataTable.Cols.ALL, - selection, + null,//selection, null, null ); diff --git a/app/src/main/java/org/fdroid/fdroid/views/whatsnew/WhatsNewAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/whatsnew/WhatsNewAdapter.java index 26cc19a0a..3c848a7af 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/whatsnew/WhatsNewAdapter.java +++ b/app/src/main/java/org/fdroid/fdroid/views/whatsnew/WhatsNewAdapter.java @@ -62,7 +62,7 @@ public class WhatsNewAdapter extends RecyclerView.Adapter { @Override public int getItemViewType(int position) { - int relativePositionInCycle = position % 5; + int relativePositionInCycle = 0;//position % 5; if (BuildConfig.FLAVOR.startsWith("basic")) { if (relativePositionInCycle > 0) { @@ -115,7 +115,7 @@ public class WhatsNewAdapter extends RecyclerView.Adapter { public static class SpanSizeLookup extends GridLayoutManager.SpanSizeLookup { @Override public int getSpanSize(int position) { - int relativePositionInCycle = position % 5; + int relativePositionInCycle =0;// position % 5; if (relativePositionInCycle == 0) { return 2; } else { @@ -145,7 +145,7 @@ public class WhatsNewAdapter extends RecyclerView.Adapter { int horizontalPadding = (int) resources.getDimension(R.dimen.whats_new__padding__app_card__horizontal); int verticalPadding = (int) resources.getDimension(R.dimen.whats_new__padding__app_card__vertical); - int relativePositionInCycle = position % 5; + int relativePositionInCycle = 0;//position % 5; if (relativePositionInCycle != 0) { // The item on the left will have both left and right padding. The item on the right // will only have padding on the right. This will allow the same amount of padding diff --git a/app/src/main/res/layout/app_card_horizontal.xml b/app/src/main/res/layout/app_card_horizontal.xml index 437d93c3a..b94bc07e9 100644 --- a/app/src/main/res/layout/app_card_horizontal.xml +++ b/app/src/main/res/layout/app_card_horizontal.xml @@ -31,7 +31,6 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:id="@+id/summary" - android:maxLines="4" android:textSize="13sp" android:ellipsize="end" android:layout_marginLeft="8dp" diff --git a/app/src/main/res/layout/app_card_large.xml b/app/src/main/res/layout/app_card_large.xml index 0c927b105..58b333787 100644 --- a/app/src/main/res/layout/app_card_large.xml +++ b/app/src/main/res/layout/app_card_large.xml @@ -38,7 +38,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/summary" - android:maxLines="4" android:textSize="14sp" android:ellipsize="end" app:layout_constraintTop_toBottomOf="@+id/icon" diff --git a/app/src/main/res/layout/app_card_list_item.xml b/app/src/main/res/layout/app_card_list_item.xml index e2cc03833..d5f9fa06d 100644 --- a/app/src/main/res/layout/app_card_list_item.xml +++ b/app/src/main/res/layout/app_card_list_item.xml @@ -31,7 +31,6 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:id="@+id/summary" - android:lines="2" android:textSize="14sp" android:ellipsize="end" android:layout_marginLeft="16dp" diff --git a/app/src/main/res/layout/app_card_normal.xml b/app/src/main/res/layout/app_card_normal.xml index b35797314..d17a1af29 100644 --- a/app/src/main/res/layout/app_card_normal.xml +++ b/app/src/main/res/layout/app_card_normal.xml @@ -32,7 +32,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/summary" - android:maxLines="3" android:ellipsize="end" app:layout_constraintTop_toBottomOf="@+id/icon" app:layout_constraintRight_toRightOf="parent"