Skip to content

Commit 0eeee95

Browse files
committed
Refactor OnyxSdkLightsController to improve handling of brightness types and streamline SDK bridging
Move ONYX_GO7 to use the SDK
1 parent 75edae7 commit 0eeee95

2 files changed

Lines changed: 261 additions & 104 deletions

File tree

app/src/main/java/org/koreader/launcher/device/LightsFactory.kt

Lines changed: 29 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ object LightsFactory {
1010
get() {
1111
return when (DeviceInfo.ID) {
1212
DeviceInfo.Id.BOYUE_S62,
13-
-> {
13+
-> {
1414
logController("Boyue S62")
1515
BoyueS62RootController()
1616
}
17+
1718
DeviceInfo.Id.ONYX_GALILEO2,
1819
DeviceInfo.Id.ONYX_GO_COLOR7,
1920
DeviceInfo.Id.ONYX_GO6,
20-
DeviceInfo.Id.ONYX_GO7,
2121
DeviceInfo.Id.ONYX_GO7GEN2,
2222
DeviceInfo.Id.ONYX_NOTE_AIR_3C,
2323
DeviceInfo.Id.ONYX_NOTE_AIR_4C,
@@ -31,24 +31,27 @@ object LightsFactory {
3131
DeviceInfo.Id.ONYX_POKE6,
3232
DeviceInfo.Id.ONYX_TAB_ULTRA_C,
3333
DeviceInfo.Id.ONYX_TAB_ULTRA_C_PRO,
34-
-> {
34+
-> {
3535
logController("Onyx Adb")
3636
OnyxAdbLightsController()
3737
}
38+
3839
DeviceInfo.Id.ONYX_C67,
3940
DeviceInfo.Id.ONYX_MAGICBOOK,
4041
DeviceInfo.Id.ONYX_MONTECRISTO3,
41-
-> {
42+
-> {
4243
logController("Onyx C67")
4344
OnyxC67Controller()
4445
}
46+
4547
DeviceInfo.Id.ONYX_JDREAD,
4648
DeviceInfo.Id.ONYX_NOVA3_COLOR,
4749
DeviceInfo.Id.TAGUS_GEA,
48-
-> {
50+
-> {
4951
logController("Onyx Color")
5052
OnyxColorController()
5153
}
54+
5255
DeviceInfo.Id.ONYX_DARWIN7,
5356
DeviceInfo.Id.ONYX_EDISON,
5457
DeviceInfo.Id.ONYX_FAUST3,
@@ -63,10 +66,11 @@ object LightsFactory {
6366
DeviceInfo.Id.ONYX_POKE2,
6467
DeviceInfo.Id.ONYX_POKE3,
6568
DeviceInfo.Id.ONYX_POKE_PRO,
66-
-> {
69+
-> {
6770
logController("Onyx/Qualcomm")
6871
OnyxWarmthController()
6972
}
73+
7074
DeviceInfo.Id.ONYX_DARWIN5,
7175
DeviceInfo.Id.ONYX_DARWIN9,
7276
DeviceInfo.Id.ONYX_LEAF2,
@@ -82,10 +86,12 @@ object LightsFactory {
8286
DeviceInfo.Id.ONYX_POKE4LITE,
8387
DeviceInfo.Id.ONYX_TAB_ULTRA,
8488
DeviceInfo.Id.STORYTEL_READER2,
85-
-> {
89+
DeviceInfo.Id.ONYX_GO7,
90+
-> {
8691
logController("Onyx/Sdk")
8792
OnyxSdkLightsController()
8893
}
94+
8995
DeviceInfo.Id.CREMA_0710C,
9096
DeviceInfo.Id.CREMA_CARTA_G,
9197
DeviceInfo.Id.MEEBOOK_P6,
@@ -95,35 +101,40 @@ object LightsFactory {
95101
DeviceInfo.Id.TOLINO_SHINE3,
96102
DeviceInfo.Id.TOLINO_VISION4,
97103
DeviceInfo.Id.TOLINO_VISION5,
98-
-> {
104+
-> {
99105
logController("TolinoNTX")
100106
TolinoNtxController()
101107
}
108+
102109
DeviceInfo.Id.CREMA_0660L,
103110
DeviceInfo.Id.HISENSE_TOUCH_LITE,
104111
DeviceInfo.Id.TOLINO_PAGE2,
105-
-> {
112+
-> {
106113
logController("TolinoNTXNoWarmth")
107114
TolinoNtxNoWarmthController()
108115
}
116+
109117
DeviceInfo.Id.NOOK_GL4,
110118
DeviceInfo.Id.TOLINO_EPOS2,
111-
-> {
119+
-> {
112120
logController("TolinoRoot")
113121
TolinoRootController()
114122
}
123+
115124
DeviceInfo.Id.TOLINO_EPOS3,
116125
DeviceInfo.Id.TOLINO_VISION6,
117126
DeviceInfo.Id.TOLINO_SHINE4,
118-
-> {
127+
-> {
119128
logController("TolinoB300Controller")
120129
TolinoB300Controller()
121130
}
131+
122132
DeviceInfo.Id.ONYX_PALMA2_PRO,
123-
-> {
133+
-> {
124134
logController("OnyxPalma2Pro")
125135
OnyxPalma2ProController()
126136
}
137+
127138
else -> {
128139
logController("Generic")
129140
GenericController()
@@ -132,7 +143,11 @@ object LightsFactory {
132143
}
133144

134145
private fun logController(name: String?) {
135-
Log.i(TAG, String.format(Locale.US,
136-
"Using %s driver", name))
146+
Log.i(
147+
TAG, String.format(
148+
Locale.US,
149+
"Using %s driver", name
150+
)
151+
)
137152
}
138153
}

0 commit comments

Comments
 (0)