Skip to content
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

London 2024 #229

Merged
merged 19 commits into from
Oct 25, 2024
Merged
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
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 = 60106
versionName = "6.1.6"
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
2 changes: 1 addition & 1 deletion android/src/main/res/drawable-night/about_droidcon.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@
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:fillColor="#3FE4C5"
android:fillType="nonZero"/>
</vector>
18 changes: 9 additions & 9 deletions android/src/main/res/drawable/about_droidcon.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,29 +5,29 @@
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"/>
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="#0014E6"/>
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="#0014E6"/>
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="#0014E6"/>
android:fillColor="#3FE4C5"/>
<path
android:pathData="M140,50.8h10.5v45.2h-10.5z"
android:fillColor="#0014E6"/>
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="#0014E6"/>
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="#0014E6"/>
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="#0014E6"/>
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="#7DE1C3"/>
android:fillColor="#0014E6"/>
</vector>
Loading
Loading