Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Compose migration #71

Merged
merged 49 commits into from
Sep 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
1195df3
Bump version id to 200
Hamza417 Sep 9, 2024
193b32f
Compose home screen rev01
Hamza417 Sep 9, 2024
9d57073
Compose home screen rev02
Hamza417 Sep 9, 2024
af7315c
Compose home screen rev02
Hamza417 Sep 9, 2024
4e1daf8
Compose home screen rev03
Hamza417 Sep 9, 2024
01de4bd
Compose home screen rev04
Hamza417 Sep 9, 2024
6be1117
Compose home screen rev05
Hamza417 Sep 9, 2024
3d70b3e
Compose wallpaper screen rev01
Hamza417 Sep 9, 2024
3bc238d
Compose wallpaper screen rev01
Hamza417 Sep 9, 2024
edd4d82
Compose wallpaper screen rev02
Hamza417 Sep 9, 2024
2014f22
Compose wallpaper screen rev03
Hamza417 Sep 9, 2024
b1d3eee
Compose wallpaper screen rev03
Hamza417 Sep 9, 2024
21d0855
Compose wallpaper screen rev03
Hamza417 Sep 9, 2024
619bf1f
Compose wallpaper screen rev04
Hamza417 Sep 9, 2024
eb0d0ff
Compose setup screen rev01
Hamza417 Sep 10, 2024
1009382
Compose setup screen rev02
Hamza417 Sep 10, 2024
a7d7e19
Compose setup screen rev03
Hamza417 Sep 10, 2024
588d42d
Compose setup screen rev03
Hamza417 Sep 10, 2024
bd7eaa9
Merge branch 'compose_migration' of https://github.com/Hamza417/Walle…
Hamza417 Sep 10, 2024
db851a2
Compose wallpapers screen rev01
Hamza417 Sep 10, 2024
b0ae9b8
Compose wallpapers screen rev02
Hamza417 Sep 10, 2024
3e32dfc
Compose settings screen rev01
Hamza417 Sep 10, 2024
622c7e7
Fix list padding issues
Hamza417 Sep 10, 2024
1ad512c
Add sttings screenshot
Hamza417 Sep 10, 2024
cf2a368
Add other app links in settings
Hamza417 Sep 10, 2024
b984c22
Fix crashing while storage permission
Hamza417 Sep 10, 2024
d0d9d86
Add option to go back to legacy interface
Hamza417 Sep 10, 2024
5f3911e
Add grid span selection for compose
Hamza417 Sep 10, 2024
97f5801
Add all auto wallpaper settings
Hamza417 Sep 10, 2024
8403621
Add warning icon on wallpapers
Hamza417 Sep 10, 2024
19bcd24
Add global wallpaper tonal shadows
Hamza417 Sep 10, 2024
ce57ac4
Fix wallpaper not storing in database
Hamza417 Sep 10, 2024
9011eaf
Add option to hide warning indicator
Hamza417 Sep 10, 2024
69c79a3
Tags screen rev01
Hamza417 Sep 10, 2024
2c03ac2
Fix add tag dialog UI
Hamza417 Sep 11, 2024
4b8f1a7
Add tags in wallpaper screen
Hamza417 Sep 11, 2024
d1f1696
Add tagged wallpapers list
Hamza417 Sep 11, 2024
394e99d
Update screenshots
Hamza417 Sep 11, 2024
f2186f2
Add blur slider
Hamza417 Sep 11, 2024
1e76a9d
Try to fix brightness and contrast sliders
Hamza417 Sep 11, 2024
2024e98
Add option to toggle image based shadow
Hamza417 Sep 11, 2024
f8a778a
Update screenshots
Hamza417 Sep 11, 2024
e84a7e4
Update screenshots
Hamza417 Sep 11, 2024
9a1e398
Merge branch 'compose_migration' of https://github.com/Hamza417/Walle…
Hamza417 Sep 11, 2024
33c2e5b
Update README.md
Hamza417 Sep 11, 2024
f88324f
Update README.md
Hamza417 Sep 11, 2024
e3f58cb
Update README.md
Hamza417 Sep 11, 2024
5c57cd9
Update README.md
Hamza417 Sep 11, 2024
4f4d486
Update README.md
Hamza417 Sep 11, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .idea/deploymentTargetSelector.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ from there? then Peristyle is for you :)

