Skip to content

Commit 8f1cbec

Browse files
committed
make activity inflating consistent across simple apps
1 parent 6747a9a commit 8f1cbec

File tree

5 files changed

+14
-14
lines changed

5 files changed

+14
-14
lines changed

app/src/main/kotlin/com/simplemobiletools/flashlight/activities/BrightDisplayActivity.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import com.simplemobiletools.flashlight.databinding.ActivityBrightDisplayBinding
1111
import com.simplemobiletools.flashlight.extensions.config
1212

1313
class BrightDisplayActivity : SimpleActivity() {
14-
private lateinit var binding: ActivityBrightDisplayBinding
14+
private val binding by lazy(LazyThreadSafetyMode.NONE) { ActivityBrightDisplayBinding.inflate(layoutInflater) }
1515

1616
override fun onCreate(savedInstanceState: Bundle?) {
1717
window.addFlags(
@@ -23,7 +23,6 @@ class BrightDisplayActivity : SimpleActivity() {
2323

2424
useDynamicTheme = false
2525
super.onCreate(savedInstanceState)
26-
binding = ActivityBrightDisplayBinding.inflate(layoutInflater)
2726
setContentView(binding.root)
2827
supportActionBar?.hide()
2928
setBackgroundColor(config.brightDisplayColor)

app/src/main/kotlin/com/simplemobiletools/flashlight/activities/MainActivity.kt

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,15 @@ import org.greenrobot.eventbus.Subscribe
2828
import java.util.*
2929

3030
class MainActivity : SimpleActivity() {
31-
private val MAX_STROBO_DELAY = 2000L
32-
private val MIN_STROBO_DELAY = 10L
33-
private val FLASHLIGHT_STATE = "flashlight_state"
34-
private val STROBOSCOPE_STATE = "stroboscope_state"
31+
companion object {
32+
private const val MAX_STROBO_DELAY = 2000L
33+
private const val MIN_STROBO_DELAY = 10L
34+
private const val FLASHLIGHT_STATE = "flashlight_state"
35+
private const val STROBOSCOPE_STATE = "stroboscope_state"
36+
}
37+
38+
private val binding by lazy(LazyThreadSafetyMode.NONE) { ActivityMainBinding.inflate(layoutInflater) }
3539

36-
private lateinit var binding: ActivityMainBinding
3740
private var mBus: EventBus? = null
3841
private var mCameraImpl: MyCameraImpl? = null
3942
private var mIsFlashlightOn = false
@@ -42,7 +45,6 @@ class MainActivity : SimpleActivity() {
4245
override fun onCreate(savedInstanceState: Bundle?) {
4346
isMaterialActivity = true
4447
super.onCreate(savedInstanceState)
45-
binding = ActivityMainBinding.inflate(layoutInflater)
4648
setContentView(binding.root)
4749
appLaunched(BuildConfig.APPLICATION_ID)
4850
setupOptionsMenu()

app/src/main/kotlin/com/simplemobiletools/flashlight/activities/SettingsActivity.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,11 @@ import java.util.Locale
1212
import kotlin.system.exitProcess
1313

1414
class SettingsActivity : SimpleActivity() {
15-
private lateinit var binding: ActivitySettingsBinding
15+
private val binding by lazy(LazyThreadSafetyMode.NONE) { ActivitySettingsBinding.inflate(layoutInflater) }
1616

1717
override fun onCreate(savedInstanceState: Bundle?) {
1818
isMaterialActivity = true
1919
super.onCreate(savedInstanceState)
20-
binding = ActivitySettingsBinding.inflate(layoutInflater)
2120
setContentView(binding.root)
2221

2322
binding.apply {

app/src/main/kotlin/com/simplemobiletools/flashlight/activities/WidgetBrightDisplayConfigureActivity.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ import com.simplemobiletools.flashlight.extensions.config
1717
import com.simplemobiletools.flashlight.helpers.MyWidgetBrightDisplayProvider
1818

1919
class WidgetBrightDisplayConfigureActivity : SimpleActivity() {
20-
private lateinit var binding: WidgetBrightDisplayConfigBinding
20+
private val binding by lazy(LazyThreadSafetyMode.NONE) { WidgetBrightDisplayConfigBinding.inflate(layoutInflater) }
21+
2122
private var mWidgetAlpha = 0f
2223
private var mWidgetId = 0
2324
private var mWidgetColor = 0
@@ -27,7 +28,6 @@ class WidgetBrightDisplayConfigureActivity : SimpleActivity() {
2728
public override fun onCreate(savedInstanceState: Bundle?) {
2829
useDynamicTheme = false
2930
super.onCreate(savedInstanceState)
30-
binding = WidgetBrightDisplayConfigBinding.inflate(layoutInflater)
3131
setResult(Activity.RESULT_CANCELED)
3232
setContentView(binding.root)
3333
initVariables()

app/src/main/kotlin/com/simplemobiletools/flashlight/activities/WidgetTorchConfigureActivity.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ import com.simplemobiletools.flashlight.extensions.updateBrightDisplayWidget
1818
import com.simplemobiletools.flashlight.helpers.MyWidgetTorchProvider
1919

2020
class WidgetTorchConfigureActivity : SimpleActivity() {
21-
private lateinit var binding: WidgetTorchConfigBinding
21+
private val binding by lazy(LazyThreadSafetyMode.NONE) { WidgetTorchConfigBinding.inflate(layoutInflater) }
22+
2223
private var mWidgetAlpha = 0f
2324
private var mWidgetId = 0
2425
private var mWidgetColor = 0
@@ -28,7 +29,6 @@ class WidgetTorchConfigureActivity : SimpleActivity() {
2829
public override fun onCreate(savedInstanceState: Bundle?) {
2930
useDynamicTheme = false
3031
super.onCreate(savedInstanceState)
31-
binding = WidgetTorchConfigBinding.inflate(layoutInflater)
3232
setResult(Activity.RESULT_CANCELED)
3333
setContentView(binding.root)
3434
initVariables()

0 commit comments

Comments
 (0)