Updating KtLint and running it (#241)

* Updating KtLint call

* Save icon

* Change app name and icon

* Update AboutViewModel.kt

* running formatting

* Adding Universal Resources (#242)

* removing unused colors and adding default colors

* Update Info.plist

---------

Co-authored-by: Kevin Galligan <[email protected]>

Author: KevinSchildhorn

.editorconfig

@@ -11,7 +11,6 @@ ij_kotlin_line_break_after_multiline_when_entry = true
 indent_size = 4
 indent_style = space
 insert_final_newline = true
-parameter-list-wrapping = true
 ktlint_argument_list_wrapping_ignore_when_parameter_count_greater_or_equal_than = 8
 ktlint_chain_method_rule_force_multiline_when_chain_operator_count_greater_or_equal_than = 4
 ktlint_code_style = android_studio
@@ -20,5 +19,6 @@ ktlint_function_naming_ignore_when_annotated_with = Composable
 ktlint_function_signature_body_expression_wrapping = default
 ktlint_ignore_back_ticked_identifier = false
 max_line_length = 140
+parameter-list-wrapping = true
 
 

android/src/main/java/co/touchlab/droidcon/android/MainActivity.kt

@@ -155,7 +155,6 @@ class MainActivity :
             if (ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS) == PackageManager.PERMISSION_GRANTED) {
                 // Permissions already granted, nothing to do
             } else if (false && shouldShowRequestPermissionRationale(Manifest.permission.POST_NOTIFICATIONS)) {
-                /* DISABLED: */
                 // TODO: Not implemented yet: display an educational UI explaining to the user the features that will be enabled
                 //       by them granting the POST_NOTIFICATION permission. This UI should provide the user
                 //       "OK" and "No thanks" buttons. If the user selects "OK," directly request the permission.

build.gradle.kts

@@ -17,15 +17,6 @@ plugins {
 subprojects {
     apply(plugin = rootProject.libs.plugins.ktlint.get().pluginId)
 
-    ktlint {
-        version.set("0.37.2")
-        enableExperimentalRules.set(true)
-        verbose.set(true)
-        filter {
-            exclude { it.file.path.contains("build/") }
-        }
-    }
-
     afterEvaluate {
         tasks.named("check") {
             dependsOn(tasks.getByName("ktlintCheck"))
@@ -39,6 +30,11 @@ subprojects {
     }
     configure<org.jlleitschuh.gradle.ktlint.KtlintExtension> {
         version.set("1.4.0")
+        enableExperimentalRules.set(true)
+        verbose.set(true)
+        filter {
+            exclude { it.file.path.contains("build/") }
+        }
     }
 }
 

ios/Droidcon/Droidcon.xcodeproj/project.pbxproj

@@ -396,13 +396,14 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 60107;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				DEVELOPMENT_TEAM = 8UD86646U9;
+				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(SRCROOT)/../build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/Droidcon/Info.plist";
+				INFOPLIST_KEY_CFBundleDisplayName = Droidcon;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -416,7 +417,7 @@
 					"\"DroidconKit\"",
 					"-lsqlite3",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = co.touchlab.droidcon.ios.london;
+				PRODUCT_BUNDLE_IDENTIFIER = com.droidcon.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_VERSION = 5.0;
@@ -432,13 +433,14 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 60107;
-				DEVELOPMENT_TEAM = 8UD86646U9;
+				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(SRCROOT)/../build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/Droidcon/Info.plist";
+				INFOPLIST_KEY_CFBundleDisplayName = Droidcon;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -452,7 +454,7 @@
 					"\"DroidconKit\"",
 					"-lsqlite3",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = co.touchlab.droidcon.ios.london;
+				PRODUCT_BUNDLE_IDENTIFIER = com.droidcon.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_VERSION = 5.0;