Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Switched back to BottomNavigationView
Arty Bishop0303c53a7259
diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/MainActivity.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/MainActivity.ktindex 7bdedb43..69d550c6 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/MainActivity.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/MainActivity.kt@@ -30,19 +30,27 @@ import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreenimport androidx.fragment.app.Fragmentimport androidx.lifecycle.Lifecycleimport androidx.lifecycle.LifecycleEventObserver+import androidx.navigation.fragment.NavHostFragmentimport androidx.navigation.fragment.findNavController+import androidx.navigation.ui.NavigationUI+import androidx.navigation.ui.NavigationUiSaveStateControl+import com.rtbishop.look4sat.Rimport com.rtbishop.look4sat.databinding.ActivityMainBindingimport dagger.hilt.android.AndroidEntryPoint@AndroidEntryPointclass MainActivity : AppCompatActivity() {+ @OptIn(NavigationUiSaveStateControl::class)@SuppressLint("SourceLockedOrientationActivity")override fun onCreate(savedInstanceState: Bundle?) {requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAITinstallSplashScreen()super.onCreate(savedInstanceState)- setContentView(ActivityMainBinding.inflate(layoutInflater).root)+ val binding = ActivityMainBinding.inflate(layoutInflater)+ val host = supportFragmentManager.findFragmentById(R.id.nav_host) as NavHostFragment+ NavigationUI.setupWithNavController(binding.navBar, host.navController, false)+ setContentView(binding.root)}override fun attachBaseContext(newBase: Context?) {diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xmlnew file mode 100644index 00000000..7ae71340--- /dev/null+++ b/app/src/main/res/drawable/ic_about.xml@@ -0,0 +1,11 @@+<vector xmlns:android="http://schemas.android.com/apk/res/android"+ android:width="24dp"+ android:height="24dp"+ android:autoMirrored="true"+ android:tint="?attr/colorControlNormal"+ android:viewportWidth="24"+ android:viewportHeight="24">+ <path+ android:fillColor="@android:color/white"+ android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,19h-2v-2h2v2zM15.07,11.25l-0.9,0.92C13.45,12.9 13,13.5 13,15h-2v-0.5c0,-1.1 0.45,-2.1 1.17,-2.83l1.24,-1.26c0.37,-0.36 0.59,-0.86 0.59,-1.41 0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2L8,9c0,-2.21 1.79,-4 4,-4s4,1.79 4,4c0,0.88 -0.36,1.68 -0.93,2.25z" />+</vector>diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xmlnew file mode 100644index 00000000..a95f37b1--- /dev/null+++ b/app/src/main/res/drawable/ic_settings.xml@@ -0,0 +1,11 @@+<vector xmlns:android="http://schemas.android.com/apk/res/android"+ android:width="24dp"+ android:height="24dp"+ android:autoMirrored="true"+ android:tint="?attr/colorControlNormal"+ android:viewportWidth="24"+ android:viewportHeight="24">+ <path+ android:fillColor="@android:color/white"+ android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z" />+</vector>diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xmlindex 0274daed..e12c7ee3 100644--- a/app/src/main/res/layout/activity_main.xml+++ b/app/src/main/res/layout/activity_main.xml@@ -1,9 +1,30 @@<?xml version="1.0" encoding="utf-8"?>-<androidx.fragment.app.FragmentContainerView xmlns:android="http://schemas.android.com/apk/res/android"+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"xmlns:app="http://schemas.android.com/apk/res-auto"- android:id="@+id/nav_host"- android:name="androidx.navigation.fragment.NavHostFragment"android:layout_width="match_parent"- android:layout_height="match_parent"- app:defaultNavHost="true"- app:navGraph="@navigation/nav_graph" />+ 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/menu/nav_menu.xml b/app/src/main/res/menu/nav_menu.xmlnew file mode 100644index 00000000..a3f6c009--- /dev/null+++ b/app/src/main/res/menu/nav_menu.xml@@ -0,0 +1,23 @@+<?xml version="1.0" encoding="utf-8"?>+<menu xmlns:android="http://schemas.android.com/apk/res/android">+ <item+ android:id="@+id/nav_entries"+ android:icon="@drawable/ic_satellite"+ android:title="@string/menu_satellites" />+ <item+ android:id="@+id/nav_passes"+ android:icon="@drawable/ic_list"+ android:title="@string/menu_passes" />+ <item+ android:id="@+id/nav_map"+ android:icon="@drawable/ic_map"+ android:title="@string/menu_map" />+ <item+ 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 872cc852..e5abb3f4 100644--- a/app/src/main/res/navigation/nav_graph.xml+++ b/app/src/main/res/navigation/nav_graph.xml@@ -53,7 +53,19 @@<fragmentandroid:id="@+id/nav_settings"android:name="com.rtbishop.look4sat.presentation.settingsScreen.SettingsFragment"- tools:layout="@layout/fragment_settings">+ tools:layout="@layout/fragment_settings" />+ <fragment+ android:id="@+id/nav_about"+ android:name="com.rtbishop.look4sat.presentation.radarScreen.RadarFragment"+ tools:layout="@layout/fragment_radar">+ <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"diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xmlindex 6e7458ab..9901fb21 100644--- a/app/src/main/res/values-ru/strings.xml+++ b/app/src/main/res/values-ru/strings.xml@@ -5,6 +5,12 @@<string name="app_version">Версия: %s</string><string name="app_subtitle">Трекер спутников для Android</string>+ <string name="menu_satellites">Спутники</string>+ <string name="menu_passes">Пролеты</string>+ <string name="menu_map">Карта</string>+ <string name="menu_settings">Настройки</string>+ <string name="menu_about">Инфо</string>+<!--Buttons--><string name="btn_add">Добавить</string>diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xmlindex e17fdac4..de7db7d3 100644--- a/app/src/main/res/values-zh-rCN/strings.xml+++ b/app/src/main/res/values-zh-rCN/strings.xml@@ -5,6 +5,12 @@<string name="app_version">版本:%s</string><string name="app_subtitle">人造卫星追踪和过境预测</string>+ <string name="menu_satellites">Satellites</string>+ <string name="menu_passes">Passes</string>+ <string name="menu_map">World Map</string>+ <string name="menu_settings">Settings</string>+ <string name="menu_about">About</string>+<!--Buttons--><string name="btn_add">添加</string>diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xmlindex a1fe2d01..21a272a3 100644--- a/app/src/main/res/values/strings.xml+++ b/app/src/main/res/values/strings.xml@@ -5,6 +5,12 @@<string name="app_version">Version: %s</string><string name="app_subtitle">Satellite tracker and pass predictor</string>+ <string name="menu_satellites">Satellites</string>+ <string name="menu_passes">Passes</string>+ <string name="menu_map">World Map</string>+ <string name="menu_settings">Settings</string>+ <string name="menu_about">About</string>+<!--Buttons--><string name="btn_add">Add</string>diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xmlindex fde65210..1310c990 100644--- a/app/src/main/res/values/styles.xml+++ b/app/src/main/res/values/styles.xml@@ -12,7 +12,12 @@<item name="colorControlNormal">@color/textMain</item><item name="colorPrimary">@color/accent</item><item name="colorSecondary">@color/accent</item>- <item name="colorOnPrimaryContainer">@color/background</item>+ <!-- Bottom bar colors-->+ <item name="colorOnSecondaryContainer">@color/background</item>+ <item name="colorOnSurfaceVariant">@color/textMain</item>+ <item name="colorSecondaryContainer">@color/accent</item>+ <item name="colorOnPrimaryContainer">@color/textMain</item>+ <!-- --><item name="android:forceDarkAllowed" tools:targetApi="q">false</item><item name="android:listDivider">@drawable/item_divider</item><item name="android:navigationBarColor">@color/background</item>@@ -127,6 +132,7 @@<item name="android:layout_width">match_parent</item><item name="android:layout_height">@dimen/bottom_bar_size</item><item name="android:layout_gravity">bottom</item>+ <item name="android:layout_marginBottom">3dp</item><item name="android:backgroundTint">@color/bottomBar</item><item name="contentInsetStart">@dimen/bottom_bar_inset</item><item name="contentInsetEnd">@dimen/bottom_bar_inset</item>