fix(macOS): style and add tests

Kaiteki-Fedi · May 22, 2023 · 99245dc · 99245dc
1 parent 4d776b1
commit 99245dc
Show file tree

Hide file tree

Showing 9 changed files with 213 additions and 33 deletions.
diff --git a/src/kaiteki/.metadata b/src/kaiteki/.metadata
@@ -4,20 +4,20 @@
 # This file should be version controlled.
 
 version:
-  revision: 6928314d505d2bb4777be05e45d7808a5aa91d2a
-  channel: stable
+  revision: 74e4b092e5212ebf8292dde2a48d3da960c0920b
+  channel: beta
 
 project_type: app
 
 # Tracks metadata for the flutter migrate command
 migration:
   platforms:
     - platform: root
-      create_revision: 6928314d505d2bb4777be05e45d7808a5aa91d2a
-      base_revision: 6928314d505d2bb4777be05e45d7808a5aa91d2a
-    - platform: linux
-      create_revision: 6928314d505d2bb4777be05e45d7808a5aa91d2a
-      base_revision: 6928314d505d2bb4777be05e45d7808a5aa91d2a
+      create_revision: 74e4b092e5212ebf8292dde2a48d3da960c0920b
+      base_revision: 74e4b092e5212ebf8292dde2a48d3da960c0920b
+    - platform: macos
+      create_revision: 74e4b092e5212ebf8292dde2a48d3da960c0920b
+      base_revision: 74e4b092e5212ebf8292dde2a48d3da960c0920b
 
   # User provided section
 

diff --git a/src/kaiteki/lib/ui/instance_vetting/bottom_sheet.dart b/src/kaiteki/lib/ui/instance_vetting/bottom_sheet.dart
@@ -251,7 +251,9 @@ class _InstanceVettingBottomSheetState
               alignment: Alignment.topLeft,
               child: hasDescription
                   ? Text.rich(
-                    TextRenderer.fromContext(context, ref).render(parseText(description, const {HtmlTextParser()}),),
+                      TextRenderer.fromContext(context, ref).render(
+                        parseText(description, const {HtmlTextParser()}),
+                      ),
                       style: Theme.of(context).textTheme.bodyMedium,
                     )
                   : Text(

diff --git a/src/kaiteki/macos/Podfile b/src/kaiteki/macos/Podfile
@@ -31,6 +31,9 @@ target 'Runner' do
   use_modular_headers!
 
   flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__))
+  target 'RunnerTests' do
+    inherit! :search_paths
+  end
 end
 
 post_install do |installer|

diff --git a/src/kaiteki/macos/Podfile.lock b/src/kaiteki/macos/Podfile.lock
@@ -1,6 +1,4 @@
 PODS:
-  - device_info_plus (0.0.1):
-    - FlutterMacOS
   - dynamic_color (0.0.2):
     - FlutterMacOS
   - flutter_local_notifications (0.0.1):
@@ -20,7 +18,6 @@ PODS:
     - FlutterMacOS
 
 DEPENDENCIES:
-  - device_info_plus (from `Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos`)
   - dynamic_color (from `Flutter/ephemeral/.symlinks/plugins/dynamic_color/macos`)
   - flutter_local_notifications (from `Flutter/ephemeral/.symlinks/plugins/flutter_local_notifications/macos`)
   - FlutterMacOS (from `Flutter/ephemeral`)
@@ -31,8 +28,6 @@ DEPENDENCIES:
   - wakelock_macos (from `Flutter/ephemeral/.symlinks/plugins/wakelock_macos/macos`)
 
 EXTERNAL SOURCES:
-  device_info_plus:
-    :path: Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos
   dynamic_color:
     :path: Flutter/ephemeral/.symlinks/plugins/dynamic_color/macos
   flutter_local_notifications:
@@ -51,7 +46,6 @@ EXTERNAL SOURCES:
     :path: Flutter/ephemeral/.symlinks/plugins/wakelock_macos/macos
 
 SPEC CHECKSUMS:
-  device_info_plus: 5401765fde0b8d062a2f8eb65510fb17e77cf07f
   dynamic_color: 2eaa27267de1ca20d879fbd6e01259773fb1670f
   flutter_local_notifications: 3805ca215b2fb7f397d78b66db91f6a747af52e4
   FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
@@ -61,6 +55,6 @@ SPEC CHECKSUMS:
   url_launcher_macos: 5335912b679c073563f29d89d33d10d459f95451
   wakelock_macos: bc3f2a9bd8d2e6c89fee1e1822e7ddac3bd004a9
 
-PODFILE CHECKSUM: 353c8bcc5d5b0994e508d035b5431cfe18c1dea7
+PODFILE CHECKSUM: 236401fc2c932af29a9fcf0e97baeeb2d750d367
 
 COCOAPODS: 1.12.1
diff --git a/src/kaiteki/macos/Runner.xcodeproj/project.pbxproj b/src/kaiteki/macos/Runner.xcodeproj/project.pbxproj
diff --git a/src/kaiteki/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/src/kaiteki/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -37,6 +37,17 @@
          </BuildableReference>
       </MacroExpansion>
       <Testables>
+         <TestableReference
+            skipped = "NO"
+            parallelizable = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "331C80D4294CF70F00263BE5"
+               BuildableName = "RunnerTests.xctest"
+               BlueprintName = "RunnerTests"
+               ReferencedContainer = "container:Runner.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction

diff --git a/src/kaiteki/macos/Runner/Configs/AppInfo.xcconfig b/src/kaiteki/macos/Runner/Configs/AppInfo.xcconfig
@@ -11,4 +11,4 @@ PRODUCT_NAME = kaiteki
 PRODUCT_BUNDLE_IDENTIFIER = moe.craftplacer.kaiteki
 
 // The copyright displayed in application information
-PRODUCT_COPYRIGHT = Copyright © 2022 moe.craftplacer. All rights reserved.
+PRODUCT_COPYRIGHT = Copyright © 2023 moe.craftplacer. All rights reserved.
diff --git a/src/kaiteki/macos/Runner/MainFlutterWindow.swift b/src/kaiteki/macos/Runner/MainFlutterWindow.swift
@@ -3,7 +3,7 @@ import FlutterMacOS
 
 class MainFlutterWindow: NSWindow {
   override func awakeFromNib() {
-    let flutterViewController = FlutterViewController.init()
+    let flutterViewController = FlutterViewController()
     let windowFrame = self.frame
     self.contentViewController = flutterViewController
     self.setFrame(windowFrame, display: true)

diff --git a/src/kaiteki/macos/RunnerTests/RunnerTests.swift b/src/kaiteki/macos/RunnerTests/RunnerTests.swift
@@ -0,0 +1,12 @@
+import FlutterMacOS
+import Cocoa
+import XCTest
+
+class RunnerTests: XCTestCase {
+
+  func testExample() {
+    // If you add code to the Runner application, consider adding tests here.
+    // See https://developer.apple.com/documentation/xctest for more information about using XCTest.
+  }
+
+}