Skip to content

Commit 8eb4255

Browse files
committed
Remove dependency on Onyx SDK
1 parent d8abe51 commit 8eb4255

File tree

5 files changed

+21
-21
lines changed

5 files changed

+21
-21
lines changed

app/build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ android {
1111

1212
defaultConfig {
1313
applicationId = "me.haroldmartin.golwallpaper"
14-
minSdk = 29
14+
minSdk = 28
1515
targetSdk = 35
1616
versionCode = 1
1717
versionName = "1.0"
@@ -52,7 +52,6 @@ dependencies {
5252
implementation(libs.androidx.ui.graphics)
5353
implementation(libs.androidx.ui.tooling.preview)
5454
implementation(libs.androidx.work.runtime)
55-
implementation(libs.onyxsdkDevice)
5655
implementation(platform(libs.androidx.compose.bom))
5756

5857
testImplementation(libs.junit)

app/src/main/java/me/haroldmartin/golwallpaper/MainViewModel.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,20 +35,20 @@ class MainViewModel(
3535

3636
fun setFgColor(context: Context, color: Int) = viewModelScope.launch {
3737
saveFgColor(color)
38-
saveScreenSaver(context, showToast = true)
38+
saveScreenSaver(context, showHint = true)
3939
}
4040

4141
fun setBgColor(context: Context, color: Int) = viewModelScope.launch {
4242
saveBgColor(color)
43-
saveScreenSaver(context, showToast = true)
43+
saveScreenSaver(context, showHint = true)
4444
}
4545

4646
fun saveNextStep(context: Context) = viewModelScope.launch {
47-
saveScreenSaver(context, showToast = true)
47+
saveScreenSaver(context, showHint = true)
4848
}
4949

5050
fun reset(context: Context, pattern: String?) = viewModelScope.launch {
51-
saveScreenSaver(context, showToast = true, pattern = pattern)
51+
saveScreenSaver(context, showHint = true, pattern = pattern)
5252
}
5353

5454
fun openIssues(context: Context) {

app/src/main/java/me/haroldmartin/golwallpaper/WallpaperWorker.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class WallpaperWorker(private val context: Context, workerParams: WorkerParamete
1616
Log.d(TAG, "doWork on thread ${Thread.currentThread().name}")
1717
try {
1818
AppContainer.init(context)
19-
AppContainer.saveScreensaver(context, showToast = false)
19+
AppContainer.saveScreensaver(context, showHint = false)
2020
Result.success()
2121
} catch (e: Exception) {
2222
Log.e(TAG, "Error syncing data", e)

app/src/main/java/me/haroldmartin/golwallpaper/utils/SaveScreensaver.kt

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package me.haroldmartin.golwallpaper.utils
22

33
import android.content.Context
4+
import android.content.Intent
45
import android.util.Log
56
import androidx.compose.ui.graphics.Color
67
import androidx.compose.ui.graphics.toArgb
78
import androidx.core.net.toUri
8-
import com.onyx.android.sdk.api.device.screensaver.ScreenResourceManager
99
import me.haroldmartin.golwallpaper.data.UserDataStore
1010
import me.haroldmartin.golwallpaper.data.UserDataStore.Keys
1111
import me.haroldmartin.golwallpaper.domain.GolController
@@ -18,9 +18,10 @@ import kotlinx.coroutines.withContext
1818

1919
private const val TAG = "SaveWallpaper"
2020
private const val SCREEN_TO_GRID_RATIO = 10
21+
private const val ONYX_SCREENSAVER_TYPE = 16
2122

2223
class SaveScreensaver(val dataStore: UserDataStore, val ioDispatcher: CoroutineDispatcher) {
23-
suspend operator fun invoke(context: Context, showToast: Boolean, pattern: String? = null) {
24+
suspend operator fun invoke(context: Context, showHint: Boolean, pattern: String? = null) {
2425
withContext(ioDispatcher) {
2526
val resolution = getScreenResolution(context)
2627
val fgColor = getFgColor()
@@ -61,12 +62,11 @@ class SaveScreensaver(val dataStore: UserDataStore, val ioDispatcher: CoroutineD
6162

6263
bitmap.recycle()
6364

64-
val isSuccess = ScreenResourceManager.setScreensaver(
65-
context,
65+
context.setScreensaver(
6666
uriAndFakePath.second,
67-
showToast,
67+
showHint,
6868
)
69-
Log.d(TAG, "setScreensaver: $isSuccess , ${getAppMemoryUsage(context)}")
69+
Log.d(TAG, "setScreensaver: ${getAppMemoryUsage(context)}")
7070
}
7171
}
7272

@@ -96,3 +96,12 @@ private fun Resolution.toRowsCols(): Pair<Int, Int> {
9696
val cols = height / (SCREEN_TO_GRID_RATIO * ratio).toInt()
9797
return rows to cols
9898
}
99+
100+
private fun Context.setScreensaver(filePath: String, showHint: Boolean) {
101+
sendBroadcast(
102+
Intent("onyx.action.SCREENSAVER")
103+
.putExtra("type", ONYX_SCREENSAVER_TYPE)
104+
.putExtra("file", filePath)
105+
.putExtra("show_result_hint", showHint),
106+
)
107+
}

settings.gradle.kts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,6 @@ dependencyResolutionManagement {
1616
repositories {
1717
google()
1818
mavenCentral()
19-
maven {
20-
url = uri("http://repo.boox.com/repository/proxy-public/")
21-
isAllowInsecureProtocol = true
22-
}
23-
maven {
24-
url = uri("http://repo.boox.com/repository/maven-public/")
25-
isAllowInsecureProtocol = true
26-
}
2719
}
2820
}
2921

0 commit comments

Comments
 (0)