mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-04-08 09:27:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

use black/white for cardview fab icon, change floppy icon to check mark

Browse Source
This commit is contained in:
Katharine Chui
2022-08-05 20:49:59 +08:00
parent ebbcbf324f
commit ddf27e619d
4 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
View File

@@ -43,7 +43,6 @@ import androidx.appcompat.widget.Toolbar;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.constraintlayout.widget.Guideline;
import androidx.coordinatorlayout.widget.CoordinatorLayout;
import androidx.core.content.ContextCompat;
import androidx.core.graphics.BlendModeColorFilterCompat;
import androidx.core.graphics.BlendModeCompat;
import androidx.core.graphics.ColorUtils;
@@ -52,7 +51,6 @@ import androidx.core.widget.TextViewCompat;
import com.google.android.material.appbar.AppBarLayout;
import com.google.android.material.bottomappbar.BottomAppBar;
import com.google.android.material.color.MaterialColors;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import java.io.UnsupportedEncodingException;
@@ -627,14 +625,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
editButton.setBackgroundTintList(ColorStateList.valueOf(complementaryColor));
Drawable editButtonIcon = editButton.getDrawable();
editButtonIcon.mutate();
int colorPrimary = MaterialColors.getColor(this, R.attr.colorPrimary, ContextCompat.getColor(this, R.color.md_theme_light_primary));
int colorOnPrimary = MaterialColors.getColor(this, R.attr.colorOnPrimary, ContextCompat.getColor(this, R.color.md_theme_light_onPrimary));
boolean darkMode = Utils.isDarkModeEnabled(this);
if (Utils.needsDarkForeground(complementaryColor)) {
editButtonIcon.setTint(darkMode ? colorOnPrimary : colorPrimary);
} else {
editButtonIcon.setTint(darkMode ? colorPrimary : colorOnPrimary);
}
editButtonIcon.setTint(Utils.needsDarkForeground(complementaryColor) ? Color.BLACK : Color.WHITE);
editButton.setImageDrawable(editButtonIcon);
Bitmap icon = Utils.retrieveCardImage(this, loyaltyCard.id, ImageLocationType.icon);
@@ -699,7 +690,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
imageTypes.add(ImageType.IMAGE_BACK);
}
setDotIndicator(darkMode);
setDotIndicator(Utils.isDarkModeEnabled(this));
setFullscreen(isFullscreen);

5
app/src/main/res/layout/activity_manage_group.xml
View File

@@ -7,14 +7,15 @@
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context="protect.card_locker.ManageGroupActivity">
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fabSave"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|bottom"
app:srcCompat="@drawable/save_24dp"
android:layout_margin="16dp"
android:contentDescription="@string/save"
android:layout_margin="16dp" />
app:srcCompat="@drawable/ic_done" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"

4
app/src/main/res/layout/loyalty_card_edit_activity.xml
View File

@@ -12,9 +12,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|bottom"
app:srcCompat="@drawable/save_24dp"
android:layout_margin="16dp"
android:contentDescription="@string/save"
android:layout_margin="16dp" />
app:srcCompat="@drawable/ic_done" />
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"

2
app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java
View File

@@ -382,7 +382,7 @@ public class LoyaltyCardViewActivityTest {
Currency currency = Currency.getInstance("EUR");
Date expiryDate = new Date();
Bitmap frontBitmap = BitmapFactory.decodeResource(context.getResources(), R.drawable.circle);
Bitmap backBitmap = BitmapFactory.decodeResource(context.getResources(), R.drawable.save_24dp);
Bitmap backBitmap = BitmapFactory.decodeResource(context.getResources(), R.drawable.ic_done);
storeField.setText("correct store");
noteField.setText("correct note");