Added minor fixes to resources and build scripts

2023-08-05 14:01:10 +01:00 · 2023-08-05 14:01:10 +01:00 · 5cefc5129f
commit 5cefc5129f
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@ -15,6 +15,7 @@ android {
        targetSdk = 33
        versionCode = 313
        versionName = "3.1.3"
+        resourceConfigurations.addAll(listOf("en", "ru", "si", "zh-rCN", "anydpi"))
        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
    }
    buildFeatures {
--- a/app/src/main/java/com/rtbishop/look4sat/presentation/MainScreen.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/MainScreen.kt
@ -26,9 +26,9 @@ import com.rtbishop.look4sat.presentation.radar.RadarScreen
 import com.rtbishop.look4sat.presentation.settings.SettingsScreen

 sealed class Screen(var title: String, var icon: Int, var route: String) {
-    data object Entries : Screen("Entries", R.drawable.ic_entries, "entries")
+    data object Entries : Screen("Entries", R.drawable.ic_sputnik, "entries")
    data object Passes : Screen("Passes", R.drawable.ic_passes, "passes")
-    data object Radar : Screen("Radar", R.drawable.ic_radar, "radar")
+    data object Radar : Screen("Radar", R.drawable.ic_settings, "radar")
    data object Map : Screen("World Map", R.drawable.ic_world_map, "world_map")
    data object Settings : Screen("Settings", R.drawable.ic_settings, "settings")
 }
--- a/app/src/main/java/com/rtbishop/look4sat/presentation/entries/EntriesScreen.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/entries/EntriesScreen.kt
@ -142,7 +142,7 @@ private fun SaveButton(saveSelection: () -> Unit, modifier: Modifier = Modifier)
        colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.primary)
    ) {
        Box(modifier = clickableModifier.fillMaxSize(), contentAlignment = Alignment.Center) {
-            Icon(painter = painterResource(id = R.drawable.ic_checkmark), contentDescription = null)
+            Icon(painter = painterResource(id = R.drawable.ic_done), contentDescription = null)
        }
    }
 }
