diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/EntriesFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/EntriesFragment.kt index de121eec..5ff39091 100644 --- a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/EntriesFragment.kt +++ b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/EntriesFragment.kt @@ -5,9 +5,11 @@ import android.os.Bundle import android.view.View import android.widget.SearchView import androidx.appcompat.app.AppCompatActivity +import androidx.core.content.res.ResourcesCompat import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider import androidx.navigation.findNavController +import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.LinearLayoutManager import com.rtbishop.look4sat.Look4SatApp import com.rtbishop.look4sat.R @@ -45,11 +47,19 @@ class EntriesFragment : Fragment(R.layout.fragment_entries), binding.apply { importWeb.setOnClickListener { showSourcesDialog() } importFile.setOnClickListener { showFileDialog() } - selectAll.setOnClickListener { entriesAdapter.selectAll() } - entriesFab.setOnClickListener { goToPassesAndCalculateForSelection() } searchBar.setOnQueryTextListener(this@EntriesFragment) - entriesRecycler.layoutManager = LinearLayoutManager(requireActivity()) - entriesRecycler.adapter = entriesAdapter + selectAll.setOnClickListener { entriesAdapter.selectAll() } + entriesRecycler.apply { + val linearLayoutMgr = LinearLayoutManager(requireContext()) + val divider = DividerItemDecoration(requireContext(), linearLayoutMgr.orientation) + val drawable = ResourcesCompat + .getDrawable(resources, R.drawable.entries_divider, requireActivity().theme) + drawable?.let { divider.setDrawable(it) } + layoutManager = linearLayoutMgr + adapter = entriesAdapter + addItemDecoration(divider) + } + entriesFab.setOnClickListener { goToPassesAndCalculateForSelection() } } } diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/AboutFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/InfoFragment.kt similarity index 91% rename from app/src/main/java/com/rtbishop/look4sat/ui/fragments/AboutFragment.kt rename to app/src/main/java/com/rtbishop/look4sat/ui/fragments/InfoFragment.kt index 838e126b..0ab2632f 100644 --- a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/AboutFragment.kt +++ b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/InfoFragment.kt @@ -27,13 +27,13 @@ import android.view.View import androidx.fragment.app.Fragment import com.rtbishop.look4sat.BuildConfig import com.rtbishop.look4sat.R -import com.rtbishop.look4sat.databinding.FragmentAboutBinding +import com.rtbishop.look4sat.databinding.FragmentInfoBinding -class AboutFragment : Fragment(R.layout.fragment_about) { +class InfoFragment : Fragment(R.layout.fragment_info) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - FragmentAboutBinding.bind(view).apply { + FragmentInfoBinding.bind(view).apply { version.text = String.format(getString(R.string.app_version), BuildConfig.VERSION_NAME) message.movementMethod = LinkMovementMethod.getInstance() } diff --git a/app/src/main/res/drawable/entries_divider.xml b/app/src/main/res/drawable/entries_divider.xml new file mode 100644 index 00000000..f02d1393 --- /dev/null +++ b/app/src/main/res/drawable/entries_divider.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml index 79558f54..c8f4bdbe 100644 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -21,7 +21,7 @@ android:shape="rectangle"> diff --git a/app/src/main/res/drawable/ic_menu_about.xml b/app/src/main/res/drawable/ic_menu_info.xml similarity index 100% rename from app/src/main/res/drawable/ic_menu_about.xml rename to app/src/main/res/drawable/ic_menu_info.xml diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 25a95f28..052a3f3f 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -20,10 +20,11 @@ android:id="@+id/nav_bottom" android:layout_width="match_parent" android:layout_height="48dp" + android:background="@color/themeDark" app:itemIconSize="24dp" app:itemIconTint="@color/nav_item_selector" app:itemTextColor="@color/nav_item_selector" - app:labelVisibilityMode="selected" + app:labelVisibilityMode="labeled" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/dialog_entries.xml b/app/src/main/res/layout/dialog_entries.xml deleted file mode 100644 index aa21e7ec..00000000 --- a/app/src/main/res/layout/dialog_entries.xml +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/fragment_entries.xml b/app/src/main/res/layout/fragment_entries.xml index b8ffa042..abfbc89f 100644 --- a/app/src/main/res/layout/fragment_entries.xml +++ b/app/src/main/res/layout/fragment_entries.xml @@ -29,7 +29,7 @@ + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/entries_bar" /> + tools:context=".ui.fragments.InfoFragment"> diff --git a/app/src/main/res/menu/nav_menu.xml b/app/src/main/res/menu/nav_menu.xml index 5d5e9caa..e44df533 100644 --- a/app/src/main/res/menu/nav_menu.xml +++ b/app/src/main/res/menu/nav_menu.xml @@ -34,7 +34,7 @@ android:icon="@drawable/ic_menu_prefs" android:title="@string/menu_prefs" /> \ No newline at end of file diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml index 01d3cdf5..206e45dc 100644 --- a/app/src/main/res/navigation/nav_graph.xml +++ b/app/src/main/res/navigation/nav_graph.xml @@ -68,8 +68,8 @@ android:name="com.rtbishop.look4sat.ui.fragments.PrefsFragment" /> + android:id="@+id/nav_info" + android:name="com.rtbishop.look4sat.ui.fragments.InfoFragment" + tools:layout="@layout/fragment_info" /> diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 26392cf4..133a1f60 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -24,13 +24,13 @@ Пролеты Карта Мира Настройки - О приложении + Инфо Выберите спутники для слежения Показать трассу орбиты для Фильтровать пролеты Управление источниками TLE - Имя/Идентификатор + ID / Имя Количество часов Показать пролеты за след. Х часов diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 392e8678..30768b20 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -23,7 +23,7 @@ #191919 #FFE082 #242424 - #080808 + #121212 #CC000000 #66000000 #D50000 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 594e20d3..89575875 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -25,13 +25,13 @@ Passes World Map Settings - About + Info Select satellites to track Show ground track for Filter passes Manage TLE sources - Name/CatNum + ID / Name Hours ahead Show passes that occur within X hours @@ -65,9 +65,8 @@ ID: %d AOS — %2d° %2d° — LOS - dd MMM @ HH:mm:ss + dd MMM - HH:mm:ss - %.4f Az: %.1f° El: %.1f° Lat: %.1f°