Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Added types dialog, removed EntriesFragment
Arty Bishop1ea4da3baf93
diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesAdapter.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesAdapter.ktdeleted file mode 100644index 185a4c1d..00000000--- a/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesAdapter.kt+++ /dev/null@@ -1,78 +0,0 @@-/*- * Look4Sat. Amateur radio satellite tracker and pass predictor.- * Copyright (C) 2019-2022 Arty Bishop ([email protected])- *- * This program is free software: you can redistribute it and/or modify- * it under the terms of the GNU General Public License as published by- * the Free Software Foundation, either version 3 of the License, or- * (at your option) any later version.- *- * This program is distributed in the hope that it will be useful,- * but WITHOUT ANY WARRANTY; without even the implied warranty of- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the- * GNU General Public License for more details.- *- * You should have received a copy of the GNU General Public License- * along with this program. If not, see <https://www.gnu.org/licenses/>.- */-package com.rtbishop.look4sat.presentation.entriesScreen--import android.view.LayoutInflater-import android.view.ViewGroup-import androidx.recyclerview.widget.AsyncListDiffer-import androidx.recyclerview.widget.DiffUtil-import androidx.recyclerview.widget.RecyclerView-import com.rtbishop.look4sat.databinding.ItemEntryBinding-import com.rtbishop.look4sat.domain.model.SatItem--class EntriesAdapter(private val clickListener: EntriesClickListener) :- RecyclerView.Adapter<EntriesAdapter.SatItemHolder>() {-- private val diffCallback = object : DiffUtil.ItemCallback<SatItem>() {- override fun areItemsTheSame(oldItem: SatItem, newItem: SatItem): Boolean {- return oldItem.catnum == newItem.catnum- }-- override fun areContentsTheSame(oldItem: SatItem, newItem: SatItem): Boolean {- return oldItem.isSelected == newItem.isSelected- }- }- private val differ = AsyncListDiffer(this, diffCallback)-- fun submitList(items: List<SatItem>) {- differ.submitList(items)- }-- override fun getItemCount(): Int = differ.currentList.size-- override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SatItemHolder {- return SatItemHolder.from(parent)- }-- override fun onBindViewHolder(holder: SatItemHolder, position: Int) {- holder.bind(differ.currentList[position], clickListener)- }-- class SatItemHolder private constructor(private val binding: ItemEntryBinding) :- RecyclerView.ViewHolder(binding.root) {-- fun bind(item: SatItem, listener: EntriesClickListener) {- binding.entryCheckbox.text = item.name- binding.entryCheckbox.isChecked = item.isSelected- binding.entryCheckbox.setOnClickListener {- listener.updateSelection(listOf(item.catnum), item.isSelected.not())- }- }-- companion object {- fun from(parent: ViewGroup): SatItemHolder {- val inflater = LayoutInflater.from(parent.context)- return SatItemHolder(ItemEntryBinding.inflate(inflater, parent, false))- }- }- }-- interface EntriesClickListener {- fun updateSelection(catNums: List<Int>, isSelected: Boolean)- }-}diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesFragment.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesFragment.ktdeleted file mode 100644index 381b1740..00000000--- a/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesFragment.kt+++ /dev/null@@ -1,117 +0,0 @@-/*- * Look4Sat. Amateur radio satellite tracker and pass predictor.- * Copyright (C) 2019-2022 Arty Bishop ([email protected])- *- * This program is free software: you can redistribute it and/or modify- * it under the terms of the GNU General Public License as published by- * the Free Software Foundation, either version 3 of the License, or- * (at your option) any later version.- *- * This program is distributed in the hope that it will be useful,- * but WITHOUT ANY WARRANTY; without even the implied warranty of- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the- * GNU General Public License for more details.- *- * You should have received a copy of the GNU General Public License- * along with this program. If not, see <https://www.gnu.org/licenses/>.- */-package com.rtbishop.look4sat.presentation.entriesScreen--import android.os.Bundle-import android.view.View-import androidx.appcompat.app.AlertDialog-import androidx.core.widget.doOnTextChanged-import androidx.fragment.app.Fragment-import androidx.fragment.app.viewModels-import androidx.navigation.fragment.findNavController-import androidx.recyclerview.widget.DividerItemDecoration-import androidx.recyclerview.widget.GridLayoutManager-import androidx.recyclerview.widget.RecyclerView-import androidx.recyclerview.widget.SimpleItemAnimator-import com.rtbishop.look4sat.R-import com.rtbishop.look4sat.databinding.FragmentEntriesBinding-import com.rtbishop.look4sat.domain.model.DataState-import com.rtbishop.look4sat.domain.model.SatItem-import com.rtbishop.look4sat.presentation.clickWithDebounce-import com.rtbishop.look4sat.presentation.getNavResult-import com.rtbishop.look4sat.presentation.setNavResult-import dagger.hilt.android.AndroidEntryPoint--@AndroidEntryPoint-class EntriesFragment : Fragment(R.layout.fragment_entries) {-- private val viewModel: EntriesViewModel by viewModels()- private lateinit var binding: FragmentEntriesBinding-- override fun onViewCreated(view: View, savedInstanceState: Bundle?) {- super.onViewCreated(view, savedInstanceState)- val entriesAdapter = EntriesAdapter(viewModel)- binding = FragmentEntriesBinding.bind(view).apply {- entriesRecycler.apply {- setHasFixedSize(true)- adapter = entriesAdapter- layoutManager = GridLayoutManager(requireContext(), 2)- (itemAnimator as SimpleItemAnimator).supportsChangeAnimations = false- addItemDecoration(DividerItemDecoration(requireContext(), 1))- addOnScrollListener(object : RecyclerView.OnScrollListener() {- override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {- if (dy > 0 && entriesFab.visibility == View.VISIBLE) entriesFab.hide()- else if (dy < 0 && entriesFab.visibility != View.VISIBLE) entriesFab.show()- }- })- }- entriesBtnBack.clickWithDebounce { findNavController().navigateUp() }- entriesSearch.doOnTextChanged { text, _, _, _ -> viewModel.setQuery(text.toString()) }-// entriesBtnModes.clickWithDebounce {-// val direction = EntriesFragmentDirections.entriesToModes()-// findNavController().navigate(direction)-// }- entriesBtnSelect.clickWithDebounce { viewModel.selectCurrentItems(true) }- entriesBtnClear.clickWithDebounce { viewModel.selectCurrentItems(false) }- val typeMessageFormat = requireContext().getString(R.string.types_message)- val type = if (viewModel.getSatType().isNullOrBlank()) "All" else viewModel.getSatType()- entriesTypeMessage.text = String.format(typeMessageFormat, type)- entriesTypeCard.setOnClickListener { showSelectTypeDialog() }- }- viewModel.satData.observe(viewLifecycleOwner) { satData ->- handleSatData(satData, entriesAdapter)- binding.entriesFab.clickWithDebounce {- setNavResult("selection", viewModel.saveSelection())- findNavController().popBackStack()- }- }-// getNavResult<List<String>>(R.id.nav_entries, "modes") { modes ->-// viewModel.saveSelectedModes(modes)-// }- }-- private fun handleSatData(dataState: DataState<List<SatItem>>, entriesAdapter: EntriesAdapter) {- when (dataState) {- is DataState.Success -> {- entriesAdapter.submitList(dataState.data)- binding.entriesProgress.visibility = View.INVISIBLE- }- is DataState.Loading -> {- binding.entriesProgress.visibility = View.VISIBLE- }- else -> {}- }- }-- private fun showSelectTypeDialog() {- val satelliteTypes = viewModel.satTypes.toTypedArray()- val selectedValue = satelliteTypes.indexOf(viewModel.getSatType())- val typeFormat = requireContext().getString(R.string.types_message)- AlertDialog.Builder(requireContext()).apply {- setTitle(R.string.types_title)- setSingleChoiceItems(satelliteTypes, selectedValue) { dialog, index ->- val selectedItem = satelliteTypes[index]- binding.entriesTypeMessage.text = String.format(typeFormat, selectedItem)- viewModel.setSatType(selectedItem)- dialog.dismiss()- }- create()- show()- }- }-}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.ktindex 56f59fe2..04803cff 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@@ -2,6 +2,7 @@ package com.rtbishop.look4sat.presentation.entriesScreenimport androidx.compose.foundation.ExperimentalFoundationApiimport androidx.compose.foundation.background+import androidx.compose.foundation.clickableimport androidx.compose.foundation.layout.*import androidx.compose.foundation.lazy.LazyColumnimport androidx.compose.foundation.lazy.items@@ -39,6 +40,15 @@ fun EntriesScreen(passesViewModel: PassesViewModel = hiltViewModel()) {val state = viewModel.satData.observeAsState(DataState.Loading)++ val showDialog = rememberSaveable { mutableStateOf(false) }+ val toggleDialog = { showDialog.value = showDialog.value.not() }+ if (showDialog.value) {+ TypesDialog(list = viewModel.satTypes, selected = viewModel.getSatType(), toggleDialog) {+ viewModel.setSatType(it)+ }+ }+val unselectAll = { viewModel.selectCurrentItems(false) }val selectAll = { viewModel.selectCurrentItems(true) }Column(modifier = Modifier.padding(6.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) {@@ -47,7 +57,12 @@ fun EntriesScreen(passesViewModel.calculatePasses(selection = entries)navToPasses()})- MiddleBar(unselectAll = { unselectAll() }, selectAll = { selectAll() })+ Row(horizontalArrangement = Arrangement.spacedBy(6.dp), modifier = Modifier.height(48.dp)) {+ EntryTypeCard(+ type = viewModel.getSatType(), { toggleDialog() }, modifier = Modifier.weight(1f)+ )+ SelectionCard(unselectAll = { unselectAll() }, selectAll = { selectAll() })+ }EntriesCard(state = state.value) { list, value -> viewModel.updateSelection(list, value) }}}@@ -125,19 +140,19 @@ private fun SaveButton(saveSelection: () -> Unit, modifier: Modifier = Modifier)@Composableprivate fun MiddleBar(unselectAll: () -> Unit, selectAll: () -> Unit) {Row(horizontalArrangement = Arrangement.spacedBy(6.dp), modifier = Modifier.height(48.dp)) {- EntryTypeCard(type = "Amateur", modifier = Modifier.weight(1f))+ EntryTypeCard(type = "Amateur", {}, modifier = Modifier.weight(1f))SelectionCard(unselectAll = { unselectAll() }, selectAll = { selectAll() })}}@Composable-private fun EntryTypeCard(type: String, modifier: Modifier = Modifier) {+private fun EntryTypeCard(type: String, onClick: () -> Unit, modifier: Modifier = Modifier) {ElevatedCard(modifier = modifier) {- Row(- horizontalArrangement = Arrangement.Start,+ Row(horizontalArrangement = Arrangement.Start,verticalAlignment = Alignment.CenterVertically,- modifier = Modifier.height(48.dp)- ) {+ modifier = Modifier+ .height(48.dp)+ .clickable { onClick() }) {Icon(imageVector = Icons.Outlined.PlayArrow,contentDescription = null,diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesViewModel.ktindex 52c27db8..ab2538ea 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesViewModel.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesViewModel.kt@@ -31,9 +31,9 @@ import javax.inject.Injectclass EntriesViewModel @Inject constructor(private val repository: IDataRepository,private val settings: ISettingsManager-) : ViewModel(), EntriesAdapter.EntriesClickListener {+) : ViewModel() {- private val satType = MutableLiveData(String())+ private val satType = MutableLiveData("All")// private val transModes = MutableLiveData(settings.loadModesSelection())private val currentQuery = MutableLiveData(String())private val itemsFromRepo = liveData {@@ -52,7 +52,7 @@ class EntriesViewModel @Inject constructor(val satData = itemsWithQuery.map { items -> DataState.Success(items) }val satTypes: List<String> = settings.sourcesMap.keys.sorted()- fun getSatType(): String? = satType.value+ fun getSatType() = satType.value ?: "All"fun setSatType(type: String) {satType.value = type@@ -79,7 +79,7 @@ class EntriesViewModel @Inject constructor(} ?: emptyList()}- override fun updateSelection(catNums: List<Int>, isSelected: Boolean) {+ fun updateSelection(catNums: List<Int>, isSelected: Boolean) {itemsFromRepo.value?.let { itemsAll ->val copiedList = itemsAll.map { item -> item.copy() }catNums.forEach { catnum ->diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/TypesDialog.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/TypesDialog.ktnew file mode 100644index 00000000..66d05400--- /dev/null+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/TypesDialog.kt@@ -0,0 +1,59 @@+package com.rtbishop.look4sat.presentation.entriesScreen++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+import androidx.compose.material3.*+import androidx.compose.runtime.Composable+import androidx.compose.ui.Alignment+import androidx.compose.ui.Modifier+import androidx.compose.ui.text.font.FontWeight+import androidx.compose.ui.text.style.TextOverflow+import androidx.compose.ui.tooling.preview.Preview+import androidx.compose.ui.unit.dp+import androidx.compose.ui.window.Dialog+import com.rtbishop.look4sat.presentation.MainTheme++@Preview(showBackground = true)+@Composable+private fun TypeDialogPreview() {+ val types = listOf("All", "Amateur", "Geostationary", "Military", "Weather")+ MainTheme { TypesDialog(types, "All", {}) {} }+}++@Composable+fun TypesDialog(list: List<String>, selected: String, toggle: () -> Unit, click: (String) -> Unit) {+ Dialog(onDismissRequest = { toggle() }) {+ ElevatedCard(modifier = Modifier.fillMaxHeight(0.9f)) {+ LazyColumn(+ modifier = Modifier.background(MaterialTheme.colorScheme.background),+ verticalArrangement = Arrangement.spacedBy(1.dp)+ ) {+ items(list) { type ->+ Surface {+ Row(verticalAlignment = Alignment.CenterVertically,+ modifier = Modifier+ .background(MaterialTheme.colorScheme.surface)+ .clickable {+ click(type)+ toggle()+ }) {+ RadioButton(selected = type == selected, onClick = {})+ Text(+ text = type,+ modifier = Modifier+ .padding(end = 6.dp)+ .fillMaxWidth(),+ fontWeight = FontWeight.Normal,+ maxLines = 1,+ overflow = TextOverflow.Ellipsis+ )+ }+ }+ }+ }+ }+ }+}diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesAdapter.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesAdapter.ktindex fd6ad9d5..67a4f4a1 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesAdapter.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesAdapter.kt@@ -71,7 +71,7 @@ class PassesAdapter(private val clickListener: PassesClickListener) :private val satIdFormat = itemView.context.getString(R.string.pass_satId)private val aosAzFormat = itemView.context.getString(R.string.pass_aosAz)private val altFormat = itemView.context.getString(R.string.pass_altitude)- private val losAzFormat = itemView.context.getString(R.string.pass_los)+ private val losAzFormat = itemView.context.getString(R.string.pass_losAz)private val startTimeFormat = itemView.context.getString(R.string.pass_startTime)private val elevFormat = itemView.context.getString(R.string.pass_elevation)private val endTimeFormat = itemView.context.getString(R.string.pass_endTime)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.ktindex d2c89eb1..44a8e56f 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@@ -11,6 +11,7 @@ import androidx.compose.runtime.livedata.observeAsStateimport androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifierimport androidx.compose.ui.res.painterResource+import androidx.compose.ui.res.stringResourceimport androidx.compose.ui.text.font.FontWeightimport androidx.compose.ui.text.style.TextAlignimport androidx.compose.ui.text.style.TextOverflow@@ -23,6 +24,10 @@ import com.rtbishop.look4sat.domain.predict.NearEarthSatimport com.rtbishop.look4sat.domain.predict.OrbitalDataimport com.rtbishop.look4sat.domain.predict.SatPassimport com.rtbishop.look4sat.presentation.MainTheme+import java.text.SimpleDateFormat+import java.util.*++private val sdf = SimpleDateFormat("HH:mm:ss", Locale.ENGLISH)@Composablefun PassesScreen(viewModel: PassesViewModel = hiltViewModel()) {@@ -86,24 +91,29 @@ private fun Pass(pass: SatPass, modifier: Modifier = Modifier) {horizontalArrangement = Arrangement.SpaceBetween,modifier = Modifier.fillMaxWidth()) {- Text(text = "AOS - 90")- Text(text = "Altitude: 1800 km")- Text(text = "180 - LOS")+ Text(text = stringResource(id = R.string.pass_aosAz, pass.aosAzimuth))+ Text(+ text = stringResource(id = R.string.pass_altitude, pass.altitude),+ textAlign = TextAlign.Center,+ modifier = Modifier.weight(1f)+ )+ Text(text = stringResource(id = R.string.pass_losAz, pass.losAzimuth))}Row(verticalAlignment = Alignment.CenterVertically,horizontalArrangement = Arrangement.SpaceBetween,modifier = Modifier.fillMaxWidth()) {- Text(text = "16:02:28 - Sun")- Text(text = "Sun - 16:02:28")+ val deepTime = stringResource(id = R.string.pass_placeholder)+ Text(text = if (pass.isDeepSpace) deepTime else sdf.format(Date(pass.aosTime)))+ LinearProgressIndicator(+ progress = pass.progress,+ modifier = modifier.weight(1f),+ color = MaterialTheme.colorScheme.primary,+ trackColor = MaterialTheme.colorScheme.inverseSurface+ )+ Text(text = if (pass.isDeepSpace) deepTime else sdf.format(Date(pass.losTime)))}- LinearProgressIndicator(- progress = pass.progress,- modifier = modifier.fillMaxWidth(),- color = MaterialTheme.colorScheme.primary,- trackColor = MaterialTheme.colorScheme.inverseSurface- )}}}diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesViewModel.ktindex ce70d51c..1eb0a77d 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesViewModel.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesViewModel.kt@@ -64,7 +64,7 @@ class PassesViewModel @Inject constructor(fun shouldUseUTC() = settings.getUseUTC()fun calculatePasses(- hoursAhead: Int = settings.getHoursAhead(),+ hoursAhead: Int = 1,minElevation: Double = settings.getMinElevation(),timeRef: Long = System.currentTimeMillis(),selection: List<Int>? = nulldiff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xmldeleted file mode 100644index 868b390b..00000000--- a/app/src/main/res/drawable/ic_delete.xml+++ /dev/null@@ -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="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z" />-</vector>diff --git a/app/src/main/res/drawable/ic_support.xml b/app/src/main/res/drawable/ic_support.xmldeleted file mode 100644index 051f8ad9..00000000--- a/app/src/main/res/drawable/ic_support.xml+++ /dev/null@@ -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="M14,21c1.93,0 3.62,-1.17 4,-3l-1.75,-0.88C16,18.21 15.33,19 14,19l-4.9,0c0.83,-1 1.5,-2.34 1.5,-4c0,-0.35 -0.03,-0.69 -0.08,-1L14,14v-2l-4.18,0C9,10.42 8,9.6 8,8c0,-1.93 1.57,-3.5 3.5,-3.5c1.5,0 2.79,0.95 3.28,2.28L16.63,6c-0.8,-2.05 -2.79,-3.5 -5.13,-3.5C8.46,2.5 6,4.96 6,8c0,1.78 0.79,2.9 1.49,4L6,12v2l2.47,0c0.08,0.31 0.13,0.64 0.13,1c0,2.7 -2.6,4 -2.6,4v2H14z" />-</vector>diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xmldeleted file mode 100644index e12c7ee3..00000000--- a/app/src/main/res/layout/activity_main.xml+++ /dev/null@@ -1,30 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"- xmlns:app="http://schemas.android.com/apk/res-auto"- android:layout_width="match_parent"- android:layout_height="match_parent">-- <androidx.fragment.app.FragmentContainerView- android:id="@+id/nav_host"- android:name="androidx.navigation.fragment.NavHostFragment"- android:layout_width="0dp"- android:layout_height="0dp"- app:defaultNavHost="true"- app:layout_constraintBottom_toTopOf="@+id/nav_bar"- app:layout_constraintEnd_toEndOf="parent"- app:layout_constraintStart_toStartOf="parent"- app:layout_constraintTop_toTopOf="parent"- app:navGraph="@navigation/nav_graph" />-- <com.google.android.material.bottomnavigation.BottomNavigationView- android:id="@+id/nav_bar"- android:layout_width="0dp"- android:layout_height="56dp"- app:itemBackground="@color/bottomBar"- app:labelVisibilityMode="unlabeled"- app:layout_constraintBottom_toBottomOf="parent"- app:layout_constraintEnd_toEndOf="parent"- app:layout_constraintStart_toStartOf="parent"- app:menu="@menu/nav_menu" />--</androidx.constraintlayout.widget.ConstraintLayout>\ No newline at end of filediff --git a/app/src/main/res/layout/fragment_entries.xml b/app/src/main/res/layout/fragment_entries.xmldeleted file mode 100644index c033bf66..00000000--- a/app/src/main/res/layout/fragment_entries.xml+++ /dev/null@@ -1,126 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"- xmlns:app="http://schemas.android.com/apk/res-auto"- android:layout_width="match_parent"- android:layout_height="match_parent"- android:transitionGroup="true">-- <androidx.cardview.widget.CardView- android:id="@+id/entries_toolbar"- style="@style/Toolbar">-- <ImageButton- android:id="@+id/entries_btn_back"- style="@style/ToolbarButton"- android:layout_gravity="start|center_vertical"- android:contentDescription="@string/btn_back"- android:src="@drawable/ic_back" />-- <EditText- android:id="@+id/entries_search"- style="@style/ToolbarTitle"- android:layout_width="match_parent"- android:layout_height="match_parent"- android:layout_marginStart="52dp"- android:layout_marginTop="4dp"- android:layout_marginEnd="52dp"- android:layout_marginBottom="4dp"- android:hint="@string/entries_search_hint"- android:importantForAutofill="no"- android:inputType="text" />-- <ImageButton- android:id="@+id/entries_btn_modes"- style="@style/ToolbarButton"- android:layout_gravity="end|center_vertical"- android:contentDescription="@string/btn_modes"- android:src="@drawable/ic_modes" />-- </androidx.cardview.widget.CardView>-- <androidx.cardview.widget.CardView- android:id="@+id/entries_type_card"- style="@style/SurfaceCard"- android:layout_width="match_parent"- android:layout_height="42dp"- android:layout_marginStart="@dimen/view_default_margin"- android:layout_marginTop="60dp"- android:layout_marginEnd="@dimen/view_default_margin">-- <TextView- android:id="@+id/entries_type_message"- android:layout_width="wrap_content"- android:layout_height="match_parent"- android:layout_gravity="start|center_vertical"- android:gravity="center"- android:includeFontPadding="false"- android:paddingStart="14dp"- android:paddingEnd="14dp"- android:text="@string/types_title"- android:textColor="@color/accent"- android:textSize="@dimen/text_size_mediumLarge" />-- <ImageView- android:id="@+id/entries_type_img"- android:layout_width="wrap_content"- android:layout_height="match_parent"- android:layout_gravity="end|center_vertical"- android:contentDescription="@string/types_title"- android:paddingStart="14dp"- android:paddingEnd="14dp"- android:src="@drawable/ic_next"- app:tint="@color/accent" />-- </androidx.cardview.widget.CardView>-- <androidx.cardview.widget.CardView- style="@style/SurfaceCard"- android:layout_width="match_parent"- android:layout_height="match_parent"- android:layout_marginStart="@dimen/view_default_margin"- android:layout_marginTop="108dp"- android:layout_marginEnd="@dimen/view_default_margin"- android:layout_marginBottom="@dimen/surface_margin_bot">-- <androidx.recyclerview.widget.RecyclerView- android:id="@+id/entries_recycler"- style="@style/Recycler"- android:layout_width="match_parent"- android:layout_height="match_parent" />-- <ProgressBar- android:id="@+id/entries_progress"- style="@style/RecyclerProgress" />-- </androidx.cardview.widget.CardView>-- <com.google.android.material.bottomappbar.BottomAppBar- android:id="@+id/entries_bottom_bar"- style="@style/BottomBar">-- <Button- android:id="@+id/entries_btn_select"- style="@style/NormalButton"- android:layout_width="@dimen/button_width_max"- android:layout_gravity="start|center_vertical"- android:layout_marginStart="@dimen/button_margin_side"- android:text="@string/btn_select" />-- <Button- android:id="@+id/entries_btn_clear"- style="@style/NormalButton"- android:layout_width="@dimen/button_width_max"- android:layout_gravity="end|center_vertical"- android:layout_marginEnd="@dimen/button_margin_side"- android:text="@string/btn_clear_all" />-- </com.google.android.material.bottomappbar.BottomAppBar>-- <com.google.android.material.floatingactionbutton.FloatingActionButton- android:id="@+id/entries_fab"- style="@style/FloatingActionButton"- android:contentDescription="@string/btn_done"- android:src="@drawable/ic_done"- app:layout_anchor="@id/entries_bottom_bar" />--</androidx.coordinatorlayout.widget.CoordinatorLayout>diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xmlindex d3604d78..412dbdf3 100644--- a/app/src/main/res/layout/fragment_settings.xml+++ b/app/src/main/res/layout/fragment_settings.xml@@ -144,7 +144,7 @@<com.google.android.material.floatingactionbutton.FloatingActionButtonandroid:id="@+id/settings_fab"style="@style/FloatingActionButton"- android:src="@drawable/ic_support"+ android:src="@drawable/ic_done"android:contentDescription="@string/btn_support"app:layout_anchor="@id/settings_bottom_bar" />diff --git a/app/src/main/res/layout/item_entry.xml b/app/src/main/res/layout/item_entry.xmldeleted file mode 100644index 9ce57cf1..00000000--- a/app/src/main/res/layout/item_entry.xml+++ /dev/null@@ -1,17 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"- style="@style/RecyclerItemCard">-- <CheckBox- android:id="@+id/entry_checkbox"- android:layout_width="match_parent"- android:layout_height="41dp"- android:layout_marginStart="6dp"- android:background="@color/cardRegular"- android:ellipsize="end"- android:lines="1"- android:padding="4dp"- android:textColor="@color/textMain"- android:textSize="@dimen/text_size_medium" />--</androidx.cardview.widget.CardView>diff --git a/app/src/main/res/layout/item_pass.xml b/app/src/main/res/layout/item_pass.xmlindex 8a75a08e..29ca06dc 100644--- a/app/src/main/res/layout/item_pass.xml+++ b/app/src/main/res/layout/item_pass.xml@@ -58,7 +58,7 @@android:id="@+id/pass_los"android:layout_width="wrap_content"android:layout_height="wrap_content"- android:text="@string/pass_los"+ android:text="@string/pass_losAz"android:textSize="@dimen/text_size_small"app:layout_constraintBaseline_toBaselineOf="@+id/pass_aos"app:layout_constraintEnd_toEndOf="@+id/pass_id"diff --git a/app/src/main/res/layout/item_source.xml b/app/src/main/res/layout/item_source.xmldeleted file mode 100644index bee3df7e..00000000--- a/app/src/main/res/layout/item_source.xml+++ /dev/null@@ -1,21 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<com.google.android.material.textfield.TextInputLayout xmlns:android="http://schemas.android.com/apk/res/android"- xmlns:app="http://schemas.android.com/apk/res-auto"- android:id="@+id/source_input"- android:layout_width="match_parent"- android:layout_height="wrap_content"- android:layout_marginStart="4dp"- android:layout_marginTop="4dp"- android:layout_marginEnd="4dp"- android:layout_marginBottom="4dp"- android:hint="@string/sources_hint"- app:endIconDrawable="@drawable/ic_delete"- app:endIconMode="custom">-- <com.google.android.material.textfield.TextInputEditText- android:id="@+id/source_text"- android:layout_width="match_parent"- android:layout_height="match_parent"- android:inputType="textUri" />--</com.google.android.material.textfield.TextInputLayout>diff --git a/app/src/main/res/menu/nav_menu.xml b/app/src/main/res/menu/nav_menu.xmlindex a3f6c009..d2d5be3f 100644--- a/app/src/main/res/menu/nav_menu.xml+++ b/app/src/main/res/menu/nav_menu.xml@@ -16,8 +16,4 @@android:id="@+id/nav_settings"android:icon="@drawable/ic_settings"android:title="@string/menu_settings" />- <item- android:id="@+id/nav_about"- android:icon="@drawable/ic_about"- android:title="@string/menu_about" /></menu>diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xmlindex 44ea5cfb..8a2fc7b1 100644--- a/app/src/main/res/navigation/nav_graph.xml+++ b/app/src/main/res/navigation/nav_graph.xml@@ -4,18 +4,6 @@xmlns:tools="http://schemas.android.com/tools"android:id="@+id/nav_root"app:startDestination="@id/nav_passes">- <fragment- android:id="@+id/nav_entries"- android:name="com.rtbishop.look4sat.presentation.entriesScreen.EntriesFragmentCompose"- tools:layout="@layout/fragment_entries">- <action- android:id="@+id/entries_to_modes"- app:destination="@id/nav_modes"- app:enterAnim="@anim/nav_default_enter_anim"- app:exitAnim="@anim/nav_default_exit_anim"- app:popEnterAnim="@anim/nav_default_pop_enter_anim"- app:popExitAnim="@anim/nav_default_pop_exit_anim" />- </fragment><fragmentandroid:id="@+id/nav_passes"android:name="com.rtbishop.look4sat.presentation.passesScreen.PassesFragment"@@ -54,18 +42,6 @@android:id="@+id/nav_settings"android:name="com.rtbishop.look4sat.presentation.settingsScreen.SettingsFragment"tools:layout="@layout/fragment_settings" />- <fragment- android:id="@+id/nav_about"- android:name="com.rtbishop.look4sat.presentation.aboutScreen.AboutFragment">- <argument- android:name="catNum"- android:defaultValue="-1"- app:argType="integer" />- <argument- android:name="aosTime"- android:defaultValue="0L"- app:argType="long" />- </fragment><dialogandroid:id="@+id/nav_modes"android:name="com.rtbishop.look4sat.presentation.entriesScreen.ModesDialog"diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xmlindex 7aced4f5..910f5607 100644--- a/app/src/main/res/values-ru/strings.xml+++ b/app/src/main/res/values-ru/strings.xml@@ -78,8 +78,8 @@<string name="pass_satId">Id:%d</string><string name="pass_aosAz">НПС - %.1f°</string><string name="pass_elevation">Элевация: %.1f°</string>- <string name="pass_los">%.1f° - КПС</string>- <string name="pass_altitude">Высота: %.0fкм</string>+ <string name="pass_losAz">%.1f° - КПС</string>+ <string name="pass_altitude">Высота: %d км</string><string name="pass_placeholder"> - - : - - </string><string name="pass_startTime">HH:mm:ss - EEE</string><string name="pass_endTime">EEE - HH:mm:ss</string>diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xmlindex ae1bf34a..7a154664 100644--- a/app/src/main/res/values-zh-rCN/strings.xml+++ b/app/src/main/res/values-zh-rCN/strings.xml@@ -78,8 +78,8 @@<string name="pass_satId">Id:%d</string><string name="pass_aosAz">入境 - %.1f°</string><string name="pass_elevation">仰角:%.1f°</string>- <string name="pass_los">%.1f° - 出境</string>- <string name="pass_altitude">高度:%.0f km</string>+ <string name="pass_losAz">%.1f° - 出境</string>+ <string name="pass_altitude">高度:%d km</string><string name="pass_placeholder">" - - : - - "</string><string name="pass_startTime">HH:mm:ss - EEE</string><string name="pass_endTime">EEE - HH:mm:ss</string>diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xmlindex 043e0104..e0c9b8b4 100644--- a/app/src/main/res/values/strings.xml+++ b/app/src/main/res/values/strings.xml@@ -77,12 +77,12 @@<string name="pass_satName">%s</string><string name="pass_satId">Id:%d</string><string name="pass_aosAz">AOS - %.1f°</string>- <string name="pass_elevation">ELEV: %.1f°</string>- <string name="pass_los">%.1f° - LOS</string>- <string name="pass_altitude">ALT: %.0f km</string>+ <string name="pass_elevation">Elevation: %.1f°</string>+ <string name="pass_losAz">%.1f° - LOS</string>+ <string name="pass_altitude">Altitude: %d km</string><string name="pass_placeholder"> - - : - - </string>- <string name="pass_startTime">HH:mm:ss - MMM dd</string>- <string name="pass_endTime">dd MMM - HH:mm:ss</string>+ <string name="pass_startTime">HH:mm:ss - EEE</string>+ <string name="pass_endTime">EEE - HH:mm:ss</string><string name="radar_az_text">Azimuth</string><string name="radar_az_value">%.1f°</string>