| ![01](./fastlane/metadata/android/en-US/images/phoneScreenshots/01.png) | ![02](./fastlane/metadata/android/en-US/images/phoneScreenshots/02.png) | ![03](./fastlane/metadata/android/en-US/images/phoneScreenshots/03.png) |
|:-----------------------------------------------------------------------:|:-----------------------------------------------------------------------:|:-----------------------------------------------------------------------:|
| ![03](./fastlane/metadata/android/en-US/images/phoneScreenshots/04.png) | ![05](./fastlane/metadata/android/en-US/images/phoneScreenshots/05.png) | ![06](./fastlane/metadata/android/en-US/images/phoneScreenshots/06.png) |
| ![04](./fastlane/metadata/android/en-US/images/phoneScreenshots/04.png) | ![05](./fastlane/metadata/android/en-US/images/phoneScreenshots/05.png) | ![06](./fastlane/metadata/android/en-US/images/phoneScreenshots/06.png) |
| ![07](./fastlane/metadata/android/en-US/images/phoneScreenshots/07.png) | ![08](./fastlane/metadata/android/en-US/images/phoneScreenshots/08.png) | ![09](./fastlane/metadata/android/en-US/images/phoneScreenshots/09.png) |

## Triggering AutoWallpaperService from Other Apps

Expand Down
14 changes: 12 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ android {
applicationId "app.simple.peri"
minSdk 24
targetSdk 34
versionCode 154
versionName "1.54_beta"
versionCode 200
versionName "2.00_beta"

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

Expand Down Expand Up @@ -93,6 +93,10 @@ dependencies {
implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.8.5'
implementation 'androidx.compose.runtime:runtime-livedata'
implementation 'androidx.compose.foundation:foundation:1.7.0'
implementation 'androidx.compose.ui:ui-tooling-preview-android:1.7.0'
implementation 'androidx.navigation:navigation-compose:2.8.0'
implementation "androidx.compose.material:material-icons-extended:1.7.0"
debugImplementation 'androidx.compose.ui:ui-tooling:1.7.0'

implementation 'androidx.window:window:1.3.0'
implementation 'androidx.core:core-ktx:1.13.1'
Expand All @@ -107,12 +111,14 @@ dependencies {
implementation 'androidx.recyclerview:recyclerview:1.3.2'
implementation 'androidx.preference:preference-ktx:1.2.1'
implementation 'androidx.biometric:biometric-ktx:1.2.0-alpha05'
implementation 'androidx.palette:palette-ktx:1.0.0'

implementation 'com.google.android.material:material:1.12.0'

// Glide
implementation 'com.github.bumptech.glide:glide:4.16.0'
implementation 'com.github.bumptech.glide:okhttp3-integration:4.15.1'
implementation "com.github.bumptech.glide:compose:1.0.0-beta01"
//noinspection KaptUsageInsteadOfKsp
kapt 'com.github.bumptech.glide:compiler:4.15.1'

Expand All @@ -124,6 +130,10 @@ dependencies {

implementation 'me.saket.telephoto:zoomable-image-glide:0.7.1'

def hazeVersion = "0.9.0-beta01"
implementation "dev.chrisbanes.haze:haze:$hazeVersion"
implementation("dev.chrisbanes.haze:haze-materials:$hazeVersion")

testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
Expand Down
40 changes: 40 additions & 0 deletions app/schemas/app.simple.peri.database.instances.TagsDatabase/1.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"formatVersion": 1,
"database": {
"version": 1,
"identityHash": "88d7a4b07350f3aef9f605e3960c71f6",
"entities": [
{
"tableName": "tags",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT NOT NULL, `sum` TEXT, PRIMARY KEY(`name`))",
"fields": [
{
"fieldPath": "name",
"columnName": "name",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "sum",
"columnName": "sum",
"affinity": "TEXT",
"notNull": false
}
],
"primaryKey": {
"autoGenerate": false,
"columnNames": [
"name"
]
},
"indices": [],
"foreignKeys": []
}
],
"views": [],
"setupQueries": [
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '88d7a4b07350f3aef9f605e3960c71f6')"
]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
"formatVersion": 1,
"database": {
"version": 4,
"identityHash": "75288abb9acca6c96c8789ed7a6db3b9",
"identityHash": "fdcd169174923f6f5f12521903d61b51",
"entities": [
{
"tableName": "wallpapers",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT, `uri` TEXT NOT NULL, `width` INTEGER, `height` INTEGER, `dateModified` INTEGER NOT NULL, `size` INTEGER NOT NULL, `isSelected` INTEGER NOT NULL, PRIMARY KEY(`uri`))",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT, `uri` TEXT NOT NULL, `md5` TEXT NOT NULL, `width` INTEGER, `height` INTEGER, `dateModified` INTEGER NOT NULL, `size` INTEGER NOT NULL, `isSelected` INTEGER NOT NULL, PRIMARY KEY(`md5`))",
"fields": [
{
"fieldPath": "name",
Expand All @@ -20,6 +20,12 @@
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "md5",
"columnName": "md5",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "width",
"columnName": "width",
Expand Down Expand Up @@ -54,7 +60,7 @@
"primaryKey": {
"autoGenerate": false,
"columnNames": [
"uri"
"md5"
]
},
"indices": [],
Expand All @@ -64,7 +70,7 @@
"views": [],
"setupQueries": [
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '75288abb9acca6c96c8789ed7a6db3b9')"
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'fdcd169174923f6f5f12521903d61b51')"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
{
"formatVersion": 1,
"database": {
"version": 5,
"identityHash": "fdcd169174923f6f5f12521903d61b51",
"entities": [
{
"tableName": "wallpapers",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT, `uri` TEXT NOT NULL, `md5` TEXT NOT NULL, `width` INTEGER, `height` INTEGER, `dateModified` INTEGER NOT NULL, `size` INTEGER NOT NULL, `isSelected` INTEGER NOT NULL, PRIMARY KEY(`md5`))",
"fields": [
{
"fieldPath": "name",
"columnName": "name",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "uri",
"columnName": "uri",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "md5",
"columnName": "md5",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "width",
"columnName": "width",
"affinity": "INTEGER",
"notNull": false
},
{
"fieldPath": "height",
"columnName": "height",
"affinity": "INTEGER",
"notNull": false
},
{
"fieldPath": "dateModified",
"columnName": "dateModified",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "size",
"columnName": "size",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "isSelected",
"columnName": "isSelected",
"affinity": "INTEGER",
"notNull": true
}
],
"primaryKey": {
"autoGenerate": false,
"columnNames": [
"md5"
]
},
"indices": [],
"foreignKeys": []
}
],
"views": [],
"setupQueries": [
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'fdcd169174923f6f5f12521903d61b51')"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
{
"formatVersion": 1,
"database": {
"version": 6,
"identityHash": "2b861ba28cc3b83eb67b4ccb5f2b71ae",
"entities": [
{
"tableName": "wallpapers",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT, `uri` TEXT NOT NULL, `md5` TEXT NOT NULL, `prominentColor` INTEGER NOT NULL, `width` INTEGER, `height` INTEGER, `dateModified` INTEGER NOT NULL, `size` INTEGER NOT NULL, `isSelected` INTEGER NOT NULL, PRIMARY KEY(`md5`))",
"fields": [
{
"fieldPath": "name",
"columnName": "name",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "uri",
"columnName": "uri",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "md5",
"columnName": "md5",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "prominentColor",
"columnName": "prominentColor",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "width",
"columnName": "width",
"affinity": "INTEGER",
"notNull": false
},
{
"fieldPath": "height",
"columnName": "height",
"affinity": "INTEGER",
"notNull": false
},
{
"fieldPath": "dateModified",
"columnName": "dateModified",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "size",
"columnName": "size",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "isSelected",
"columnName": "isSelected",
"affinity": "INTEGER",
"notNull": true
}
],
"primaryKey": {
"autoGenerate": false,
"columnNames": [
"md5"
]
},
"indices": [],
"foreignKeys": []
}
],
"views": [],
"setupQueries": [
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '2b861ba28cc3b83eb67b4ccb5f2b71ae')"
]
}
}
Loading