diff --git a/app/src/basic/java/org/fdroid/fdroid/views/main/MainViewController.java b/app/src/basic/java/org/fdroid/fdroid/views/main/MainViewController.java index 0ac429535..e53fc239b 100644 --- a/app/src/basic/java/org/fdroid/fdroid/views/main/MainViewController.java +++ b/app/src/basic/java/org/fdroid/fdroid/views/main/MainViewController.java @@ -19,11 +19,11 @@ package org.fdroid.fdroid.views.main; -import androidx.annotation.Nullable; -import androidx.fragment.app.Fragment; -import androidx.appcompat.app.AppCompatActivity; -import androidx.recyclerview.widget.RecyclerView; import android.widget.FrameLayout; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.RecyclerView; import org.fdroid.fdroid.R; import org.fdroid.fdroid.views.PreferencesFragment; import org.fdroid.fdroid.views.updates.UpdatesViewBinder; @@ -49,10 +49,10 @@ class MainViewController extends RecyclerView.ViewHolder { } /** - * @see WhatsNewViewBinder + * @see LatestViewBinder */ - public void bindWhatsNewView() { - new WhatsNewViewBinder(activity, frame); + public void bindLatestView() { + new LatestViewBinder(activity, frame); } /** diff --git a/app/src/basic/res/menu/main_activity_screens.xml b/app/src/basic/res/menu/main_activity_screens.xml index 7bc7eb79a..7b7a2ebcf 100644 --- a/app/src/basic/res/menu/main_activity_screens.xml +++ b/app/src/basic/res/menu/main_activity_screens.xml @@ -6,7 +6,7 @@ + android:id="@+id/latest"/> diff --git a/app/src/full/java/org/fdroid/fdroid/views/main/MainViewController.java b/app/src/full/java/org/fdroid/fdroid/views/main/MainViewController.java index 67937d1bd..985cbfb90 100644 --- a/app/src/full/java/org/fdroid/fdroid/views/main/MainViewController.java +++ b/app/src/full/java/org/fdroid/fdroid/views/main/MainViewController.java @@ -32,10 +32,10 @@ class MainViewController extends RecyclerView.ViewHolder { } /** - * @see WhatsNewViewBinder + * @see LatestViewBinder */ - public void bindWhatsNewView() { - new WhatsNewViewBinder(activity, frame); + public void bindLatestView() { + new LatestViewBinder(activity, frame); } /** diff --git a/app/src/full/res/menu/main_activity_screens.xml b/app/src/full/res/menu/main_activity_screens.xml index 31537fa5f..69e32f23b 100644 --- a/app/src/full/res/menu/main_activity_screens.xml +++ b/app/src/full/res/menu/main_activity_screens.xml @@ -6,7 +6,7 @@ + android:id="@+id/latest"/> diff --git a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java index 21982aab3..7d58bcc86 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java +++ b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java @@ -408,7 +408,7 @@ public class AppDetailsRecyclerViewAdapter authorView = (TextView) view.findViewById(R.id.author); lastUpdateView = (TextView) view.findViewById(R.id.text_last_update); summaryView = (TextView) view.findViewById(R.id.summary); - whatsNewView = (TextView) view.findViewById(R.id.whats_new); + whatsNewView = (TextView) view.findViewById(R.id.latest); descriptionView = (TextView) view.findViewById(R.id.description); descriptionMoreView = (TextView) view.findViewById(R.id.description_more); antiFeaturesSectionView = view.findViewById(R.id.anti_features_section); diff --git a/app/src/main/java/org/fdroid/fdroid/views/whatsnew/WhatsNewAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/main/LatestAdapter.java similarity index 85% rename from app/src/main/java/org/fdroid/fdroid/views/whatsnew/WhatsNewAdapter.java rename to app/src/main/java/org/fdroid/fdroid/views/main/LatestAdapter.java index 7d1ba624d..d6ec7baf5 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/whatsnew/WhatsNewAdapter.java +++ b/app/src/main/java/org/fdroid/fdroid/views/main/LatestAdapter.java @@ -1,4 +1,4 @@ -package org.fdroid.fdroid.views.whatsnew; +package org.fdroid.fdroid.views.main; import androidx.appcompat.app.AppCompatActivity; import android.content.Context; @@ -16,15 +16,15 @@ import org.fdroid.fdroid.R; import org.fdroid.fdroid.data.App; import org.fdroid.fdroid.views.categories.AppCardController; -public class WhatsNewAdapter extends RecyclerView.Adapter { +public class LatestAdapter extends RecyclerView.Adapter { private Cursor cursor; private final AppCompatActivity activity; private final RecyclerView.ItemDecoration appListDecorator; - public WhatsNewAdapter(AppCompatActivity activity) { + public LatestAdapter(AppCompatActivity activity) { this.activity = activity; - appListDecorator = new WhatsNewAdapter.ItemDecorator(activity); + appListDecorator = new LatestAdapter.ItemDecorator(activity); } @Override @@ -44,13 +44,13 @@ public class WhatsNewAdapter extends RecyclerView.Adapter { public AppCardController onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { int layout; switch (viewType) { - case R.id.whats_new_large_tile: + case R.id.latest_large_tile: layout = R.layout.app_card_large; break; - case R.id.whats_new_small_tile: + case R.id.latest_small_tile: layout = R.layout.app_card_horizontal; break; - case R.id.whats_new_regular_list: + case R.id.latest_regular_list: layout = R.layout.app_card_list_item; break; default: @@ -66,27 +66,27 @@ public class WhatsNewAdapter extends RecyclerView.Adapter { if (BuildConfig.FLAVOR.startsWith("basic")) { if (relativePositionInCycle > 0) { - return R.id.whats_new_small_tile; + return R.id.latest_small_tile; } else { - return R.id.whats_new_regular_list; + return R.id.latest_regular_list; } } if (position == 0) { - return R.id.whats_new_regular_list; + return R.id.latest_regular_list; } else { switch (relativePositionInCycle) { case 1: case 2: - return R.id.whats_new_large_tile; + return R.id.latest_large_tile; case 3: case 4: - return R.id.whats_new_small_tile; + return R.id.latest_small_tile; case 0: default: - return R.id.whats_new_regular_list; + return R.id.latest_regular_list; } } } @@ -128,8 +128,8 @@ public class WhatsNewAdapter extends RecyclerView.Adapter { * Applies padding to items, ensuring that the spacing on the left, centre, and right all match. * The vertical padding is slightly shorter than the horizontal padding also. * - * @see org.fdroid.fdroid.R.dimen#whats_new__padding__app_card__horizontal - * @see org.fdroid.fdroid.R.dimen#whats_new__padding__app_card__vertical + * @see org.fdroid.fdroid.R.dimen#latest__padding__app_card__horizontal + * @see org.fdroid.fdroid.R.dimen#latest__padding__app_card__vertical */ private static class ItemDecorator extends RecyclerView.ItemDecoration { private final Context context; @@ -142,8 +142,8 @@ public class WhatsNewAdapter extends RecyclerView.Adapter { public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) { int position = parent.getChildAdapterPosition(view); Resources resources = context.getResources(); - 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 horizontalPadding = (int) resources.getDimension(R.dimen.latest__padding__app_card__horizontal); + int verticalPadding = (int) resources.getDimension(R.dimen.latest__padding__app_card__vertical); int relativePositionInCycle = position % 5; if (position == 0) { diff --git a/app/src/main/java/org/fdroid/fdroid/views/main/WhatsNewViewBinder.java b/app/src/main/java/org/fdroid/fdroid/views/main/LatestViewBinder.java similarity index 85% rename from app/src/main/java/org/fdroid/fdroid/views/main/WhatsNewViewBinder.java rename to app/src/main/java/org/fdroid/fdroid/views/main/LatestViewBinder.java index 1b29ffdb8..dee85b698 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/main/WhatsNewViewBinder.java +++ b/app/src/main/java/org/fdroid/fdroid/views/main/LatestViewBinder.java @@ -26,42 +26,41 @@ import org.fdroid.fdroid.data.RepoProvider; import org.fdroid.fdroid.data.Schema.AppMetadataTable; import org.fdroid.fdroid.panic.HidingManager; import org.fdroid.fdroid.views.apps.AppListActivity; -import org.fdroid.fdroid.views.whatsnew.WhatsNewAdapter; import java.util.Date; /** * Loads a list of newly added or recently updated apps and displays them to the user. */ -class WhatsNewViewBinder implements LoaderManager.LoaderCallbacks { +class LatestViewBinder implements LoaderManager.LoaderCallbacks { private static final int LOADER_ID = 978015789; - private final WhatsNewAdapter whatsNewAdapter; + private final LatestAdapter latestAdapter; private final AppCompatActivity activity; private final TextView emptyState; private final RecyclerView appList; private ProgressBar progressBar; - WhatsNewViewBinder(final AppCompatActivity activity, FrameLayout parent) { + LatestViewBinder(final AppCompatActivity activity, FrameLayout parent) { this.activity = activity; - View whatsNewView = activity.getLayoutInflater().inflate(R.layout.main_tab_whats_new, parent, true); + View latestView = activity.getLayoutInflater().inflate(R.layout.main_tab_latest, parent, true); - whatsNewAdapter = new WhatsNewAdapter(activity); + latestAdapter = new LatestAdapter(activity); GridLayoutManager layoutManager = new GridLayoutManager(activity, 2); - layoutManager.setSpanSizeLookup(new WhatsNewAdapter.SpanSizeLookup()); + layoutManager.setSpanSizeLookup(new LatestAdapter.SpanSizeLookup()); - emptyState = (TextView) whatsNewView.findViewById(R.id.empty_state); + emptyState = (TextView) latestView.findViewById(R.id.empty_state); - appList = (RecyclerView) whatsNewView.findViewById(R.id.app_list); + appList = (RecyclerView) latestView.findViewById(R.id.app_list); appList.setHasFixedSize(true); appList.setLayoutManager(layoutManager); - appList.setAdapter(whatsNewAdapter); + appList.setAdapter(latestAdapter); - final SwipeRefreshLayout swipeToRefresh = (SwipeRefreshLayout) whatsNewView + final SwipeRefreshLayout swipeToRefresh = (SwipeRefreshLayout) latestView .findViewById(R.id.swipe_to_refresh); Utils.applySwipeLayoutColors(swipeToRefresh); swipeToRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() { @@ -72,7 +71,7 @@ class WhatsNewViewBinder implements LoaderManager.LoaderCallbacks { } }); - FloatingActionButton searchFab = (FloatingActionButton) whatsNewView.findViewById(R.id.fab_search); + FloatingActionButton searchFab = (FloatingActionButton) latestView.findViewById(R.id.fab_search); searchFab.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -119,9 +118,9 @@ class WhatsNewViewBinder implements LoaderManager.LoaderCallbacks { return; } - whatsNewAdapter.setAppsCursor(cursor); + latestAdapter.setAppsCursor(cursor); - if (whatsNewAdapter.getItemCount() == 0) { + if (latestAdapter.getItemCount() == 0) { emptyState.setVisibility(View.VISIBLE); appList.setVisibility(View.GONE); explainEmptyStateToUser(); @@ -170,6 +169,6 @@ class WhatsNewViewBinder implements LoaderManager.LoaderCallbacks { return; } - whatsNewAdapter.setAppsCursor(null); + latestAdapter.setAppsCursor(null); } } diff --git a/app/src/main/java/org/fdroid/fdroid/views/main/MainViewAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/main/MainViewAdapter.java index 5fdf45e74..2500aac22 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/main/MainViewAdapter.java +++ b/app/src/main/java/org/fdroid/fdroid/views/main/MainViewAdapter.java @@ -86,8 +86,8 @@ class MainViewAdapter extends RecyclerView.Adapter { public MainViewController onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { MainViewController holder = createEmptyView(activity); switch (viewType) { - case R.id.whats_new: - holder.bindWhatsNewView(); + case R.id.latest: + holder.bindLatestView(); break; case R.id.categories: holder.bindCategoriesView(); diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 818de33ad..f51d10eb9 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -17,6 +17,6 @@ android:layout_above="@+id/bottom_navigation" android:layout_width="match_parent" android:layout_height="match_parent" - tools:listitem="@layout/main_tab_whats_new" /> + tools:listitem="@layout/main_tab_latest" /> \ No newline at end of file diff --git a/app/src/main/res/layout/app_details2_header.xml b/app/src/main/res/layout/app_details2_header.xml index 3bcf1b7b9..ea6441021 100644 --- a/app/src/main/res/layout/app_details2_header.xml +++ b/app/src/main/res/layout/app_details2_header.xml @@ -182,7 +182,7 @@ tools:text="App summary, one line - outlining what this app does" /> 16dp - 12dp - 10dp + 12dp + 10dp diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml index b58bc5ba3..b726b69ec 100644 --- a/app/src/main/res/values/ids.xml +++ b/app/src/main/res/values/ids.xml @@ -2,12 +2,12 @@ - - - + + + - + \ No newline at end of file