Skip to content

Updating KtLint and running it #241

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: kpg/change-app-name
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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


Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ import androidx.core.content.ContextCompat
import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
import androidx.core.view.WindowCompat
import androidx.lifecycle.lifecycleScope
import com.droidcon.app.R
import co.touchlab.droidcon.application.service.NotificationSchedulingService
import co.touchlab.droidcon.domain.service.AnalyticsService
import co.touchlab.droidcon.service.AndroidNotificationService
import co.touchlab.droidcon.ui.theme.Colors
import co.touchlab.droidcon.ui.util.MainView
import co.touchlab.droidcon.util.NavigationController
import co.touchlab.droidcon.viewmodel.WaitForLoadedContextModel
import com.droidcon.app.R
import kotlinx.coroutines.awaitCancellation
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
Expand Down Expand Up @@ -154,7 +154,7 @@ class MainActivity :
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
if (ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS) == PackageManager.PERMISSION_GRANTED) {
// Permissions already granted, nothing to do
} else if (/* DISABLED: */ false && shouldShowRequestPermissionRationale(Manifest.permission.POST_NOTIFICATIONS)) {
} else if (false && shouldShowRequestPermissionRationale(Manifest.permission.POST_NOTIFICATIONS)) {
// 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.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package co.touchlab.droidcon.android.util

import android.content.Context
import com.droidcon.app.R
import co.touchlab.droidcon.application.service.NotificationSchedulingService
import com.droidcon.app.R

class NotificationLocalizedStringFactory(private val context: Context) : NotificationSchedulingService.LocalizedStringFactory {

Expand Down
2 changes: 1 addition & 1 deletion android/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
<string name="notification_feedback_title">Feedback Time!</string>
<string name="notification_feedback_body">Your Feedback is Requested.</string>

<string name="droidcon_title">Droidcon London 2024</string>
<string name="droidcon_title">Droidcon</string>

</resources>
14 changes: 5 additions & 9 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand All @@ -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/") }
}
}
}

Expand Down
10 changes: 6 additions & 4 deletions ios/Droidcon/Droidcon.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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;
Expand All @@ -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",
Expand All @@ -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;
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

6 changes: 0 additions & 6 deletions ios/Droidcon/Droidcon/Assets.xcassets/Attending/Contents.json

This file was deleted.

Loading
Loading