From e9f6e2c7a35fedbf21a508916998e7dc46bd86ef Mon Sep 17 00:00:00 2001 From: Tim Kluge Date: Thu, 29 May 2025 13:24:42 +0200 Subject: [PATCH] Fix BASE_URL --- .github/workflows/android.yml | 2 +- .../kotlin/de/timklge/karooreminder/screens/MainScreen.kt | 7 ------- .../kotlin/de/timklge/karooreminder/screens/Reminder.kt | 2 +- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 2bba5b5..a5810ed 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -26,7 +26,7 @@ jobs: echo "KEYSTORE_PASSWORD=${{ secrets.KEYSTORE_PASSWORD }}" >> $GITHUB_ENV echo "KEYSTORE_BASE64=${{ secrets.KEYSTORE_BASE64 }}" >> $GITHUB_ENV echo "BUILD_NUMBER=${{ github.run_number }}" >> $GITHUB_ENV - echo "BASE_URL=${{ secrets.BASE_URL || '"https://github.com/timklge/karoo-powerbar/releases/latest/download"' }}" >> $GITHUB_ENV + echo "BASE_URL=${{ secrets.BASE_URL || 'https://github.com/timklge/karoo-reminder/releases/latest/download' }}" >> $GITHUB_ENV - uses: actions/checkout@v4 - name: set up JDK 17 uses: actions/setup-java@v4 diff --git a/app/src/main/kotlin/de/timklge/karooreminder/screens/MainScreen.kt b/app/src/main/kotlin/de/timklge/karooreminder/screens/MainScreen.kt index 6833adb..ec71fc1 100644 --- a/app/src/main/kotlin/de/timklge/karooreminder/screens/MainScreen.kt +++ b/app/src/main/kotlin/de/timklge/karooreminder/screens/MainScreen.kt @@ -20,13 +20,8 @@ import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.CornerSize import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.verticalScroll -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.rounded.Add import androidx.compose.material3.Card import androidx.compose.material3.ExperimentalMaterial3Api -import androidx.compose.material3.FabPosition -import androidx.compose.material3.FloatingActionButton -import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold import androidx.compose.material3.Surface @@ -64,7 +59,6 @@ import de.timklge.karooreminder.KarooReminderExtension import de.timklge.karooreminder.R import de.timklge.karooreminder.dataStore import de.timklge.karooreminder.streamActiveRideProfile -import de.timklge.karooreminder.streamRideState import de.timklge.karooreminder.streamUserProfile import io.hammerhead.karooext.KarooSystemService import io.hammerhead.karooext.models.UserProfile @@ -74,7 +68,6 @@ import kotlinx.coroutines.launch import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json - val preferencesKey = stringPreferencesKey("reminders") suspend fun saveReminders(context: Context, reminders: MutableList) { diff --git a/app/src/main/kotlin/de/timklge/karooreminder/screens/Reminder.kt b/app/src/main/kotlin/de/timklge/karooreminder/screens/Reminder.kt index b4abfdf..5e305f4 100644 --- a/app/src/main/kotlin/de/timklge/karooreminder/screens/Reminder.kt +++ b/app/src/main/kotlin/de/timklge/karooreminder/screens/Reminder.kt @@ -151,5 +151,5 @@ fun reminderIsActive(reminder: Reminder, currentRideProfile: RideProfile?): Bool val enabledRideProfiles = reminder.enabledRideProfiles.map { it.lowercase().trim() } val currentProfileName = currentRideProfile?.name?.lowercase()?.trim() - return reminder.isActive && (currentRideProfile == null || reminder.enabledRideProfiles.isEmpty() || enabledRideProfiles.contains(currentProfileName)) + return reminder.isActive && (currentRideProfile == null || enabledRideProfiles.isEmpty() || enabledRideProfiles.contains(currentProfileName)) } \ No newline at end of file