From f3257660cadfe9b434bd23fadeb50b43c4b082ea Mon Sep 17 00:00:00 2001
From: Arty Bishop <bishop.arty@gmail.com>
Date: Thu, 18 Nov 2021 12:27:43 +0000
Subject: [PATCH] Bottom bar text size, map zoom level, pass ripple fixes

---
 .../look4sat/presentation/mapScreen/MapFragment.kt         | 4 ++--
 app/src/main/res/layout/item_pass_geo.xml                  | 5 ++++-
 app/src/main/res/layout/item_pass_leo.xml                  | 7 +++++--
 app/src/main/res/values/dimens.xml                         | 4 +++-
 app/src/main/res/values/strings.xml                        | 2 +-
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/mapScreen/MapFragment.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/mapScreen/MapFragment.kt
index 5338254c..59141138 100644
--- a/app/src/main/java/com/rtbishop/look4sat/presentation/mapScreen/MapFragment.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/mapScreen/MapFragment.kt
@@ -71,8 +71,8 @@ class MapFragment : Fragment(R.layout.fragment_map) {
                 setMultiTouchControls(true)
                 setTileSource(TileSourceFactory.WIKIMEDIA)
                 minZoomLevel = getMinZoom(resources.displayMetrics.heightPixels)
-                maxZoomLevel = 6.0
-                controller.setZoom(minZoomLevel + 0.5)
+                maxZoomLevel = 5.75
+                controller.setZoom(minZoomLevel + 0.25)
                 zoomController.setVisibility(CustomZoomButtonsController.Visibility.NEVER)
                 overlayManager.tilesOverlay.loadingBackgroundColor = Color.TRANSPARENT
                 overlayManager.tilesOverlay.loadingLineColor = Color.TRANSPARENT
diff --git a/app/src/main/res/layout/item_pass_geo.xml b/app/src/main/res/layout/item_pass_geo.xml
index b9dfd6e2..879c891e 100644
--- a/app/src/main/res/layout/item_pass_geo.xml
+++ b/app/src/main/res/layout/item_pass_geo.xml
@@ -4,17 +4,20 @@
     android:id="@+id/pass_geo_card"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:backgroundTint="@color/greyDark"
     app:cardCornerRadius="0dp">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/pass_geo_root"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:background="?android:selectableItemBackground">
 
         <ImageView
             android:id="@+id/pass_geo_bg"
             android:layout_width="0dp"
             android:layout_height="0dp"
+            android:alpha="0.64"
             android:contentDescription="@string/placeholder"
             android:scaleType="centerCrop"
             android:src="@drawable/card_pass_bg"
diff --git a/app/src/main/res/layout/item_pass_leo.xml b/app/src/main/res/layout/item_pass_leo.xml
index 20379f2d..ac19c441 100644
--- a/app/src/main/res/layout/item_pass_leo.xml
+++ b/app/src/main/res/layout/item_pass_leo.xml
@@ -4,17 +4,20 @@
     android:id="@+id/pass_leo_card"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:backgroundTint="@color/greyDark"
     app:cardCornerRadius="0dp">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/pass_leo_root"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:background="?android:selectableItemBackground">
 
         <ImageView
             android:id="@+id/pass_leo_bg"
             android:layout_width="0dp"
             android:layout_height="0dp"
+            android:alpha="0.64"
             android:contentDescription="@string/placeholder"
             android:scaleType="centerCrop"
             android:src="@drawable/card_pass_bg"
@@ -110,7 +113,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginBottom="2dp"
-            app:layout_constraintBottom_toBottomOf="@+id/pass_leo_bg"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="@+id/pass_leo_end"
             app:layout_constraintStart_toStartOf="@+id/pass_leo_start"
             app:layout_constraintTop_toBottomOf="@+id/pass_leo_elev" />
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 7dcaae24..bc49b13f 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <dimen name="fab_padding">48dp</dimen>
+    <dimen name="design_bottom_navigation_text_size" tools:override="true">12sp</dimen>
+    <dimen name="design_bottom_navigation_active_text_size" tools:override="true">12sp</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 de063c48..dd535d4f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -10,7 +10,7 @@
 
     <string name="menu_entries">Satellites</string>
     <string name="menu_passes">Passes</string>
-    <string name="menu_map">Map</string>
+    <string name="menu_map">World Map</string>
     <string name="menu_prefs">Settings</string>
     <string name="menu_about">Info</string>