mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-02-01 02:31:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

simplify adaptive bitmap creation with Canvas, trigger shortcut list refresh on card save

Browse Source
This commit is contained in:
Katharine
2021-11-10 13:26:20 +08:00
parent 1fd0acf6e4
commit 40a68a55e2
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
View File

@@ -1284,6 +1284,8 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
db.setLoyaltyCardGroups(loyaltyCardId, selectedGroups);
ShortcutHelper.updateShortcuts(this, db.getLoyaltyCard(loyaltyCardId));
finish();
}

14
app/src/main/java/protect/card_locker/ShortcutHelper.java
View File

@@ -3,6 +3,7 @@ package protect.card_locker;
import android.content.Context;
import android.content.Intent;
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.Color;
import android.os.Bundle;
@@ -120,18 +121,11 @@ class ShortcutHelper {
}
static @NotNull Bitmap createAdaptiveBitmap(@NotNull Bitmap in, int paddingColor){
int[] basePixels = new int[ADAPTIVE_BITMAP_SIZE * ADAPTIVE_BITMAP_SIZE];
paddingColor = ColorUtils.compositeColors(PADDING_COLOR_OVERLAY, paddingColor);
Arrays.fill(basePixels, paddingColor);
Bitmap ret = Bitmap.createBitmap(ADAPTIVE_BITMAP_SIZE, ADAPTIVE_BITMAP_SIZE, Bitmap.Config.ARGB_8888);
ret.setPixels(basePixels, 0, ADAPTIVE_BITMAP_SIZE, 0, 0, ADAPTIVE_BITMAP_SIZE, ADAPTIVE_BITMAP_SIZE);
Canvas output = new Canvas(ret);
output.drawColor(ColorUtils.compositeColors(PADDING_COLOR_OVERLAY, paddingColor));
Bitmap resized = Utils.resizeBitmap(in, ADAPTIVE_BITMAP_IMAGE_SIZE);
int[] inputPixels = new int[resized.getHeight() * resized.getWidth()];
resized.getPixels(inputPixels, 0, resized.getWidth(), 0, 0, resized.getWidth(), resized.getHeight());
for(int i = 0;i < inputPixels.length; i++) {
inputPixels[i] = ColorUtils.compositeColors(inputPixels[i], paddingColor);
}
ret.setPixels(inputPixels, 0, resized.getWidth(), (ADAPTIVE_BITMAP_SIZE - resized.getWidth()) / 2, (ADAPTIVE_BITMAP_SIZE - resized.getHeight()) / 2, resized.getWidth(), resized.getHeight());
output.drawBitmap(resized, (ADAPTIVE_BITMAP_SIZE - resized.getWidth()) / 2f, (ADAPTIVE_BITMAP_SIZE - resized.getHeight()) / 2f, null);
return ret;
}