From a7fbccb4db5d69180473add1f18fbf18b26a2256 Mon Sep 17 00:00:00 2001
From: SunitRoy2703 <2703iamsry@gmail.com>
Date: Wed, 7 Oct 2020 02:40:22 +0530
Subject: [PATCH] This will make the gallery as good as the default gallery
---
.../gallery/adapters/AlbumsAdapter.java | 22 +++++++-----
app/src/main/res/layout/card_album.xml | 35 ++++++++++---------
2 files changed, 32 insertions(+), 25 deletions(-)
diff --git a/app/src/main/java/org/fossasia/phimpme/gallery/adapters/AlbumsAdapter.java b/app/src/main/java/org/fossasia/phimpme/gallery/adapters/AlbumsAdapter.java
index 499cae368..2ef620959 100644
--- a/app/src/main/java/org/fossasia/phimpme/gallery/adapters/AlbumsAdapter.java
+++ b/app/src/main/java/org/fossasia/phimpme/gallery/adapters/AlbumsAdapter.java
@@ -136,7 +136,13 @@ public boolean onResourceReady(
String hexPrimaryColor = String.format("#%06X", (0xFFFFFF & theme.getPrimaryColor()));
- String textColor = theme.getBaseTheme() != ThemeHelper.LIGHT_THEME ? "#FAFAFA" : "#2b2b2b";
+ String nameTextColor;
+ String countTextColor;
+ if (theme.getBaseTheme() == ThemeHelper.LIGHT_THEME) nameTextColor = "#2b2b2b";
+ else {
+ nameTextColor = "#FAFAFA";
+ }
+ countTextColor = "#B4BAC0";
if (a.isSelected()) {
holder.ivSelectedIcon.setColor(Color.WHITE);
@@ -147,24 +153,22 @@ public boolean onResourceReady(
holder.ivAlbumPreview.setColorFilter(0x77000000, PorterDuff.Mode.SRC_ATOP);
holder.ivSelectedIcon.setVisibility(View.VISIBLE);
if (theme.getBaseTheme() == ThemeHelper.LIGHT_THEME) {
- textColor = "#FAFAFA";
+ nameTextColor = "#2b2b2b"; countTextColor = "#B4BAC0";
}
} else {
holder.ivAlbumPreview.clearColorFilter();
holder.ivSelectedIcon.setVisibility(View.GONE);
- holder.tvAlbumName.setBackgroundColor(
- ColorPalette.getTransparentColor(theme.getBackgroundColor(), 200));
- holder.tvPhotosCount.setBackgroundColor(
- ColorPalette.getTransparentColor(theme.getBackgroundColor(), 200));
+ holder.tvAlbumName.setBackgroundColor(theme.getBackgroundColor());
+ holder.tvPhotosCount.setBackgroundColor(theme.getBackgroundColor());
holder.ivPin.setBackgroundColor(
ColorPalette.getTransparentColor(theme.getBackgroundColor(), 200));
}
- holder.tvAlbumName.setTextColor(Color.parseColor(textColor));
- holder.tvPhotosCount.setTextColor(Color.parseColor(textColor));
+ holder.tvAlbumName.setTextColor(Color.parseColor(nameTextColor));
+ holder.tvPhotosCount.setTextColor(Color.parseColor(countTextColor));
holder.tvAlbumName.setText(a.getName());
holder.tvPhotosCount.setText(
- a.getCount() + " " + holder.tvPhotosCount.getContext().getString(R.string.media));
+ a.getCount() + " " ;
}
public void setOnClickListener(View.OnClickListener lis) {
diff --git a/app/src/main/res/layout/card_album.xml b/app/src/main/res/layout/card_album.xml
index b8c6300ac..9ace13d13 100644
--- a/app/src/main/res/layout/card_album.xml
+++ b/app/src/main/res/layout/card_album.xml
@@ -1,13 +1,12 @@
-
+ app:cardElevation="0dp">
-
-
-
+ app:cardCornerRadius="@dimen/size_8">
+
+
+
@@ -77,7 +81,6 @@
android:textSize="@dimen/moderate_text"
android:paddingStart="@dimen/size_8"
android:paddingEnd="@dimen/size_8"
- android:paddingTop="@dimen/size_4"
android:paddingBottom="@dimen/size_4"
app:layout_constraintEnd_toStartOf="@id/iv_storage_icon"
app:layout_constraintBottom_toBottomOf="parent"
@@ -98,4 +101,4 @@
-
\ No newline at end of file
+
\ No newline at end of file