diff --git a/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/BrightDisplayActivity.kt b/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/BrightDisplayActivity.kt index 6491d33..d31f1f8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/BrightDisplayActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/BrightDisplayActivity.kt @@ -11,7 +11,7 @@ import com.simplemobiletools.flashlight.databinding.ActivityBrightDisplayBinding import com.simplemobiletools.flashlight.extensions.config class BrightDisplayActivity : SimpleActivity() { - private lateinit var binding: ActivityBrightDisplayBinding + private val binding by lazy(LazyThreadSafetyMode.NONE) { ActivityBrightDisplayBinding.inflate(layoutInflater) } override fun onCreate(savedInstanceState: Bundle?) { window.addFlags( @@ -23,7 +23,6 @@ class BrightDisplayActivity : SimpleActivity() { useDynamicTheme = false super.onCreate(savedInstanceState) - binding = ActivityBrightDisplayBinding.inflate(layoutInflater) setContentView(binding.root) supportActionBar?.hide() setBackgroundColor(config.brightDisplayColor) diff --git a/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/MainActivity.kt index f297822..6310283 100644 --- a/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/MainActivity.kt @@ -28,12 +28,15 @@ import org.greenrobot.eventbus.Subscribe import java.util.* class MainActivity : SimpleActivity() { - private val MAX_STROBO_DELAY = 2000L - private val MIN_STROBO_DELAY = 10L - private val FLASHLIGHT_STATE = "flashlight_state" - private val STROBOSCOPE_STATE = "stroboscope_state" + companion object { + private const val MAX_STROBO_DELAY = 2000L + private const val MIN_STROBO_DELAY = 10L + private const val FLASHLIGHT_STATE = "flashlight_state" + private const val STROBOSCOPE_STATE = "stroboscope_state" + } + + private val binding by lazy(LazyThreadSafetyMode.NONE) { ActivityMainBinding.inflate(layoutInflater) } - private lateinit var binding: ActivityMainBinding private var mBus: EventBus? = null private var mCameraImpl: MyCameraImpl? = null private var mIsFlashlightOn = false @@ -42,7 +45,6 @@ class MainActivity : SimpleActivity() { override fun onCreate(savedInstanceState: Bundle?) { isMaterialActivity = true super.onCreate(savedInstanceState) - binding = ActivityMainBinding.inflate(layoutInflater) setContentView(binding.root) appLaunched(BuildConfig.APPLICATION_ID) setupOptionsMenu() diff --git a/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/SettingsActivity.kt index b5d7017..e46c15f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/SettingsActivity.kt @@ -12,12 +12,11 @@ import java.util.Locale import kotlin.system.exitProcess class SettingsActivity : SimpleActivity() { - private lateinit var binding: ActivitySettingsBinding + private val binding by lazy(LazyThreadSafetyMode.NONE) { ActivitySettingsBinding.inflate(layoutInflater) } override fun onCreate(savedInstanceState: Bundle?) { isMaterialActivity = true super.onCreate(savedInstanceState) - binding = ActivitySettingsBinding.inflate(layoutInflater) setContentView(binding.root) binding.apply { diff --git a/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/WidgetBrightDisplayConfigureActivity.kt b/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/WidgetBrightDisplayConfigureActivity.kt index 8968cbd..f64a499 100644 --- a/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/WidgetBrightDisplayConfigureActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/WidgetBrightDisplayConfigureActivity.kt @@ -17,7 +17,8 @@ import com.simplemobiletools.flashlight.extensions.config import com.simplemobiletools.flashlight.helpers.MyWidgetBrightDisplayProvider class WidgetBrightDisplayConfigureActivity : SimpleActivity() { - private lateinit var binding: WidgetBrightDisplayConfigBinding + private val binding by lazy(LazyThreadSafetyMode.NONE) { WidgetBrightDisplayConfigBinding.inflate(layoutInflater) } + private var mWidgetAlpha = 0f private var mWidgetId = 0 private var mWidgetColor = 0 @@ -27,7 +28,6 @@ class WidgetBrightDisplayConfigureActivity : SimpleActivity() { public override fun onCreate(savedInstanceState: Bundle?) { useDynamicTheme = false super.onCreate(savedInstanceState) - binding = WidgetBrightDisplayConfigBinding.inflate(layoutInflater) setResult(Activity.RESULT_CANCELED) setContentView(binding.root) initVariables() diff --git a/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/WidgetTorchConfigureActivity.kt b/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/WidgetTorchConfigureActivity.kt index 624b2bd..5e50ceb 100644 --- a/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/WidgetTorchConfigureActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/WidgetTorchConfigureActivity.kt @@ -18,7 +18,8 @@ import com.simplemobiletools.flashlight.extensions.updateBrightDisplayWidget import com.simplemobiletools.flashlight.helpers.MyWidgetTorchProvider class WidgetTorchConfigureActivity : SimpleActivity() { - private lateinit var binding: WidgetTorchConfigBinding + private val binding by lazy(LazyThreadSafetyMode.NONE) { WidgetTorchConfigBinding.inflate(layoutInflater) } + private var mWidgetAlpha = 0f private var mWidgetId = 0 private var mWidgetColor = 0 @@ -28,7 +29,6 @@ class WidgetTorchConfigureActivity : SimpleActivity() { public override fun onCreate(savedInstanceState: Bundle?) { useDynamicTheme = false super.onCreate(savedInstanceState) - binding = WidgetTorchConfigBinding.inflate(layoutInflater) setResult(Activity.RESULT_CANCELED) setContentView(binding.root) initVariables()