Skip to content

Commit

Permalink
#191: Update and small android fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
janoliver20 committed Jul 25, 2024
1 parent 63d7b46 commit 39b541f
Show file tree
Hide file tree
Showing 69 changed files with 60 additions and 16 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/Users/jancortiel/Documents/More/LBI/more-multiplatform-app/.kotlin/metadata/kotlinTransformedCInteropMetadataLibraries/org.jetbrains.kotlinx-atomicfu-0.23.1-nativeMain-cinterop/org.jetbrains.kotlinx_atomicfu-cinterop-interop-wFq7cg.klib
/Users/jancortiel/Documents/More/LBI/more-multiplatform-app/.kotlin/metadata/kotlinTransformedCInteropMetadataLibraries/io.realm.kotlin-cinterop-1.13.0-nativeDarwin-cinterop/io.realm.kotlin_cinterop-cinterop-realm_wrapper-nt9oMQ.klib
/Users/jancortiel/Documents/More/LBI/more-multiplatform-app/.kotlin/metadata/kotlinTransformedCInteropMetadataLibraries/io.ktor-ktor-utils-2.3.12-iosMain-cinterop/io.ktor_ktor-utils-cinterop-threadUtils-TE4abA.klib
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/Users/jancortiel/Documents/More/LBI/more-multiplatform-app/.kotlin/metadata/kotlinTransformedCInteropMetadataLibraries/org.jetbrains.kotlinx-atomicfu-0.23.1-nativeMain-cinterop/org.jetbrains.kotlinx_atomicfu-cinterop-interop-wFq7cg.klib
/Users/jancortiel/Documents/More/LBI/more-multiplatform-app/.kotlin/metadata/kotlinTransformedCInteropMetadataLibraries/io.realm.kotlin-cinterop-1.13.0-nativeDarwin-cinterop/io.realm.kotlin_cinterop-cinterop-realm_wrapper-nt9oMQ.klib
/Users/jancortiel/Documents/More/LBI/more-multiplatform-app/.kotlin/metadata/kotlinTransformedCInteropMetadataLibraries/io.ktor-ktor-utils-2.3.12-iosMain-cinterop/io.ktor_ktor-utils-cinterop-threadUtils-TE4abA.klib
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/Users/jancortiel/Documents/More/LBI/more-multiplatform-app/.kotlin/metadata/kotlinTransformedCInteropMetadataLibraries/org.jetbrains.kotlinx-atomicfu-0.23.1-nativeMain-cinterop/org.jetbrains.kotlinx_atomicfu-cinterop-interop-wFq7cg.klib
/Users/jancortiel/Documents/More/LBI/more-multiplatform-app/.kotlin/metadata/kotlinTransformedCInteropMetadataLibraries/io.realm.kotlin-cinterop-1.13.0-nativeDarwin-cinterop/io.realm.kotlin_cinterop-cinterop-realm_wrapper-nt9oMQ.klib
/Users/jancortiel/Documents/More/LBI/more-multiplatform-app/.kotlin/metadata/kotlinTransformedCInteropMetadataLibraries/io.ktor-ktor-utils-2.3.12-iosMain-cinterop/io.ktor_ktor-utils-cinterop-threadUtils-TE4abA.klib
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/Users/jancortiel/Documents/More/LBI/more-multiplatform-app/.kotlin/metadata/kotlinTransformedCInteropMetadataLibraries/org.jetbrains.kotlinx-atomicfu-0.23.1-nativeMain-cinterop/org.jetbrains.kotlinx_atomicfu-cinterop-interop-wFq7cg.klib
/Users/jancortiel/Documents/More/LBI/more-multiplatform-app/.kotlin/metadata/kotlinTransformedCInteropMetadataLibraries/io.realm.kotlin-cinterop-1.13.0-nativeDarwin-cinterop/io.realm.kotlin_cinterop-cinterop-realm_wrapper-nt9oMQ.klib
/Users/jancortiel/Documents/More/LBI/more-multiplatform-app/.kotlin/metadata/kotlinTransformedCInteropMetadataLibraries/io.ktor-ktor-utils-2.3.12-iosMain-cinterop/io.ktor_ktor-utils-cinterop-threadUtils-TE4abA.klib
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/Users/jancortiel/Documents/More/LBI/more-multiplatform-app/.kotlin/metadata/kotlinTransformedCInteropMetadataLibraries/org.jetbrains.kotlinx-atomicfu-0.23.1-nativeMain-cinterop/org.jetbrains.kotlinx_atomicfu-cinterop-interop-wFq7cg.klib
/Users/jancortiel/Documents/More/LBI/more-multiplatform-app/.kotlin/metadata/kotlinTransformedCInteropMetadataLibraries/io.realm.kotlin-cinterop-1.13.0-nativeDarwin-cinterop/io.realm.kotlin_cinterop-cinterop-realm_wrapper-nt9oMQ.klib
/Users/jancortiel/Documents/More/LBI/more-multiplatform-app/.kotlin/metadata/kotlinTransformedCInteropMetadataLibraries/io.ktor-ktor-utils-2.3.12-iosMain-cinterop/io.ktor_ktor-utils-cinterop-threadUtils-TE4abA.klib
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/Users/jancortiel/Documents/More/LBI/more-multiplatform-app/.kotlin/metadata/kotlinTransformedCInteropMetadataLibraries/org.jetbrains.kotlinx-atomicfu-0.23.1-nativeMain-cinterop/org.jetbrains.kotlinx_atomicfu-cinterop-interop-wFq7cg.klib
/Users/jancortiel/Documents/More/LBI/more-multiplatform-app/.kotlin/metadata/kotlinTransformedCInteropMetadataLibraries/io.realm.kotlin-cinterop-1.13.0-nativeDarwin-cinterop/io.realm.kotlin_cinterop-cinterop-realm_wrapper-nt9oMQ.klib
/Users/jancortiel/Documents/More/LBI/more-multiplatform-app/.kotlin/metadata/kotlinTransformedCInteropMetadataLibraries/io.ktor-ktor-utils-2.3.12-iosMain-cinterop/io.ktor_ktor-utils-cinterop-threadUtils-TE4abA.klib
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
package io.redlink.more.app.android.observations.HR


