Skip to content

Commit

Permalink
feat(compression and storage): add system to compress alarms
Browse files Browse the repository at this point in the history
function for compress and decompress Alarm class
use Localstorage
  • Loading branch information
TheRealPad committed May 4, 2024
1 parent f539908 commit 25869c0
Show file tree
Hide file tree
Showing 8 changed files with 49 additions and 8 deletions.
2 changes: 2 additions & 0 deletions app/src/main/java/com/eipsaferoad/owl/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,10 @@ import com.eipsaferoad.owl.presentation.login.Login
import com.eipsaferoad.owl.presentation.settings.Settings
import com.eipsaferoad.owl.presentation.theme.OwlTheme
import com.eipsaferoad.owl.utils.EnvEnum
import com.eipsaferoad.owl.utils.KeysEnum
import com.eipsaferoad.owl.utils.LocalStorage
import com.eipsaferoad.owl.utils.ReadEnvVar
import com.eipsaferoad.owl.utils.initAlarms
import com.google.android.gms.wearable.CapabilityClient
import com.google.android.gms.wearable.CapabilityInfo
import com.google.android.gms.wearable.DataClient
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import androidx.navigation.NavHostController
import com.eipsaferoad.owl.api.Request
import com.eipsaferoad.owl.presentation.PagesEnum
import com.eipsaferoad.owl.utils.EnvEnum
import com.eipsaferoad.owl.utils.KeysEnum
import com.eipsaferoad.owl.utils.LocalStorage
import okhttp3.FormBody
import okhttp3.Headers
Expand Down
11 changes: 10 additions & 1 deletion app/src/main/java/com/eipsaferoad/owl/models/AlarmType.kt
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,13 @@ open class AlarmType(
}
return 0
}
}

fun compress(): String {
return if (isActivate) "1$actual" else "0$actual"
}

fun decompress(compressStr: String) {
isActivate = (compressStr[0] == '1')
actual = compressStr.substring(1).toFloat()
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,12 @@ import androidx.wear.compose.material.Text
import androidx.wear.compose.navigation.rememberSwipeDismissableNavController
import com.eipsaferoad.owl.R
import com.eipsaferoad.owl.models.Alarm
import com.eipsaferoad.owl.models.SoundAlarm
import com.eipsaferoad.owl.models.VibrationAlarm
import com.eipsaferoad.owl.presentation.PagesEnum
import com.eipsaferoad.owl.presentation.theme.OwlTheme
import com.eipsaferoad.owl.utils.EnvEnum
import com.eipsaferoad.owl.utils.KeysEnum
import com.eipsaferoad.owl.utils.LocalStorage
import com.eipsaferoad.owl.utils.getVibrationEffects
import com.eipsaferoad.owl.utils.soundPlayer
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,9 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.tooling.preview.Devices
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.core.content.ContextCompat.getSystemService
import androidx.wear.compose.material.Button
import androidx.wear.compose.material.ButtonDefaults
import androidx.wear.compose.material.Switch
Expand All @@ -50,6 +48,7 @@ import com.eipsaferoad.owl.models.Alarm
import com.eipsaferoad.owl.models.AlarmType
import com.eipsaferoad.owl.presentation.theme.OwlTheme
import com.eipsaferoad.owl.utils.EnvEnum
import com.eipsaferoad.owl.utils.KeysEnum
import com.eipsaferoad.owl.utils.LocalStorage
import com.eipsaferoad.owl.utils.getVibrationEffects
import com.eipsaferoad.owl.utils.soundPlayer
Expand All @@ -59,7 +58,6 @@ import org.json.JSONObject

@Composable
fun Settings(context: Context, alarms: MutableState<Alarm>, mVibrator: Vibrator, apiUrl: String, accessToken: String?) {

LazyColumn(
modifier = Modifier
.padding(top = 40.dp, bottom = 40.dp)
Expand Down
11 changes: 8 additions & 3 deletions app/src/main/java/com/eipsaferoad/owl/utils/LocalStorage.kt
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
package com.eipsaferoad.owl.utils

import android.content.Context
import java.security.KeyStore
import javax.crypto.Cipher
import javax.crypto.spec.SecretKeySpec

enum class KeysEnum(val value: String) {
ALARM_VIBRATION("alarm_vibration"),
ALARM_SOUND("alarm_sound"),
ALARM_ACTIVATE("alarm_activate"),
EMAIL("email"),
PASSWORD("password")
}

enum class EnvEnum(val value: String) {
EMAIL("email"),
Expand Down
20 changes: 20 additions & 0 deletions app/src/main/java/com/eipsaferoad/owl/utils/initAlarms.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package com.eipsaferoad.owl.utils

import android.content.Context
import androidx.compose.runtime.MutableState
import com.eipsaferoad.owl.models.Alarm

fun initAlarms(context: Context, alarms: MutableState<Alarm>) {
val vibration = LocalStorage.getData(context, KeysEnum.ALARM_VIBRATION.value)
val sound = LocalStorage.getData(context, KeysEnum.ALARM_SOUND.value)
val activate = LocalStorage.getData(context, KeysEnum.ALARM_ACTIVATE.value)
if (activate != null) {
alarms.value.isAlarmActivate = activate == "1"
}
if (!vibration.isNullOrEmpty()) {
alarms.value.vibration.decompress(vibration)
}
if (!sound.isNullOrEmpty()) {
alarms.value.sound.decompress(sound)
}
}
5 changes: 4 additions & 1 deletion app/src/test/java/com/eipsaferoad/owl/OwlTest.kt
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
package com.eipsaferoad.owl

import android.os.VibrationEffect
import androidx.compose.runtime.MutableState
import androidx.compose.runtime.mutableStateOf
import com.eipsaferoad.owl.models.Alarm
import com.eipsaferoad.owl.models.SoundAlarm
import com.eipsaferoad.owl.models.VibrationAlarm
import org.junit.Assert.assertEquals
import org.junit.Test
Expand Down Expand Up @@ -53,6 +57,5 @@ class OwlTest {
alarm.updateAlarm()
alarm.updateAlarm()
alarm.updateAlarm()

}
}

0 comments on commit 25869c0

Please sign in to comment.