diff --git a/app/build.gradle b/app/build.gradle index 0cf1142e..d769971a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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" diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/bottomNav/BottomNavBar.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/BottomNavBar.kt similarity index 72% rename from app/src/main/java/com/rtbishop/look4sat/presentation/bottomNav/BottomNavBar.kt rename to app/src/main/java/com/rtbishop/look4sat/presentation/BottomNavBar.kt index b17369ed..f11b7128 100644 --- a/app/src/main/java/com/rtbishop/look4sat/presentation/bottomNav/BottomNavBar.kt +++ b/app/src/main/java/com/rtbishop/look4sat/presentation/BottomNavBar.kt @@ -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() } } } diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/MainActivity.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/MainActivity.kt index 16c8efbd..6834655a 100644 --- a/app/src/main/java/com/rtbishop/look4sat/presentation/MainActivity.kt +++ b/app/src/main/java/com/rtbishop/look4sat/presentation/MainActivity.kt @@ -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 diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/bottomNav/BottomNavItem.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/bottomNav/BottomNavItem.kt deleted file mode 100644 index 3ccf357e..00000000 --- a/app/src/main/java/com/rtbishop/look4sat/presentation/bottomNav/BottomNavItem.kt +++ /dev/null @@ -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") -} diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesScreen.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesScreen.kt index 16d0882b..b51e6aa0 100644 --- a/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesScreen.kt +++ b/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesScreen.kt @@ -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 diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesScreen.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesScreen.kt index aa0d56ae..b1a73c35 100644 --- a/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesScreen.kt +++ b/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesScreen.kt @@ -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 + refreshState: PullRefreshState, + isRefreshing: Boolean, + passes: List, + 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( diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/RadarScreen.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/RadarScreen.kt new file mode 100644 index 00000000..abbe50aa --- /dev/null +++ b/app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/RadarScreen.kt @@ -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)) { + + } + } +} diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/settingsScreen/SettingsFragment.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/settingsScreen/SettingsFragment.kt index b94ee1bb..9fba5b1e 100644 --- a/app/src/main/java/com/rtbishop/look4sat/presentation/settingsScreen/SettingsFragment.kt +++ b/app/src/main/java/com/rtbishop/look4sat/presentation/settingsScreen/SettingsFragment.kt @@ -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) { when (pos) { is DataState.Success -> { diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/aboutScreen/AboutScreen.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/settingsScreen/SettingsScreen.kt similarity index 94% rename from app/src/main/java/com/rtbishop/look4sat/presentation/aboutScreen/AboutScreen.kt rename to app/src/main/java/com/rtbishop/look4sat/presentation/settingsScreen/SettingsScreen.kt index 4d7bab70..0e7af701 100644 --- a/app/src/main/java/com/rtbishop/look4sat/presentation/aboutScreen/AboutScreen.kt +++ b/app/src/main/java/com/rtbishop/look4sat/presentation/settingsScreen/SettingsScreen.kt @@ -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) ) } diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml deleted file mode 100644 index 7ae71340..00000000 --- a/app/src/main/res/drawable/ic_about.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_back.xml b/app/src/main/res/drawable/ic_back.xml deleted file mode 100644 index cd06f309..00000000 --- a/app/src/main/res/drawable/ic_back.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_done.xml b/app/src/main/res/drawable/ic_checkmark.xml similarity index 100% rename from app/src/main/res/drawable/ic_done.xml rename to app/src/main/res/drawable/ic_checkmark.xml diff --git a/app/src/main/res/drawable/ic_elevation.xml b/app/src/main/res/drawable/ic_elevation.xml index 54fd399a..047cd0d0 100644 --- a/app/src/main/res/drawable/ic_elevation.xml +++ b/app/src/main/res/drawable/ic_elevation.xml @@ -6,6 +6,6 @@ android:viewportWidth="512" android:viewportHeight="512"> diff --git a/app/src/main/res/drawable/ic_modes.xml b/app/src/main/res/drawable/ic_modes.xml deleted file mode 100644 index e535a17e..00000000 --- a/app/src/main/res/drawable/ic_modes.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/ic_position.xml b/app/src/main/res/drawable/ic_position.xml index c5769bb5..dd37d960 100644 --- a/app/src/main/res/drawable/ic_position.xml +++ b/app/src/main/res/drawable/ic_position.xml @@ -2,9 +2,10 @@ android:width="24dp" android:height="24dp" android:autoMirrored="true" + android:tint="@color/accent" android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_radar_pos.xml b/app/src/main/res/drawable/ic_radar.xml similarity index 97% rename from app/src/main/res/drawable/ic_radar_pos.xml rename to app/src/main/res/drawable/ic_radar.xml index d3e6123d..fbb26f0a 100644 --- a/app/src/main/res/drawable/ic_radar_pos.xml +++ b/app/src/main/res/drawable/ic_radar.xml @@ -6,6 +6,6 @@ android:viewportWidth="287.97" android:viewportHeight="287.97"> diff --git a/app/src/main/res/drawable/ic_refresh.xml b/app/src/main/res/drawable/ic_refresh.xml deleted file mode 100644 index afb68d0a..00000000 --- a/app/src/main/res/drawable/ic_refresh.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_map.xml b/app/src/main/res/drawable/ic_world.xml similarity index 100% rename from app/src/main/res/drawable/ic_map.xml rename to app/src/main/res/drawable/ic_world.xml diff --git a/app/src/main/res/drawable/item_divider.xml b/app/src/main/res/drawable/item_divider.xml deleted file mode 100644 index e8e5cb49..00000000 --- a/app/src/main/res/drawable/item_divider.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_launcher_bg.xml b/app/src/main/res/drawable/launcher_bg.xml similarity index 100% rename from app/src/main/res/drawable/ic_launcher_bg.xml rename to app/src/main/res/drawable/launcher_bg.xml diff --git a/app/src/main/res/drawable/ic_launcher_fg.xml b/app/src/main/res/drawable/launcher_fg.xml similarity index 100% rename from app/src/main/res/drawable/ic_launcher_fg.xml rename to app/src/main/res/drawable/launcher_fg.xml diff --git a/app/src/main/res/drawable/ic_splash.xml b/app/src/main/res/drawable/splash.xml similarity index 98% rename from app/src/main/res/drawable/ic_splash.xml rename to app/src/main/res/drawable/splash.xml index 4d3d8106..b8048e23 100644 --- a/app/src/main/res/drawable/ic_splash.xml +++ b/app/src/main/res/drawable/splash.xml @@ -1,13 +1,14 @@ diff --git a/app/src/main/res/layout/card_about.xml b/app/src/main/res/layout/card_about.xml deleted file mode 100644 index 150334d5..00000000 --- a/app/src/main/res/layout/card_about.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/card_outro.xml b/app/src/main/res/layout/card_outro.xml deleted file mode 100644 index e1e9fc38..00000000 --- a/app/src/main/res/layout/card_outro.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/fragment_radar.xml b/app/src/main/res/layout/fragment_radar.xml index 0d6114a3..9bd34810 100644 --- a/app/src/main/res/layout/fragment_radar.xml +++ b/app/src/main/res/layout/fragment_radar.xml @@ -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" /> + android:src="@drawable/ic_world" /> @@ -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" /> + android:src="@drawable/ic_prev" /> - - + app:layout_constraintTop_toTopOf="parent" /> - - @@ -144,8 +124,8 @@ diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 4fefd60c..f4977d78 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,5 +1,5 @@ - - + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 4fefd60c..f4977d78 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,5 +1,5 @@ - - + + diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 1fcb2c2f..d11510fe 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -36,10 +36,10 @@ Онлайн Импорт GitHub - Поддержать + Поддержать F-Droid - Конфиденц. Лицензия + Конфиденц. diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 14a3cf4f..9ab3f9b6 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -36,10 +36,10 @@ 在线更新 导入文件 GitHub - 支持 + 支持 F-Droid - 隐私政策 GNU GPLv3 + 隐私政策 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b4de7789..eae6accc 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -36,10 +36,10 @@ Online Import GitHub - Support + Donate F-Droid - Privacy Policy GPLv3 Licence + Privacy Policy diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index f7195619..b8db9878 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -4,7 +4,7 @@ false @style/Theme.Look4Sat.Main @color/background - @drawable/ic_splash + @drawable/splash