[Lights]: add hasStandaloneWarmth (#426)

* implementation for onyx devices
koreader · Dec 27, 2023 · 462be28 · 462be28
1 parent 968c3b2
commit 462be28
Show file tree

Hide file tree

Showing 12 changed files with 57 additions and 0 deletions.
diff --git a/app/src/main/java/org/koreader/launcher/LuaInterface.kt b/app/src/main/java/org/koreader/launcher/LuaInterface.kt
@@ -49,6 +49,7 @@ interface LuaInterface {
     fun hasNativeRotation(): Boolean
     fun hasOTAUpdates(): Boolean
     fun hasRuntimeChanges(): Boolean
+    fun hasStandaloneWarmth(): Boolean
     fun installApk()
     fun isCharging(): Boolean
     fun isChromeOS(): Boolean

diff --git a/app/src/main/java/org/koreader/launcher/MainActivity.kt b/app/src/main/java/org/koreader/launcher/MainActivity.kt
@@ -535,6 +535,10 @@ class MainActivity : NativeActivity(), LuaInterface,
         }
     }
 
+    override fun hasStandaloneWarmth(): Boolean {
+        return device.lights.hasStandaloneWarmth()
+    }
+
     override fun hasRuntimeChanges(): Boolean {
         return MainApp.supports_runtime_changes
     }

diff --git a/app/src/main/java/org/koreader/launcher/device/LightsInterface.kt b/app/src/main/java/org/koreader/launcher/device/LightsInterface.kt
@@ -17,4 +17,5 @@ interface LightsInterface {
     fun getMinBrightness(): Int
     fun getMaxBrightness(): Int
     fun enableFrontlightSwitch(activity: Activity): Int
+    fun hasStandaloneWarmth(): Boolean
 }
diff --git a/app/src/main/java/org/koreader/launcher/device/lights/BoyueS62RootController.kt b/app/src/main/java/org/koreader/launcher/device/lights/BoyueS62RootController.kt
@@ -84,4 +84,8 @@ class BoyueS62RootController : LightsInterface {
     override fun getMaxBrightness(): Int {
         return BRIGHTNESS_MAX
     }
+
+    override fun hasStandaloneWarmth(): Boolean {
+        return false
+    }
 }
diff --git a/app/src/main/java/org/koreader/launcher/device/lights/GenericController.kt b/app/src/main/java/org/koreader/launcher/device/lights/GenericController.kt
@@ -79,13 +79,20 @@ class GenericController : LightsInterface {
     override fun getMinWarmth(): Int {
         return 0
     }
+
     override fun getMaxWarmth(): Int {
         return 0
     }
+
     override fun getMinBrightness(): Int {
         return BRIGHTNESS_MIN
     }
+
     override fun getMaxBrightness(): Int {
         return BRIGHTNESS_MAX
     }
+
+    override fun hasStandaloneWarmth(): Boolean {
+        return false
+    }
 }
diff --git a/app/src/main/java/org/koreader/launcher/device/lights/OnyxC67Controller.kt b/app/src/main/java/org/koreader/launcher/device/lights/OnyxC67Controller.kt
@@ -60,13 +60,20 @@ class OnyxC67Controller : LightsInterface {
     override fun getMinWarmth(): Int {
         return 0
     }
+
     override fun getMaxWarmth(): Int {
         return 0
     }
+
     override fun getMinBrightness(): Int {
         return BRIGHTNESS_MIN
     }
+
     override fun getMaxBrightness(): Int {
         return BRIGHTNESS_MAX
     }
+
+    override fun hasStandaloneWarmth(): Boolean {
+        return false
+    }
 }
diff --git a/app/src/main/java/org/koreader/launcher/device/lights/OnyxColorController.kt b/app/src/main/java/org/koreader/launcher/device/lights/OnyxColorController.kt
@@ -67,13 +67,20 @@ class OnyxColorController : LightsInterface {
     override fun getMinWarmth(): Int {
         return 0
     }
+
     override fun getMaxWarmth(): Int {
         return 0
     }
+
     override fun getMinBrightness(): Int {
         return BRIGHTNESS_MIN
     }
+
     override fun getMaxBrightness(): Int {
         return BRIGHTNESS_MAX
     }
+
+    override fun hasStandaloneWarmth(): Boolean {
+        return false
+    }
 }
diff --git a/app/src/main/java/org/koreader/launcher/device/lights/OnyxSdkLightsController.kt b/app/src/main/java/org/koreader/launcher/device/lights/OnyxSdkLightsController.kt
@@ -76,6 +76,10 @@ class OnyxSdkLightsController : LightsInterface {
     override fun enableFrontlightSwitch(activity: Activity): Int {
         return 1
     }
+
+    override fun hasStandaloneWarmth(): Boolean {
+        return false
+    }
 }
 
 object FrontLight {

diff --git a/app/src/main/java/org/koreader/launcher/device/lights/OnyxWarmthController.kt b/app/src/main/java/org/koreader/launcher/device/lights/OnyxWarmthController.kt
@@ -79,4 +79,8 @@ class OnyxWarmthController : LightsInterface {
     override fun enableFrontlightSwitch(activity: Activity): Int {
         return 1
     }
+
+    override fun hasStandaloneWarmth(): Boolean {
+        return true
+    }
 }
diff --git a/app/src/main/java/org/koreader/launcher/device/lights/TolinoNtxController.kt b/app/src/main/java/org/koreader/launcher/device/lights/TolinoNtxController.kt
@@ -107,4 +107,8 @@ class TolinoNtxController : Ioctl(), LightsInterface {
     override fun getMaxBrightness(): Int {
         return BRIGHTNESS_MAX
     }
+
+    override fun hasStandaloneWarmth(): Boolean {
+        return false
+    }
 }
diff --git a/app/src/main/java/org/koreader/launcher/device/lights/TolinoRootController.kt b/app/src/main/java/org/koreader/launcher/device/lights/TolinoRootController.kt
@@ -151,4 +151,8 @@ class TolinoRootController : LightsInterface {
     override fun getMaxBrightness(): Int {
         return BRIGHTNESS_MAX
     }
+
+    override fun hasStandaloneWarmth(): Boolean {
+        return false
+    }
 }
diff --git a/assets/android.lua b/assets/android.lua
@@ -2158,6 +2158,16 @@ local function run(android_app_state)
         end)
     end
 
+    android.hasStandaloneWarmth = function()
+        return JNI:context(android.app.activity.vm, function(jni)
+            return jni:callBooleanMethod(
+                android.app.activity.clazz,
+                "hasStandaloneWarmth",
+                "()Z"
+            )
+        end)
+    end
+
     android.hasNativeRotation = function()
         return JNI:context(android.app.activity.vm, function(jni)
             return jni:callBooleanMethod(