Skip to content

Commit

Permalink
Merge branch 'main' into ks/RND-272
Browse files Browse the repository at this point in the history
  • Loading branch information
KevinSchildhorn committed Oct 29, 2024
2 parents b422764 + e2f833a commit 8603f0e
Show file tree
Hide file tree
Showing 42 changed files with 21,832 additions and 8,274 deletions.
6 changes: 3 additions & 3 deletions android/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ android {
compileSdk = libs.versions.compileSdk.get().toInt()

defaultConfig {
applicationId = "co.touchlab.droidcon.nyc2019"
applicationId = "co.touchlab.droidcon.london"
minSdk = libs.versions.minSdk.get().toInt()
targetSdk = libs.versions.targetSdk.get().toInt()
versionCode = 60008
versionName = "6.0.6"
versionCode = 60107
versionName = "6.1.7"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
packaging {
Expand Down
Binary file modified android/src/main/ic_launcher-playstore.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class MainApp : Application() {
single<Context> { this@MainApp }
single<Class<out Activity>> { MainActivity::class.java }
single<SharedPreferences> {
get<Context>().getSharedPreferences("DROIDCON_SETTINGS_2023", Context.MODE_PRIVATE)
get<Context>().getSharedPreferences("DROIDCON_SETTINGS_2024", Context.MODE_PRIVATE)
}
single<ObservableSettings> { SharedPreferencesSettings(delegate = get()) }

Expand Down
70 changes: 35 additions & 35 deletions android/src/main/res/drawable-night/about_droidcon.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,39 +3,39 @@
android:height="98dp"
android:viewportWidth="518"
android:viewportHeight="98">
<path
android:pathData="M405.26,81.26C395.19,81.26 387.06,73.13 387.06,63.06C387.06,52.99 395.19,44.86 405.26,44.86C415.33,44.86 423.46,52.99 423.46,63.06C423.46,73.13 415.22,81.26 405.26,81.26M405.26,29.19C386.61,29.19 371.38,44.41 371.38,63.07C371.38,81.73 386.6,96.95 405.26,96.95C423.92,96.95 439.14,81.73 439.14,63.07C439.03,44.42 423.92,29.19 405.26,29.19"
android:fillColor="#ffffff"
android:fillType="nonZero" />
<path
android:pathData="M154.85,81.26C144.78,81.26 136.65,73.13 136.65,63.06C136.65,52.99 144.78,44.86 154.85,44.86C164.92,44.86 173.05,52.99 173.05,63.06C173.16,73.13 164.92,81.26 154.85,81.26M154.85,29.19C136.2,29.19 120.97,44.41 120.97,63.07C120.97,81.73 136.19,96.95 154.85,96.95C173.51,96.95 188.73,81.73 188.73,63.07C188.73,44.41 173.51,29.19 154.85,29.19"
android:fillColor="#ffffff"
android:fillType="nonZero" />
<path
android:pathData="M33.65,81.26C23.58,81.26 15.45,73.13 15.45,63.06C15.45,52.99 23.58,44.86 33.65,44.86C43.72,44.86 51.85,52.99 51.85,63.06C51.85,73.13 43.72,81.26 33.65,81.26M67.64,63.07L67.64,0L52.08,0L52.08,34.56C46.82,31.24 40.52,29.3 33.88,29.3C15.23,29.3 0,44.52 0,63.18C0,81.84 15.22,97.06 33.88,97.06C52.53,96.95 67.64,81.72 67.64,63.07Z"
android:fillColor="#ffffff"
android:fillType="nonZero" />
<path
android:pathData="M262.54,81.26C252.47,81.26 244.34,73.13 244.34,63.06C244.34,52.99 252.47,44.86 262.54,44.86C272.61,44.86 280.74,52.99 280.74,63.06C280.74,73.13 272.61,81.26 262.54,81.26M296.42,0L280.86,0L280.86,34.56C275.6,31.24 269.3,29.3 262.66,29.3C244.01,29.3 228.78,44.52 228.78,63.18C228.78,81.84 244,97.06 262.66,97.06C281.32,97.06 296.54,81.84 296.54,63.18L296.54,0.01L296.43,0.01L296.42,0Z"
android:fillColor="#ffffff"
android:fillType="nonZero" />
<path
android:pathData="M200.85,29.19h15.56v67.64h-15.56z"
android:fillColor="#ffffff" />
<path
android:pathData="M79.66,63.06L79.66,96.94L95.22,96.94L95.22,63.06C95.22,52.99 103.35,44.86 113.42,44.86L113.42,29.3C94.77,29.19 79.66,44.41 79.66,63.06"
android:fillColor="#ffffff"
android:fillType="nonZero" />
<path
android:pathData="M352.73,75.88C349.41,79.2 344.83,81.26 339.91,81.26C329.84,81.26 321.71,73.13 321.71,63.06C321.71,52.99 329.84,44.86 339.91,44.86C344.83,44.86 349.52,46.92 352.73,50.24L363.83,39.14C357.65,32.96 349.3,29.18 339.91,29.18C321.26,29.18 306.03,44.4 306.03,63.06C306.03,81.72 321.25,96.94 339.91,96.94C349.29,96.94 357.76,93.16 363.83,86.98L352.73,75.88Z"
android:fillColor="#ffffff"
android:fillType="nonZero" />
<path
android:pathData="M484,29.19C465.35,29.19 450.12,44.41 450.12,63.07L450.12,96.95L465.68,96.95L465.68,63.07C465.68,53 473.81,44.87 483.88,44.87C493.95,44.87 502.08,53 502.08,63.07L502.08,96.95L517.64,96.95L517.64,63.07C517.87,44.42 502.65,29.19 483.99,29.19"
android:fillColor="#ffffff"
android:fillType="nonZero" />
<path
android:pathData="M163.66,63.06C163.66,67.87 159.77,71.76 154.96,71.76C150.15,71.76 146.26,67.87 146.26,63.06C146.26,58.25 150.15,54.36 154.96,54.36C159.77,54.36 163.66,58.25 163.66,63.06"
android:fillColor="#FA6E50"
android:fillType="nonZero" />
<path
android:pathData="M405.26,81.26C395.19,81.26 387.06,73.13 387.06,63.06C387.06,52.99 395.19,44.86 405.26,44.86C415.33,44.86 423.46,52.99 423.46,63.06C423.46,73.13 415.22,81.26 405.26,81.26M405.26,29.19C386.61,29.19 371.38,44.41 371.38,63.07C371.38,81.73 386.6,96.95 405.26,96.95C423.92,96.95 439.14,81.73 439.14,63.07C439.03,44.42 423.92,29.19 405.26,29.19"
android:fillColor="#ffffff"
android:fillType="nonZero"/>
<path
android:pathData="M154.85,81.26C144.78,81.26 136.65,73.13 136.65,63.06C136.65,52.99 144.78,44.86 154.85,44.86C164.92,44.86 173.05,52.99 173.05,63.06C173.16,73.13 164.92,81.26 154.85,81.26M154.85,29.19C136.2,29.19 120.97,44.41 120.97,63.07C120.97,81.73 136.19,96.95 154.85,96.95C173.51,96.95 188.73,81.73 188.73,63.07C188.73,44.41 173.51,29.19 154.85,29.19"
android:fillColor="#ffffff"
android:fillType="nonZero"/>
<path
android:pathData="M33.65,81.26C23.58,81.26 15.45,73.13 15.45,63.06C15.45,52.99 23.58,44.86 33.65,44.86C43.72,44.86 51.85,52.99 51.85,63.06C51.85,73.13 43.72,81.26 33.65,81.26M67.64,63.07L67.64,0L52.08,0L52.08,34.56C46.82,31.24 40.52,29.3 33.88,29.3C15.23,29.3 0,44.52 0,63.18C0,81.84 15.22,97.06 33.88,97.06C52.53,96.95 67.64,81.72 67.64,63.07Z"
android:fillColor="#ffffff"
android:fillType="nonZero"/>
<path
android:pathData="M262.54,81.26C252.47,81.26 244.34,73.13 244.34,63.06C244.34,52.99 252.47,44.86 262.54,44.86C272.61,44.86 280.74,52.99 280.74,63.06C280.74,73.13 272.61,81.26 262.54,81.26M296.42,0L280.86,0L280.86,34.56C275.6,31.24 269.3,29.3 262.66,29.3C244.01,29.3 228.78,44.52 228.78,63.18C228.78,81.84 244,97.06 262.66,97.06C281.32,97.06 296.54,81.84 296.54,63.18L296.54,0.01L296.43,0.01L296.42,0Z"
android:fillColor="#ffffff"
android:fillType="nonZero"/>
<path
android:pathData="M200.85,29.19h15.56v67.64h-15.56z"
android:fillColor="#ffffff"/>
<path
android:pathData="M79.66,63.06L79.66,96.94L95.22,96.94L95.22,63.06C95.22,52.99 103.35,44.86 113.42,44.86L113.42,29.3C94.77,29.19 79.66,44.41 79.66,63.06"
android:fillColor="#ffffff"
android:fillType="nonZero"/>
<path
android:pathData="M352.73,75.88C349.41,79.2 344.83,81.26 339.91,81.26C329.84,81.26 321.71,73.13 321.71,63.06C321.71,52.99 329.84,44.86 339.91,44.86C344.83,44.86 349.52,46.92 352.73,50.24L363.83,39.14C357.65,32.96 349.3,29.18 339.91,29.18C321.26,29.18 306.03,44.4 306.03,63.06C306.03,81.72 321.25,96.94 339.91,96.94C349.29,96.94 357.76,93.16 363.83,86.98L352.73,75.88Z"
android:fillColor="#ffffff"
android:fillType="nonZero"/>
<path
android:pathData="M484,29.19C465.35,29.19 450.12,44.41 450.12,63.07L450.12,96.95L465.68,96.95L465.68,63.07C465.68,53 473.81,44.87 483.88,44.87C493.95,44.87 502.08,53 502.08,63.07L502.08,96.95L517.64,96.95L517.64,63.07C517.87,44.42 502.65,29.19 483.99,29.19"
android:fillColor="#ffffff"
android:fillType="nonZero"/>
<path
android:pathData="M163.66,63.06C163.66,67.87 159.77,71.76 154.96,71.76C150.15,71.76 146.26,67.87 146.26,63.06C146.26,58.25 150.15,54.36 154.96,54.36C159.77,54.36 163.66,58.25 163.66,63.06"
android:fillColor="#3FE4C5"
android:fillType="nonZero"/>
</vector>
54 changes: 27 additions & 27 deletions android/src/main/res/drawable/about_droidcon.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,31 @@
android:height="127.2dp"
android:viewportWidth="357.6"
android:viewportHeight="127.2">
<path
android:pathData="M276.4,50.8c-12.4,0 -22.5,10.1 -22.5,22.5s10.1,22.5 22.5,22.5c12.4,0 22.5,-10.1 22.5,-22.5S288.9,50.8 276.4,50.8zM276.4,85.5c-6.7,0 -12.2,-5.5 -12.2,-12.2s5.5,-12.2 12.2,-12.2c6.7,0 12.2,5.5 12.2,12.2S283.1,85.5 276.4,85.5z"
android:fillColor="#0014E6" />
<path
android:pathData="M109.5,50.8c-12.4,0 -22.5,10.1 -22.5,22.5S97,95.9 109.5,95.9S132,85.8 132,73.3S122,50.8 109.5,50.8zM109.5,85.5c-6.7,0 -12.2,-5.5 -12.2,-12.2s5.5,-12.2 12.2,-12.2s12.2,5.5 12.2,12.2S116.2,85.5 109.5,85.5z"
android:fillColor="#0014E6" />
<path
android:pathData="M51.2,73.3v-42H40.7v23c-3.5,-2.2 -7.7,-3.5 -12.2,-3.5C16.1,50.8 6,60.9 6,73.3s10.1,22.5 22.5,22.5S51.2,85.8 51.2,73.3L51.2,73.3zM28.7,85.5c-6.7,0 -12.2,-5.5 -12.2,-12.2S22,61.2 28.7,61.2s12.2,5.5 12.2,12.2S35.4,85.5 28.7,85.5z"
android:fillColor="#0014E6" />
<path
android:pathData="M203.9,31.3h-10.5v23c-3.5,-2.2 -7.7,-3.5 -12.2,-3.5c-12.4,0 -22.5,10.1 -22.5,22.5s10.1,22.5 22.5,22.5s22.5,-10.1 22.5,-22.5l0,0v-42H203.9zM181.3,85.5c-6.7,0 -12.2,-5.5 -12.2,-12.2s5.5,-12.2 12.2,-12.2c6.7,0 12.2,5.5 12.2,12.2C193.4,80 188,85.5 181.3,85.5z"
android:fillColor="#0014E6" />
<path
android:pathData="M140,50.8h10.5v45.2h-10.5z"
android:fillColor="#0014E6" />
<path
android:pathData="M59.3,73.3L59.3,73.3v22.5h10.5V73.3c0,-6.7 5.5,-12.2 12.2,-12.2V50.7C69.4,50.8 59.3,60.9 59.3,73.3z"
android:fillColor="#0014E6" />
<path
android:pathData="M241.4,81.9c-2.2,2.2 -5.2,3.5 -8.5,3.5c-6.7,0 -12.2,-5.5 -12.2,-12.2S226.2,61 232.9,61c3.4,0 6.3,1.3 8.5,3.5l7.4,-7.4c-4.1,-4.1 -9.7,-6.6 -16,-6.6c-12.4,0 -22.5,10.1 -22.5,22.5s10.1,22.5 22.5,22.5c6.2,0 11.9,-2.6 16,-6.6L241.4,81.9z"
android:fillColor="#0014E6" />
<path
android:pathData="M328.9,50.8c-12.4,0 -22.5,10.1 -22.5,22.5l0,0v22.5h10.5V73.3l0,0c0,-6.7 5.5,-12.2 12.2,-12.2c6.7,0 12.2,5.5 12.2,12.2l0,0v22.5h10.5V73.3l0,0C351.5,60.9 341.3,50.8 328.9,50.8z"
android:fillColor="#0014E6" />
<path
android:pathData="M109.5,73.3m-5.8,0a5.8,5.8 0,1 1,11.6 0a5.8,5.8 0,1 1,-11.6 0"
android:fillColor="#7DE1C3" />
<path
android:pathData="M276.4,50.8c-12.4,0 -22.5,10.1 -22.5,22.5s10.1,22.5 22.5,22.5c12.4,0 22.5,-10.1 22.5,-22.5S288.9,50.8 276.4,50.8zM276.4,85.5c-6.7,0 -12.2,-5.5 -12.2,-12.2s5.5,-12.2 12.2,-12.2c6.7,0 12.2,5.5 12.2,12.2S283.1,85.5 276.4,85.5z"
android:fillColor="#3FE4C5"/>
<path
android:pathData="M109.5,50.8c-12.4,0 -22.5,10.1 -22.5,22.5S97,95.9 109.5,95.9S132,85.8 132,73.3S122,50.8 109.5,50.8zM109.5,85.5c-6.7,0 -12.2,-5.5 -12.2,-12.2s5.5,-12.2 12.2,-12.2s12.2,5.5 12.2,12.2S116.2,85.5 109.5,85.5z"
android:fillColor="#3FE4C5"/>
<path
android:pathData="M51.2,73.3v-42H40.7v23c-3.5,-2.2 -7.7,-3.5 -12.2,-3.5C16.1,50.8 6,60.9 6,73.3s10.1,22.5 22.5,22.5S51.2,85.8 51.2,73.3L51.2,73.3zM28.7,85.5c-6.7,0 -12.2,-5.5 -12.2,-12.2S22,61.2 28.7,61.2s12.2,5.5 12.2,12.2S35.4,85.5 28.7,85.5z"
android:fillColor="#3FE4C5"/>
<path
android:pathData="M203.9,31.3h-10.5v23c-3.5,-2.2 -7.7,-3.5 -12.2,-3.5c-12.4,0 -22.5,10.1 -22.5,22.5s10.1,22.5 22.5,22.5s22.5,-10.1 22.5,-22.5l0,0v-42H203.9zM181.3,85.5c-6.7,0 -12.2,-5.5 -12.2,-12.2s5.5,-12.2 12.2,-12.2c6.7,0 12.2,5.5 12.2,12.2C193.4,80 188,85.5 181.3,85.5z"
android:fillColor="#3FE4C5"/>
<path
android:pathData="M140,50.8h10.5v45.2h-10.5z"
android:fillColor="#3FE4C5"/>
<path
android:pathData="M59.3,73.3L59.3,73.3v22.5h10.5V73.3c0,-6.7 5.5,-12.2 12.2,-12.2V50.7C69.4,50.8 59.3,60.9 59.3,73.3z"
android:fillColor="#3FE4C5"/>
<path
android:pathData="M241.4,81.9c-2.2,2.2 -5.2,3.5 -8.5,3.5c-6.7,0 -12.2,-5.5 -12.2,-12.2S226.2,61 232.9,61c3.4,0 6.3,1.3 8.5,3.5l7.4,-7.4c-4.1,-4.1 -9.7,-6.6 -16,-6.6c-12.4,0 -22.5,10.1 -22.5,22.5s10.1,22.5 22.5,22.5c6.2,0 11.9,-2.6 16,-6.6L241.4,81.9z"
android:fillColor="#3FE4C5"/>
<path
android:pathData="M328.9,50.8c-12.4,0 -22.5,10.1 -22.5,22.5l0,0v22.5h10.5V73.3l0,0c0,-6.7 5.5,-12.2 12.2,-12.2c6.7,0 12.2,5.5 12.2,12.2l0,0v22.5h10.5V73.3l0,0C351.5,60.9 341.3,50.8 328.9,50.8z"
android:fillColor="#3FE4C5"/>
<path
android:pathData="M109.5,73.3m-5.8,0a5.8,5.8 0,1 1,11.6 0a5.8,5.8 0,1 1,-11.6 0"
android:fillColor="#0014E6"/>
</vector>
Loading

0 comments on commit 8603f0e

Please sign in to comment.