import com.polar.androidcommunications.api.ble.model.DisInfo
import com.polar.sdk.api.PolarBleApi
import com.polar.sdk.api.PolarBleApiCallback
import com.polar.sdk.api.model.PolarDeviceInfo
Expand Down Expand Up @@ -45,35 +46,60 @@ class PolarObserverCallback : PolarBleApiCallback() {

override fun deviceConnected(polarDeviceInfo: PolarDeviceInfo) {
super.deviceConnected(polarDeviceInfo)
Napier.d("CONNECTED: ${polarDeviceInfo.deviceId}", tag = "PolarObserverCallback::deviceConnected")
Napier.d(
"CONNECTED: ${polarDeviceInfo.deviceId}",
tag = "PolarObserverCallback::deviceConnected"
)
connectionListener?.onDeviceConnected(polarDeviceInfo)
}

override fun deviceConnecting(polarDeviceInfo: PolarDeviceInfo) {
super.deviceConnecting(polarDeviceInfo)
Napier.d("CONNECTING: ${polarDeviceInfo.deviceId}", tag = "PolarObserverCallback::deviceConnecting")
Napier.d(
"CONNECTING: ${polarDeviceInfo.deviceId}",
tag = "PolarObserverCallback::deviceConnecting"
)
connectionListener?.onDeviceConnecting(polarDeviceInfo)
}

override fun deviceDisconnected(polarDeviceInfo: PolarDeviceInfo) {
super.deviceDisconnected(polarDeviceInfo)
Napier.i("Device disconnected: ${polarDeviceInfo.name}", tag = "PolarObserverCallback::deviceDisconnected")
Napier.i(
"Device disconnected: ${polarDeviceInfo.name}",
tag = "PolarObserverCallback::deviceDisconnected"
)
connectionListener?.onDeviceDisconnected(polarDeviceInfo)
}

override fun bleSdkFeatureReady(identifier: String, feature: PolarBleApi.PolarBleSdkFeature) {
super.bleSdkFeatureReady(identifier, feature)
Napier.i("SDK Feature ready: ${feature.name}, identifier: $identifier", tag = "PolarObserverCallback::bleSdkFeatureReady")
Napier.i(
"SDK Feature ready: ${feature.name}, identifier: $identifier",
tag = "PolarObserverCallback::bleSdkFeatureReady"
)
connectionListener?.onPolarFeatureReady(feature)
}

override fun disInformationReceived(identifier: String, uuid: UUID, value: String) {
super.disInformationReceived(identifier, uuid, value)
Napier.i("Disinformation: $identifier, UUID: $uuid, Value: $value", tag = "PolarObserverCallback::disInformationReceived")
Napier.i(
"Disinformation: $identifier, UUID: $uuid, Value: $value",
tag = "PolarObserverCallback::disInformationReceived"
)
}

override fun disInformationReceived(identifier: String, disInfo: DisInfo) {
Napier.i(
"Disinformation: $identifier, DisInfo: $disInfo",
tag = "PolarObserverCallback::disInformationReceived"
)
}

override fun batteryLevelReceived(identifier: String, level: Int) {
super.batteryLevelReceived(identifier, level)
Napier.i( "Battery Level Received: $level", tag = "PolarObserverCallback::batteryLevelReceived")
Napier.i(
"Battery Level Received: $level",
tag = "PolarObserverCallback::batteryLevelReceived"
)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ class PolarConnector(context: Context) : BluetoothConnector, PolarConnectorListe
override fun onPolarFeatureReady(feature: PolarBleApi.PolarBleSdkFeature) {
if (feature == PolarBleApi.PolarBleSdkFeature.FEATURE_HR) {
Napier.i(tag = "PolarConnector::onPolarFeatureReady") { "HR ready!" }
PolarHeartRateObservation.setHRFeature(false)
PolarHeartRateObservation.setHRFeature(true)
}
}

Expand Down
2 changes: 1 addition & 1 deletion androidApp/src/main/res/values-de/bluetooth-strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<string name="more_ble_context_description">Manche Aufgaben benötigen Bluetooth Geräte um abgeschlossen zu werden. Stelle sicher, dass folgende Geräte verbunden sind</string>
<string name="more_ble_context_description_part2">Sie können sich jederzeit mit Geräten verbinden in: Info > Geräte</string>
<string name="more_ble_skip">Setup überspringen</string>
<string name="more_ble_disabled">Bluetooth ist deaktiviert. Bitte aktivieren zum verbinden!</string>
<string name="more_ble_disabled">Bluetooth oder GPS deaktiviert! Bitte aktivieren Sie beides für die Nutzung!</string>
<string name="more_connect_device_info">Verbinde ein Gerät, indem du es aus der Liste auswählst, nachdem du dieses mit deinem Smartphone gekoppelt hast.</string>
<string name="more_connect_no_device_found_info">Bitte verbinde das geforderte Gerät mit deinem Smartphone, um es mit der App zu verbinden.</string>
</resources>
6 changes: 3 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
buildscript {
dependencies {
classpath("com.google.gms:google-services:4.4.1")
classpath("com.google.firebase:firebase-crashlytics-gradle:2.9.9")
classpath("com.google.gms:google-services:4.4.2")
classpath("com.google.firebase:firebase-crashlytics-gradle:3.0.2")
}
repositories {
google() // Google's Maven repository
Expand All @@ -13,7 +13,7 @@ plugins {
//trick: for the same plugin versions in all sub-modules
id("com.android.application").version("8.2.2").apply(false)
id("com.android.library").version("8.2.2").apply(false)
kotlin("android").version("1.9.22").apply(false)
kotlin("android").version("1.9.23").apply(false)
kotlin("multiplatform").version("1.9.23").apply(false)
kotlin("plugin.serialization").version("1.9.23").apply(false)
}
Expand Down
4 changes: 2 additions & 2 deletions iosApp/iosApp.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1798,7 +1798,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 4.0.12;
MARKETING_VERSION = 4.0.13;
OTHER_LDFLAGS = (
"$(inherited)",
"-framework",
Expand Down Expand Up @@ -1838,7 +1838,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 4.0.12;
MARKETING_VERSION = 4.0.13;
OTHER_LDFLAGS = (
"$(inherited)",
"-framework",
Expand Down
4 changes: 2 additions & 2 deletions iosApp/iosApp/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<key>CFBundlePackageType</key>
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
<key>CFBundleShortVersionString</key>
<string>4.0.12</string>
<string>4.0.13</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
Expand All @@ -36,7 +36,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>4.0.12</string>
<string>4.0.13</string>
<key>FirebaseAppDelegateProxyEnabled</key>
<false/>
<key>ITSAppUsesNonExemptEncryption</key>
Expand Down
2 changes: 1 addition & 1 deletion shared/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ val openapiIgnore = "$openApiInputDir/openapi-ignore"
val coroutinesVersion = "1.8.1"
val ktorVersion = "2.3.12"
val napierVersion = "2.7.1"
val serializationVersion = "1.7.1"
val serializationVersion = "1.6.0"
val gsonVersion = "2.10.1"

kotlin {
Expand Down

0 comments on commit 39b541f

Please sign in to comment.