Skip to content

Commit e058176

Browse files
YanndroidYanndroid
committed
app: v1.1.1
- fix crash with big images - bump dependencies
1 parent 38415e3 commit e058176

File tree

12 files changed

+63
-14
lines changed

12 files changed

+63
-14
lines changed

‎app/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ android {
99
applicationId "de.dlyt.yanndroid.dualwallpaper"
1010
minSdk 26
1111
targetSdk 32
12-
versionCode 2
13-
versionName "1.1.0"
12+
versionCode 3
13+
versionName "1.1.1"
1414

1515
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1616
}
@@ -39,10 +39,10 @@ configurations.all {
3939
}
4040

4141
dependencies {
42-
implementation 'io.github.oneuiproject:design:1.0.0'
43-
implementation 'io.github.oneuiproject.sesl:appcompat:1.2.1'
44-
implementation 'io.github.oneuiproject.sesl:material:1.2.0'
42+
implementation 'io.github.oneuiproject:design:1.1.1'
43+
implementation 'io.github.oneuiproject.sesl:appcompat:1.3.0'
44+
implementation 'io.github.oneuiproject.sesl:material:1.3.0'
4545
implementation 'io.github.oneuiproject.sesl:preference:1.1.0'
46-
implementation 'io.github.oneuiproject.sesl:recyclerview:1.1.0'
46+
implementation 'io.github.oneuiproject.sesl:recyclerview:1.2.0'
4747
implementation 'com.google.android.play:app-update:2.0.0'
4848
}

‎app/release/app-release.aab

-540 KB
Binary file not shown.

‎app/release/app-release.apk

-485 KB
Binary file not shown.

‎app/release/output-metadata.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"type": "SINGLE",
1212
"filters": [],
1313
"attributes": [],
14-
"versionCode": 2,
15-
"versionName": "1.1.0",
14+
"versionCode": 3,
15+
"versionName": "1.1.1",
1616
"outputFile": "app-release.apk"
1717
}
1818
],

‎app/src/main/AndroidManifest.xml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,22 @@
1414

1515
<application
1616
android:allowBackup="true"
17-
android:icon="@mipmap/ic_launcher"
17+
android:icon="@drawable/ic_launcher"
1818
android:label="@string/app_name"
1919
android:theme="@style/OneUITheme">
2020

21+
<meta-data
22+
android:name="SamsungBasicInteraction"
23+
android:value="SEP10" />
24+
25+
<meta-data
26+
android:name="com.samsung.android.icon_container.has_icon_container"
27+
android:value="true" />
28+
29+
<meta-data
30+
android:name="com.samsung.android.icon_container.feature_appicon"
31+
android:value="ADAPTIVEICON_SHADOW" />
32+
2133
<service
2234
android:name=".LiveWallpaper"
2335
android:configChanges="uiMode|orientation"