@ -169,7 +169,7 @@ private fun EntryTypeCard(type: String, onClick: () -> Unit, modifier: Modifier
                .height(48.dp)
                .clickable { onClick() }) {
            Icon(
-                painter = painterResource(id = R.drawable.ic_next),
+                painter = painterResource(id = R.drawable.ic_arrow),
                contentDescription = null,
                modifier = Modifier
                    .size(36.dp)
--- a/app/src/main/java/com/rtbishop/look4sat/presentation/map/MapViewModel.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/map/MapViewModel.kt
@ -29,12 +29,12 @@ import com.rtbishop.look4sat.domain.predict.Satellite
 import com.rtbishop.look4sat.domain.repository.ISatelliteRepo
 import com.rtbishop.look4sat.domain.repository.ISettingsRepo
 import com.rtbishop.look4sat.domain.utility.QthConverter
+import com.rtbishop.look4sat.domain.utility.clipLat
+import com.rtbishop.look4sat.domain.utility.clipLon
 import com.rtbishop.look4sat.domain.utility.toDegrees
 import com.rtbishop.look4sat.domain.utility.toTimerString
 import java.util.Date
 import kotlin.collections.set
-import kotlin.math.max
-import kotlin.math.min
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.cancelAndJoin
 import kotlinx.coroutines.delay
@ -200,21 +200,6 @@ class MapViewModel(private val satelliteRepo: ISatelliteRepo, settingsRepo: ISet
        _mapData.emit(satData)
    }

-    private fun clipLat(latitude: Double): Double {
-        return clip(latitude, -85.05, 85.05)
-    }
-
-    private fun clipLon(longitude: Double): Double {
-        var result = longitude
-        while (result < -180.0) result += 360.0
-        while (result > 180.0) result -= 360.0
-        return clip(result, -180.0, 180.0)
-    }
-
-    private fun clip(currentValue: Double, minValue: Double, maxValue: Double): Double {
-        return min(max(currentValue, minValue), maxValue)
-    }
-
    companion object {
        val Factory: ViewModelProvider.Factory = viewModelFactory {
            val applicationKey = ViewModelProvider.AndroidViewModelFactory.APPLICATION_KEY
--- a/app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarScreen.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarScreen.kt
@ -114,7 +114,7 @@ private fun TransmitterItem(radio: SatRadio) {
                    modifier = Modifier.fillMaxWidth()
                ) {
                    Icon(
-                        painter = painterResource(id = R.drawable.ic_next),
+                        painter = painterResource(id = R.drawable.ic_arrow),
                        contentDescription = null, modifier = Modifier.rotate(180f)
                    )
                    Text(
@ -123,7 +123,7 @@ private fun TransmitterItem(radio: SatRadio) {
                        textAlign = TextAlign.Center
                    )
                    Icon(
-                        painter = painterResource(id = R.drawable.ic_next),
+                        painter = painterResource(id = R.drawable.ic_arrow),
                        contentDescription = null
                    )
                }
--- a/app/src/main/java/com/rtbishop/look4sat/presentation/settings/SettingsScreen.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/settings/SettingsScreen.kt
@ -144,7 +144,7 @@ private fun CardAbout(version: String, modifier: Modifier = Modifier) {
        ) {
            Row(horizontalArrangement = Arrangement.Center) {
                Icon(
-                    painter = painterResource(id = R.drawable.ic_entries),
+                    painter = painterResource(id = R.drawable.ic_sputnik),
                    tint = MaterialTheme.colorScheme.secondary,
                    contentDescription = null,
                    modifier = Modifier
--- a/app/src/main/res/drawable/ic_arrow.xml
+++ b/app/src/main/res/drawable/ic_arrow.xml
@ -1,7 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:autoMirrored="true"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_checkbox_off.xml
+++ b/app/src/main/res/drawable/ic_checkbox_off.xml
@ -1,7 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:autoMirrored="true"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_checkbox_on.xml
+++ b/app/src/main/res/drawable/ic_checkbox_on.xml
@ -1,7 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:autoMirrored="true"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_close.xml
+++ b/app/src/main/res/drawable/ic_close.xml
@ -1,7 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:autoMirrored="true"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_checkmark.xml
+++ b/app/src/main/res/drawable/ic_checkmark.xml
@ -1,7 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:autoMirrored="true"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_elevation.xml
+++ b/app/src/main/res/drawable/ic_elevation.xml
@ -1,7 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:autoMirrored="true"
    android:viewportWidth="512"
    android:viewportHeight="512">
    <path
--- a/app/src/main/res/drawable/ic_entries.xml
+++ b/app/src/main/res/drawable/ic_entries.xml
@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:autoMirrored="true"
-    android:viewportWidth="128"
-    android:viewportHeight="128">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="m96.642,31.504c7.911,7.997 17.143,13.584 25.365,15.581l1.754,-3.997C123.78,43.048 123.786,43.005 123.802,42.965 125.834,38.995 127,34.495 127,29.715 127,13.881 114.379,1 98.867,1c-5.125,0 -9.92,1.429 -14.064,3.884l-3.398,1.598c0.08,0.306 0.133,0.599 0.221,0.91 2.32,8.104 7.652,16.667 15.016,24.112z" />
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M93.876,34.3C86.053,26.391 80.369,17.225 77.87,8.49 77.84,8.385 77.818,8.285 77.788,8.181L2.629,43.513c-1.404,0.66 -2.019,2.358 -1.372,3.791 0.472,1.046 1.485,1.663 2.545,1.663 0.392,0 0.79,-0.084 1.169,-0.263L74.045,16.235c-1.873,3.578 -2.997,7.611 -3.228,11.885L35.566,51.732c-1.294,0.866 -1.653,2.638 -0.805,3.957 0.538,0.836 1.431,1.29 2.344,1.29 0.526,0 1.06,-0.151 1.533,-0.469L71.189,34.707c1.4,8.11 6.135,15.044 12.715,19.285l-54.945,68.337c-0.981,1.22 -0.808,3.021 0.388,4.023 0.521,0.437 1.149,0.649 1.775,0.649 0.809,0 1.611,-0.357 2.166,-1.045L89.056,56.595c3.06,1.168 6.357,1.838 9.811,1.838 4.932,0 9.566,-1.312 13.601,-3.597L84.602,118.323c-0.633,1.44 0,3.131 1.41,3.777 0.372,0.17 0.76,0.25 1.144,0.25 1.07,0 2.092,-0.629 2.556,-1.691L120.402,50.739C111.642,48.416 102.042,42.555 93.876,34.3Z" />
-</vector>
--- a/app/src/main/res/drawable/ic_filter.xml
+++ b/app/src/main/res/drawable/ic_filter.xml
@ -1,7 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:autoMirrored="true"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_passes.xml
+++ b/app/src/main/res/drawable/ic_passes.xml
@ -1,7 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:autoMirrored="true"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_position.xml
+++ b/app/src/main/res/drawable/ic_position.xml
@ -1,11 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:autoMirrored="true"
-    android:tint="@color/accent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/accent"
        android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13c0,-3.87 -3.13,-7 -7,-7zM12,11.5c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5 2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5z" />
 </vector>
--- a/app/src/main/res/drawable/ic_radar.xml
+++ b/app/src/main/res/drawable/ic_radar.xml
@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:autoMirrored="true"
-    android:viewportWidth="287.97"
-    android:viewportHeight="287.97">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M143.98,287.97c79.4,0 143.99,-64.59 143.99,-143.99S223.38,0 143.98,0S0,64.59 0,143.98S64.59,287.97 143.98,287.97zM47.21,152.7c4.14,46.32 40.85,83.4 87.04,88.01v28.32c-61.79,-4.77 -111.08,-54.4 -115.36,-116.33H47.21zM197.35,74.14c2.64,-2.29 5.98,-3.74 9.69,-4c0.38,-0.03 0.75,-0.12 1.14,-0.12c9.15,0 16.57,7.42 16.57,16.57c0,1 -0.13,1.97 -0.3,2.92c-0.65,3.64 -2.49,6.84 -5.1,9.25c-2.28,2.1 -5.13,3.57 -8.31,4.12c-0.94,0.17 -1.89,0.29 -2.88,0.29c-9.15,0 -16.57,-7.42 -16.57,-16.57c0,-1.63 0.31,-3.17 0.75,-4.65C193.26,78.87 194.99,76.19 197.35,74.14zM152.7,152.7h69.55c-4.05,36.48 -33.07,65.51 -69.55,69.55V152.7zM208.18,116.01c3.09,0 6.01,-0.61 8.81,-1.5c2.52,6.22 4.25,12.84 5.11,19.73h-69.4V65.73c10.27,1.14 19.95,4.23 28.65,8.94c-1.63,3.65 -2.58,7.68 -2.58,11.93C178.76,102.82 191.96,116.01 208.18,116.01zM134.25,134.25H65.89c4.42,-35.65 32.71,-63.94 68.36,-68.36V134.25zM134.25,152.7v69.39c-36,-4.46 -64.52,-33.26 -68.52,-69.39H134.25zM152.7,269.08v-28.32c46.66,-4.17 83.89,-41.41 88.06,-88.07h28.33C264.78,214.97 214.97,264.77 152.7,269.08zM240.71,134.25c-1.09,-10.91 -4.07,-21.26 -8.48,-30.81c3.35,-4.78 5.37,-10.57 5.37,-16.84c0,-16.22 -13.2,-29.42 -29.42,-29.42c-5.09,0 -9.82,1.42 -14,3.71c-12.33,-7.47 -26.39,-12.32 -41.48,-13.68V18.89C214.62,23.17 264.26,72.46 269.03,134.25H240.71zM134.25,18.94v28.32c-45.85,4.58 -82.41,41.14 -86.98,86.99H18.95C23.69,72.8 72.8,23.69 134.25,18.94z" />
-</vector>
--- a/app/src/main/res/drawable/ic_search.xml
+++ b/app/src/main/res/drawable/ic_search.xml
@ -1,7 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:autoMirrored="true"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_settings.xml
+++ b/app/src/main/res/drawable/ic_settings.xml
@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:autoMirrored="true"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportWidth="960"
+    android:viewportHeight="960">
    <path
        android:fillColor="@android:color/white"
-        android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z" />
+        android:pathData="m388,880 l-20,-126q-19,-7 -40,-19t-37,-25l-118,54 -93,-164 108,-79q-2,-9 -2.5,-20.5T185,480q0,-9 0.5,-20.5T188,439L80,360l93,-164 118,54q16,-13 37,-25t40,-18l20,-127h184l20,126q19,7 40.5,18.5T669,250l118,-54 93,164 -108,77q2,10 2.5,21.5t0.5,21.5q0,10 -0.5,21t-2.5,21l108,78 -93,164 -118,-54q-16,13 -36.5,25.5T592,754L572,880L388,880ZM480,610q54,0 92,-38t38,-92q0,-54 -38,-92t-92,-38q-54,0 -92,38t-38,92q0,54 38,92t92,38Z" />
 </vector>
--- a/app/src/main/res/drawable/ic_sputnik.xml
+++ b/app/src/main/res/drawable/ic_sputnik.xml
@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="128"
+    android:viewportHeight="128">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="m96.64,31.5c7.91,8 17.14,13.58 25.37,15.58l1.75,-4c0.02,-0.04 0.02,-0.08 0.04,-0.12 2.03,-3.97 3.2,-8.47 3.2,-13.25 0,-15.83 -12.62,-28.71 -28.13,-28.71 -5.13,0 -9.92,1.43 -14.06,3.88l-3.4,1.6c0.08,0.31 0.13,0.6 0.22,0.91 2.32,8.1 7.65,16.67 15.02,24.11z" />
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="m93.88,34.3c-7.82,-7.91 -13.51,-17.07 -16.01,-25.81 -0.03,-0.1 -0.05,-0.2 -0.08,-0.31l-75.16,35.33c-1.4,0.66 -2.02,2.36 -1.37,3.79 0.47,1.05 1.49,1.66 2.55,1.66 0.39,0 0.79,-0.08 1.17,-0.26l69.07,-32.47c-1.87,3.58 -3,7.61 -3.23,11.88l-35.25,23.61c-1.29,0.87 -1.65,2.64 -0.8,3.96 0.54,0.84 1.43,1.29 2.34,1.29 0.53,0 1.06,-0.15 1.53,-0.47l32.55,-21.8c1.4,8.11 6.13,15.04 12.71,19.28l-54.94,68.33c-0.98,1.22 -0.81,3.02 0.39,4.02 0.52,0.44 1.15,0.65 1.78,0.65 0.81,0 1.61,-0.36 2.17,-1.04l55.77,-69.36c3.06,1.17 6.36,1.84 9.81,1.84 4.93,0 9.57,-1.31 13.6,-3.6l-27.87,63.48c-0.63,1.44 0,3.13 1.41,3.78 0.37,0.17 0.76,0.25 1.14,0.25 1.07,0 2.09,-0.63 2.56,-1.69l30.69,-69.92c-8.76,-2.32 -18.36,-8.18 -26.53,-16.44z" />
+</vector>
--- a/app/src/main/res/drawable/ic_world_map.xml
+++ b/app/src/main/res/drawable/ic_world_map.xml
@ -1,7 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:autoMirrored="true"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/launcher_fg.xml
+++ b/app/src/main/res/drawable/launcher_fg.xml
@ -1,9 +1,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="108dp"
    android:height="108dp"
-    android:autoMirrored="true"
-    android:viewportWidth="271.2439"
-    android:viewportHeight="271.2439">
+    android:viewportWidth="271.24"
+    android:viewportHeight="271.24">
    <group
        android:translateX="1.3562195"
        android:translateY="1.3562195">
@ -12,10 +11,10 @@
            android:translateY="70.26573">
            <path
                android:fillColor="@color/accent"
-                android:pathData="m96.642,31.504c7.911,7.997 17.143,13.584 25.365,15.581l1.754,-3.997C123.78,43.048 123.786,43.005 123.802,42.965 125.834,38.995 127,34.495 127,29.715 127,13.881 114.379,1 98.867,1c-5.125,0 -9.92,1.429 -14.064,3.884l-3.398,1.598c0.08,0.306 0.133,0.599 0.221,0.91 2.32,8.104 7.652,16.667 15.016,24.112z" />
+                android:pathData="m96.64,31.5c7.91,8 17.14,13.58 25.36,15.58l1.75,-4C123.78,43.05 123.79,43.01 123.8,42.97 125.83,38.99 127,34.49 127,29.72 127,13.88 114.38,1 98.87,1c-5.13,0 -9.92,1.43 -14.06,3.88l-3.4,1.6c0.08,0.31 0.13,0.6 0.22,0.91 2.32,8.1 7.65,16.67 15.02,24.11z" />
            <path
                android:fillColor="@color/accent"
-                android:pathData="M93.876,34.3C86.053,26.391 80.369,17.225 77.87,8.49 77.84,8.385 77.818,8.285 77.788,8.181L2.629,43.513c-1.404,0.66 -2.019,2.358 -1.372,3.791 0.472,1.046 1.485,1.663 2.545,1.663 0.392,0 0.79,-0.084 1.169,-0.263L74.045,16.235c-1.873,3.578 -2.997,7.611 -3.228,11.885L35.566,51.732c-1.294,0.866 -1.653,2.638 -0.805,3.957 0.538,0.836 1.431,1.29 2.344,1.29 0.526,0 1.06,-0.151 1.533,-0.469L71.189,34.707c1.4,8.11 6.135,15.044 12.715,19.285l-54.945,68.337c-0.981,1.22 -0.808,3.021 0.388,4.023 0.521,0.437 1.149,0.649 1.775,0.649 0.809,0 1.611,-0.357 2.166,-1.045L89.056,56.595c3.06,1.168 6.357,1.838 9.811,1.838 4.932,0 9.566,-1.312 13.601,-3.597L84.602,118.323c-0.633,1.44 0,3.131 1.41,3.777 0.372,0.17 0.76,0.25 1.144,0.25 1.07,0 2.092,-0.629 2.556,-1.691L120.402,50.739C111.642,48.416 102.042,42.555 93.876,34.3Z" />
+                android:pathData="M93.88,34.3C86.05,26.39 80.37,17.23 77.87,8.49 77.84,8.39 77.82,8.28 77.79,8.18L2.63,43.51c-1.4,0.66 -2.02,2.36 -1.37,3.79 0.47,1.05 1.49,1.66 2.55,1.66 0.39,0 0.79,-0.08 1.17,-0.26L74.04,16.24c-1.87,3.58 -3,7.61 -3.23,11.89L35.57,51.73c-1.29,0.87 -1.65,2.64 -0.81,3.96 0.54,0.84 1.43,1.29 2.34,1.29 0.53,0 1.06,-0.15 1.53,-0.47L71.19,34.71c1.4,8.11 6.14,15.04 12.72,19.28l-54.94,68.34c-0.98,1.22 -0.81,3.02 0.39,4.02 0.52,0.44 1.15,0.65 1.77,0.65 0.81,0 1.61,-0.36 2.17,-1.04L89.06,56.6c3.06,1.17 6.36,1.84 9.81,1.84 4.93,0 9.57,-1.31 13.6,-3.6L84.6,118.32c-0.63,1.44 0,3.13 1.41,3.78 0.37,0.17 0.76,0.25 1.14,0.25 1.07,0 2.09,-0.63 2.56,-1.69L120.4,50.74C111.64,48.42 102.04,42.56 93.88,34.3Z" />
        </group>
    </group>
 </vector>
--- a/app/src/main/res/drawable/splash.xml
+++ b/app/src/main/res/drawable/splash.xml
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@ -7,7 +7,7 @@
        <item name="android:forceDarkAllowed" tools:targetApi="q">false</item>
        <item name="postSplashScreenTheme">@style/Theme.Look4Sat.Main</item>
        <item name="windowSplashScreenBackground">@color/background</item>
-        <item name="windowSplashScreenAnimatedIcon">@drawable/splash</item>
+        <item name="windowSplashScreenAnimatedIcon">@drawable/launcher_fg</item>
    </style>

    <style name="Theme.Look4Sat.Main" parent="android:Theme.Material.Light.NoActionBar">
--- a/domain/src/main/java/com/rtbishop/look4sat/domain/utility/GeoConverter.kt
+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/utility/GeoConverter.kt
@ -1,12 +1,9 @@
 package com.rtbishop.look4sat.domain.utility

 import com.rtbishop.look4sat.domain.predict.DEG2RAD
-import com.rtbishop.look4sat.domain.predict.PI
 import com.rtbishop.look4sat.domain.predict.RAD2DEG
-import kotlin.math.ln
 import kotlin.math.max
 import kotlin.math.min
-import kotlin.math.sin

 private const val MIN_LATITUDE = -85.05112877980658
 private const val MAX_LATITUDE = 85.05112877980658
@ -17,14 +14,14 @@ fun Double.toDegrees(): Double = this * RAD2DEG

 fun Double.toRadians(): Double = this * DEG2RAD

-fun Double.latToY01(): Double {
-    val sinus = sin(clipLat(this) * PI / MAX_LONGITUDE)
-    return 0.5 - ln((1 + sinus) / (1 - sinus)) / (4 * PI)
-}
+//fun Double.latToY01(): Double {
+//    val sinus = sin(clipLat(this) * PI / MAX_LONGITUDE)
+//    return 0.5 - ln((1 + sinus) / (1 - sinus)) / (4 * PI)
+//}

-fun Double.lonToX01(): Double {
-    return (clipLon(this) - MIN_LONGITUDE) / (MAX_LONGITUDE - MIN_LONGITUDE)
-}
+//fun Double.lonToX01(): Double {
+//    return (clipLon(this) - MIN_LONGITUDE) / (MAX_LONGITUDE - MIN_LONGITUDE)
+//}

 //fun Double.y01ToLat(): Double {
 //    return 90 - 360 * atan(exp((this - 0.5) * 2 * PI)) / PI
@ -34,11 +31,11 @@ fun Double.lonToX01(): Double {
 //    return MIN_LONGITUDE + (MAX_LONGITUDE - MIN_LONGITUDE) * this
 //}

-private fun clipLat(latitude: Double): Double {
+fun clipLat(latitude: Double): Double {
    return clip(latitude, MIN_LATITUDE, MAX_LATITUDE)
 }

-private fun clipLon(longitude: Double): Double {
+fun clipLon(longitude: Double): Double {
    var result = longitude
    while (result < MIN_LONGITUDE) result += 360.0
    while (result > MAX_LONGITUDE) result -= 360.0
--- a/gradle.properties
+++ b/gradle.properties
@ -1,5 +1,4 @@
-android.defaults.buildfeatures.buildconfig=false
-android.enableJetifier=false
+android.enableR8.fullMode=true
 android.nonFinalResIds=true
 android.nonTransitiveRClass=true
 android.useAndroidX=true
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@ -1,3 +1,5 @@
+@file:Suppress("UnstableApiUsage")
+
 pluginManagement {
    repositories {
        google()
@ -12,7 +14,6 @@ dependencyResolutionManagement {
        mavenCentral()
    }
 }
+
 rootProject.name = "Look4Sat"
-include ":app"
-include ":data"
-include ":domain"
+include(":app", ":data", ":domain")