Dependencies, resources and code cleanup

2026-10-02 03:15:37 +00:00 · 2025-12-27 15:01:33 +00:00
1 parent 68d35f0104
commit 007e6d8f9d
@@ -28,6 +28,7 @@ android {
                arg("room.incremental", "true")
                arg("room.expandProjection", "true")
            }
+            correctErrorTypes true
        }
    }
    buildTypes {
@@ -72,9 +73,7 @@ dependencies {
    implementation "androidx.core:core-splashscreen:$core_splashscreen_version"
    implementation "androidx.constraintlayout:constraintlayout:$constraint_version"
    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
-    implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
    implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
-    implementation "androidx.navigation:navigation-runtime-ktx:$navigation_version"
    implementation "androidx.navigation:navigation-fragment-ktx:$navigation_version"
    implementation "androidx.navigation:navigation-ui-ktx:$navigation_version"
    implementation "androidx.room:room-runtime:$room_version"
@@ -1,4 +1,4 @@
-package com.rtbishop.look4sat.presentation.bottomNav
+package com.rtbishop.look4sat.presentation

 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.height
@@ -17,21 +17,30 @@ import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
-import com.rtbishop.look4sat.presentation.MainTheme
-import com.rtbishop.look4sat.presentation.aboutScreen.AboutScreen
+import com.rtbishop.look4sat.R
 import com.rtbishop.look4sat.presentation.entriesScreen.EntriesScreen
 import com.rtbishop.look4sat.presentation.mapScreen.MapScreen
 import com.rtbishop.look4sat.presentation.passesScreen.PassesScreen
 import com.rtbishop.look4sat.presentation.passesScreen.PassesViewModel
+import com.rtbishop.look4sat.presentation.radarScreen.RadarScreen
+import com.rtbishop.look4sat.presentation.settingsScreen.SettingsScreen
+
+sealed class BottomNavItem(var title: String, var icon: Int, var screen_route: String) {
+    object Satellites : BottomNavItem("Satellites", R.drawable.ic_satellite, "satellites")
+    object Passes : BottomNavItem("Passes", R.drawable.ic_list, "passes")
+    object Radar : BottomNavItem("Radar", R.drawable.ic_radar, "radar")
+    object WorldMap : BottomNavItem("World Map", R.drawable.ic_world, "world_map")
+    object Settings : BottomNavItem("Settings", R.drawable.ic_settings, "settings")
+}

@Composable
 fun BottomNavBar(navController: NavController) {
    val items = listOf(
        BottomNavItem.Satellites,
        BottomNavItem.Passes,
+        BottomNavItem.Radar,
        BottomNavItem.WorldMap,
-        BottomNavItem.Settings,
-        BottomNavItem.About
+        BottomNavItem.Settings
    )
    NavigationBar(modifier = Modifier.height(48.dp)) {
        val navBackStackEntry by navController.currentBackStackEntryAsState()
@@ -53,15 +62,18 @@ fun BottomNavBar(navController: NavController) {
@Composable
 fun NavigationGraph(navController: NavHostController) {
    val navToPasses = { navController.navigate(BottomNavItem.Passes.screen_route) }
+    val navToRadar = { navController.navigate(BottomNavItem.Radar.screen_route) }
    val passesViewModel: PassesViewModel = hiltViewModel()
    NavHost(navController, startDestination = BottomNavItem.Passes.screen_route) {
        composable(BottomNavItem.Satellites.screen_route) {
            EntriesScreen(navToPasses, passesViewModel = passesViewModel)
        }
-        composable(BottomNavItem.Passes.screen_route) { PassesScreen(viewModel = passesViewModel) }
+        composable(BottomNavItem.Passes.screen_route) {
+            PassesScreen(navToRadar, viewModel = passesViewModel)
+        }
+        composable(BottomNavItem.Radar.screen_route) { RadarScreen() }
        composable(BottomNavItem.WorldMap.screen_route) { MapScreen() }
-        composable(BottomNavItem.Settings.screen_route) {}
-        composable(BottomNavItem.About.screen_route) { AboutScreen() }
+        composable(BottomNavItem.Settings.screen_route) { SettingsScreen() }
    }
 }

@@ -27,7 +27,6 @@ import android.view.View
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
-import com.rtbishop.look4sat.presentation.bottomNav.MainScreenView
 import dagger.hilt.android.AndroidEntryPoint

@AndroidEntryPoint
@@ -1,11 +0,0 @@
-package com.rtbishop.look4sat.presentation.bottomNav
-
-import com.rtbishop.look4sat.R
-
-sealed class BottomNavItem(var title: String, var icon: Int, var screen_route: String) {
-    object Satellites : BottomNavItem("Satellites", R.drawable.ic_satellite, "satellites")
-    object Passes : BottomNavItem("Passes", R.drawable.ic_list, "passes")
-    object WorldMap : BottomNavItem("World Map", R.drawable.ic_map, "world_map")
-    object Settings : BottomNavItem("Settings", R.drawable.ic_settings, "settings")
-    object About : BottomNavItem("About", R.drawable.ic_about, "about")
-}
@@ -135,7 +135,7 @@ private fun SaveButton(saveSelection: () -> Unit, modifier: Modifier = Modifier)
            containerColor = MaterialTheme.colorScheme.primary,
            contentColor = MaterialTheme.colorScheme.onPrimary
        ), shape = MaterialTheme.shapes.medium, modifier = modifier.width(96.dp)
-    ) { Icon(painter = painterResource(id = R.drawable.ic_done), contentDescription = null) }
+    ) { Icon(painter = painterResource(id = R.drawable.ic_checkmark), contentDescription = null) }
 }

@Composable
@@ -4,6 +4,7 @@ package com.rtbishop.look4sat.presentation.passesScreen

 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
@@ -40,7 +41,7 @@ private val sdf = SimpleDateFormat("HH:mm:ss", Locale.ENGLISH)

@OptIn(ExperimentalMaterialApi::class)
@Composable
-fun PassesScreen(viewModel: PassesViewModel = hiltViewModel()) {
+fun PassesScreen(navToRadar: () -> Unit, viewModel: PassesViewModel = hiltViewModel()) {
    val state = viewModel.passes.observeAsState()
    val timerText = viewModel.timerText.observeAsState()
    val isRefreshing = state.value is DataState.Loading
@@ -92,7 +93,7 @@ fun PassesScreen(viewModel: PassesViewModel = hiltViewModel()) {
                )
            }
        }
-        PassesCard(refreshState, isRefreshing, passes)
+        PassesCard(refreshState, isRefreshing, passes, navToRadar)
    }
 }

