Skip to content

Commit c62427b

Browse files
authored
Merge master into fdroid
2 parents 5d84c2a + 6814f43 commit c62427b

File tree

97 files changed

+2394
-1807
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+2394
-1807
lines changed

.github/workflows/crowdin.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
uses: actions/checkout@v4
2020

2121
- name: Sync Translations
22-
uses: crowdin/github-action@v1
22+
uses: crowdin/github-action@v2
2323
with:
2424
upload_translations: false
2525
upload_sources: true

.github/workflows/crowdin_download.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
printf '%s\n' '${{ steps.translators.outputs.json_report }}' > ./app/src/main/assets/translators.json
4040

4141
- name: Download translations
42-
uses: crowdin/github-action@v1
42+
uses: crowdin/github-action@v2
4343
with:
4444
upload_translations: false
4545
upload_sources: false

.github/workflows/crowdin_upload.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
uses: actions/checkout@v4
1919

2020
- name: Upload Strings
21-
uses: crowdin/github-action@v1
21+
uses: crowdin/github-action@v2
2222
with:
2323
upload_translations: false
2424
upload_sources: true

app/build.gradle.kts

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import com.android.build.gradle.internal.api.BaseVariantOutputImpl
33
plugins {
44
alias(libs.plugins.agp.app)
55
alias(libs.plugins.kotlin.android)
6-
alias(libs.plugins.kotlin.kapt)
6+
alias(libs.plugins.kotlin.ksp)
77
}
88

99
android {
@@ -13,14 +13,18 @@ android {
1313
defaultConfig {
1414
minSdk = 31
1515
targetSdk = 35
16-
versionCode = 23
17-
versionName = "v1.11.2"
16+
versionCode = 24
17+
versionName = "v1.11.3"
18+
19+
ksp {
20+
arg("room.schemaLocation", "$projectDir/schemas")
21+
}
1822
}
1923

2024
buildTypes {
2125
debug {
22-
isMinifyEnabled = true
23-
isShrinkResources = true
26+
isMinifyEnabled = false
27+
isShrinkResources = false
2428

2529
proguardFiles(
2630
getDefaultProguardFile("proguard-android-optimize.txt"),
@@ -51,7 +55,6 @@ android {
5155

5256
buildFeatures {
5357
viewBinding = true
54-
dataBinding = true
5558
buildConfig = true
5659
aidl = true
5760
}
@@ -104,5 +107,9 @@ dependencies {
104107
implementation(libs.recyclerview.selection)
105108
implementation(libs.blurView)
106109
implementation(libs.lifecycle.common.jvm)
107-
annotationProcessor(libs.glide.compiler)
110+
ksp(libs.glide.compiler)
111+
implementation(libs.room.runtime)
112+
implementation(libs.room.ktx)
113+
ksp(libs.room.compiler)
114+
implementation(libs.zip4j)
108115
}
Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
{
2+
"formatVersion": 1,
3+
"database": {
4+
"version": 1,
5+
"identityHash": "ebcb729a0a5962f2d0018caf4b5c79c6",
6+
"entities": [
7+
{
8+
"tableName": "custom_style_table",
9+
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`styleId` TEXT NOT NULL, `styleName` TEXT NOT NULL, `description` TEXT NOT NULL, `prefsGson` TEXT NOT NULL, `monet` TEXT NOT NULL, `palette` TEXT NOT NULL, PRIMARY KEY(`styleId`))",
10+
"fields": [
11+
{
12+
"fieldPath": "styleId",
13+
"columnName": "styleId",
14+
"affinity": "TEXT",
15+
"notNull": true
16+
},
17+
{
18+
"fieldPath": "styleName",
19+
"columnName": "styleName",
20+
"affinity": "TEXT",
21+
"notNull": true
22+
},
23+
{
24+
"fieldPath": "description",
25+
"columnName": "description",
26+
"affinity": "TEXT",
27+
"notNull": true
28+
},
29+
{
30+
"fieldPath": "prefsGson",
31+
"columnName": "prefsGson",
32+
"affinity": "TEXT",
33+
"notNull": true
34+
},
35+
{
36+
"fieldPath": "monet",
37+
"columnName": "monet",
38+
"affinity": "TEXT",
39+
"notNull": true
40+
},
41+
{
42+
"fieldPath": "palette",
43+
"columnName": "palette",
44+
"affinity": "TEXT",
45+
"notNull": true
46+
}
47+
],
48+
"primaryKey": {
49+
"autoGenerate": false,
50+
"columnNames": [
51+
"styleId"
52+
]
53+
},
54+
"indices": [],
55+
"foreignKeys": []
56+
}
57+
],
58+
"views": [],
59+
"setupQueries": [
60+
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
61+
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'ebcb729a0a5962f2d0018caf4b5c79c6')"
62+
]
63+
}
64+
}

app/src/main/assets/translators.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

app/src/main/java/com/drdisagree/colorblendr/common/Const.kt

Lines changed: 0 additions & 156 deletions
This file was deleted.

0 commit comments

Comments
 (0)