diff --git a/android/src/main/res/drawable/ic_launcher_foreground.xml b/android/src/main/res/drawable/ic_launcher_foreground.xml
index b0fba1d7..21e57198 100644
--- a/android/src/main/res/drawable/ic_launcher_foreground.xml
+++ b/android/src/main/res/drawable/ic_launcher_foreground.xml
@@ -3,266 +3,424 @@
android:height="1024dp"
android:viewportWidth="1024"
android:viewportHeight="1024">
+
+
+
+
+
+
+
+ android:pathData="M2.8,-0.4h1023.9v1024.7h-1023.9z"/>
-
+ android:pathData="M747.6,262.9h73.6v39.5h-73.6z"
+ android:strokeLineJoin="round"
+ android:strokeWidth="5.2"
+ android:fillColor="#0014e5"
+ android:strokeColor="#fff"/>
+
+
+
+
+
+
+
+
+
+ android:fillColor="#0014e5"/>
+ android:fillColor="#fff"/>
+ android:fillColor="#0014e5"/>
+ android:fillColor="#fff"/>
+ android:fillColor="#0014e5"/>
+ android:fillColor="#fff"/>
+ android:fillColor="#0014e5"/>
+
+ android:fillColor="#0014e5"/>
+
+
+
+
+
+
+
+ android:fillColor="#0014e5"/>
+ android:pathData="M766.3,604.6v-32.3c0,-3.2 2.6,-5.8 5.8,-5.8s5.8,2.6 5.8,5.8v32.3h-11.7Z"
+ android:strokeWidth="0"
+ android:fillColor="#fff"/>
+ android:pathData="M797.3,604.6L797.3,572.3"
+ android:strokeWidth="0"
+ android:fillColor="#0014e5"/>
+ android:pathData="M791.5,604.6v-32.3c0,-3.2 2.6,-5.8 5.8,-5.8s5.8,2.6 5.8,5.8v32.3h-11.7Z"
+ android:strokeWidth="0"
+ android:fillColor="#fff"/>
+ android:pathData="M823.3,604.6L823.3,572.3"
+ android:strokeWidth="0"
+ android:fillColor="#0014e5"/>
+ android:pathData="M817.5,604.6v-32.3c0,-3.2 2.6,-5.8 5.8,-5.8s5.8,2.6 5.8,5.8v32.3h-11.7Z"
+ android:strokeWidth="0"
+ android:fillColor="#fff"/>
+ android:pathData="M746.3,683.9L746.3,651.6"
+ android:strokeWidth="0"
+ android:fillColor="#0014e5"/>
+ android:pathData="M740.4,683.9v-32.3c0,-3.2 2.6,-5.8 5.8,-5.8s5.8,2.6 5.8,5.8v32.3h-11.7Z"
+ android:strokeWidth="0"
+ android:fillColor="#fff"/>
+ android:pathData="M772.1,683.9L772.1,651.6"
+ android:strokeWidth="0"
+ android:fillColor="#0014e5"/>
+ android:pathData="M766.3,683.9v-32.3c0,-3.2 2.6,-5.8 5.8,-5.8s5.8,2.6 5.8,5.8v32.3h-11.7Z"
+ android:strokeWidth="0"
+ android:fillColor="#fff"/>
+ android:pathData="M797.3,683.9L797.3,651.6"
+ android:strokeWidth="0"
+ android:fillColor="#0014e5"/>
+ android:pathData="M791.5,683.9v-32.3c0,-3.2 2.6,-5.8 5.8,-5.8s5.8,2.6 5.8,5.8v32.3h-11.7Z"
+ android:strokeWidth="0"
+ android:fillColor="#fff"/>
+ android:pathData="M823.3,683.9L823.3,651.6"
+ android:strokeWidth="0"
+ android:fillColor="#0014e5"/>
+ android:pathData="M817.5,683.9v-32.3c0,-3.2 2.6,-5.8 5.8,-5.8s5.8,2.6 5.8,5.8v32.3h-11.7Z"
+ android:strokeWidth="0"
+ android:fillColor="#fff"/>
+ android:pathData="M746.3,763.2L746.3,730.9"
+ android:strokeWidth="0"
+ android:fillColor="#0014e5"/>
+ android:pathData="M740.4,763.2v-32.3c0,-3.2 2.6,-5.8 5.8,-5.8s5.8,2.6 5.8,5.8v32.3h-11.7Z"
+ android:strokeWidth="0"
+ android:fillColor="#fff"/>
+ android:pathData="M772.1,763.2L772.1,730.9"
+ android:strokeWidth="0"
+ android:fillColor="#0014e5"/>
+ android:pathData="M766.3,763.2v-32.3c0,-3.2 2.6,-5.8 5.8,-5.8s5.8,2.6 5.8,5.8v32.3h-11.7Z"
+ android:strokeWidth="0"
+ android:fillColor="#fff"/>
+ android:pathData="M797.3,763.2L797.3,730.9"
+ android:strokeWidth="0"
+ android:fillColor="#0014e5"/>
+ android:pathData="M791.5,763.2v-32.3c0,-3.2 2.6,-5.8 5.8,-5.8s5.8,2.6 5.8,5.8v32.3h-11.7Z"
+ android:strokeWidth="0"
+ android:fillColor="#fff"/>
+ android:pathData="M823.3,763.2L823.3,730.9"
+ android:strokeWidth="0"
+ android:fillColor="#0014e5"/>
+ android:pathData="M817.5,763.2v-32.3c0,-3.2 2.6,-5.8 5.8,-5.8s5.8,2.6 5.8,5.8v32.3h-11.7Z"
+ android:strokeWidth="0"
+ android:fillColor="#fff"/>
+ android:pathData="M746.3,842.5L746.3,810.2"
+ android:strokeWidth="0"
+ android:fillColor="#0014e5"/>
+ android:pathData="M740.4,842.5v-32.3c0,-3.2 2.6,-5.8 5.8,-5.8s5.8,2.6 5.8,5.8v32.3h-11.7Z"
+ android:strokeWidth="0"
+ android:fillColor="#fff"/>
+ android:pathData="M772.1,842.5L772.1,810.2"
+ android:strokeWidth="0"
+ android:fillColor="#0014e5"/>
+ android:pathData="M766.3,842.5v-32.3c0,-3.2 2.6,-5.8 5.8,-5.8s5.8,2.6 5.8,5.8v32.3h-11.7Z"
+ android:strokeWidth="0"
+ android:fillColor="#fff"/>
+ android:pathData="M797.3,842.5L797.3,810.2"
+ android:strokeWidth="0"
+ android:fillColor="#0014e5"/>
+ android:pathData="M791.5,842.5v-32.3c0,-3.2 2.6,-5.8 5.8,-5.8s5.8,2.6 5.8,5.8v32.3h-11.7Z"
+ android:strokeWidth="0"
+ android:fillColor="#fff"/>
+ android:pathData="M823.3,842.5L823.3,810.2"
+ android:strokeWidth="0"
+ android:fillColor="#0014e5"/>
+ android:pathData="M817.5,842.5v-32.3c0,-3.2 2.6,-5.8 5.8,-5.8s5.8,2.6 5.8,5.8v32.3h-11.7Z"
+ android:strokeWidth="0"
+ android:fillColor="#fff"/>
+ android:pathData="M746.3,921.8L746.3,889.5"
+ android:strokeWidth="0"
+ android:fillColor="#0014e5"/>
+ android:pathData="M740.4,921.8v-32.3c0,-3.2 2.6,-5.8 5.8,-5.8s5.8,2.6 5.8,5.8v32.3h-11.7Z"
+ android:strokeWidth="0"
+ android:fillColor="#fff"/>
+ android:pathData="M772.1,921.8L772.1,889.5"
+ android:strokeWidth="0"
+ android:fillColor="#0014e5"/>
+ android:pathData="M766.3,921.8v-32.3c0,-3.2 2.6,-5.8 5.8,-5.8s5.8,2.6 5.8,5.8v32.3h-11.7Z"
+ android:strokeWidth="0"
+ android:fillColor="#fff"/>
+ android:pathData="M797.3,921.8L797.3,889.5"
+ android:strokeWidth="0"
+ android:fillColor="#0014e5"/>
+ android:pathData="M791.5,921.8v-32.3c0,-3.2 2.6,-5.8 5.8,-5.8s5.8,2.6 5.8,5.8v32.3h-11.7Z"
+ android:strokeWidth="0"
+ android:fillColor="#fff"/>
+ android:pathData="M823.3,921.8L823.3,889.5"
+ android:strokeWidth="0"
+ android:fillColor="#0014e5"/>
+ android:pathData="M817.5,921.8v-32.3c0,-3.2 2.6,-5.8 5.8,-5.8s5.8,2.6 5.8,5.8v32.3h-11.7Z"
+ android:strokeWidth="0"
+ android:fillColor="#fff"/>
+ android:pathData="M721.5,606.6L848,606.6"
+ android:strokeLineJoin="round"
+ android:strokeWidth="5.2"
+ android:fillColor="#0014e5"
+ android:strokeColor="#fff"
+ android:strokeLineCap="round"/>
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/android/src/main/res/drawable/ic_splash_screen.xml b/android/src/main/res/drawable/ic_splash_screen.xml
index f2ded85b..9796a73f 100644
--- a/android/src/main/res/drawable/ic_splash_screen.xml
+++ b/android/src/main/res/drawable/ic_splash_screen.xml
@@ -5,368 +5,346 @@
android:viewportHeight="1920">
+ android:strokeWidth="0"
+ android:fillColor="#7de1c3"/>
+ android:pathData="M974.3,554v-58.9c66.6,0 120.5,57 120.5,127.4h-55.7c0,-37.9 -29,-68.5 -64.8,-68.5"
+ android:strokeWidth="0"
+ android:fillColor="#7de1c3"/>
+ android:pathData="M620,1329.5c-8.8,0 -15.9,-7.1 -15.9,-15.9s7.1,-15.9 15.9,-15.9 15.9,7.1 15.9,15.9 -7.1,15.9 -15.9,15.9h0M620,1284c-16.3,0 -29.5,13.2 -29.5,29.6s13.2,29.5 29.5,29.5 29.5,-13.2 29.5,-29.5h0c0,-16.3 -13.2,-29.5 -29.5,-29.6"
+ android:strokeWidth="0"
+ android:fillColor="#fff"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ android:strokeColor="#fff"
+ android:strokeLineCap="round"/>
+ android:strokeColor="#fff"
+ android:strokeLineCap="round"/>
+ android:strokeColor="#fff"
+ android:strokeLineCap="round"/>
+ android:strokeColor="#fff"
+ android:strokeLineCap="round"/>
+ android:pathData="M802.7,575v-10.5c0,-2.9 2.4,-5.3 5.3,-5.3s5.3,2.4 5.3,5.3v10.5h-10.6Z"
+ android:strokeWidth="0"
+ android:fillColor="#fff"/>
+ android:pathData="M831.4,575v-10.5c0,-2.9 2.4,-5.3 5.3,-5.3s5.3,2.4 5.3,5.3v10.5h-10.6Z"
+ android:strokeWidth="0"
+ android:fillColor="#fff"/>
+ android:pathData="M831.7,492.4v-10.5c0,-2.9 2.4,-5.3 5.3,-5.3s5.3,2.4 5.3,5.3v10.5h-10.6Z"
+ android:strokeWidth="0"
+ android:fillColor="#fff"/>
+ android:pathData="M815.1,492.4v-10.5c0,-2.9 2.4,-5.3 5.3,-5.3s5.3,2.4 5.3,5.3v10.5h-10.6Z"
+ android:strokeWidth="0"
+ android:fillColor="#fff"/>
+ android:pathData="M848.3,492.4v-10.5c0,-2.9 2.4,-5.3 5.3,-5.3s5.3,2.4 5.3,5.3v10.5h-10.6Z"
+ android:strokeWidth="0"
+ android:fillColor="#fff"/>
+ android:pathData="M859.8,575v-10.5c0,-2.9 2.4,-5.3 5.3,-5.3s5.3,2.4 5.3,5.3v10.5h-10.6Z"
+ android:strokeWidth="0"
+ android:fillColor="#fff"/>
-
-
-
-
-
-
-
-
-
+ android:strokeColor="#fff"
+ android:strokeLineCap="round"/>
+ android:strokeColor="#fff"
+ android:strokeLineCap="round"/>
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ android:strokeColor="#fff"
+ android:strokeLineCap="round"/>
-
-
-
+
-
-
-
+
+ android:strokeColor="#fff"
+ android:strokeLineCap="round"/>
-
-
-
-
-
-
-
-
+ android:strokeColor="#fff"
+ android:strokeLineCap="round"/>
diff --git a/ios/Droidcon/Droidcon/Assets.xcassets/AppIcon.appiconset/Contents.json b/ios/Droidcon/Droidcon/Assets.xcassets/AppIcon.appiconset/Contents.json
index a77e4aac..53323e86 100644
--- a/ios/Droidcon/Droidcon/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/ios/Droidcon/Droidcon/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,7 +1,7 @@
{
"images" : [
{
- "filename" : "dclondon24-icon.jpg",
+ "filename" : "dcLondon24-Icon.jpg",
"idiom" : "universal",
"platform" : "ios",
"size" : "1024x1024"
diff --git a/ios/Droidcon/Droidcon/Assets.xcassets/AppIcon.appiconset/dclondon24-icon.jpg b/ios/Droidcon/Droidcon/Assets.xcassets/AppIcon.appiconset/dclondon24-icon.jpg
index ac0a9268..f1bcf4d3 100644
Binary files a/ios/Droidcon/Droidcon/Assets.xcassets/AppIcon.appiconset/dclondon24-icon.jpg and b/ios/Droidcon/Droidcon/Assets.xcassets/AppIcon.appiconset/dclondon24-icon.jpg differ
diff --git a/ios/Droidcon/Droidcon/Assets.xcassets/LaunchScreen/LaunchScreen_Icon.imageset/Contents.json b/ios/Droidcon/Droidcon/Assets.xcassets/LaunchScreen/LaunchScreen_Icon.imageset/Contents.json
index 43953ad8..dddfaa44 100644
--- a/ios/Droidcon/Droidcon/Assets.xcassets/LaunchScreen/LaunchScreen_Icon.imageset/Contents.json
+++ b/ios/Droidcon/Droidcon/Assets.xcassets/LaunchScreen/LaunchScreen_Icon.imageset/Contents.json
@@ -1,7 +1,7 @@
{
"images" : [
{
- "filename" : "ic_splash_screen.svg",
+ "filename" : "London 24-Splash screen.svg",
"idiom" : "universal"
}
],
diff --git a/ios/Droidcon/Droidcon/Assets.xcassets/LaunchScreen/LaunchScreen_Icon.imageset/London 24-Splash screen.svg b/ios/Droidcon/Droidcon/Assets.xcassets/LaunchScreen/LaunchScreen_Icon.imageset/London 24-Splash screen.svg
new file mode 100644
index 00000000..db98a13c
--- /dev/null
+++ b/ios/Droidcon/Droidcon/Assets.xcassets/LaunchScreen/LaunchScreen_Icon.imageset/London 24-Splash screen.svg
@@ -0,0 +1,135 @@
+
+
\ No newline at end of file
diff --git a/ios/Droidcon/Droidcon/Assets.xcassets/LaunchScreen/LaunchScreen_Icon.imageset/ic_splash_screen.svg b/ios/Droidcon/Droidcon/Assets.xcassets/LaunchScreen/LaunchScreen_Icon.imageset/ic_splash_screen.svg
deleted file mode 100644
index b93e0e39..00000000
--- a/ios/Droidcon/Droidcon/Assets.xcassets/LaunchScreen/LaunchScreen_Icon.imageset/ic_splash_screen.svg
+++ /dev/null
@@ -1,94 +0,0 @@
-
-
-
diff --git a/ios/Droidcon/Droidcon/Settings/SettingsView.swift b/ios/Droidcon/Droidcon/Settings/SettingsView.swift
index e5dcb89c..e1dacc3b 100644
--- a/ios/Droidcon/Droidcon/Settings/SettingsView.swift
+++ b/ios/Droidcon/Droidcon/Settings/SettingsView.swift
@@ -41,10 +41,12 @@ struct SettingsView: View {
.navigationTitle("Settings.Title")
.navigationBarTitleDisplayMode(.inline)
.toolbar {
- Button("Open \(Constants.SisterApp.shared.name)") {
- openSisterApp()
+ if(Constants.SisterApp.shared.showLaunchButton){
+ Button("Open \(Constants.SisterApp.shared.name)") {
+ openSisterApp()
+ }
+ .buttonStyle(BorderedProminentButtonStyle())
}
- .buttonStyle(BorderedProminentButtonStyle())
}
}
.navigationViewStyle(StackNavigationViewStyle())
diff --git a/shared-ui/src/commonMain/composeResources/drawable/venue-map-1.jpg b/shared-ui/src/commonMain/composeResources/drawable/venue-map-1.jpg
index 7b1096fc..06572301 100644
Binary files a/shared-ui/src/commonMain/composeResources/drawable/venue-map-1.jpg and b/shared-ui/src/commonMain/composeResources/drawable/venue-map-1.jpg differ
diff --git a/shared-ui/src/commonMain/kotlin/co.touchlab.droidcon/ui/settings/SettingsView.kt b/shared-ui/src/commonMain/kotlin/co.touchlab.droidcon/ui/settings/SettingsView.kt
index dab5b8bb..512559e0 100644
--- a/shared-ui/src/commonMain/kotlin/co.touchlab.droidcon/ui/settings/SettingsView.kt
+++ b/shared-ui/src/commonMain/kotlin/co.touchlab.droidcon/ui/settings/SettingsView.kt
@@ -27,6 +27,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.input.nestedscroll.nestedScroll
import androidx.compose.ui.unit.dp
+import co.touchlab.droidcon.Constants
import co.touchlab.droidcon.ui.theme.Dimensions
import co.touchlab.droidcon.ui.util.observeAsState
import co.touchlab.droidcon.viewmodel.settings.SettingsViewModel
@@ -43,7 +44,9 @@ internal fun SettingsView(viewModel: SettingsViewModel) {
title = { Text("Settings") },
scrollBehavior = scrollBehavior,
actions = {
- PlatformSwitchApp()
+ if (Constants.SisterApp.showLaunchButton) {
+ PlatformSwitchApp()
+ }
}
)
},
@@ -79,7 +82,11 @@ internal fun SettingsView(viewModel: SettingsViewModel) {
}
@Composable
-internal fun IconTextSwitchRow(text: String, image: ImageVector, checked: MutableObservableProperty) {
+internal fun IconTextSwitchRow(
+ text: String,
+ image: ImageVector,
+ checked: MutableObservableProperty
+) {
val isChecked by checked.observeAsState()
Row(
modifier = Modifier
diff --git a/shared-ui/src/commonMain/kotlin/co.touchlab.droidcon/viewmodel/ApplicationViewModel.kt b/shared-ui/src/commonMain/kotlin/co.touchlab.droidcon/viewmodel/ApplicationViewModel.kt
index 392bf565..e48a919c 100644
--- a/shared-ui/src/commonMain/kotlin/co.touchlab.droidcon/viewmodel/ApplicationViewModel.kt
+++ b/shared-ui/src/commonMain/kotlin/co.touchlab.droidcon/viewmodel/ApplicationViewModel.kt
@@ -1,5 +1,6 @@
package co.touchlab.droidcon.viewmodel
+import co.touchlab.droidcon.Constants
import co.touchlab.droidcon.application.gateway.SettingsGateway
import co.touchlab.droidcon.application.service.Notification
import co.touchlab.droidcon.application.service.NotificationSchedulingService
@@ -46,7 +47,13 @@ class ApplicationViewModel(
var presentedFeedback: FeedbackDialogViewModel? by managed(null)
val observePresentedFeedback by observe(::presentedFeedback)
- val tabs = listOf(Tab.Schedule, Tab.MyAgenda, Tab.Venue, Tab.Sponsors, Tab.Settings)
+ val tabs = listOfNotNull(
+ Tab.Schedule,
+ Tab.MyAgenda,
+ if (Constants.showVenueMap) Tab.Venue else null,
+ Tab.Sponsors,
+ Tab.Settings
+ )
var selectedTab: Tab by published(Tab.Schedule)
val observeSelectedTab by observe(::selectedTab)
@@ -69,6 +76,7 @@ class ApplicationViewModel(
// We're not checking whether feedback is enabled, because the user opened a feedback notification.
presentNextFeedback()
}
+
is Notification.Local.Reminder -> {
selectedTab = Tab.Schedule
schedule.openSessionDetail(notification.sessionId)
diff --git a/shared/src/commonMain/kotlin/co/touchlab/droidcon/Constants.kt b/shared/src/commonMain/kotlin/co/touchlab/droidcon/Constants.kt
index c79a1426..dff6adee 100644
--- a/shared/src/commonMain/kotlin/co/touchlab/droidcon/Constants.kt
+++ b/shared/src/commonMain/kotlin/co/touchlab/droidcon/Constants.kt
@@ -10,6 +10,7 @@ object Constants {
* When time zone is changed, generate a new hash by running `md5 -s "${timeZoneString}|${Sessionize.scheduleId}"` in command line
*/
val conferenceTimeZoneHash = "7f5ba3fbad43896bad6847f6e8c662ac"
+ val showVenueMap:Boolean = false
object Firestore {
@@ -28,6 +29,7 @@ object Constants {
}
object SisterApp {
+ val showLaunchButton: Boolean = false
const val name = "Fluttercon"
const val androidPackageName = "co.touchlab.fluttercon"
const val iosUrlString = "fluttercon://open"