Skip to content

Satellite tracker and pass predictor for Android, inspired by Gpredict

Even further changes to layouts and styles

Arty Bishopb0b2283ca526
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.kt
index e24706b5..750f8698 100644
--- a/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesFragment.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesFragment.kt
@@ -26,6 +26,7 @@ import androidx.fragment.app.viewModels
import androidx.navigation.fragment.findNavController
import androidx.recyclerview.widget.DividerItemDecoration
import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.SimpleItemAnimator
import com.google.android.material.snackbar.Snackbar
import com.rtbishop.look4sat.R
import com.rtbishop.look4sat.databinding.FragmentEntriesBinding
@@ -54,6 +55,7 @@ class EntriesFragment : Fragment(R.layout.fragment_entries) {
this.adapter = adapter
this.layoutManager = layoutManager
addItemDecoration(itemDecoration)
+ (itemAnimator as SimpleItemAnimator).supportsChangeAnimations = false
}
entriesBack.setOnClickListener { findNavController().navigateUp() }
entriesSearch.doOnTextChanged { text, _, _, _ -> viewModel.setQuery(text.toString()) }
diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesFragment.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesFragment.kt
index ca69b4a2..5220f203 100644
--- a/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesFragment.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesFragment.kt
@@ -26,6 +26,7 @@ import androidx.navigation.fragment.findNavController
import androidx.recyclerview.widget.DividerItemDecoration
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.SimpleItemAnimator
import com.rtbishop.look4sat.R
import com.rtbishop.look4sat.databinding.FragmentPassesBinding
import com.rtbishop.look4sat.domain.model.DataState
@@ -57,6 +58,7 @@ class PassesFragment : Fragment(R.layout.fragment_passes), PassesAdapter.PassesC
this.adapter = adapter
this.layoutManager = layoutManager
addItemDecoration(itemDecoration)
+ (itemAnimator as SimpleItemAnimator).supportsChangeAnimations = false
addOnScrollListener(object : RecyclerView.OnScrollListener() {
override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
if (dy > 0 && passesFab.visibility == View.VISIBLE) passesFab.hide()
diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/RadarFragment.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/RadarFragment.kt
index a7b6f21b..1e953260 100644
--- a/app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/RadarFragment.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/RadarFragment.kt
@@ -25,6 +25,7 @@ import androidx.fragment.app.viewModels
import androidx.navigation.fragment.findNavController
import androidx.recyclerview.widget.DividerItemDecoration
import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.SimpleItemAnimator
import com.rtbishop.look4sat.R
import com.rtbishop.look4sat.databinding.FragmentRadarBinding
import com.rtbishop.look4sat.domain.predict.SatPass
@@ -59,6 +60,7 @@ class RadarFragment : Fragment(R.layout.fragment_radar) {
this.adapter = adapter
this.layoutManager = LinearLayoutManager(context)
addItemDecoration(itemDecoration)
+ (itemAnimator as SimpleItemAnimator).supportsChangeAnimations = false
}
setupObservers(adapter, this)
}
@@ -84,11 +86,9 @@ class RadarFragment : Fragment(R.layout.fragment_radar) {
viewModel.transmitters.observe(viewLifecycleOwner, { list ->
if (list.isNotEmpty()) {
transmittersAdapter.submitList(list)
- binding.radarRecycler.visibility = View.VISIBLE
- binding.radarRecyclerMsg.visibility = View.INVISIBLE
+ binding.radarRecyclerMsg.text = getString(R.string.trans_data)
} else {
- binding.radarRecycler.visibility = View.INVISIBLE
- binding.radarRecyclerMsg.visibility = View.VISIBLE
+ binding.radarRecyclerMsg.text = getString(R.string.trans_no_data)
}
radarView?.invalidate()
})
diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/sourcesScreen/SourcesDialog.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/sourcesScreen/SourcesDialog.kt
index b6d3e6b2..9f984848 100644
--- a/app/src/main/java/com/rtbishop/look4sat/presentation/sourcesScreen/SourcesDialog.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/sourcesScreen/SourcesDialog.kt
@@ -45,21 +45,23 @@ class SourcesDialog : AppCompatDialogFragment() {
override fun onViewCreated(view: View, state: Bundle?) {
super.onViewCreated(view, state)
val sources = settings.loadDataSources()
- val sourcesAdapter = SourcesAdapter().apply { setSources(sources.map { Source(it) }) }
+ val adapter = SourcesAdapter().apply { setSources(sources.map { Source(it) }) }
+ val layoutManager = LinearLayoutManager(requireContext())
DialogSourcesBinding.bind(view).apply {
dialog?.window?.setLayout(
WindowManager.LayoutParams.MATCH_PARENT,
WindowManager.LayoutParams.WRAP_CONTENT
)
sourcesRecycler.apply {
- adapter = sourcesAdapter
- layoutManager = LinearLayoutManager(requireContext())
+ setHasFixedSize(true)
+ this.adapter = adapter
+ this.layoutManager = layoutManager
}
sourcesBtnAdd.setOnClickListener {
- sourcesAdapter.addSource()
+ adapter.addSource()
}
sourcesBtnPos.setOnClickListener {
- setNavResult("sources", sourcesAdapter.getSources().map { it.sourceUrl })
+ setNavResult("sources", adapter.getSources().map { it.sourceUrl })
dismiss()
}
sourcesBtnNeg.setOnClickListener { dismiss() }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index cfe00338..92aad262 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -6,8 +6,4 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
app:defaultNavHost="true"
- app:layout_constraintBottom_toTopOf="@+id/main_nav_bottom"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
app:navGraph="@navigation/nav_graph" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/card_prefs_about.xml b/app/src/main/res/layout/card_prefs_about.xml
index 281a79d2..46306712 100644
--- a/app/src/main/res/layout/card_prefs_about.xml
+++ b/app/src/main/res/layout/card_prefs_about.xml
@@ -1,9 +1,7 @@
<?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/SettingsCard"
- android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ style="@style/SurfaceCard">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
@@ -31,7 +29,7 @@
android:includeFontPadding="false"
android:text="@string/app_name"
android:textColor="@color/themeAccent"
- android:textSize="48sp"
+ android:textSize="@dimen/text_size_app_title"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/about_img"
app:layout_constraintTop_toTopOf="parent" />
@@ -42,7 +40,7 @@
android:layout_height="wrap_content"
android:text="@string/about_version"
android:textColor="@color/themeLight"
- android:textSize="22sp"
+ android:textSize="@dimen/text_size_large"
app:layout_constraintStart_toStartOf="@+id/about_title"
app:layout_constraintTop_toBottomOf="@+id/about_title" />
@@ -53,7 +51,7 @@
android:layout_marginTop="4dp"
android:text="@string/about_subtitle"
android:textColor="@color/themeLight"
- android:textSize="20sp"
+ android:textSize="@dimen/text_size_large"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/about_version" />
diff --git a/app/src/main/res/layout/card_prefs_location.xml b/app/src/main/res/layout/card_prefs_location.xml
index 9289f26b..8b734c94 100644
--- a/app/src/main/res/layout/card_prefs_location.xml
+++ b/app/src/main/res/layout/card_prefs_location.xml
@@ -1,9 +1,7 @@
<?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/SettingsCard"
- android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ style="@style/SurfaceCard">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/card_prefs_other.xml b/app/src/main/res/layout/card_prefs_other.xml
index 19563b82..d538540c 100644
--- a/app/src/main/res/layout/card_prefs_other.xml
+++ b/app/src/main/res/layout/card_prefs_other.xml
@@ -1,9 +1,7 @@
<?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/SettingsCard"
- android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ style="@style/SurfaceCard">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/card_prefs_tracking.xml b/app/src/main/res/layout/card_prefs_tracking.xml
index 08543e2d..cc4630ef 100644
--- a/app/src/main/res/layout/card_prefs_tracking.xml
+++ b/app/src/main/res/layout/card_prefs_tracking.xml
@@ -1,9 +1,7 @@
<?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/SettingsCard"
- android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ style="@style/SurfaceCard">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/card_prefs_update.xml b/app/src/main/res/layout/card_prefs_update.xml
index e4d53c77..414ae195 100644
--- a/app/src/main/res/layout/card_prefs_update.xml
+++ b/app/src/main/res/layout/card_prefs_update.xml
@@ -1,9 +1,7 @@
<?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/SettingsCard"
- android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ style="@style/SurfaceCard">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/card_prefs_warranty.xml b/app/src/main/res/layout/card_prefs_warranty.xml
index bfb76fd5..509af336 100644
--- a/app/src/main/res/layout/card_prefs_warranty.xml
+++ b/app/src/main/res/layout/card_prefs_warranty.xml
@@ -1,9 +1,7 @@
<?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/SettingsCard"
- android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ style="@style/SurfaceCard">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/dialog_sources.xml b/app/src/main/res/layout/dialog_sources.xml
index a8cc2ec2..857d5d93 100644
--- a/app/src/main/res/layout/dialog_sources.xml
+++ b/app/src/main/res/layout/dialog_sources.xml
@@ -43,6 +43,7 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/sources_recycler"
+ style="@style/AppRecycler"
android:layout_width="0dp"
android:layout_height="280dp"
android:layout_marginStart="16dp"
diff --git a/app/src/main/res/layout/fragment_entries.xml b/app/src/main/res/layout/fragment_entries.xml
index a25ccb83..f8bcf67b 100644
--- a/app/src/main/res/layout/fragment_entries.xml
+++ b/app/src/main/res/layout/fragment_entries.xml
@@ -37,7 +37,7 @@
android:inputType="text"
android:textColor="@color/themeAccent"
android:textColorHint="@color/themeAccent"
- android:textSize="20sp" />
+ android:textSize="@dimen/text_size_large" />
<ImageButton
android:id="@+id/entries_mode"
@@ -49,15 +49,13 @@
<androidx.cardview.widget.CardView
android:id="@+id/entries_list_card"
- style="@style/ToolbarCard"
+ style="@style/SurfaceCard"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
- android:layout_marginBottom="3dp"
- android:clipChildren="true"
- app:cardElevation="0dp"
+ android:layout_marginBottom="2dp"
app:layout_constraintBottom_toTopOf="@+id/entries_select_all"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -65,7 +63,7 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/entries_recycler"
- style="@style/ListRecycler"
+ style="@style/AppRecycler"
android:layout_width="match_parent"
android:layout_height="match_parent" />
@@ -85,11 +83,11 @@
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="4dp"
- android:layout_marginBottom="3dp"
+ android:layout_marginBottom="4dp"
android:backgroundTint="@color/surfaceCard"
android:text="@string/entries_select_all"
android:textAllCaps="false"
- android:textSize="16sp"
+ android:textSize="@dimen/text_size_medium"
app:cornerRadius="8dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/entries_accept"
@@ -106,7 +104,7 @@
android:backgroundTint="@color/surfaceCard"
android:text="@string/btn_accept"
android:textAllCaps="false"
- android:textSize="16sp"
+ android:textSize="@dimen/text_size_medium"
app:cornerRadius="8dp"
app:layout_constraintBaseline_toBaselineOf="@+id/entries_select_all"
app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_map.xml b/app/src/main/res/layout/fragment_map.xml
index 1674d396..7db5264e 100644
--- a/app/src/main/res/layout/fragment_map.xml
+++ b/app/src/main/res/layout/fragment_map.xml
@@ -1,8 +1,6 @@
<?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"
- xmlns:tools="http://schemas.android.com/tools"
- android:id="@+id/map_root"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:keepScreenOn="true">
@@ -33,14 +31,13 @@
<androidx.cardview.widget.CardView
android:id="@+id/map_card"
- style="@style/ToolbarCard"
+ style="@style/SurfaceCard"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="2dp"
- android:clipChildren="true"
app:layout_constraintBottom_toTopOf="@+id/map_btn_prev"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -71,7 +68,7 @@
<androidx.cardview.widget.CardView
android:id="@+id/map_card_info"
- style="@style/ToolbarCard"
+ style="@style/SurfaceCard"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
@@ -82,7 +79,6 @@
app:layout_constraintStart_toStartOf="parent">
<androidx.constraintlayout.widget.ConstraintLayout
- android:id="@+id/map_data_root"
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -162,8 +158,7 @@
android:src="@drawable/ic_arrow"
android:tint="@color/themeLight"
app:layout_constraintBottom_toTopOf="@+id/map_card_info"
- app:layout_constraintStart_toStartOf="parent"
- tools:ignore="DuplicateSpeakableTextCheck" />
+ app:layout_constraintStart_toStartOf="parent" />
<ImageButton
android:id="@+id/map_btn_next"
@@ -189,7 +184,8 @@
android:maxLines="1"
android:text="@string/map_copyright"
android:textColor="@color/themeLight"
- android:textSize="13sp"
+ android:includeFontPadding="false"
+ android:textSize="@dimen/text_size_copyright"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
diff --git a/app/src/main/res/layout/fragment_passes.xml b/app/src/main/res/layout/fragment_passes.xml
index 54c9ad60..eb55fa74 100644
--- a/app/src/main/res/layout/fragment_passes.xml
+++ b/app/src/main/res/layout/fragment_passes.xml
@@ -36,15 +36,13 @@
<androidx.cardview.widget.CardView
android:id="@+id/passes_list_card"
- style="@style/ToolbarCard"
+ style="@style/SurfaceCard"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
- android:clipChildren="true"
- app:cardElevation="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -57,7 +55,7 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/passes_list"
- style="@style/ListRecycler"
+ style="@style/AppRecycler"
android:layout_width="match_parent"
android:layout_height="match_parent" />
@@ -69,7 +67,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/passes_error"
- android:textSize="20sp"
+ android:textSize="@dimen/text_size_large"
android:visibility="invisible" />
</androidx.cardview.widget.CardView>
@@ -81,10 +79,9 @@
android:layout_height="wrap_content"
android:layout_marginEnd="24dp"
android:layout_marginBottom="24dp"
- android:elevation="16dp"
android:src="@drawable/ic_satellite"
android:tint="@color/surfaceBg"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_radar.xml b/app/src/main/res/layout/fragment_radar.xml
index a3028f00..b9708db3 100644
--- a/app/src/main/res/layout/fragment_radar.xml
+++ b/app/src/main/res/layout/fragment_radar.xml
@@ -39,21 +39,23 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
+ android:layout_marginTop="2dp"
android:layout_marginEnd="8dp"
android:gravity="center"
- android:textSize="16sp"
+ android:includeFontPadding="false"
+ android:textSize="@dimen/text_size_medium"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/radar_toolbar" />
<androidx.cardview.widget.CardView
android:id="@+id/radar_card"
- style="@style/SettingsCard"
+ style="@style/SurfaceCard"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="8dp"
+ android:layout_marginTop="2dp"
android:layout_marginEnd="8dp"
- android:elevation="0dp"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -65,9 +67,8 @@
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginTop="4dp"
- android:elevation="8dp"
android:text="@string/pat_azimuth"
- android:textSize="15sp"
+ android:textSize="@dimen/text_size_small"
app:layout_constraintStart_toStartOf="@+id/radar_card"
app:layout_constraintTop_toTopOf="@+id/radar_card" />
@@ -77,9 +78,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_marginEnd="4dp"
- android:elevation="8dp"
android:text="@string/pat_elevation"
- android:textSize="15sp"
+ android:textSize="@dimen/text_size_small"
app:layout_constraintEnd_toEndOf="@+id/radar_card"
app:layout_constraintTop_toTopOf="@+id/radar_card" />
@@ -89,9 +89,8 @@
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginBottom="4dp"
- android:elevation="8dp"
android:text="@string/pat_altitude"
- android:textSize="15sp"
+ android:textSize="@dimen/text_size_small"
app:layout_constraintBottom_toBottomOf="@+id/radar_card"
app:layout_constraintStart_toStartOf="@+id/radar_card" />
@@ -101,22 +100,20 @@
android:layout_height="wrap_content"
android:layout_marginEnd="4dp"
android:layout_marginBottom="4dp"
- android:elevation="8dp"
android:text="@string/pat_distance"
- android:textSize="15sp"
+ android:textSize="@dimen/text_size_small"
app:layout_constraintBottom_toBottomOf="@+id/radar_card"
app:layout_constraintEnd_toEndOf="@+id/radar_card" />
<androidx.cardview.widget.CardView
android:id="@+id/radar_list_card"
- style="@style/ToolbarCard"
+ style="@style/SurfaceCard"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="8dp"
+ android:layout_marginTop="2dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
- android:clipChildren="true"
- app:cardElevation="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -124,7 +121,7 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/radar_recycler"
- style="@style/ListRecycler"
+ style="@style/AppRecycler"
android:layout_width="match_parent"
android:layout_height="match_parent" />
@@ -135,10 +132,12 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
+ android:layout_marginTop="2dp"
android:layout_marginEnd="8dp"
android:gravity="center"
+ android:includeFontPadding="false"
android:text="@string/trans_no_data"
- android:textSize="16sp"
+ android:textSize="@dimen/text_size_medium"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/radar_card" />
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index f467c379..e27c42da 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -29,12 +29,12 @@
</androidx.cardview.widget.CardView>
<ScrollView
+ style="@style/AppRecycler"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
- style="@style/ListRecycler"
android:layout_marginBottom="8dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@@ -48,6 +48,8 @@
<include
android:id="@+id/prefs_info"
layout="@layout/card_prefs_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" />
diff --git a/app/src/main/res/layout/item_entry.xml b/app/src/main/res/layout/item_entry.xml
index f0e5466d..a86d45b6 100644
--- a/app/src/main/res/layout/item_entry.xml
+++ b/app/src/main/res/layout/item_entry.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/entry_card"
- style="@style/ListItemCard">
+ style="@style/RecyclerItemCard">
<CheckBox
android:id="@+id/entry_checkbox"
@@ -13,6 +13,6 @@
android:lines="1"
android:padding="1dp"
android:textColor="@color/themeLight"
- android:textSize="16sp" />
+ android:textSize="@dimen/text_size_medium" />
</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_pass.xml b/app/src/main/res/layout/item_pass.xml
index 39a301bf..34887c1a 100644
--- a/app/src/main/res/layout/item_pass.xml
+++ b/app/src/main/res/layout/item_pass.xml
@@ -2,7 +2,7 @@
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/pass_card"
- style="@style/ListItemCard">
+ style="@style/RecyclerItemCard">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/pass_root"
@@ -17,6 +17,7 @@
android:layout_marginStart="6dp"
android:layout_marginTop="4dp"
android:text="@string/pass_satName"
+ android:textSize="@dimen/text_size_small"
android:textColor="@color/themeAccent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -27,6 +28,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="6dp"
android:text="@string/pass_satId"
+ android:textSize="@dimen/text_size_small"
android:textColor="@color/themeAccent"
app:layout_constraintBaseline_toBaselineOf="@+id/pass_name"
app:layout_constraintEnd_toEndOf="parent" />
@@ -37,6 +39,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:text="@string/pass_aosAz"
+ android:textSize="@dimen/text_size_small"
app:layout_constraintEnd_toStartOf="@+id/pass_los"
app:layout_constraintHorizontal_chainStyle="spread_inside"
app:layout_constraintStart_toStartOf="@+id/pass_name"
@@ -47,6 +50,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/pass_altitude"
+ android:textSize="@dimen/text_size_small"
app:layout_constraintBaseline_toBaselineOf="@+id/pass_aos"
app:layout_constraintEnd_toEndOf="@+id/pass_los"
app:layout_constraintStart_toStartOf="@+id/pass_aos" />
@@ -56,6 +60,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/pass_los"
+ android:textSize="@dimen/text_size_small"
app:layout_constraintBaseline_toBaselineOf="@+id/pass_aos"
app:layout_constraintEnd_toEndOf="@+id/pass_id"
app:layout_constraintStart_toEndOf="@+id/pass_aos" />
@@ -66,6 +71,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:text="@string/pass_startTime"
+ android:textSize="@dimen/text_size_small"
app:layout_constraintEnd_toStartOf="@+id/pass_end"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintHorizontal_chainStyle="spread_inside"
@@ -77,6 +83,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/pass_elevation"
+ android:textSize="@dimen/text_size_small"
app:layout_constraintBaseline_toBaselineOf="@+id/pass_start"
app:layout_constraintEnd_toEndOf="@+id/pass_end"
app:layout_constraintStart_toStartOf="@+id/pass_start" />
@@ -86,6 +93,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/pass_endTime"
+ android:textSize="@dimen/text_size_small"
app:layout_constraintBaseline_toBaselineOf="@+id/pass_start"
app:layout_constraintEnd_toEndOf="@+id/pass_los"
app:layout_constraintHorizontal_bias="0.5"
diff --git a/app/src/main/res/layout/item_trans.xml b/app/src/main/res/layout/item_trans.xml
index 706ba2cd..d182eef6 100644
--- a/app/src/main/res/layout/item_trans.xml
+++ b/app/src/main/res/layout/item_trans.xml
@@ -2,8 +2,7 @@
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/trans_card"
- style="@style/ListItemCard"
- android:layout_marginBottom="1dp">
+ style="@style/RecyclerItemCard">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/trans_root"
@@ -28,7 +27,7 @@
android:gravity="center"
android:maxLines="1"
android:text="@string/trans_description"
- android:textSize="15sp"
+ android:textSize="@dimen/text_size_small"
app:layout_constraintEnd_toStartOf="@+id/trans_uplink_img"
app:layout_constraintHorizontal_chainStyle="spread_inside"
app:layout_constraintStart_toEndOf="@+id/trans_downlink_img"
@@ -51,7 +50,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/trans_link_low"
- android:textSize="24sp"
+ android:textSize="@dimen/text_size_frequency"
app:layout_constraintEnd_toStartOf="@+id/trans_guideline"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/trans_desc" />
@@ -73,7 +72,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/trans_link_low"
- android:textSize="24sp"
+ android:textSize="@dimen/text_size_frequency"
app:layout_constraintBaseline_toBaselineOf="@+id/trans_downlink"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/trans_guideline" />
@@ -85,7 +84,7 @@
android:layout_marginStart="6dp"
android:layout_marginBottom="4dp"
android:text="@string/trans_mode"
- android:textSize="15sp"
+ android:textSize="@dimen/text_size_small"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/trans_inverted"
app:layout_constraintHorizontal_chainStyle="spread_inside"
@@ -98,7 +97,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="6dp"
android:text="@string/trans_inverted"
- android:textSize="15sp"
+ android:textSize="@dimen/text_size_small"
app:layout_constraintBaseline_toBaselineOf="@+id/trans_mode"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/trans_mode" />
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index cb921f40..a3781884 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -35,6 +35,7 @@
<string name="trans_mode">Модуляция: %s</string>
<string name="trans_no_mode">Модуляция: нет</string>
<string name="trans_inverted">Инверсия: %s</string>
+ <string name="trans_data">Трансиверы спутника:</string>
<string name="trans_no_data">Не найдены трансиверы для этого спутника</string>
<string name="map_title">Карта Мира</string>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index a4adad0e..fc5a79f9 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -9,9 +9,9 @@
<color name="surfaceTop">#383838</color>
<color name="surfaceChip">#303030</color>
<color name="surfaceButton">#242424</color>
- <color name="surfaceToolbar">#202020</color>
+ <color name="surfaceToolbar">#1A1A1A</color>
<color name="surfaceSystem">#1A1A1A</color>
- <color name="surfaceCard">#181818</color>
+ <color name="surfaceCard">#1A1A1A</color>
<color name="surfaceBg">#121212</color>
<color name="mapInfoLayout">#B3181818</color>
<color name="transparent">@android:color/transparent</color>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 0c20d14a..e8eacd63 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -4,4 +4,11 @@
<dimen name="card_elev_high">8dp</dimen>
<dimen name="card_corner_low">0dp</dimen>
<dimen name="card_corner_high">8dp</dimen>
+ <dimen name="text_size_copyright">13sp</dimen>
+ <dimen name="text_size_small">15sp</dimen>
+ <dimen name="text_size_medium">16sp</dimen>
+ <dimen name="text_size_large">20sp</dimen>
+ <dimen name="text_size_frequency">24sp</dimen>
+ <dimen name="text_size_app_timer">42sp</dimen>
+ <dimen name="text_size_app_title">48sp</dimen>
</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 85b2d1ec..852dfe53 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -49,6 +49,7 @@
<string name="trans_no_link" translatable="false">- - . - -</string>
<string name="trans_link_low" translatable="false">%.4f</string>
<string name="trans_link_lowHigh" translatable="false">%.4f - %.4f</string>
+ <string name="trans_data">Satellite transceivers:</string>
<string name="trans_no_data">No transceivers found for this satellite</string>
<string name="map_title">World Map</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 99a2f570..5e140696 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,36 +1,40 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<style name="Theme.Look4Sat.SplashScreen" parent="Theme.SplashScreen">
+ <item name="android:forceDarkAllowed" tools:targetApi="q">false</item>
+ <item name="postSplashScreenTheme">@style/Theme.Look4Sat.Main</item>
<item name="windowSplashScreenBackground">@color/surfaceBg</item>
<item name="windowSplashScreenAnimatedIcon">@drawable/ic_splash_drawable</item>
- <item name="postSplashScreenTheme">@style/Theme.Look4Sat.Main</item>
- <item name="android:forceDarkAllowed" tools:targetApi="q">false</item>
</style>
<style name="Theme.Look4Sat.Main" parent="Theme.AppCompat.NoActionBar">
- <item name="colorPrimary">@color/themeAccent</item>
- <item name="colorSecondary">@color/themeAccent</item>
<item name="colorAccent">@color/themeAccent</item>
<item name="colorControlNormal">@color/themeLight</item>
+ <item name="colorPrimary">@color/themeAccent</item>
+ <item name="colorSecondary">@color/themeAccent</item>
+ <item name="android:forceDarkAllowed" tools:targetApi="q">false</item>
+ <item name="android:listDivider">@drawable/item_divider</item>
+ <item name="android:navigationBarColor">@color/surfaceBg</item>
<item name="android:textColorPrimary">@color/themeLight</item>
<item name="android:statusBarColor">@color/surfaceBg</item>
<item name="android:windowBackground">@color/surfaceBg</item>
- <item name="android:navigationBarColor">@color/surfaceBg</item>
- <item name="android:forceDarkAllowed" tools:targetApi="q">false</item>
- <item name="android:listDivider">@drawable/item_divider</item>
</style>
<style name="AppButton">
<item name="android:backgroundTint">@color/surfaceButton</item>
- <item name="android:drawablePadding">4dp</item>
<item name="android:ellipsize">end</item>
<item name="android:maxLines">1</item>
<item name="android:textAllCaps">false</item>
<item name="android:textColor">@color/themeLight</item>
- <item name="android:textSize">16sp</item>
+ <item name="android:textSize">@dimen/text_size_medium</item>
+ </style>
+
+ <style name="AppRecycler">
+ <item name="android:overScrollMode">never</item>
+ <item name="android:scrollbars">none</item>
</style>
- <style name="ListItemCard">
+ <style name="RecyclerItemCard">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="cardBackgroundColor">@color/surfaceCard</item>
@@ -38,73 +42,67 @@
<item name="cardElevation">@dimen/card_elev_low</item>
</style>
- <style name="ListRecycler">
- <item name="android:animateLayoutChanges">false</item>
- <item name="android:overScrollMode">never</item>
- <item name="android:scrollbars">none</item>
+ <style name="SurfaceCard">
+ <item name="android:clipChildren">true</item>
+ <item name="android:layout_width">match_parent</item>
+ <item name="android:layout_height">wrap_content</item>
+ <item name="cardBackgroundColor">@color/surfaceCard</item>
+ <item name="cardCornerRadius">@dimen/card_corner_high</item>
+ <item name="cardElevation">@dimen/card_elev_low</item>
</style>
<style name="ToolbarCard">
+ <item name="android:clipChildren">true</item>
<item name="android:layout_width">0dp</item>
<item name="android:layout_height">48dp</item>
- <item name="cardElevation">@dimen/card_elev_low</item>
- <item name="cardBackgroundColor">@color/surfaceCard</item>
+ <item name="cardBackgroundColor">@color/surfaceToolbar</item>
<item name="cardCornerRadius">@dimen/card_corner_high</item>
+ <item name="cardElevation">@dimen/card_elev_low</item>
</style>
<style name="ToolbarButton">
<item name="android:layout_width">48dp</item>
<item name="android:layout_height">48dp</item>
<item name="android:background">?actionBarItemBackground</item>
- <item name="android:elevation">8dp</item>
<item name="android:tint">@color/themeLight</item>
</style>
<style name="ToolbarTimer">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
- <item name="android:elevation">8dp</item>
<item name="android:includeFontPadding">false</item>
<item name="android:text">@string/timer_zero</item>
<item name="android:textColor">@color/themeAccent</item>
- <item name="android:textSize">38sp</item>
+ <item name="android:textSize">@dimen/text_size_app_timer</item>
<item name="android:textStyle">bold</item>
</style>
<style name="ToolbarTitle">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
- <item name="android:elevation">8dp</item>
<item name="android:includeFontPadding">false</item>
<item name="android:textColor">@color/themeLight</item>
- <item name="android:textSize">20sp</item>
+ <item name="android:textSize">@dimen/text_size_large</item>
</style>
<style name="WorldMapText">
- <item name="android:textSize">16sp</item>
+ <item name="android:textSize">@dimen/text_size_medium</item>
<item name="android:textColor">@color/themeLight</item>
</style>
<style name="WorldMapTitle">
- <item name="android:textSize">16sp</item>
+ <item name="android:textSize">@dimen/text_size_medium</item>
<item name="android:textColor">@color/themeLight</item>
</style>
- <style name="SettingsCard">
- <item name="android:layout_width">0dp</item>
- <item name="android:layout_height">wrap_content</item>
- <item name="cardBackgroundColor">@color/surfaceCard</item>
- <item name="cardCornerRadius">@dimen/card_corner_high</item>
- </style>
-
<style name="SettingsText">
- <item name="android:textSize">16sp</item>
+ <item name="android:textSize">@dimen/text_size_medium</item>
<item name="android:textColor">@color/themeLight</item>
</style>
<style name="SettingsTitle">
<item name="android:includeFontPadding">false</item>
- <item name="android:textSize">16sp</item>
+ <item name="android:textSize">@dimen/text_size_medium</item>
<item name="android:textColor">@color/themeAccent</item>
</style>
@@ -114,21 +112,21 @@
<item name="android:maxLines">1</item>
<item name="android:textAllCaps">false</item>
<item name="android:textColor">@color/themeAccent</item>
- <item name="android:textSize">16sp</item>
+ <item name="android:textSize">@dimen/text_size_medium</item>
</style>
<style name="DialogText">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textColor">@color/themeLight</item>
- <item name="android:textSize">16sp</item>
+ <item name="android:textSize">@dimen/text_size_medium</item>
</style>
<style name="DialogTitle">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textColor">@color/themeAccent</item>
- <item name="android:textSize">16sp</item>
+ <item name="android:textSize">@dimen/text_size_medium</item>
</style>
</resources>
\ No newline at end of file