diff --git a/.editorconfig b/.editorconfig index 130cf2e07..8ccc3e578 100644 --- a/.editorconfig +++ b/.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 diff --git a/android/src/main/java/co/touchlab/droidcon/android/MainActivity.kt b/android/src/main/java/co/touchlab/droidcon/android/MainActivity.kt index 201b36f4d..4700295b2 100644 --- a/android/src/main/java/co/touchlab/droidcon/android/MainActivity.kt +++ b/android/src/main/java/co/touchlab/droidcon/android/MainActivity.kt @@ -27,7 +27,6 @@ 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 @@ -35,6 +34,7 @@ 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 @@ -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. diff --git a/android/src/main/java/co/touchlab/droidcon/android/util/NotificationLocalizedStringFactory.kt b/android/src/main/java/co/touchlab/droidcon/android/util/NotificationLocalizedStringFactory.kt index b174df6ff..01df3b826 100644 --- a/android/src/main/java/co/touchlab/droidcon/android/util/NotificationLocalizedStringFactory.kt +++ b/android/src/main/java/co/touchlab/droidcon/android/util/NotificationLocalizedStringFactory.kt @@ -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 { diff --git a/android/src/main/res/values/strings.xml b/android/src/main/res/values/strings.xml index 4cb1278a2..3e3555f07 100644 --- a/android/src/main/res/values/strings.xml +++ b/android/src/main/res/values/strings.xml @@ -7,6 +7,6 @@ Feedback Time! Your Feedback is Requested. - Droidcon London 2024 + Droidcon diff --git a/build.gradle.kts b/build.gradle.kts index 287ebc655..d03c079bf 100644 --- a/build.gradle.kts +++ b/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 { version.set("1.4.0") + enableExperimentalRules.set(true) + verbose.set(true) + filter { + exclude { it.file.path.contains("build/") } + } } } diff --git a/ios/Droidcon/Droidcon.xcodeproj/project.pbxproj b/ios/Droidcon/Droidcon.xcodeproj/project.pbxproj index a585e7009..159ad0ce6 100644 --- a/ios/Droidcon/Droidcon.xcodeproj/project.pbxproj +++ b/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; diff --git a/ios/Droidcon/Droidcon/Assets.xcassets/Accent.colorset/Contents.json b/ios/Droidcon/Droidcon/Assets.xcassets/Accent.colorset/Contents.json deleted file mode 100644 index 64d204bd5..000000000 --- a/ios/Droidcon/Droidcon/Assets.xcassets/Accent.colorset/Contents.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0xE6", - "green" : "0x14", - "red" : "0x00" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0xE6", - "green" : "0x14", - "red" : "0x00" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/ios/Droidcon/Droidcon/Assets.xcassets/AttendButton.colorset/Contents.json b/ios/Droidcon/Droidcon/Assets.xcassets/AttendButton.colorset/Contents.json deleted file mode 100644 index 64d204bd5..000000000 --- a/ios/Droidcon/Droidcon/Assets.xcassets/AttendButton.colorset/Contents.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0xE6", - "green" : "0x14", - "red" : "0x00" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0xE6", - "green" : "0x14", - "red" : "0x00" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/ios/Droidcon/Droidcon/Assets.xcassets/AttendButton_Foreground.colorset/Contents.json b/ios/Droidcon/Droidcon/Assets.xcassets/AttendButton_Foreground.colorset/Contents.json deleted file mode 100644 index f80ebe64e..000000000 --- a/ios/Droidcon/Droidcon/Assets.xcassets/AttendButton_Foreground.colorset/Contents.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "extended-gray", - "components" : { - "alpha" : "1.000", - "white" : "1.000" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "extended-gray", - "components" : { - "alpha" : "1.000", - "white" : "1.000" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/ios/Droidcon/Droidcon/Assets.xcassets/Attending/AttendingConflict.colorset/Contents.json b/ios/Droidcon/Droidcon/Assets.xcassets/Attending/AttendingConflict.colorset/Contents.json deleted file mode 100644 index e2372e9b5..000000000 --- a/ios/Droidcon/Droidcon/Assets.xcassets/Attending/AttendingConflict.colorset/Contents.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0x2C", - "green" : "0x58", - "red" : "0xF1" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0x2C", - "green" : "0x58", - "red" : "0xF1" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/ios/Droidcon/Droidcon/Assets.xcassets/Attending/AttendingNormal.colorset/Contents.json b/ios/Droidcon/Droidcon/Assets.xcassets/Attending/AttendingNormal.colorset/Contents.json deleted file mode 100644 index f1c581798..000000000 --- a/ios/Droidcon/Droidcon/Assets.xcassets/Attending/AttendingNormal.colorset/Contents.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0xFD", - "green" : "0xD1", - "red" : "0x68" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0xFD", - "green" : "0xD1", - "red" : "0x68" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/ios/Droidcon/Droidcon/Assets.xcassets/Attending/AttendingPast.colorset/Contents.json b/ios/Droidcon/Droidcon/Assets.xcassets/Attending/AttendingPast.colorset/Contents.json deleted file mode 100644 index 8aab17934..000000000 --- a/ios/Droidcon/Droidcon/Assets.xcassets/Attending/AttendingPast.colorset/Contents.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0x66", - "green" : "0x66", - "red" : "0x66" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0xA1", - "green" : "0xA1", - "red" : "0xA1" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/ios/Droidcon/Droidcon/Assets.xcassets/Attending/Contents.json b/ios/Droidcon/Droidcon/Assets.xcassets/Attending/Contents.json deleted file mode 100644 index 73c00596a..000000000 --- a/ios/Droidcon/Droidcon/Assets.xcassets/Attending/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/ios/Droidcon/Droidcon/Assets.xcassets/Divider.colorset/Contents.json b/ios/Droidcon/Droidcon/Assets.xcassets/Divider.colorset/Contents.json deleted file mode 100644 index 0795ae9ab..000000000 --- a/ios/Droidcon/Droidcon/Assets.xcassets/Divider.colorset/Contents.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "platform" : "ios", - "reference" : "systemGray2Color" - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "platform" : "ios", - "reference" : "systemGray2Color" - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/ios/Droidcon/Droidcon/Assets.xcassets/ElevatedBackground.colorset/Contents.json b/ios/Droidcon/Droidcon/Assets.xcassets/ElevatedBackground.colorset/Contents.json deleted file mode 100644 index 9157d7068..000000000 --- a/ios/Droidcon/Droidcon/Assets.xcassets/ElevatedBackground.colorset/Contents.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0xFA", - "green" : "0xFA", - "red" : "0xFA" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "platform" : "ios", - "reference" : "systemGray4Color" - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/ios/Droidcon/Droidcon/Assets.xcassets/ElevatedBackgroundDisabled.colorset/Contents.json b/ios/Droidcon/Droidcon/Assets.xcassets/ElevatedBackgroundDisabled.colorset/Contents.json deleted file mode 100644 index f768b1a79..000000000 --- a/ios/Droidcon/Droidcon/Assets.xcassets/ElevatedBackgroundDisabled.colorset/Contents.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "platform" : "ios", - "reference" : "systemGray5Color" - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "platform" : "ios", - "reference" : "systemGray2Color" - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/ios/Droidcon/Droidcon/Assets.xcassets/ElevatedHeaderBackground.colorset/Contents.json b/ios/Droidcon/Droidcon/Assets.xcassets/ElevatedHeaderBackground.colorset/Contents.json deleted file mode 100644 index f02bb91af..000000000 --- a/ios/Droidcon/Droidcon/Assets.xcassets/ElevatedHeaderBackground.colorset/Contents.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0xF9", - "green" : "0xF9", - "red" : "0xF9" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0x33", - "green" : "0x33", - "red" : "0x33" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/ios/Droidcon/Droidcon/Assets.xcassets/Shadow.colorset/Contents.json b/ios/Droidcon/Droidcon/Assets.xcassets/Shadow.colorset/Contents.json deleted file mode 100644 index 6b8557477..000000000 --- a/ios/Droidcon/Droidcon/Assets.xcassets/Shadow.colorset/Contents.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "0.200", - "blue" : "0x00", - "green" : "0x00", - "red" : "0x00" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "0.000", - "blue" : "0x00", - "green" : "0x00", - "red" : "0x00" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/ios/Droidcon/Droidcon/Assets.xcassets/TextFieldBackground.colorset/Contents.json b/ios/Droidcon/Droidcon/Assets.xcassets/TextFieldBackground.colorset/Contents.json deleted file mode 100644 index 21aabfc27..000000000 --- a/ios/Droidcon/Droidcon/Assets.xcassets/TextFieldBackground.colorset/Contents.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0xEE", - "green" : "0xEE", - "red" : "0xEE" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0x66", - "green" : "0x66", - "red" : "0x66" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/ios/Droidcon/Droidcon/Info.plist b/ios/Droidcon/Droidcon/Info.plist index 071acbe31..d0c5fe25e 100644 --- a/ios/Droidcon/Droidcon/Info.plist +++ b/ios/Droidcon/Droidcon/Info.plist @@ -2,10 +2,6 @@ - LSApplicationQueriesSchemes - - fluttercon - CADisableMinimumFrameDurationOnPhone CFBundleDevelopmentRegion @@ -17,7 +13,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - Droidcon London 2024 + Droidcon CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString @@ -28,10 +24,10 @@ CFBundleTypeRole Editor CFBundleURLName - droidconlondon + droidcon CFBundleURLSchemes - droidconlondon + droidcon diff --git a/shared-ui/src/commonMain/kotlin/co.touchlab.droidcon/ui/theme/Colors.kt b/shared-ui/src/commonMain/kotlin/co.touchlab.droidcon/ui/theme/Colors.kt index 40b62c3fd..27b5c3d66 100644 --- a/shared-ui/src/commonMain/kotlin/co.touchlab.droidcon/ui/theme/Colors.kt +++ b/shared-ui/src/commonMain/kotlin/co.touchlab.droidcon/ui/theme/Colors.kt @@ -3,82 +3,9 @@ package co.touchlab.droidcon.ui.theme import androidx.compose.ui.graphics.Color object Colors { + val droidconGreen = Color(0xFF4CE2C3) + val droidconBlue = Color(0xFF010DEB) + val droidconRed = Color(0xFFF66E4D) - val primary = Color(0xFF7de1c3) - val secondary = Color(0xFF0014e6) - val secondaryLighter = Color(0xFF0014e6) - - val imageBackground = Color(0xFF999999) - val darkBlue = Color(0xFF0E65B1) - val skyBlue = Color(0xFF68D1fD) - val orange = Color(0xFFF1582C) - - val grey = Color(0xFF868686) - val darkGrey51 = Color(0xFF333333) - val darkGrey32 = Color(0xFF202020) - val lightGrey220 = Color(0xFFDCDCDC) - val lightGrey222 = Color(0xFFDEDEDE) - val lightGrey250 = Color(0xFFFAFAFA) - - val droidcon_theme_light_primary = Color(0xFF0014E6) - val droidcon_theme_light_onPrimary = Color(0xFFFFFFFF) - val droidcon_theme_light_primaryContainer = Color(0xFFE0E0FF) - val droidcon_theme_light_onPrimaryContainer = Color(0xFF000569) - val droidcon_theme_light_secondary = Color(0xFF006B56) - val droidcon_theme_light_onSecondary = Color(0xFFFFFFFF) - val droidcon_theme_light_secondaryContainer = Color(0xFF7DE1C3) - val droidcon_theme_light_onSecondaryContainer = Color(0xFF002018) - val droidcon_theme_light_tertiary = Color(0xFFF1582C) - val droidcon_theme_light_onTertiary = Color(0xFFFFFFFF) - val droidcon_theme_light_tertiaryContainer = Color(0xFFFFDBD1) - val droidcon_theme_light_onTertiaryContainer = Color(0xFF3B0900) - val droidcon_theme_light_error = Color(0xFFBA1A1A) - val droidcon_theme_light_errorContainer = Color(0xFFFFDAD6) - val droidcon_theme_light_onError = Color(0xFFFFFFFF) - val droidcon_theme_light_onErrorContainer = Color(0xFF410002) - val droidcon_theme_light_background = Color(0xFFFAFDFD) - val droidcon_theme_light_onBackground = Color(0xFF191C1D) - val droidcon_theme_light_outline = Color(0xFF6F797A) - val droidcon_theme_light_inverseOnSurface = Color(0xFFEFF1F1) - val droidcon_theme_light_inverseSurface = Color(0xFF2E3132) - val droidcon_theme_light_inversePrimary = Color(0xFFBEC2FF) - val droidcon_theme_light_surfaceTint = Color(0xFF3140FB) - val droidcon_theme_light_outlineVariant = Color(0xFFBFC8CA) - val droidcon_theme_light_scrim = Color(0xFF000000) - val droidcon_theme_light_surface = Color(0xFFF8FAFA) - val droidcon_theme_light_onSurface = Color(0xFF191C1D) - val droidcon_theme_light_surfaceVariant = Color(0xFFDBE4E6) - val droidcon_theme_light_onSurfaceVariant = Color(0xFF3F484A) - - val droidcon_theme_dark_primary = Color(0xFFBEC2FF) - val droidcon_theme_dark_onPrimary = Color(0xFF000BA6) - val droidcon_theme_dark_primaryContainer = Color(0xFF0014E6) - val droidcon_theme_dark_onPrimaryContainer = Color(0xFFE0E0FF) - val droidcon_theme_dark_secondary = Color(0xFF5FDBB9) - val droidcon_theme_dark_onSecondary = Color(0xFF00382C) - val droidcon_theme_dark_secondaryContainer = Color(0xFF005140) - val droidcon_theme_dark_onSecondaryContainer = Color(0xFF7EF8D5) - val droidcon_theme_dark_tertiary = Color(0xFFFFB5A0) - val droidcon_theme_dark_onTertiary = Color(0xFF601400) - val droidcon_theme_dark_tertiaryContainer = Color(0xFF872000) - val droidcon_theme_dark_onTertiaryContainer = Color(0xFFFFDBD1) - val droidcon_theme_dark_error = Color(0xFFFFB4AB) - val droidcon_theme_dark_errorContainer = Color(0xFF93000A) - val droidcon_theme_dark_onError = Color(0xFF690005) - val droidcon_theme_dark_onErrorContainer = Color(0xFFFFDAD6) - val droidcon_theme_dark_background = Color(0xFF191C1D) - val droidcon_theme_dark_onBackground = Color(0xFFE1E3E3) - val droidcon_theme_dark_outline = Color(0xFF899294) - val droidcon_theme_dark_inverseOnSurface = Color(0xFF191C1D) - val droidcon_theme_dark_inverseSurface = Color(0xFFE1E3E3) - val droidcon_theme_dark_inversePrimary = Color(0xFF3140FB) - val droidcon_theme_dark_surfaceTint = Color(0xFFBEC2FF) - val droidcon_theme_dark_outlineVariant = Color(0xFF3F484A) - val droidcon_theme_dark_scrim = Color(0xFF000000) - val droidcon_theme_dark_surface = Color(0xFF101415) - val droidcon_theme_dark_onSurface = Color(0xFFC4C7C7) - val droidcon_theme_dark_surfaceVariant = Color(0xFF3F484A) - val droidcon_theme_dark_onSurfaceVariant = Color(0xFFBFC8CA) - - val seed = Color(0xFF0014E6) + val primary = droidconGreen } diff --git a/shared-ui/src/commonMain/kotlin/co.touchlab.droidcon/ui/theme/Theme.kt b/shared-ui/src/commonMain/kotlin/co.touchlab.droidcon/ui/theme/Theme.kt index 85aa1274a..acb660ba5 100644 --- a/shared-ui/src/commonMain/kotlin/co.touchlab.droidcon/ui/theme/Theme.kt +++ b/shared-ui/src/commonMain/kotlin/co.touchlab.droidcon/ui/theme/Theme.kt @@ -14,72 +14,6 @@ private val DarkColorScheme = darkColorScheme( primary = Colors.primary, ) -@Suppress("ktlint:standard:backing-property-naming") -private val _LightColorScheme = lightColorScheme( - primary = Colors.primary, - onPrimary = Colors.droidcon_theme_light_onPrimary, - primaryContainer = Colors.droidcon_theme_light_primaryContainer, - onPrimaryContainer = Colors.droidcon_theme_light_onPrimaryContainer, - secondary = Colors.droidcon_theme_light_secondary, - onSecondary = Colors.droidcon_theme_light_onSecondary, - secondaryContainer = Colors.droidcon_theme_light_secondaryContainer, - onSecondaryContainer = Colors.droidcon_theme_light_onSecondaryContainer, - tertiary = Colors.droidcon_theme_light_tertiary, - onTertiary = Colors.droidcon_theme_light_onTertiary, - tertiaryContainer = Colors.droidcon_theme_light_tertiaryContainer, - onTertiaryContainer = Colors.droidcon_theme_light_onTertiaryContainer, - error = Colors.droidcon_theme_light_error, - errorContainer = Colors.droidcon_theme_light_errorContainer, - onError = Colors.droidcon_theme_light_onError, - onErrorContainer = Colors.droidcon_theme_light_onErrorContainer, - background = Colors.droidcon_theme_light_background, - onBackground = Colors.droidcon_theme_light_onBackground, - outline = Colors.droidcon_theme_light_outline, - inverseOnSurface = Colors.droidcon_theme_light_inverseOnSurface, - inverseSurface = Colors.droidcon_theme_light_inverseSurface, - inversePrimary = Colors.droidcon_theme_light_inversePrimary, - surfaceTint = Colors.droidcon_theme_light_surfaceTint, - outlineVariant = Colors.droidcon_theme_light_outlineVariant, - scrim = Colors.droidcon_theme_light_scrim, - surface = Colors.droidcon_theme_light_surface, - onSurface = Colors.droidcon_theme_light_onSurface, - surfaceVariant = Colors.droidcon_theme_light_surfaceVariant, - onSurfaceVariant = Colors.droidcon_theme_light_onSurfaceVariant, -) - -@Suppress("ktlint:standard:backing-property-naming") -private val _DarkColorScheme = darkColorScheme( - primary = Colors.droidcon_theme_dark_primary, - onPrimary = Colors.droidcon_theme_dark_onPrimary, - primaryContainer = Colors.droidcon_theme_dark_primaryContainer, - onPrimaryContainer = Colors.droidcon_theme_dark_onPrimaryContainer, - secondary = Colors.droidcon_theme_dark_secondary, - onSecondary = Colors.droidcon_theme_dark_onSecondary, - secondaryContainer = Colors.droidcon_theme_dark_secondaryContainer, - onSecondaryContainer = Colors.droidcon_theme_dark_onSecondaryContainer, - tertiary = Colors.droidcon_theme_dark_tertiary, - onTertiary = Colors.droidcon_theme_dark_onTertiary, - tertiaryContainer = Colors.droidcon_theme_dark_tertiaryContainer, - onTertiaryContainer = Colors.droidcon_theme_dark_onTertiaryContainer, - error = Colors.droidcon_theme_dark_error, - errorContainer = Colors.droidcon_theme_dark_errorContainer, - onError = Colors.droidcon_theme_dark_onError, - onErrorContainer = Colors.droidcon_theme_dark_onErrorContainer, - background = Colors.droidcon_theme_dark_background, - onBackground = Colors.droidcon_theme_dark_onBackground, - outline = Colors.droidcon_theme_dark_outline, - inverseOnSurface = Colors.droidcon_theme_dark_inverseOnSurface, - inverseSurface = Colors.droidcon_theme_dark_inverseSurface, - inversePrimary = Colors.droidcon_theme_dark_inversePrimary, - surfaceTint = Colors.droidcon_theme_dark_surfaceTint, - outlineVariant = Colors.droidcon_theme_dark_outlineVariant, - scrim = Colors.droidcon_theme_dark_scrim, - surface = Colors.droidcon_theme_dark_surface, - onSurface = Colors.droidcon_theme_dark_onSurface, - surfaceVariant = Colors.droidcon_theme_dark_surfaceVariant, - onSurfaceVariant = Colors.droidcon_theme_dark_onSurfaceVariant, -) - @Composable internal fun DroidconTheme(darkTheme: Boolean = isSystemInDarkTheme(), content: @Composable () -> Unit) { val colorScheme = when { diff --git a/shared/src/commonMain/kotlin/co/touchlab/droidcon/domain/service/impl/DefaultSyncService.kt b/shared/src/commonMain/kotlin/co/touchlab/droidcon/domain/service/impl/DefaultSyncService.kt index 4c0f37391..94a205649 100644 --- a/shared/src/commonMain/kotlin/co/touchlab/droidcon/domain/service/impl/DefaultSyncService.kt +++ b/shared/src/commonMain/kotlin/co/touchlab/droidcon/domain/service/impl/DefaultSyncService.kt @@ -334,39 +334,41 @@ class DefaultSyncService( Pair(date, dateFromString(adjustedInstant.toString())) }.toMap() - fun updateDateTimeString(dateTimeString: String): String { - return originalToAdjustedDateMap.get(dateFromString(dateTimeString)) + "T" + timeFromString(dateTimeString) - } - - val days = kotlin.runCatching { if(testNotificationTimes) { - _days.map { originalDay -> - ScheduleDto.DayDto( - originalToAdjustedDateMap.get(dateFromString(originalDay.date))!!, - originalDay.rooms.map { room -> - ScheduleDto.RoomDto( - room.id, room.name, - room.sessions.map { originalSession -> - ScheduleDto.SessionDto( - id = originalSession.id, - title = originalSession.title, - description = originalSession.description, - startsAt = updateDateTimeString(originalSession.startsAt), - endsAt = updateDateTimeString(originalSession.endsAt), - isServiceSession = originalSession.isServiceSession, - isPlenumSession = originalSession.isPlenumSession, - speakers = originalSession.speakers, - categories = originalSession.categories, - roomID = originalSession.roomID, - room = originalSession.room, - ) - }, - ) - }, - ) + fun updateDateTimeString(dateTimeString: String): String = + originalToAdjustedDateMap.get(dateFromString(dateTimeString)) + "T" + timeFromString(dateTimeString) + + val days = kotlin.runCatching { + if (testNotificationTimes) { + _days.map { originalDay -> + ScheduleDto.DayDto( + originalToAdjustedDateMap.get(dateFromString(originalDay.date))!!, + originalDay.rooms.map { room -> + ScheduleDto.RoomDto( + room.id, + room.name, + room.sessions.map { originalSession -> + ScheduleDto.SessionDto( + id = originalSession.id, + title = originalSession.title, + description = originalSession.description, + startsAt = updateDateTimeString(originalSession.startsAt), + endsAt = updateDateTimeString(originalSession.endsAt), + isServiceSession = originalSession.isServiceSession, + isPlenumSession = originalSession.isPlenumSession, + speakers = originalSession.speakers, + categories = originalSession.categories, + roomID = originalSession.roomID, + room = originalSession.room, + ) + }, + ) + }, + ) + } + } else { + _days } - } else { - _days - }}.let { result -> + }.let { result -> result.getOrThrow() }