Move preference window handling and Bundle access to Kotlin

KotlinLogos/KotlinLogos/KotlinLogos.swift

@@ -3,39 +3,28 @@ import Cocoa
 import KotlinLogo
 
 class KotlinLogosView : ScreenSaverView {
-
  let kotlinScreenSaverView = KotlinScreenSaverViewKt.create()
 
  override init?(frame: NSRect, isPreview: Bool) {
  super.init(frame: frame, isPreview: isPreview)
- let b = Bundle(for: type(of: self))
- kotlinScreenSaverView.doInit(screenSaverView: self, isPreview: isPreview, bundle: b)
+ kotlinScreenSaverView.doInit(screenSaverView: self, isPreview: isPreview)
  }
-
- @available(*, unavailable)
+
  required init?(coder decoder: NSCoder) {
  fatalError("init(coder:) has not been implemented")
  }
- 
+
  override func draw(_ rect: NSRect) {
  super.draw(rect)
-
- var r = rect
- kotlinScreenSaverView.draw(rect: &r)
+ var mutableRect = rect
+ kotlinScreenSaverView.draw(rect: &mutableRect)
  }
- 
+
  override func animateOneFrame() {
  super.animateOneFrame()
  kotlinScreenSaverView.animateOneFrame()
  }
 
- lazy var sheetController: NSWindowController = ConfigKt.prefController()
-
- override var hasConfigureSheet: Bool {
- return true
- }
-
- override var configureSheet: NSWindow? {
- return sheetController.window
- }
+ override var hasConfigureSheet: Bool { kotlinScreenSaverView.configureSheet != nil }
+ override var configureSheet: NSWindow? { kotlinScreenSaverView.configureSheet }
 }

src/nativeMain/kotlin/KotlinScreenSaverView.kt

@@ -2,6 +2,7 @@
 
 import kotlinx.cinterop.CPointer
 import kotlinx.cinterop.ExperimentalForeignApi
+import platform.AppKit.NSWindow
 import platform.Foundation.NSBundle
 import platform.Foundation.NSRect
 import platform.ScreenSaver.ScreenSaverView
@@ -18,12 +19,14 @@ abstract class KotlinScreenSaverView {
  protected var isPreview = false
  private set
 
- open fun init(screenSaverView: ScreenSaverView, isPreview: Boolean, bundle: NSBundle) {
+ open fun init(screenSaverView: ScreenSaverView, isPreview: Boolean) {
  this.view = screenSaverView
- this.bundle = bundle
+ this.bundle = NSBundle.bundleWithIdentifier("co.zsmb.KotlinLogos")!!
  this.isPreview = isPreview
  }
 
  abstract fun draw(rect: CPointer<NSRect>)
  abstract fun animateOneFrame()
+
+ open val configureSheet: NSWindow? = null
 }

src/nativeMain/kotlin/LogoScreenSaverView.kt

@@ -1,25 +1,30 @@
 @file:OptIn(ExperimentalForeignApi::class)
 
+import config.KotlinLogosPrefController
 import config.Preferences
 import kotlinx.cinterop.CPointer
 import kotlinx.cinterop.ExperimentalForeignApi
-import platform.Foundation.NSBundle
+import platform.AppKit.NSWindow
 import platform.Foundation.NSNotificationCenter
 import platform.Foundation.NSRect
 import platform.Foundation.NSUserDefaultsDidChangeNotification
 import platform.ScreenSaver.ScreenSaverView
 import util.Debouncer
 
 class LogoScreenSaverView : KotlinScreenSaverView() {
- private var logos: List<BouncingLogo> = emptyList()
+ private val preferencesController by lazy { KotlinLogosPrefController() }
+ override val configureSheet: NSWindow?
+ get() = preferencesController.window
 
- override fun init(screenSaverView: ScreenSaverView, isPreview: Boolean, bundle: NSBundle) {
- super.init(screenSaverView, isPreview, bundle)
+ override fun init(screenSaverView: ScreenSaverView, isPreview: Boolean) {
+ super.init(screenSaverView, isPreview)
  screenSaverView.animationTimeInterval = 1 / 60.0
  setupUserDefaultsObserver()
  initLogos()
  }
 
+ private var logos: List<BouncingLogo> = emptyList()
+
  override fun draw(rect: CPointer<NSRect>) {
  logos.forEach(BouncingLogo::draw)
  }
@@ -29,6 +34,11 @@ class LogoScreenSaverView : KotlinScreenSaverView() {
  view.setNeedsDisplayInRect(view.frame)
  }
 
+ private fun initLogos() {
+ logos.forEach(BouncingLogo::dispose)
+ logos = List(Preferences.LOGO_COUNT) { BouncingLogo(view, bundle, imageSets[Preferences.LOGO_SET].images()) }
+ }
+
  private val debouncer = Debouncer(delayMs = 500)
 
  private fun setupUserDefaultsObserver() {
@@ -37,10 +47,4 @@ class LogoScreenSaverView : KotlinScreenSaverView() {
  debouncer.execute { initLogos() }
  }
  }
-
- private fun initLogos() {
- logos.forEach(BouncingLogo::dispose)
- logos = List(Preferences.LOGO_COUNT) { BouncingLogo(view, bundle, imageSets[Preferences.LOGO_SET].images()) }
- }
 }
-

src/nativeMain/kotlin/config/Config.kt

@@ -234,7 +234,3 @@ class KotlinLogosPrefController : NSWindowController, NSWindowDelegateProtocol {
  window?.sheetParent?.endSheet(window!!)
  }
 }
-
-fun prefController(): NSWindowController {
- return KotlinLogosPrefController()
-}