@@ -104,13 +105,15 @@ private fun PassPreview() {
    )
    val satellite = NearEarthSat(data)
    val pass = SatPass(1L, 25.0, 10L, 75.0, 850, 45.0, satellite, 0.5f)
-    MainTheme { Pass(pass = pass) }
+    MainTheme { Pass(pass = pass, {}) }
 }

@Composable
-private fun Pass(pass: SatPass, modifier: Modifier = Modifier) {
+private fun Pass(pass: SatPass, navToRadar: () -> Unit, modifier: Modifier = Modifier) {
    Surface(color = MaterialTheme.colorScheme.background, modifier = modifier) {
-        Surface(modifier = Modifier.padding(bottom = 2.dp)) {
+        Surface(modifier = Modifier
+            .padding(bottom = 2.dp)
+            .clickable { navToRadar() }) {
            Column(
                verticalArrangement = Arrangement.spacedBy(2.dp),
                modifier = Modifier
@@ -196,13 +199,16 @@ private fun Pass(pass: SatPass, modifier: Modifier = Modifier) {
@OptIn(ExperimentalFoundationApi::class)
@Composable
 private fun PassesCard(
-    refreshState: PullRefreshState, isRefreshing: Boolean, passes: List<SatPass>
+    refreshState: PullRefreshState,
+    isRefreshing: Boolean,
+    passes: List<SatPass>,
+    navToRadar: () -> Unit
 ) {
    ElevatedCard(modifier = Modifier.fillMaxSize()) {
        Box(Modifier.pullRefresh(refreshState)) {
            LazyColumn(modifier = Modifier.fillMaxSize()) {
                items(items = passes, key = { item -> item.catNum + item.aosTime }) { pass ->
-                    Pass(pass, Modifier.animateItemPlacement())
+                    Pass(pass, navToRadar, Modifier.animateItemPlacement())
                }
            }
            PullRefreshIndicator(
@@ -0,0 +1,57 @@
+package com.rtbishop.look4sat.presentation.radarScreen
+
+import androidx.compose.foundation.layout.*
+import androidx.compose.material3.*
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.hilt.navigation.compose.hiltViewModel
+import com.rtbishop.look4sat.R
+
+@Composable
+fun RadarScreen(viewModel: RadarViewModel = hiltViewModel()) {
+
+    Column(modifier = Modifier.padding(6.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) {
+        ElevatedCard(modifier = Modifier.height(52.dp)) {
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+                horizontalArrangement = Arrangement.SpaceBetween,
+                modifier = Modifier.fillMaxSize()
+            ) {
+                IconButton(onClick = {}) {
+                    Icon(
+                        painter = painterResource(id = R.drawable.ic_filter),
+                        contentDescription = null
+                    )
+                }
+                Column(
+                    verticalArrangement = Arrangement.SpaceEvenly, modifier = Modifier.weight(1f)
+                ) {
+                    Text(text = "Null")
+                    Text(text = "Null")
+                }
+                Text(
+                    text = "00:00:00",
+                    fontSize = 36.sp,
+                    fontWeight = FontWeight.Bold,
+                    color = MaterialTheme.colorScheme.primary,
+                    textAlign = TextAlign.End,
+                    modifier = Modifier
+                        .weight(1f)
+                        .padding(bottom = 2.dp, end = 8.dp)
+                )
+            }
+        }
+        ElevatedCard(modifier = Modifier.fillMaxSize().weight(1f)) {
+
+        }
+        ElevatedCard(modifier = Modifier.fillMaxSize().weight(1f)) {
+
+        }
+    }
+}
@@ -22,7 +22,6 @@ import android.content.Intent
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
-import android.text.method.LinkMovementMethod
 import android.view.View
 import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
@@ -31,7 +30,6 @@ import androidx.core.widget.doOnTextChanged
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.asLiveData
-import com.rtbishop.look4sat.BuildConfig
 import com.rtbishop.look4sat.R
 import com.rtbishop.look4sat.databinding.FragmentSettingsBinding
 import com.rtbishop.look4sat.domain.model.DataState
@@ -81,8 +79,6 @@ class SettingsFragment : Fragment(R.layout.fragment_settings) {
            settingsScroll.setOnScrollChangeListener(NestedScrollView.OnScrollChangeListener { _, _, y, _, newY ->
                if (y > newY) settingsFab.hide() else settingsFab.show()
            })
-            settingsAbout.aboutVersion.text =
-                String.format(getString(R.string.app_version), BuildConfig.VERSION_NAME)
            settingsBtnGithub.clickWithDebounce {
                gotoUrl("https://github.com/rt-bishop/Look4Sat/")
            }
@@ -98,7 +94,6 @@ class SettingsFragment : Fragment(R.layout.fragment_settings) {
        setupRemoteCard()
        setupBTCard()
        setupOtherCard()
-        setupOutroCard()
        viewModel.stationPosition.asLiveData().observe(viewLifecycleOwner) { stationPos ->
            stationPos?.let { handleStationPosition(stationPos) }
        }
@@ -225,13 +220,6 @@ class SettingsFragment : Fragment(R.layout.fragment_settings) {
        }
    }

-    private fun setupOutroCard() {
-        binding.run {
-            settingsOutro.outroThanks.movementMethod = LinkMovementMethod.getInstance()
-            settingsOutro.outroLicense.movementMethod = LinkMovementMethod.getInstance()
-        }
-    }
-
    private fun handleStationPosition(pos: DataState<GeoPos>) {
        when (pos) {
            is DataState.Success -> {
@@ -1,4 +1,4 @@
-package com.rtbishop.look4sat.presentation.aboutScreen
+package com.rtbishop.look4sat.presentation.settingsScreen

 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
@@ -24,11 +24,11 @@ import com.rtbishop.look4sat.presentation.gotoUrl
 private const val POLICY_URL = "https://sites.google.com/view/look4sat-privacy-policy/home"
 private const val LICENSE_URL = "https://www.gnu.org/licenses/gpl-3.0.html"
 private const val GITHUB_URL = "https://github.com/rt-bishop/Look4Sat/"
-private const val SUPPORT_URL = "https://ko-fi.com/rt_bishop"
+private const val DONATE_URL = "https://ko-fi.com/rt_bishop"
 private const val FDROID_URL = "https://f-droid.org/en/packages/com.rtbishop.look4sat/"

@Composable
-fun AboutScreen() {
+fun SettingsScreen() {
    LazyColumn(
        modifier = Modifier.padding(6.dp), verticalArrangement = Arrangement.spacedBy(6.dp)
    ) {
@@ -71,13 +71,18 @@ private fun CardAbout(version: String, modifier: Modifier = Modifier) {
                horizontalArrangement = Arrangement.SpaceEvenly, modifier = Modifier.padding(4.dp)
            ) {
                CardButton(
-                    onClick = { gotoUrl(context, POLICY_URL) },
-                    text = stringResource(id = R.string.btn_privacy),
+                    onClick = { gotoUrl(context, GITHUB_URL) },
+                    text = stringResource(id = R.string.btn_github),
                    modifier = Modifier.weight(1f)
                )
                CardButton(
-                    onClick = { gotoUrl(context, LICENSE_URL) },
-                    text = stringResource(id = R.string.btn_license),
+                    onClick = { gotoUrl(context, DONATE_URL) },
+                    text = stringResource(id = R.string.btn_donate),
+                    modifier = Modifier.weight(1f)
+                )
+                CardButton(
+                    onClick = { gotoUrl(context, FDROID_URL) },
+                    text = stringResource(id = R.string.btn_fdroid),
                    modifier = Modifier.weight(1f)
                )
            }
@@ -114,18 +119,13 @@ private fun CardCredits(modifier: Modifier = Modifier) {
                horizontalArrangement = Arrangement.SpaceEvenly, modifier = Modifier.padding(4.dp)
            ) {
                CardButton(
-                    onClick = { gotoUrl(context, GITHUB_URL) },
-                    text = stringResource(id = R.string.btn_github),
+                    onClick = { gotoUrl(context, LICENSE_URL) },
+                    text = stringResource(id = R.string.btn_license),
                    modifier = Modifier.weight(1f)
                )
                CardButton(
-                    onClick = { gotoUrl(context, SUPPORT_URL) },
-                    text = stringResource(id = R.string.btn_support),
-                    modifier = Modifier.weight(1f)
-                )
-                CardButton(
-                    onClick = { gotoUrl(context, FDROID_URL) },
-                    text = stringResource(id = R.string.btn_fdroid),
+                    onClick = { gotoUrl(context, POLICY_URL) },
+                    text = stringResource(id = R.string.btn_privacy),
                    modifier = Modifier.weight(1f)
                )
            }
@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:autoMirrored="true"
-    android:tint="?attr/colorControlNormal"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,19h-2v-2h2v2zM15.07,11.25l-0.9,0.92C13.45,12.9 13,13.5 13,15h-2v-0.5c0,-1.1 0.45,-2.1 1.17,-2.83l1.24,-1.26c0.37,-0.36 0.59,-0.86 0.59,-1.41 0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2L8,9c0,-2.21 1.79,-4 4,-4s4,1.79 4,4c0,0.88 -0.36,1.68 -0.93,2.25z" />
-</vector>
@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:autoMirrored="true"
-    android:tint="?attr/colorControlNormal"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z" />
-</vector>
@@ -6,6 +6,6 @@
    android:viewportWidth="512"
    android:viewportHeight="512">
    <path
-        android:fillColor="#000000"
+        android:fillColor="@android:color/white"
        android:pathData="M495.3,425.74H255.18c-3.58,-52 -23.78,-100.69 -58.12,-140.07L401.37,81.37c6.52,-6.52 6.52,-17.09 0,-23.61c-6.52,-6.52 -17.09,-6.52 -23.61,0L162.23,273.29L4.89,430.63c-4.77,4.77 -6.21,11.96 -3.62,18.2s8.67,10.3 15.42,10.3h222.61h256c9.22,0 16.7,-7.47 16.7,-16.7C512,433.21 504.52,425.74 495.3,425.74z" />
 </vector>
@@ -1,23 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:autoMirrored="true"
-    android:tint="?attr/colorControlNormal"
-    android:viewportWidth="128"
-    android:viewportHeight="128">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="m105.138,114.121a2.864,2.864 90,0 0,1.701 -0.85l19.334,-19.331a2.864,2.864 90,0 0,-0 -4.027l-26.584,-26.625a2.864,2.864 90,0 0,-1.835 -0.805l-7.922,-0.626 5.773,-5.772a2.864,2.864 90,0 0,-0 -4.027l-19.602,-19.644a2.864,2.864 90,0 0,-4.073 -0l-5.773,5.772 -0.627,-7.92a2.864,2.864 90,0 0,-0.805 -1.835l-26.629,-26.58a2.864,2.864 90,0 0,-4.073 -0l-19.289,19.286a2.864,2.864 90,0 0,-0 4.072l26.584,26.625a2.864,2.864 90,0 0,1.835 0.805l7.922,0.626 -5.773,5.772a2.864,2.864 90,0 0,-0 4.072l19.603,19.599a2.864,2.864 90,0 0,4.073 -0l5.773,-5.772 0.626,7.92a2.864,2.864 90,0 0,0.806 1.835l26.629,26.58a2.864,2.864 90,0 0,2.059 0.85,2.864 2.864,90 0,0 0.269,-0zM104.825,107.23 L80.97,83.38 80.165,72.685 85.58,67.271 96.276,68.121 120.13,91.926zM55.326,47.85 L44.629,47 20.775,23.194 36.081,7.891 59.891,31.741 60.741,42.436z" />
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="m62.653,115.806a2.864,2.864 90,1 0,-0 -5.727c-11.457,-0 -22.876,-4.351 -31.634,-13.107 -8.741,-8.74 -13.095,-20.174 -13.095,-31.614a2.864,2.864 90,1 0,-5.728 -0c-0,12.897 4.935,25.829 14.773,35.664 9.85,9.848 22.772,14.785 35.684,14.785z" />
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="m62.653,127a2.864,2.864 90,1 0,-0 -5.727c-14.325,-0 -28.612,-5.441 -39.547,-16.375 -10.935,-10.933 -16.378,-25.233 -16.378,-39.541a2.864,2.864 90,1 0,-5.728 -0c-0,15.763 6.025,31.562 18.055,43.59 12.029,12.028 27.818,18.052 43.597,18.052z" />
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="m62.653,104.698a2.864,2.864 90,1 0,-0 -5.727c-8.62,-0 -17.201,-3.263 -23.778,-9.839 -6.577,-6.576 -9.855,-15.174 -9.855,-23.774a2.864,2.864 90,1 0,-5.728 -0c-0,10.061 3.861,20.153 11.533,27.824 7.672,7.671 17.756,11.517 27.829,11.517z" />
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="m62.653,93.475a2.864,2.864 90,1 0,-0 -5.727c-5.737,-0 -11.453,-2.174 -15.836,-6.557 -4.384,-4.383 -6.558,-10.098 -6.558,-15.834a2.864,2.864 90,1 0,-5.728 -0c-0,7.192 2.757,14.406 8.236,19.883 5.479,5.478 12.693,8.234 19.887,8.234z" />
-</vector>
@@ -2,9 +2,10 @@
    android:width="24dp"
    android:height="24dp"
    android:autoMirrored="true"
+    android:tint="@color/accent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
-        android:fillColor="@color/accent"
+        android:fillColor="@android:color/white"
        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>
@@ -6,6 +6,6 @@
    android:viewportWidth="287.97"
    android:viewportHeight="287.97">
    <path
-        android:fillColor="#000000"
+        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>
@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:autoMirrored="true"
-    android:tint="?attr/colorControlNormal"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M19,8l-4,4h3c0,3.31 -2.69,6 -6,6 -1.01,0 -1.97,-0.25 -2.8,-0.7l-1.46,1.46C8.97,19.54 10.43,20 12,20c4.42,0 8,-3.58 8,-8h3l-4,-4zM6,12c0,-3.31 2.69,-6 6,-6 1.01,0 1.97,0.25 2.8,0.7l1.46,-1.46C15.03,4.46 13.57,4 12,4c-4.42,0 -8,3.58 -8,8H1l4,4 4,-4H6z" />
-</vector>
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <size
-        android:width="1dp"
-        android:height="1dp" />
-    <solid android:color="@color/background" />
-</shape>
@@ -1,13 +1,14 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="192dp"
    android:height="200dp"
+    android:tint="@color/accent"
    android:viewportWidth="210"
    android:viewportHeight="220">
    <group
        android:translateX="52"
        android:translateY="44">
        <path
-            android:fillColor="@color/accent"
+            android:fillColor="@android:color/white"
            android:pathData="m104.005,111.936q0.504,0 0.958,-0.063 0.467,-0.076 0.87,-0.176l0,1.674q-0.202,0.101 -0.555,0.214 -0.34,0.113 -0.807,0.201 -0.454,0.101 -1.034,0.164 -0.58,0.063 -1.261,0.063 -0.87,0 -1.576,-0.214 -0.706,-0.201 -1.198,-0.68 -0.492,-0.491 -0.757,-1.259 -0.265,-0.78 -0.265,-1.913l0,-8.244l-1.942,0l0,-1.322q0.832,0 1.488,-0.327 0.656,-0.327 1.047,-0.755 0.794,-0.831 1.185,-2.555l2.144,0l0,3.197l3.304,0l0,1.762l-3.304,0l0,7.98q0,1.171 0.391,1.712 0.404,0.541 1.311,0.541zM85.595,109.922q0,1.108 0.353,1.661 0.353,0.554 1.11,0.554 0.555,0 0.996,-0.227 0.454,-0.239 0.769,-0.667 0.328,-0.428 0.492,-1.032 0.177,-0.617 0.177,-1.372l0,-1.938l-1.16,0.076q-0.769,0.038 -1.299,0.252 -0.53,0.201 -0.845,0.566 -0.315,0.365 -0.454,0.894 -0.139,0.529 -0.139,1.233zM87.89,101.188q-0.492,0 -0.832,0.214 -0.328,0.201 -0.53,0.579 -0.202,0.365 -0.29,0.881 -0.076,0.503 -0.076,1.108 -1.74,0 -2.623,-0.39 -0.87,-0.39 -0.87,-1.334 0,-0.705 0.416,-1.208 0.429,-0.503 1.147,-0.818 0.731,-0.315 1.69,-0.453 0.971,-0.151 2.068,-0.151 1.362,0 2.371,0.239 1.021,0.227 1.69,0.743 0.681,0.516 1.021,1.359 0.34,0.831 0.34,2.039l0,6.57q0,0.529 0.076,0.881 0.088,0.352 0.265,0.566 0.177,0.201 0.479,0.289 0.303,0.088 0.731,0.088l0.101,0l0,1.372l-4.804,0l-0.542,-1.775l-0.227,0q-0.429,0.516 -0.807,0.906 -0.378,0.378 -0.807,0.629 -0.429,0.252 -0.971,0.365 -0.53,0.126 -1.261,0.126 -0.857,0 -1.601,-0.252 -0.731,-0.252 -1.286,-0.768 -0.542,-0.529 -0.857,-1.309 -0.315,-0.793 -0.315,-1.863 0,-2.102 1.438,-3.109 1.45,-1.007 4.35,-1.095l2.118,-0.076l0,-1.422q0,-0.642 -0.05,-1.183 -0.05,-0.541 -0.214,-0.931 -0.164,-0.39 -0.492,-0.604 -0.315,-0.214 -0.845,-0.214zM72.115,114.013q-1.74,0 -2.9,-0.327 -1.16,-0.327 -1.866,-0.843 -0.694,-0.516 -0.996,-1.158 -0.29,-0.642 -0.29,-1.271 0,-0.667 0.24,-1.12 0.252,-0.453 0.656,-0.743 0.416,-0.289 0.933,-0.415 0.53,-0.126 1.097,-0.126 0,1.108 0.265,1.951 0.265,0.831 0.731,1.397 0.467,0.554 1.11,0.843 0.656,0.277 1.425,0.277 0.757,0 1.349,-0.214 0.593,-0.214 1.009,-0.592 0.416,-0.378 0.63,-0.881 0.214,-0.516 0.214,-1.108 0,-0.654 -0.265,-1.158 -0.265,-0.516 -0.807,-0.944 -0.53,-0.441 -1.349,-0.831 -0.807,-0.403 -1.891,-0.856 -1.349,-0.554 -2.282,-1.133 -0.921,-0.592 -1.488,-1.271 -0.567,-0.68 -0.82,-1.473 -0.24,-0.793 -0.24,-1.737 0,-1.183 0.479,-2.14 0.479,-0.957 1.324,-1.636 0.845,-0.68 2.005,-1.045 1.16,-0.365 2.522,-0.365 1.425,0 2.459,0.239 1.034,0.227 1.702,0.629 0.681,0.403 1.009,0.957 0.328,0.541 0.328,1.171 0,0.453 -0.202,0.843 -0.189,0.39 -0.593,0.68 -0.391,0.289 -0.996,0.453 -0.593,0.164 -1.387,0.164 0,-0.541 -0.151,-1.158 -0.139,-0.629 -0.467,-1.158 -0.328,-0.541 -0.857,-0.894 -0.517,-0.352 -1.261,-0.352 -0.517,0 -0.984,0.151 -0.467,0.151 -0.82,0.453 -0.34,0.302 -0.542,0.755 -0.202,0.441 -0.202,1.019 0,0.541 0.177,1.019 0.177,0.478 0.643,0.944 0.479,0.453 1.299,0.919 0.832,0.453 2.144,0.982 1.324,0.541 2.257,1.108 0.933,0.566 1.526,1.221 0.605,0.642 0.87,1.422 0.277,0.768 0.277,1.712 0,1.246 -0.492,2.291 -0.492,1.032 -1.412,1.775 -0.921,0.743 -2.219,1.158 -1.286,0.415 -2.9,0.415zM62.115,108.966l0,1.573q0,0.604 0.164,0.969 0.177,0.365 0.454,0.566 0.29,0.189 0.681,0.252 0.391,0.063 0.82,0.063l0.328,0l0,1.372l-9.054,0l0,-1.372l0.719,0q0.441,0 0.82,-0.063 0.391,-0.063 0.668,-0.252 0.29,-0.201 0.454,-0.566 0.177,-0.365 0.177,-0.969l0,-1.573l-7.15,0l0,-1.573l7.326,-12.032l3.594,0l0,11.906l2.686,0l0,1.699zM58.345,102.761q0,-1.133 0.038,-2.442 0.038,-1.309 0.139,-2.517 -0.126,0.302 -0.404,0.831 -0.277,0.529 -0.593,1.095 -0.315,0.554 -0.605,1.057 -0.29,0.491 -0.441,0.73l-3.48,5.752l5.347,0zM50.855,113.761l-0.366,0q-1.412,0 -2.371,-0.063 -0.958,-0.063 -1.652,-0.289 -0.694,-0.227 -1.198,-0.68 -0.504,-0.466 -1.009,-1.259l-2.295,-3.612 -1.034,0.768l0,2.089q0,0.554 0.177,0.881 0.189,0.327 0.454,0.503 0.277,0.176 0.605,0.239 0.328,0.05 0.605,0.05l0.303,0l0,1.372L34.866,113.761l0,-1.372l0.303,0q0.29,0 0.605,-0.05 0.328,-0.063 0.593,-0.239 0.277,-0.176 0.454,-0.503 0.189,-0.327 0.189,-0.881l0,-13.606q0,-0.516 -0.189,-0.818 -0.177,-0.315 -0.454,-0.478 -0.277,-0.176 -0.605,-0.227 -0.315,-0.05 -0.593,-0.05l-0.303,0l0,-1.359l6.065,0l0,9.943q0,0.352 -0.025,0.818 -0.013,0.453 -0.038,0.868 -0.038,0.491 -0.063,0.994l3.253,-3.637q0.429,-0.478 0.555,-0.755 0.139,-0.289 0.139,-0.478 0,-0.327 -0.353,-0.503 -0.34,-0.189 -0.984,-0.189l0,-1.296l6.507,0l0,1.296q-0.895,0 -1.765,0.529 -0.857,0.516 -1.879,1.661l-1.627,1.85 3.43,5.11q0.681,1.019 1.374,1.51 0.694,0.491 1.311,0.491l0.088,0zM33.517,106.31q0,1.007 -0.29,1.901 -0.29,0.894 -0.82,1.573 -0.517,0.667 -1.261,1.057 -0.731,0.39 -1.627,0.39 -1.198,0 -2.333,-0.73 -1.122,-0.743 -2.055,-2.417 -0.794,1.523 -1.828,2.303 -1.034,0.768 -2.181,0.768 -0.883,0 -1.627,-0.34 -0.744,-0.352 -1.286,-0.982 -0.542,-0.642 -0.845,-1.548 -0.29,-0.919 -0.29,-2.052 0,-1.032 0.29,-1.926 0.29,-0.906 0.82,-1.561 0.53,-0.667 1.274,-1.045 0.744,-0.39 1.664,-0.39 0.593,0 1.173,0.176 0.593,0.164 1.147,0.541 0.567,0.365 1.072,0.944 0.517,0.579 0.946,1.41 0.794,-1.498 1.791,-2.24 0.996,-0.755 2.295,-0.755Line truncated
    </group>
 </vector>
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    style="@style/SurfaceCard">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <ImageView
-            android:id="@+id/about_img"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="4dp"
-            android:contentDescription="@string/app_name"
-            android:src="@drawable/ic_satellite"
-            app:layout_constraintBottom_toBottomOf="@+id/about_version"
-            app:layout_constraintDimensionRatio="h,1:1"
-            app:layout_constraintEnd_toStartOf="@+id/about_title"
-            app:layout_constraintHorizontal_chainStyle="packed"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/about_title"
-            app:tint="@color/accent" />
-
-        <TextView
-            android:id="@+id/about_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="10dp"
-            android:layout_marginEnd="8dp"
-            android:includeFontPadding="false"
-            android:text="@string/app_name"
-            android:textColor="@color/accent"
-            android:textSize="@dimen/text_size_app_title"
-            app:layout_constraintBottom_toTopOf="@+id/about_version"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.5"
-            app:layout_constraintStart_toEndOf="@+id/about_img"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/about_version"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:text="@string/app_version"
-            android:textColor="@color/textMain"
-            android:textSize="@dimen/text_size_large"
-            app:layout_constraintBottom_toTopOf="@+id/about_subtitle"
-            app:layout_constraintEnd_toEndOf="@+id/about_title"
-            app:layout_constraintStart_toStartOf="@+id/about_title"
-            app:layout_constraintTop_toBottomOf="@+id/about_title" />
-
-        <TextView
-            android:id="@+id/about_subtitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:layout_marginBottom="12dp"
-            android:text="@string/app_subtitle"
-            android:textColor="@color/textMain"
-            android:textSize="@dimen/text_size_large"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.5"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/about_version" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</androidx.cardview.widget.CardView>
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    style="@style/SurfaceCard">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <TextView
-            android:id="@+id/outro_title"
-            style="@style/SettingsTitle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="12dp"
-            android:layout_marginTop="10dp"
-            android:layout_marginEnd="12dp"
-            android:text="@string/outro_title"
-            app:layout_constraintBottom_toTopOf="@+id/outro_thanks"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/outro_thanks"
-            style="@style/SettingsText"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:text="@string/outro_thanks"
-            app:layout_constraintBottom_toTopOf="@+id/outro_license"
-            app:layout_constraintEnd_toEndOf="@+id/outro_title"
-            app:layout_constraintHorizontal_bias="0.5"
-            app:layout_constraintStart_toStartOf="@+id/outro_title"
-            app:layout_constraintTop_toBottomOf="@+id/outro_title" />
-
-        <TextView
-            android:id="@+id/outro_license"
-            style="@style/SettingsText"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:layout_marginBottom="10dp"
-            android:text="@string/outro_license"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="@+id/outro_title"
-            app:layout_constraintHorizontal_bias="0.5"
-            app:layout_constraintStart_toStartOf="@+id/outro_title"
-            app:layout_constraintTop_toBottomOf="@+id/outro_thanks" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</androidx.cardview.widget.CardView>
@@ -19,7 +19,7 @@
            style="@style/ToolbarButton"
            android:layout_gravity="start|center_vertical"
            android:contentDescription="@string/btn_back"
-            android:src="@drawable/ic_back" />
+            android:src="@drawable/ic_prev" />

        <TextView
            android:id="@+id/radar_timer"
@@ -30,7 +30,7 @@
            style="@style/ToolbarButton"
            android:layout_gravity="end|center_vertical"
            android:contentDescription="@string/btn_map"
-            android:src="@drawable/ic_map" />
+            android:src="@drawable/ic_world" />

    </androidx.cardview.widget.CardView>

@@ -163,7 +163,7 @@
                android:layout_gravity="center"
                android:layout_marginBottom="24dp"
                android:contentDescription="@string/radio_no_data"
-                android:src="@drawable/ic_modes" />
+                android:src="@drawable/ic_satellite" />

            <TextView
                android:id="@+id/radar_empty_msg"
@@ -14,7 +14,7 @@
            style="@style/ToolbarButton"
            android:layout_gravity="start|center_vertical"
            android:contentDescription="@string/btn_back"
-            android:src="@drawable/ic_back" />
+            android:src="@drawable/ic_prev" />

        <TextView
            android:id="@+id/settings_title"
@@ -43,15 +43,6 @@
                android:layout_width="match_parent"
                android:layout_height="wrap_content">

-                <include
-                    android:id="@+id/settings_about"
-                    layout="@layout/card_about"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
                <include
                    android:id="@+id/settings_location"
                    layout="@layout/card_location"
@@ -60,7 +51,7 @@
                    android:layout_marginTop="@dimen/view_default_margin"
                    app:layout_constraintEnd_toEndOf="parent"
                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/settings_about" />
+                    app:layout_constraintTop_toTopOf="parent" />

                <include
                    android:id="@+id/settings_data"
@@ -102,17 +93,6 @@
                    app:layout_constraintStart_toStartOf="parent"
                    app:layout_constraintTop_toBottomOf="@+id/settings_btremote" />

-                <include
-                    android:id="@+id/settings_outro"
-                    layout="@layout/card_outro"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/view_default_margin"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/settings_other" />
-
            </androidx.constraintlayout.widget.ConstraintLayout>

        </androidx.core.widget.NestedScrollView>
@@ -144,8 +124,8 @@
    <com.google.android.material.floatingactionbutton.FloatingActionButton
        android:id="@+id/settings_fab"
        style="@style/FloatingActionButton"
-        android:src="@drawable/ic_done"
-        android:contentDescription="@string/btn_support"
+        android:src="@drawable/ic_checkmark"
+        android:contentDescription="@string/btn_donate"
        app:layout_anchor="@id/settings_bottom_bar" />

 </androidx.coordinatorlayout.widget.CoordinatorLayout>
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_bg" />
-    <foreground android:drawable="@drawable/ic_launcher_fg" />
+    <background android:drawable="@drawable/launcher_bg" />
+    <foreground android:drawable="@drawable/launcher_fg" />
 </adaptive-icon>
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_bg" />
-    <foreground android:drawable="@drawable/ic_launcher_fg" />
+    <background android:drawable="@drawable/launcher_bg" />
+    <foreground android:drawable="@drawable/launcher_fg" />
 </adaptive-icon>
@@ -36,10 +36,10 @@
    <string name="btn_web">Онлайн</string>
    <string name="btn_import">Импорт</string>
    <string name="btn_github">GitHub</string>
-    <string name="btn_support">Поддержать</string>
+    <string name="btn_donate">Поддержать</string>
    <string name="btn_fdroid">F-Droid</string>
-    <string name="btn_privacy">Конфиденц.</string>
    <string name="btn_license">Лицензия</string>
+    <string name="btn_privacy">Конфиденц.</string>

    <!--Dialogs-->

@@ -36,10 +36,10 @@
    <string name="btn_web">在线更新</string>
    <string name="btn_import">导入文件</string>
    <string name="btn_github">GitHub</string>
-    <string name="btn_support">支持</string>
+    <string name="btn_donate">支持</string>
    <string name="btn_fdroid">F-Droid</string>
-    <string name="btn_privacy">隐私政策</string>
    <string name="btn_license">GNU GPLv3</string>
+    <string name="btn_privacy">隐私政策</string>

    <!--Dialogs-->

@@ -36,10 +36,10 @@
    <string name="btn_web">Online</string>
    <string name="btn_import">Import</string>
    <string name="btn_github">GitHub</string>
-    <string name="btn_support">Support</string>
+    <string name="btn_donate">Donate</string>
    <string name="btn_fdroid">F-Droid</string>
-    <string name="btn_privacy">Privacy Policy</string>
    <string name="btn_license">GPLv3 Licence</string>
+    <string name="btn_privacy">Privacy Policy</string>

    <!--Dialogs-->

@@ -4,7 +4,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/ic_splash</item>
+        <item name="windowSplashScreenAnimatedIcon">@drawable/splash</item>
    </style>

    <style name="Theme.Look4Sat.Main" parent="Theme.MaterialComponents.NoActionBar">
@@ -19,7 +19,6 @@
 <!--        <item name="colorOnPrimaryContainer">@color/textMain</item>-->
        <!--        -->
        <item name="android:forceDarkAllowed" tools:targetApi="q">false</item>
-        <item name="android:listDivider">@drawable/item_divider</item>
        <item name="android:navigationBarColor">@color/background</item>
        <item name="android:textColorPrimary">@color/textMain</item>
        <item name="android:statusBarColor">@color/background</item>