Poprawki
This commit is contained in:
parent
3857c4421d
commit
db18d55ec7
@ -1,6 +1,7 @@
|
||||
package org.lemiesz.uidemo
|
||||
|
||||
import org.lemiesz.alib.dev.SharedPreferencesModuleImpl
|
||||
import org.lemiesz.alib.dev.getSharedPreferencesModule
|
||||
import org.lemiesz.crequire.AndroidInjModule
|
||||
import org.lemiesz.klib.logInj
|
||||
import org.lemiesz.require.req
|
||||
@ -12,7 +13,7 @@ val inject by lazy { AppModule() }
|
||||
class AppModule : AndroidInjModule() {
|
||||
|
||||
private val sharedPreferencesModule by disposable {
|
||||
SharedPreferencesModuleImpl(
|
||||
getSharedPreferencesModule(
|
||||
androidContext(),
|
||||
scope
|
||||
)
|
||||
|
||||
@ -2,8 +2,10 @@ package org.lemiesz.appsensor
|
||||
|
||||
import android.hardware.Sensor
|
||||
import org.lemiesz.alib.dev.SharedPreferencesModuleImpl
|
||||
import org.lemiesz.alib.dev.getSharedPreferencesModule
|
||||
import org.lemiesz.alib.dev.gps.GpsSensorFake
|
||||
import org.lemiesz.alib.dev.gps.GpsSensorImpl
|
||||
import org.lemiesz.alib.dev.gps.getGpsSensor
|
||||
import org.lemiesz.alib.dev.sensors.SensorInfoFake
|
||||
import org.lemiesz.alib.dev.sensors.sensorData
|
||||
import org.lemiesz.crequire.AndroidInjModule
|
||||
@ -27,7 +29,7 @@ val inject by lazy { AppModule() }
|
||||
class AppModule : AndroidInjModule() {
|
||||
|
||||
private val sharedPreferencesModule by disposable {
|
||||
SharedPreferencesModuleImpl(
|
||||
getSharedPreferencesModule(
|
||||
androidContext(),
|
||||
scope
|
||||
)
|
||||
@ -48,12 +50,10 @@ class AppModule : AndroidInjModule() {
|
||||
|
||||
|
||||
private val gpsSensor by disposable {
|
||||
androidContext()?.let {
|
||||
GpsSensorImpl(
|
||||
context = it,
|
||||
scope = scope
|
||||
)
|
||||
} ?: GpsSensorFake()
|
||||
getGpsSensor(
|
||||
context = androidContext(),
|
||||
scope = scope
|
||||
)
|
||||
}
|
||||
|
||||
val gpsModel by disposable<GpsModel> {
|
||||
|
||||
@ -28,6 +28,14 @@ interface SharedPreferencesModule {
|
||||
fun setPreference(block: Editor.() -> Unit)
|
||||
}
|
||||
|
||||
fun getSharedPreferencesModule(
|
||||
context: Context?,
|
||||
scope: CoroutineScope
|
||||
): SharedPreferencesModule = SharedPreferencesModuleImpl(
|
||||
context = context,
|
||||
scope = scope
|
||||
)
|
||||
|
||||
class SharedPreferencesModuleImpl(
|
||||
context: Context?,
|
||||
scope: CoroutineScope
|
||||
|
||||
@ -387,4 +387,13 @@ class GpsSensorFake : GpsSensor() {
|
||||
get() = TODO("Not yet implemented")
|
||||
override val gps: StateFlow<GpsLocation>
|
||||
get() = TODO("Not yet implemented")
|
||||
}
|
||||
|
||||
fun getGpsSensor(
|
||||
context: Context?,
|
||||
scope: CoroutineScope
|
||||
): GpsSensor = if (context != null) {
|
||||
GpsSensorImpl(context = context, scope = scope)
|
||||
} else {
|
||||
GpsSensorFake()
|
||||
}
|
||||
@ -4,7 +4,7 @@ plugins {
|
||||
|
||||
allprojects {
|
||||
group = "org.lemiesz"
|
||||
version = "1.3.8"
|
||||
version = "1.3.10"
|
||||
}
|
||||
|
||||
//nexusPublishing {
|
||||
|
||||
8
publish
Executable file
8
publish
Executable file
@ -0,0 +1,8 @@
|
||||
#!/bin/bash
|
||||
|
||||
JAVA_HOME="/usr/lib/jvm/java-17-openjdk/"
|
||||
|
||||
./gradlew material3Lib:publish -Dorg.gradle.java.home=$JAVA_HOME
|
||||
./gradlew testLib:publish -Dorg.gradle.java.home=$JAVA_HOME
|
||||
./gradlew composeRequire:publish -Dorg.gradle.java.home=$JAVA_HOME
|
||||
./gradlew composeLib:publish -Dorg.gradle.java.home=$JAVA_HOME
|
||||
Loading…
Reference in New Issue
Block a user