‎app/src/main/java/de/dlyt/yanndroid/dualwallpaper/WallpaperService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public void onCreate() {
2626
public int onStartCommand(Intent intent, int flags, int startId) {
2727
Log.e("WallpaperService", "onStartCommand");
2828
startForeground(3000, new NotificationCompat.Builder(this, "4000")
29-
.setSmallIcon(dev.oneuiproject.oneui.R.drawable.ic_oui_wallpaper_outline)
29+
.setSmallIcon(R.drawable.ic_oui_wallpaper_outline)
3030
.setContentTitle(getString(R.string.wallpaper_service))
3131
.setContentText(getString(R.string.noti_desc))
3232
.setContentIntent(PendingIntent.getActivity(

‎app/src/main/java/de/dlyt/yanndroid/dualwallpaper/ui/adapter/ViewPagerAdapter.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,10 @@ private void updateImages(ImageView imageView, boolean homeScreen, boolean light
5454
ExecutorService executor = Executors.newSingleThreadExecutor();
5555
executor.execute(() -> {
5656
Bitmap image = BitmapFactory.decodeFile(wallpaperUtil.getWallpaperPath(homeScreen, lightMode));
57-
imageView.post(() -> imageView.setImageBitmap(image));
57+
if (image == null) return;
58+
double scale = Math.max((double) imageView.getWidth() / (double) image.getWidth(), (double) imageView.getHeight() / (double) image.getHeight());
59+
Bitmap scaledImage = Bitmap.createScaledBitmap(image, (int) (image.getWidth() * scale), (int) (image.getHeight() * scale), true);
60+
imageView.post(() -> imageView.setImageBitmap(scaledImage));
5861
});
5962
executor.shutdown();
6063
}

‎app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml renamed to ‎app/src/main/res/drawable/ic_launcher.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3-
<background android:drawable="@color/ic_launcher_background"/>
4-
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
3+
<background android:drawable="@color/ic_launcher_background" />
4+
<foreground android:drawable="@drawable/ic_launcher_foreground" />
55
</adaptive-icon>

‎app/src/main/res/drawable/ic_oui_ab_app_info.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:autoMirrored="true"
5+
android:viewportWidth="72"
6+
android:viewportHeight="72">
7+
<path
8+
android:fillColor="@color/oui_primary_icon_color"
9+
android:fillType="evenOdd"
10+
android:pathData="M36,8.25c15.327,0,27.75,12.425,27.75,27.753C63.75,51.328,51.327,63.75,36,63.75c-15.325,0-27.75-12.423-27.75-27.747C8.25,20.676,20.675,8.25,36,8.25z M36,12.75c-12.84,0-23.25,10.411-23.25,23.253C12.75,48.842,23.16,59.25,36,59.25c12.842,0,23.25-10.407,23.25-23.247C59.25,23.16,48.842,12.75,36,12.75z M39,30.41v20.616c0,1.243-1.008,2.25-2.25,2.25c-1.139,0-2.081-0.847-2.229-1.944L34.5,51.026V34.908l-3.504,0.002c-1.139,0-2.081-0.846-2.229-1.944l-0.021-0.306c0-1.139,0.846-2.08,1.945-2.229l0.305-0.021H39z M36.166,20.896c1.657,0,3,1.344,3,3c0,1.656-1.344,3-3,3c-1.656,0-3-1.344-3-3C33.166,22.24,34.51,20.896,36.166,20.896z"
11+
android:strokeWidth="1"
12+
android:strokeColor="#00000000" />
13+
</vector>

‎app/src/main/res/drawable/ic_oui_wallpaper_outline.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<vector android:height="24dp" android:tint="#000000"
2+
android:viewportHeight="24" android:viewportWidth="24"
3+
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
4+
<path android:fillColor="#00000000" android:fillType="evenOdd"
5+
android:pathData="M16.5,21.2813L7.5,21.2813C5.9469,21.2813 4.6875,20.0218 4.6875,18.4688L4.6875,5.5313C4.6875,3.9779 5.9469,2.7188 7.5,2.7188L16.5,2.7188C18.0531,2.7188 19.3125,3.9779 19.3125,5.5313L19.3125,18.4688C19.3125,20.0218 18.0531,21.2813 16.5,21.2813ZM19.0313,13.9357L16.5037,11.2745C16.0711,10.8189 15.3488,10.8062 14.9002,11.2458L11.1669,14.9051C10.9487,15.1192 10.5994,15.1195 10.3803,14.9063L9.1211,13.6778C8.6787,13.2466 7.9719,13.2525 7.5368,13.6907L4.9688,16.2793M9.5001,9.2509C10.4307,9.2509 11.1873,8.4938 11.1873,7.5634C11.1873,6.6331 10.4307,5.8759 9.5001,5.8759C8.5691,5.8759 7.8123,6.6331 7.8123,7.5634C7.8123,8.4938 8.5691,9.2509 9.5001,9.2509Z"
6+
android:strokeColor="#000000" android:strokeLineCap="round"
7+
android:strokeLineJoin="round" android:strokeWidth="1.5"/>
8+
</vector>

‎app/src/main/res/values-v31/colors.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<color name="sesl_round_and_bgcolor_dark">@android:color/system_neutral1_900</color>
4+
<color name="sesl_round_and_bgcolor_light">@android:color/system_neutral1_50</color>
5+
<color name="sesl_action_bar_background_color_dark">@android:color/system_neutral1_900</color>
6+
<color name="sesl_action_bar_background_color_light">@android:color/system_neutral1_50</color>
7+
8+
<color name="sesl_primary_color_dark">@android:color/system_accent1_600</color>
9+
<color name="sesl_primary_color_light">@android:color/system_accent1_600</color>
10+
11+
<color name="sesl_primary_dark_color_dark">@android:color/system_accent1_700</color>
12+
<color name="sesl_primary_dark_color_light">@android:color/system_accent1_500</color>
13+
</resources>

‎app/src/main/res/xml/live_wallpaper.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<wallpaper xmlns:android="http://schemas.android.com/apk/res/android"
33
android:description="@string/app_name"
4-
android:thumbnail="@mipmap/ic_launcher" />
4+
android:thumbnail="@drawable/ic_launcher" />

0 commit comments

Comments
 (0)