Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Added NavActivity as a future replacement for the MainActivity
Arty Bishopd4ac615a8d3d
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xmlindex 41288a85..7b35f156 100644--- a/app/src/main/AndroidManifest.xml+++ b/app/src/main/AndroidManifest.xml@@ -18,7 +18,6 @@--><manifest xmlns:android="http://schemas.android.com/apk/res/android"- xmlns:tools="http://schemas.android.com/tools"package="com.rtbishop.look4sat"><uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />@@ -28,23 +27,31 @@<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /><application- android:name="com.rtbishop.look4sat.Look4SatApp"+ android:name=".Look4SatApp"android:allowBackup="false"android:icon="@mipmap/ic_launcher"android:label="@string/app_name"- android:supportsRtl="true"- android:theme="@style/AppTheme"- tools:ignore="GoogleAppIndexingWarning">+ android:theme="@style/AppTheme"><activity- android:name="com.rtbishop.look4sat.ui.MainActivity"+ android:name=".ui.NavActivity"+ android:screenOrientation="portrait">+ <!-- <intent-filter>-->+ <!-- <action android:name="android.intent.action.MAIN" />-->++ <!-- <category android:name="android.intent.category.LAUNCHER" />-->+ <!-- </intent-filter>-->+ </activity>+ <activity+ android:name=".ui.MainActivity"android:configChanges="orientation|screenSize"android:label="@string/app_name"android:theme="@style/AppTheme.Splash"><intent-filter><action android:name="android.intent.action.MAIN" />+<category android:name="android.intent.category.LAUNCHER" /></intent-filter></activity></application>-</manifest>+</manifest>\ No newline at end of filediff --git a/app/src/main/java/com/rtbishop/look4sat/ui/MainActivity.kt b/app/src/main/java/com/rtbishop/look4sat/ui/MainActivity.ktindex 170539bc..2cd1a7c2 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/MainActivity.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/MainActivity.kt@@ -31,7 +31,6 @@ import android.view.Viewimport android.view.WindowManagerimport androidx.appcompat.app.AppCompatActivityimport androidx.core.app.ActivityCompat-import androidx.lifecycle.Observerimport androidx.lifecycle.ViewModelProviderimport androidx.lifecycle.lifecycleScopeimport androidx.navigation.findNavController@@ -133,7 +132,7 @@ class MainActivity : AppCompatActivity(), TleSourcesDialogFragment.SourcesSubmit}private fun setupObservers() {- viewModel.getGSP().observe(this, Observer { result ->+ viewModel.getGSP().observe(this, { result ->when (result) {is Result.Success -> {drawerBinding.drawerLatValue.text =@@ -151,7 +150,7 @@ class MainActivity : AppCompatActivity(), TleSourcesDialogFragment.SourcesSubmit}}})- viewModel.getUpdateStatus().observe(this, Observer { result ->+ viewModel.getUpdateStatus().observe(this, { result ->when (result) {is Result.Success -> getString(R.string.import_data_success).toast(this)is Result.Error -> getString(R.string.import_data_failure).toast(this)diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/NavActivity.kt b/app/src/main/java/com/rtbishop/look4sat/ui/NavActivity.ktnew file mode 100644index 00000000..11368458--- /dev/null+++ b/app/src/main/java/com/rtbishop/look4sat/ui/NavActivity.kt@@ -0,0 +1,19 @@+package com.rtbishop.look4sat.ui++import android.os.Bundle+import androidx.appcompat.app.AppCompatActivity+import androidx.navigation.fragment.NavHostFragment+import androidx.navigation.ui.setupWithNavController+import com.rtbishop.look4sat.R+import com.rtbishop.look4sat.databinding.ActivityNavBinding++class NavActivity : AppCompatActivity() {++ override fun onCreate(savedInstanceState: Bundle?) {+ super.onCreate(savedInstanceState)+ val binding = ActivityNavBinding.inflate(layoutInflater)+ setContentView(binding.root)+ val navHost = supportFragmentManager.findFragmentById(R.id.nav_frag) as NavHostFragment+ binding.navBottom.setupWithNavController(navHost.navController)+ }+}\ No newline at end of filediff --git a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/MapOsmFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/MapOsmFragment.ktindex 6975e116..fefb9906 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/MapOsmFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/MapOsmFragment.kt@@ -9,6 +9,7 @@ import android.view.Viewimport androidx.core.content.ContextCompatimport androidx.core.content.res.ResourcesCompatimport androidx.fragment.app.Fragment+import androidx.fragment.app.FragmentActivityimport androidx.lifecycle.ViewModelProviderimport androidx.lifecycle.lifecycleScopeimport androidx.preference.PreferenceManager@@ -20,7 +21,6 @@ import com.rtbishop.look4sat.data.Resultimport com.rtbishop.look4sat.data.SatItemimport com.rtbishop.look4sat.data.SatPassimport com.rtbishop.look4sat.databinding.FragmentMapOsmBinding-import com.rtbishop.look4sat.ui.MainActivityimport com.rtbishop.look4sat.ui.SharedViewModelimport kotlinx.coroutines.Dispatchersimport kotlinx.coroutines.delay@@ -43,7 +43,7 @@ class MapOsmFragment : Fragment(R.layout.fragment_map_osm) {@Injectlateinit var modelFactory: ViewModelFactory- private lateinit var mainActivity: MainActivity+ private lateinit var mainActivity: FragmentActivityprivate lateinit var viewModel: SharedViewModelprivate lateinit var binding: FragmentMapOsmBindingprivate lateinit var trackPaint: Paint@@ -54,7 +54,7 @@ class MapOsmFragment : Fragment(R.layout.fragment_map_osm) {override fun onViewCreated(view: View, savedInstanceState: Bundle?) {super.onViewCreated(view, savedInstanceState)binding = FragmentMapOsmBinding.bind(view)- mainActivity = requireActivity() as MainActivity+ mainActivity = requireActivity()(mainActivity.application as Look4SatApp).appComponent.inject(this)viewModel = ViewModelProvider(mainActivity, modelFactory).get(SharedViewModel::class.java)diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/MapViewFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/MapViewFragment.ktindex 4970c3a5..106dd362 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/MapViewFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/MapViewFragment.kt@@ -23,6 +23,7 @@ import android.os.Bundleimport android.view.Viewimport androidx.appcompat.app.AlertDialogimport androidx.fragment.app.Fragment+import androidx.fragment.app.FragmentActivityimport androidx.lifecycle.ViewModelProviderimport androidx.lifecycle.lifecycleScopeimport com.github.amsacode.predict4java.GroundStationPosition@@ -33,7 +34,6 @@ import com.rtbishop.look4sat.dagger.ViewModelFactoryimport com.rtbishop.look4sat.data.Resultimport com.rtbishop.look4sat.data.SatPassimport com.rtbishop.look4sat.databinding.FragmentMapViewBinding-import com.rtbishop.look4sat.ui.MainActivityimport com.rtbishop.look4sat.ui.SharedViewModelimport com.rtbishop.look4sat.ui.views.MapViewimport com.rtbishop.look4sat.utility.Extensions.toast@@ -47,7 +47,7 @@ class MapViewFragment : Fragment(R.layout.fragment_map_view) {@Injectlateinit var modelFactory: ViewModelFactory- private lateinit var mainActivity: MainActivity+ private lateinit var mainActivity: FragmentActivityprivate lateinit var viewModel: SharedViewModelprivate lateinit var mapView: MapViewprivate lateinit var predictor: PassPredictor@@ -60,7 +60,7 @@ class MapViewFragment : Fragment(R.layout.fragment_map_view) {override fun onViewCreated(view: View, savedInstanceState: Bundle?) {super.onViewCreated(view, savedInstanceState)binding = FragmentMapViewBinding.bind(view)- mainActivity = requireActivity() as MainActivity+ mainActivity = requireActivity()(mainActivity.application as Look4SatApp).appComponent.inject(this)viewModel = ViewModelProvider(mainActivity, modelFactory).get(SharedViewModel::class.java)setupObservers(binding)diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PassListFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PassListFragment.ktindex ca1c8952..b359e199 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PassListFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PassListFragment.kt@@ -30,6 +30,7 @@ import android.widget.TextViewimport android.widget.Toastimport androidx.appcompat.app.AlertDialogimport androidx.fragment.app.Fragment+import androidx.fragment.app.FragmentActivityimport androidx.lifecycle.ViewModelProviderimport androidx.lifecycle.lifecycleScopeimport androidx.recyclerview.widget.LinearLayoutManager@@ -41,7 +42,6 @@ import com.rtbishop.look4sat.data.Resultimport com.rtbishop.look4sat.data.SatEntryimport com.rtbishop.look4sat.data.SatPassimport com.rtbishop.look4sat.databinding.FragmentPassListBinding-import com.rtbishop.look4sat.ui.MainActivityimport com.rtbishop.look4sat.ui.SharedViewModelimport com.rtbishop.look4sat.ui.adapters.SatPassAdapterimport com.rtbishop.look4sat.utility.Extensions.toast@@ -64,7 +64,7 @@ class PassListFragment : Fragment(R.layout.fragment_pass_list) {private lateinit var btnPassPrefs: ImageButtonprivate lateinit var aosTimer: CountDownTimerprivate lateinit var aosTimerText: TextView- private lateinit var mainActivity: MainActivity+ private lateinit var mainActivity: FragmentActivityprivate var isTimerSet: Boolean = falseprivate var satPassList: MutableList<SatPass> = mutableListOf()@@ -82,7 +82,7 @@ class PassListFragment : Fragment(R.layout.fragment_pass_list) {override fun onViewCreated(view: View, savedInstanceState: Bundle?) {super.onViewCreated(view, savedInstanceState)- mainActivity = activity as MainActivity+ mainActivity = requireActivity()(mainActivity.application as Look4SatApp).appComponent.inject(this)viewModel = ViewModelProvider(mainActivity, modelFactory).get(SharedViewModel::class.java)satPassAdapter = SatPassAdapter(satPassList, prefsManager)diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PolarViewFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PolarViewFragment.ktindex c2bd4199..c188e4aa 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PolarViewFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PolarViewFragment.kt@@ -24,6 +24,7 @@ import android.hardware.*import android.os.Bundleimport android.view.Viewimport androidx.fragment.app.Fragment+import androidx.fragment.app.FragmentActivityimport androidx.lifecycle.ViewModelProviderimport androidx.lifecycle.lifecycleScopeimport androidx.navigation.fragment.navArgs@@ -34,7 +35,6 @@ import com.rtbishop.look4sat.dagger.ViewModelFactoryimport com.rtbishop.look4sat.data.Resultimport com.rtbishop.look4sat.data.SatPassimport com.rtbishop.look4sat.databinding.FragmentPolarViewBinding-import com.rtbishop.look4sat.ui.MainActivityimport com.rtbishop.look4sat.ui.SharedViewModelimport com.rtbishop.look4sat.ui.adapters.TransmitterAdapterimport com.rtbishop.look4sat.ui.views.PolarView@@ -48,7 +48,7 @@ class PolarViewFragment : Fragment(R.layout.fragment_polar_view), SensorEventLis@Injectlateinit var modelFactory: ViewModelFactory- private lateinit var mainActivity: MainActivity+ private lateinit var mainActivity: FragmentActivityprivate lateinit var viewModel: SharedViewModelprivate lateinit var binding: FragmentPolarViewBindingprivate lateinit var satPass: SatPass@@ -60,7 +60,7 @@ class PolarViewFragment : Fragment(R.layout.fragment_polar_view), SensorEventLisoverride fun onViewCreated(view: View, savedInstanceState: Bundle?) {super.onViewCreated(view, savedInstanceState)- mainActivity = activity as MainActivity+ mainActivity = requireActivity()binding = FragmentPolarViewBinding.bind(view)(mainActivity.application as Look4SatApp).appComponent.inject(this)viewModel = ViewModelProvider(mainActivity, modelFactory).get(SharedViewModel::class.java)@@ -110,7 +110,6 @@ class PolarViewFragment : Fragment(R.layout.fragment_polar_view), SensorEventLisif (result is Result.Success) {val refreshRate = viewModel.getRefreshRate()satPass = result.data[args.satPassIndex]- mainActivity.supportActionBar?.title = satPass.tle.namepolarView = PolarView(mainActivity, satPass)binding.framePolar.addView(polarView)observeTransmitters()diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PreferencesFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PreferencesFragment.ktindex 13c747d7..1a755a95 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PreferencesFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PreferencesFragment.kt@@ -22,18 +22,18 @@ package com.rtbishop.look4sat.ui.fragmentsimport android.content.SharedPreferencesimport android.os.Bundleimport android.text.InputType+import androidx.fragment.app.FragmentActivityimport androidx.lifecycle.ViewModelProviderimport androidx.preference.EditTextPreferenceimport androidx.preference.PreferenceFragmentCompatimport com.rtbishop.look4sat.R-import com.rtbishop.look4sat.ui.MainActivityimport com.rtbishop.look4sat.ui.SharedViewModelimport com.rtbishop.look4sat.utility.Extensions.toastclass PreferencesFragment : PreferenceFragmentCompat(),SharedPreferences.OnSharedPreferenceChangeListener {- private lateinit var mainActivity: MainActivity+ private lateinit var mainActivity: FragmentActivityprivate lateinit var viewModel: SharedViewModelprivate lateinit var keyLat: Stringprivate lateinit var keyLon: String@@ -44,7 +44,7 @@ class PreferencesFragment : PreferenceFragmentCompat(),setPreferencesFromResource(R.xml.preference, rootKey)val provider = EditTextPreference.SimpleSummaryProvider.getInstance()- mainActivity = activity as MainActivity+ mainActivity = requireActivity()viewModel = ViewModelProvider(mainActivity).get(SharedViewModel::class.java)keyLat = mainActivity.getString(R.string.pref_lat_key)diff --git a/app/src/main/res/color/nav_item_selector.xml b/app/src/main/res/color/nav_item_selector.xmlnew file mode 100644index 00000000..539f4f3b--- /dev/null+++ b/app/src/main/res/color/nav_item_selector.xml@@ -0,0 +1,5 @@+<?xml version="1.0" encoding="utf-8"?>+<selector xmlns:android="http://schemas.android.com/apk/res/android">+ <item android:color="@color/themeAccent" android:state_selected="true" />+ <item android:color="@color/themeLight" />+</selector>\ No newline at end of filediff --git a/app/src/main/res/drawable/ic_help_outline.xml b/app/src/main/res/drawable/ic_help_outline.xmlnew file mode 100644index 00000000..95af104a--- /dev/null+++ b/app/src/main/res/drawable/ic_help_outline.xml@@ -0,0 +1,10 @@+<vector xmlns:android="http://schemas.android.com/apk/res/android"+ android:width="24dp"+ android:height="24dp"+ android:tint="?attr/colorControlNormal"+ android:viewportWidth="24"+ android:viewportHeight="24">+ <path+ android:fillColor="@android:color/white"+ android:pathData="M11,18h2v-2h-2v2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM12,6c-2.21,0 -4,1.79 -4,4h2c0,-1.1 0.9,-2 2,-2s2,0.9 2,2c0,2 -3,1.75 -3,5h2c0,-2.25 3,-2.5 3,-5 0,-2.21 -1.79,-4 -4,-4z" />+</vector>diff --git a/app/src/main/res/drawable/ic_list.xml b/app/src/main/res/drawable/ic_list.xmlnew file mode 100644index 00000000..9d1961ed--- /dev/null+++ b/app/src/main/res/drawable/ic_list.xml@@ -0,0 +1,10 @@+<vector xmlns:android="http://schemas.android.com/apk/res/android"+ android:width="24dp"+ android:height="24dp"+ android:tint="?attr/colorControlNormal"+ android:viewportWidth="24"+ android:viewportHeight="24">+ <path+ android:fillColor="@android:color/white"+ android:pathData="M4,10.5c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM4,4.5c-0.83,0 -1.5,0.67 -1.5,1.5S3.17,7.5 4,7.5 5.5,6.83 5.5,6 4.83,4.5 4,4.5zM4,16.5c-0.83,0 -1.5,0.68 -1.5,1.5s0.68,1.5 1.5,1.5 1.5,-0.68 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM7,19h14v-2L7,17v2zM7,13h14v-2L7,11v2zM7,5v2h14L21,5L7,5z" />+</vector>diff --git a/app/src/main/res/layout/activity_nav.xml b/app/src/main/res/layout/activity_nav.xmlnew file mode 100644index 00000000..0793a628--- /dev/null+++ b/app/src/main/res/layout/activity_nav.xml@@ -0,0 +1,38 @@+<?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.coordinatorlayout.widget.CoordinatorLayout+ android:layout_width="0dp"+ android:layout_height="0dp"+ app:layout_constraintBottom_toTopOf="@+id/nav_bottom"+ app:layout_constraintEnd_toEndOf="parent"+ app:layout_constraintStart_toStartOf="parent"+ app:layout_constraintTop_toTopOf="parent">++ <androidx.fragment.app.FragmentContainerView+ android:id="@+id/nav_frag"+ android:name="androidx.navigation.fragment.NavHostFragment"+ android:layout_width="match_parent"+ android:layout_height="match_parent"+ app:defaultNavHost="true"+ app:navGraph="@navigation/temp_graph" />++ </androidx.coordinatorlayout.widget.CoordinatorLayout>++ <com.google.android.material.bottomnavigation.BottomNavigationView+ android:id="@+id/nav_bottom"+ android:layout_width="match_parent"+ android:layout_height="48dp"+ app:itemIconSize="24dp"+ app:itemIconTint="@color/nav_item_selector"+ app:itemTextColor="@color/nav_item_selector"+ app:labelVisibilityMode="selected"+ 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..c19440bb--- /dev/null+++ b/app/src/main/res/menu/nav_menu.xml@@ -0,0 +1,40 @@+<?xml version="1.0" encoding="utf-8"?><!--+ ~ Look4Sat. Amateur radio and weather satellite tracker and passes predictor for Android.+ ~ Copyright (C) 2019, 2020 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 2 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, write to the Free Software Foundation, Inc.,+ ~ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.+ -->+<menu xmlns:android="http://schemas.android.com/apk/res/android">+ <item+ android:id="@+id/nav_satellites"+ android:icon="@drawable/ic_sat_desc_left"+ android:title="@string/menu_bottom_entries" />+ <item+ android:id="@+id/nav_passes"+ android:icon="@drawable/ic_list"+ android:title="@string/menu_bottom_passes" />+ <item+ android:id="@+id/nav_world_map"+ android:icon="@drawable/ic_update_tle"+ android:title="@string/menu_bottom_osm" />+ <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_help_outline"+ android:title="@string/menu_bottom_about" />+</menu>\ No newline at end of filediff --git a/app/src/main/res/navigation/temp_graph.xml b/app/src/main/res/navigation/temp_graph.xmlnew file mode 100644index 00000000..3dd676a7--- /dev/null+++ b/app/src/main/res/navigation/temp_graph.xml@@ -0,0 +1,25 @@+<?xml version="1.0" encoding="utf-8"?>+<navigation 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/temp_graph"+ app:startDestination="@id/nav_about">++ <fragment+ android:id="@+id/nav_satellites"+ android:name="com.rtbishop.look4sat.ui.fragments.AboutFragment" />+ <fragment+ android:id="@+id/nav_passes"+ android:name="com.rtbishop.look4sat.ui.fragments.AboutFragment" />+ <fragment+ android:id="@+id/nav_world_map"+ android:name="com.rtbishop.look4sat.ui.fragments.AboutFragment" />+ <fragment+ android:id="@+id/nav_settings"+ android:name="com.rtbishop.look4sat.ui.fragments.AboutFragment" />+ <fragment+ android:id="@+id/nav_about"+ android:name="com.rtbishop.look4sat.ui.fragments.AboutFragment"+ android:label="fragment_about"+ tools:layout="@layout/fragment_about" />+</navigation>\ No newline at end of filediff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xmlindex ed0f677d..db5459c8 100644--- a/app/src/main/res/values-ru/strings.xml+++ b/app/src/main/res/values-ru/strings.xml@@ -37,6 +37,11 @@<string name="menu_map_osm">Карта мира (Демо)</string><string name="menu_settings">Настройки</string><string name="menu_about">О приложении</string>+ <string name="menu_bottom_entries">Спутники</string>+ <string name="menu_bottom_passes">Пролеты</string>+ <string name="menu_bottom_osm">Карта Мира</string>+ <string name="menu_bottom_settings">Настройки</string>+ <string name="menu_bottom_about">О приложении</string><string name="dialog_select_sat">Выберите спутники для слежения</string><string name="dialog_show_track">Показать трассу орбиты для</string>diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xmlindex cc3c3598..df1685e1 100644--- a/app/src/main/res/values/strings.xml+++ b/app/src/main/res/values/strings.xml@@ -40,6 +40,11 @@<string name="menu_map_osm">World Map Demo</string><string name="menu_settings">Settings</string><string name="menu_about">About the App</string>+ <string name="menu_bottom_entries">Satellites</string>+ <string name="menu_bottom_passes">Passes</string>+ <string name="menu_bottom_osm">World Map</string>+ <string name="menu_bottom_settings">Settings</string>+ <string name="menu_bottom_about">About</string><string name="dialog_select_sat">Select satellites to track</string><string name="dialog_show_track">Show ground track for</string>