Skip to content

Commit d68c92e

Browse files
awxkeeawxkee
committed
Starting work on 16kb pages, scaling updates
1 parent bd8578e commit d68c92e

File tree

16 files changed

+345
-152
lines changed

16 files changed

+345
-152
lines changed

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ on:
1515
branches:
1616
- '*'
1717
- '!ci_test_*'
18+
- 'master'
1819

1920
jobs:
2021
build:

‎app/build.gradle.kts‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@ plugins {
22
id("com.android.application")
33
id("org.jetbrains.kotlin.android")
44
id("com.google.devtools.ksp")
5-
id("org.jetbrains.kotlin.plugin.compose") version "2.0.0"
5+
id("org.jetbrains.kotlin.plugin.compose") version "2.2.0"
66
}
77

88
android {
99
namespace = "com.awxkee.jxlcoder"
10-
compileSdk = 34
10+
compileSdk = 35
1111

1212
defaultConfig {
1313
applicationId = "com.awxkee.jxlcoder"
1414
minSdk = 24
15-
targetSdk = 34
15+
targetSdk = 35
1616
versionCode = 1
1717
versionName = "1.0"
1818

@@ -53,28 +53,28 @@ android {
5353

5454
dependencies {
5555
implementation(project(":jxlcoder"))
56-
implementation("androidx.core:core-ktx:1.13.1")
57-
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.6")
58-
implementation("androidx.activity:activity-compose:1.9.2")
59-
implementation(platform("androidx.compose:compose-bom:2024.09.02"))
56+
implementation("androidx.core:core-ktx:1.16.0")
57+
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.9.2")
58+
implementation("androidx.activity:activity-compose:1.10.1")
59+
implementation(platform("androidx.compose:compose-bom:2025.07.00"))
6060
implementation("androidx.compose.ui:ui")
6161
implementation("androidx.compose.ui:ui-graphics")
6262
implementation("androidx.compose.ui:ui-tooling-preview")
6363
implementation("androidx.compose.material3:material3")
6464
testImplementation("junit:junit:4.13.2")
65-
androidTestImplementation("androidx.test.ext:junit:1.2.1")
66-
androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
67-
androidTestImplementation(platform("androidx.compose:compose-bom:2024.09.02"))
65+
androidTestImplementation("androidx.test.ext:junit:1.3.0")
66+
androidTestImplementation("androidx.test.espresso:espresso-core:3.7.0")
67+
androidTestImplementation(platform("androidx.compose:compose-bom:2025.07.00"))
6868
androidTestImplementation("androidx.compose.ui:ui-test-junit4")
6969
debugImplementation("androidx.compose.ui:ui-tooling")
7070
debugImplementation("androidx.compose.ui:ui-test-manifest")
7171

72-
api("io.coil-kt:coil:2.6.0")
73-
implementation("io.coil-kt:coil-compose:2.5.0")
72+
api("io.coil-kt:coil:2.7.0")
73+
implementation("io.coil-kt:coil-compose:2.7.0")
7474

75-
implementation("com.squareup.okio:okio:3.3.0")
75+
implementation("com.squareup.okio:okio:3.16.0")
7676

7777
implementation("com.github.bumptech.glide:glide:4.16.0")
7878
ksp("com.github.bumptech.glide:ksp:4.16.0")
79-
implementation("com.github.bumptech.glide:compose:1.0.0-alpha.5")
79+
implementation("com.github.bumptech.glide:compose:1.0.0-beta01")
8080
}

‎app/src/main/java/com/awxkee/jxlcoder/JxlDecoder.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ class JxlDecoder(
7474
), true
7575
)
7676
}
77+
7778
class Factory : Decoder.Factory {
7879
override fun create(
7980
result: SourceResult,

‎app/src/main/java/com/awxkee/jxlcoder/MainActivity.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,8 @@ class MainActivity : ComponentActivity() {
211211
// Resizable version
212212
val srcImage = JxlCoder.decodeSampled(
213213
buffer4,
214-
width = largeImageSize.width / 2,
215-
height = largeImageSize.height / 2,
214+
width = largeImageSize.width / 3,
215+
height = largeImageSize.height / 3,
216216
preferredColorConfig = PreferredColorConfig.HARDWARE,
217217
com.awxkee.jxlcoder.ScaleMode.FIT,
218218
toneMapper = JxlToneMapper.REC2408,
@@ -223,8 +223,8 @@ class MainActivity : ComponentActivity() {
223223
}
224224
val srcImage1 = JxlCoder.decodeSampled(
225225
buffer4,
226-
width = largeImageSize.width / 2,
227-
height = largeImageSize.height / 2,
226+
width = largeImageSize.width / 4,
227+
height = largeImageSize.height / 5,
228228
preferredColorConfig = PreferredColorConfig.HARDWARE,
229229
com.awxkee.jxlcoder.ScaleMode.FIT,
230230
toneMapper = JxlToneMapper.REC2408_PERCEPTUAL,

‎build.gradle.kts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
plugins {
3-
id("com.android.application") version "8.8.0" apply false
4-
id("org.jetbrains.kotlin.android") version "2.0.20" apply false
5-
id("com.android.library") version "8.8.0" apply false
6-
id("com.google.devtools.ksp") version "2.0.20-1.0.25" apply false
3+
id("com.android.application") version "8.12.0" apply false
4+
id("org.jetbrains.kotlin.android") version "2.2.0" apply false
5+
id("com.android.library") version "8.12.0" apply false
6+
id("com.google.devtools.ksp") version "2.2.0-2.0.2" apply false
77
}

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Sun Aug 20 15:15:13 GET 2023
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

‎jxlcoder/build.gradle.kts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66
id("org.jetbrains.kotlin.android")
77
id("maven-publish")
88
id("signing")
9-
id("com.vanniktech.maven.publish") version "0.29.0"
9+
id("com.vanniktech.maven.publish") version "0.34.0"
1010
}
1111

1212
mavenPublishing {
@@ -60,7 +60,7 @@ mavenPublishing {
6060

6161
android {
6262
namespace = "io.github.awxkee.jxlcoder"
63-
compileSdk = 34
63+
compileSdk = 35
6464

6565
defaultConfig {
6666
minSdk = 21
@@ -115,10 +115,10 @@ android {
115115
}
116116

117117
dependencies {
118-
implementation("androidx.core:core-ktx:1.13.1")
119-
implementation("androidx.appcompat:appcompat:1.7.0")
118+
implementation("androidx.core:core-ktx:1.16.0")
119+
implementation("androidx.appcompat:appcompat:1.7.1")
120120
implementation("com.google.android.material:material:1.12.0")
121121
testImplementation("junit:junit:4.13.2")
122-
androidTestImplementation("androidx.test.ext:junit:1.2.1")
123-
androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
122+
androidTestImplementation("androidx.test.ext:junit:1.3.0")
123+
androidTestImplementation("androidx.test.espresso:espresso-core:3.7.0")
124124
}

‎jxlcoder/src/main/cpp/CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ target_include_directories(cpufeatures PUBLIC ${ANDROID_NDK}/sources/android/cpu
5050
target_link_libraries(cpufeatures dl)
5151
list(APPEND EXTRA_LIBS cpufeatures)
5252

53+
target_link_options(jxlcoder PRIVATE "-Wl,-z,max-page-size=16384")
54+
5355
set(CMAKE_CXX_STANDARD 20)
5456
set(CMAKE_CXX_STANDARD_REQUIRED ON)
5557

‎jxlcoder/src/main/cpp/lib/arm64-v8a/libweaver.a‎

-120 KB
Binary file not shown.

‎jxlcoder/src/main/cpp/lib/armeabi-v7a/libweaver.a‎

209 KB
Binary file not shown.

0 commit comments

Comments
 (0)