Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Added sat and map drawables. Modified map fragment layout.
Arty Bishopad3900a17fd5
diff --git a/app/src/main/java/com/rtbishop/lookingsat/MainActivity.kt b/app/src/main/java/com/rtbishop/lookingsat/MainActivity.ktindex c991742b..71e47c6a 100644--- a/app/src/main/java/com/rtbishop/lookingsat/MainActivity.kt+++ b/app/src/main/java/com/rtbishop/lookingsat/MainActivity.kt@@ -1,5 +1,6 @@package com.rtbishop.lookingsat+import android.content.pm.ActivityInfoimport android.os.Bundleimport android.os.CountDownTimerimport android.view.Menu@@ -55,10 +56,19 @@ class MainActivity : AppCompatActivity() {navView.setupWithNavController(navController)navController.addOnDestinationChangedListener { _, destination, _ ->- if (destination.id == R.id.nav_sky) {- timerLayout.visibility = View.VISIBLE- } else {- timerLayout.visibility = View.GONE+ when {+ destination.id == R.id.nav_sky -> {+ this.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT+ toolbar.visibility = View.VISIBLE+ timerLayout.visibility = View.VISIBLE+ }+ destination.id == R.id.nav_map -> {+ this.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE+ toolbar.visibility = View.GONE+ }+ else -> {+ timerLayout.visibility = View.GONE+ }}}}diff --git a/app/src/main/res/drawable/ic_sat_up.xml b/app/src/main/res/drawable/ic_sat_asc_left.xmlsimilarity index 93%rename from app/src/main/res/drawable/ic_sat_up.xmlrename to app/src/main/res/drawable/ic_sat_asc_left.xmlindex 2b676c19..d64687cd 100644--- a/app/src/main/res/drawable/ic_sat_up.xml+++ b/app/src/main/res/drawable/ic_sat_asc_left.xml@@ -5,31 +5,31 @@android:viewportHeight="128"><pathandroid:fillAlpha="1"- android:fillColor="#ffffff"+ android:fillColor="#C0C0C0"android:fillType="evenOdd"android:pathData="m105.138,13.879a2.864,2.864 90,0 1,1.701 0.85l19.334,19.331a2.864,2.864 90,0 1,-0 4.027l-26.584,26.625a2.864,2.864 90,0 1,-1.835 0.805l-7.922,0.626 5.773,5.772a2.864,2.864 90,0 1,-0 4.027l-19.602,19.644a2.864,2.864 90,0 1,-4.073 0l-5.773,-5.772 -0.627,7.92a2.864,2.864 90,0 1,-0.805 1.835l-26.629,26.58a2.864,2.864 90,0 1,-4.073 0l-19.289,-19.286a2.864,2.864 90,0 1,-0 -4.072l26.584,-26.625a2.864,2.864 90,0 1,1.835 -0.805l7.922,-0.626 -5.773,-5.772a2.864,2.864 90,0 1,-0 -4.072l19.603,-19.599a2.864,2.864 90,0 1,4.073 0l5.773,5.772 0.626,-7.92a2.864,2.864 90,0 1,0.806 -1.835l26.629,-26.58a2.864,2.864 90,0 1,2.059 -0.85,2.864 2.864,90 0,1 0.269,0zM104.825,20.77 L80.97,44.62 80.165,55.315 85.58,60.729 96.276,59.879 120.13,36.074zM55.326,80.15 L44.629,81 20.775,104.806 36.081,120.109 59.891,96.259 60.741,85.564z"android:strokeColor="#00000000" /><pathandroid:fillAlpha="1"- android:fillColor="#ffffff"+ android:fillColor="#C0C0C0"android:fillType="evenOdd"android:pathData="m62.653,12.194a2.864,2.864 90,1 1,-0 5.727c-11.457,0 -22.876,4.351 -31.634,13.107 -8.741,8.74 -13.095,20.174 -13.095,31.614a2.864,2.864 90,1 1,-5.728 0c-0,-12.897 4.935,-25.829 14.773,-35.664 9.85,-9.848 22.772,-14.785 35.684,-14.785z"android:strokeColor="#00000000" /><pathandroid:fillAlpha="1"- android:fillColor="#ffffff"+ android:fillColor="#C0C0C0"android:fillType="evenOdd"android:pathData="m62.653,1a2.864,2.864 90,1 1,-0 5.727c-14.325,0 -28.612,5.441 -39.547,16.375 -10.935,10.933 -16.378,25.233 -16.378,39.541a2.864,2.864 90,1 1,-5.728 0c-0,-15.763 6.025,-31.562 18.055,-43.59 12.029,-12.028 27.818,-18.052 43.597,-18.052z"android:strokeColor="#00000000" /><pathandroid:fillAlpha="1"- android:fillColor="#ffffff"+ android:fillColor="#C0C0C0"android:fillType="evenOdd"android:pathData="m62.653,23.302a2.864,2.864 90,1 1,-0 5.727c-8.62,0 -17.201,3.263 -23.778,9.839 -6.577,6.576 -9.855,15.174 -9.855,23.774a2.864,2.864 90,1 1,-5.728 0c-0,-10.061 3.861,-20.153 11.533,-27.824 7.672,-7.671 17.756,-11.517 27.829,-11.517z"android:strokeColor="#00000000" /><pathandroid:fillAlpha="1"- android:fillColor="#ffffff"+ android:fillColor="#C0C0C0"android:fillType="evenOdd"android:pathData="m62.653,34.525a2.864,2.864 90,1 1,-0 5.727c-5.737,0 -11.453,2.174 -15.836,6.557 -4.384,4.383 -6.558,10.098 -6.558,15.834a2.864,2.864 90,1 1,-5.728 0c-0,-7.192 2.757,-14.406 8.236,-19.883 5.479,-5.478 12.693,-8.234 19.887,-8.234z"android:strokeColor="#00000000" />diff --git a/app/src/main/res/drawable/ic_sat_asc_right.xml b/app/src/main/res/drawable/ic_sat_asc_right.xmlnew file mode 100644index 00000000..a7cb41be--- /dev/null+++ b/app/src/main/res/drawable/ic_sat_asc_right.xml@@ -0,0 +1,36 @@+<vector xmlns:android="http://schemas.android.com/apk/res/android"+ android:width="128dp"+ android:height="128dp"+ android:viewportWidth="128"+ android:viewportHeight="128">+ <path+ android:fillAlpha="1"+ android:fillColor="#C0C0C0"+ android:fillType="evenOdd"+ android:pathData="m22.862,13.879a2.864,2.864 90,0 0,-1.701 0.85l-19.334,19.331a2.864,2.864 90,0 0,0 4.027l26.584,26.625a2.864,2.864 90,0 0,1.835 0.805l7.922,0.626 -5.773,5.772a2.864,2.864 90,0 0,0 4.027l19.602,19.644a2.864,2.864 90,0 0,4.073 0l5.773,-5.772 0.627,7.92a2.864,2.864 90,0 0,0.805 1.835l26.629,26.58a2.864,2.864 90,0 0,4.073 0l19.289,-19.286a2.864,2.864 90,0 0,0 -4.072l-26.584,-26.625a2.864,2.864 90,0 0,-1.835 -0.805l-7.922,-0.626 5.773,-5.772a2.864,2.864 90,0 0,0 -4.072l-19.603,-19.599a2.864,2.864 90,0 0,-4.073 0l-5.773,5.772 -0.626,-7.92a2.864,2.864 90,0 0,-0.806 -1.835l-26.629,-26.58a2.864,2.864 90,0 0,-2.059 -0.85,2.864 2.864,90 0,0 -0.269,0zM23.175,20.77 L47.03,44.62 47.835,55.315 42.42,60.729 31.724,59.879 7.87,36.074zM72.674,80.15 L83.371,81 107.225,104.806 91.919,120.109 68.109,96.259 67.259,85.564z"+ android:strokeColor="#00000000" />+ <path+ android:fillAlpha="1"+ android:fillColor="#C0C0C0"+ android:fillType="evenOdd"+ android:pathData="m65.347,12.194a2.864,2.864 90,1 0,0 5.727c11.457,0 22.876,4.351 31.634,13.107 8.741,8.74 13.095,20.174 13.095,31.614a2.864,2.864 90,1 0,5.728 0c0,-12.897 -4.935,-25.829 -14.773,-35.664 -9.85,-9.848 -22.772,-14.785 -35.684,-14.785z"+ android:strokeColor="#00000000" />+ <path+ android:fillAlpha="1"+ android:fillColor="#C0C0C0"+ android:fillType="evenOdd"+ android:pathData="m65.347,1a2.864,2.864 90,1 0,0 5.727c14.325,0 28.612,5.441 39.547,16.375 10.935,10.933 16.378,25.233 16.378,39.541a2.864,2.864 90,1 0,5.728 0c0,-15.763 -6.025,-31.562 -18.055,-43.59 -12.029,-12.028 -27.818,-18.052 -43.597,-18.052z"+ android:strokeColor="#00000000" />+ <path+ android:fillAlpha="1"+ android:fillColor="#C0C0C0"+ android:fillType="evenOdd"+ android:pathData="m65.347,23.302a2.864,2.864 90,1 0,0 5.727c8.62,0 17.201,3.263 23.778,9.839 6.577,6.576 9.855,15.174 9.855,23.774a2.864,2.864 90,1 0,5.728 0c0,-10.061 -3.861,-20.153 -11.533,-27.824 -7.672,-7.671 -17.756,-11.517 -27.829,-11.517z"+ android:strokeColor="#00000000" />+ <path+ android:fillAlpha="1"+ android:fillColor="#C0C0C0"+ android:fillType="evenOdd"+ android:pathData="m65.347,34.525a2.864,2.864 90,1 0,0 5.727c5.737,0 11.453,2.174 15.836,6.557 4.384,4.383 6.558,10.098 6.558,15.834a2.864,2.864 90,1 0,5.728 0c0,-7.192 -2.757,-14.406 -8.236,-19.883 -5.479,-5.478 -12.693,-8.234 -19.887,-8.234z"+ android:strokeColor="#00000000" />+</vector>diff --git a/app/src/main/res/drawable/ic_sat.xml b/app/src/main/res/drawable/ic_sat_desc_left.xmlsimilarity index 93%rename from app/src/main/res/drawable/ic_sat.xmlrename to app/src/main/res/drawable/ic_sat_desc_left.xmlindex 8a1dda24..8f8b0b5d 100644--- a/app/src/main/res/drawable/ic_sat.xml+++ b/app/src/main/res/drawable/ic_sat_desc_left.xml@@ -5,31 +5,31 @@android:viewportHeight="128"><pathandroid:fillAlpha="1"- android:fillColor="#ffffff"+ android:fillColor="#C0C0C0"android:fillType="evenOdd"android:pathData="m105.138,114.121a2.864,2.864 90,0 0,1.701 -0.85l19.334,-19.331a2.864,2.864 90,0 0,-0 -4.027l-26.584,-26.625a2.864,2.864 90,0 0,-1.835 -0.805l-7.922,-0.626 5.773,-5.772a2.864,2.864 90,0 0,-0 -4.027l-19.602,-19.644a2.864,2.864 90,0 0,-4.073 -0l-5.773,5.772 -0.627,-7.92a2.864,2.864 90,0 0,-0.805 -1.835l-26.629,-26.58a2.864,2.864 90,0 0,-4.073 -0l-19.289,19.286a2.864,2.864 90,0 0,-0 4.072l26.584,26.625a2.864,2.864 90,0 0,1.835 0.805l7.922,0.626 -5.773,5.772a2.864,2.864 90,0 0,-0 4.072l19.603,19.599a2.864,2.864 90,0 0,4.073 -0l5.773,-5.772 0.626,7.92a2.864,2.864 90,0 0,0.806 1.835l26.629,26.58a2.864,2.864 90,0 0,2.059 0.85,2.864 2.864,90 0,0 0.269,-0zM104.825,107.23 L80.97,83.38 80.165,72.685 85.58,67.271 96.276,68.121 120.13,91.926zM55.326,47.85 L44.629,47 20.775,23.194 36.081,7.891 59.891,31.741 60.741,42.436z"android:strokeColor="#00000000" /><pathandroid:fillAlpha="1"- android:fillColor="#ffffff"+ android:fillColor="#C0C0C0"android:fillType="evenOdd"android:pathData="m62.653,115.806a2.864,2.864 90,1 0,-0 -5.727c-11.457,-0 -22.876,-4.351 -31.634,-13.107 -8.741,-8.74 -13.095,-20.174 -13.095,-31.614a2.864,2.864 90,1 0,-5.728 -0c-0,12.897 4.935,25.829 14.773,35.664 9.85,9.848 22.772,14.785 35.684,14.785z"android:strokeColor="#00000000" /><pathandroid:fillAlpha="1"- android:fillColor="#ffffff"+ android:fillColor="#C0C0C0"android:fillType="evenOdd"android:pathData="m62.653,127a2.864,2.864 90,1 0,-0 -5.727c-14.325,-0 -28.612,-5.441 -39.547,-16.375 -10.935,-10.933 -16.378,-25.233 -16.378,-39.541a2.864,2.864 90,1 0,-5.728 -0c-0,15.763 6.025,31.562 18.055,43.59 12.029,12.028 27.818,18.052 43.597,18.052z"android:strokeColor="#00000000" /><pathandroid:fillAlpha="1"- android:fillColor="#ffffff"+ android:fillColor="#C0C0C0"android:fillType="evenOdd"android:pathData="m62.653,104.698a2.864,2.864 90,1 0,-0 -5.727c-8.62,-0 -17.201,-3.263 -23.778,-9.839 -6.577,-6.576 -9.855,-15.174 -9.855,-23.774a2.864,2.864 90,1 0,-5.728 -0c-0,10.061 3.861,20.153 11.533,27.824 7.672,7.671 17.756,11.517 27.829,11.517z"android:strokeColor="#00000000" /><pathandroid:fillAlpha="1"- android:fillColor="#ffffff"+ android:fillColor="#C0C0C0"android:fillType="evenOdd"android:pathData="m62.653,93.475a2.864,2.864 90,1 0,-0 -5.727c-5.737,-0 -11.453,-2.174 -15.836,-6.557 -4.384,-4.383 -6.558,-10.098 -6.558,-15.834a2.864,2.864 90,1 0,-5.728 -0c-0,7.192 2.757,14.406 8.236,19.883 5.479,5.478 12.693,8.234 19.887,8.234z"android:strokeColor="#00000000" />diff --git a/app/src/main/res/drawable/ic_sat_down.xml b/app/src/main/res/drawable/ic_sat_desc_right.xmlsimilarity index 93%rename from app/src/main/res/drawable/ic_sat_down.xmlrename to app/src/main/res/drawable/ic_sat_desc_right.xmlindex cc78a6af..52eddad3 100644--- a/app/src/main/res/drawable/ic_sat_down.xml+++ b/app/src/main/res/drawable/ic_sat_desc_right.xml@@ -5,31 +5,31 @@android:viewportHeight="128"><pathandroid:fillAlpha="1"- android:fillColor="#A4A4A4"+ android:fillColor="#C0C0C0"android:fillType="evenOdd"android:pathData="m22.862,114.121a2.864,2.864 90,0 1,-1.701 -0.85l-19.334,-19.331a2.864,2.864 90,0 1,0 -4.027l26.584,-26.625a2.864,2.864 90,0 1,1.835 -0.805l7.922,-0.626 -5.773,-5.772a2.864,2.864 90,0 1,0 -4.027l19.602,-19.644a2.864,2.864 90,0 1,4.073 -0l5.773,5.772 0.627,-7.92a2.864,2.864 90,0 1,0.805 -1.835l26.629,-26.58a2.864,2.864 90,0 1,4.073 -0l19.289,19.286a2.864,2.864 90,0 1,0 4.072l-26.584,26.625a2.864,2.864 90,0 1,-1.835 0.805l-7.922,0.626 5.773,5.772a2.864,2.864 90,0 1,0 4.072l-19.603,19.599a2.864,2.864 90,0 1,-4.073 -0l-5.773,-5.772 -0.626,7.92a2.864,2.864 90,0 1,-0.806 1.835l-26.629,26.58a2.864,2.864 90,0 1,-2.059 0.85,2.864 2.864,90 0,1 -0.269,-0zM23.176,107.23 L47.03,83.38 47.835,72.685 42.42,67.271 31.724,68.121 7.87,91.926zM72.674,47.85 L83.371,47 107.225,23.194 91.919,7.891 68.109,31.741 67.259,42.436z"android:strokeColor="#00000000" /><pathandroid:fillAlpha="1"- android:fillColor="#A4A4A4"+ android:fillColor="#C0C0C0"android:fillType="evenOdd"android:pathData="m65.347,115.806a2.864,2.864 90,1 1,0 -5.727c11.457,-0 22.876,-4.351 31.634,-13.107 8.741,-8.74 13.095,-20.174 13.095,-31.614a2.864,2.864 90,1 1,5.728 -0c0,12.897 -4.935,25.829 -14.773,35.664 -9.85,9.848 -22.772,14.785 -35.684,14.785z"android:strokeColor="#00000000" /><pathandroid:fillAlpha="1"- android:fillColor="#A4A4A4"+ android:fillColor="#C0C0C0"android:fillType="evenOdd"android:pathData="m65.347,127a2.864,2.864 90,1 1,0 -5.727c14.325,-0 28.612,-5.441 39.547,-16.375 10.935,-10.933 16.378,-25.233 16.378,-39.541a2.864,2.864 90,1 1,5.728 -0c0,15.763 -6.025,31.562 -18.055,43.59 -12.029,12.028 -27.818,18.052 -43.597,18.052z"android:strokeColor="#00000000" /><pathandroid:fillAlpha="1"- android:fillColor="#A4A4A4"+ android:fillColor="#C0C0C0"android:fillType="evenOdd"android:pathData="m65.347,104.698a2.864,2.864 90,1 1,0 -5.727c8.62,-0 17.201,-3.263 23.778,-9.839 6.577,-6.576 9.855,-15.174 9.855,-23.774a2.864,2.864 90,1 1,5.728 -0c0,10.061 -3.861,20.153 -11.533,27.824 -7.672,7.671 -17.756,11.517 -27.829,11.517z"android:strokeColor="#00000000" /><pathandroid:fillAlpha="1"- android:fillColor="#A4A4A4"+ android:fillColor="#C0C0C0"android:fillType="evenOdd"android:pathData="m65.347,93.475a2.864,2.864 90,1 1,0 -5.727c5.737,-0 11.453,-2.174 15.836,-6.557 4.384,-4.383 6.558,-10.098 6.558,-15.834a2.864,2.864 90,1 1,5.728 -0c0,7.192 -2.757,14.406 -8.236,19.883 -5.479,5.478 -12.693,8.234 -19.887,8.234z"android:strokeColor="#00000000" />diff --git a/app/src/main/res/drawable/map_nasa.webp b/app/src/main/res/drawable/map_nasa.webpnew file mode 100644index 00000000..4f4c8f5cBinary files /dev/null and b/app/src/main/res/drawable/map_nasa.webp differdiff --git a/app/src/main/res/layout-land/fragment_worldmap.xml b/app/src/main/res/layout-land/fragment_worldmap.xmlnew file mode 100644index 00000000..26f765e8--- /dev/null+++ b/app/src/main/res/layout-land/fragment_worldmap.xml@@ -0,0 +1,32 @@+<?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:layout_width="match_parent"+ android:layout_height="match_parent"+ tools:context=".ui.WorldMapFragment">++ <ImageView+ android:id="@+id/worldmap_img"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"+ android:contentDescription="@string/map_content"+ android:scaleType="fitXY"+ android:src="@drawable/map_nasa"+ app:layout_constraintBottom_toBottomOf="parent"+ app:layout_constraintEnd_toEndOf="parent"+ app:layout_constraintStart_toStartOf="parent"+ app:layout_constraintTop_toTopOf="parent" />++ <com.google.android.material.floatingactionbutton.FloatingActionButton+ android:id="@+id/worldmap_fab"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"+ android:layout_gravity="bottom|start"+ android:layout_marginStart="@dimen/fab_margin"+ android:layout_marginBottom="@dimen/fab_margin"+ app:backgroundTint="@color/colorPrimary"+ app:layout_constraintBottom_toBottomOf="parent"+ app:layout_constraintStart_toStartOf="parent"+ app:srcCompat="@drawable/ic_sat_asc_right" />+</androidx.constraintlayout.widget.ConstraintLayout>\ No newline at end of filediff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xmlindex 4241d0a4..a379fe7e 100644--- a/app/src/main/res/layout/activity_main.xml+++ b/app/src/main/res/layout/activity_main.xml@@ -18,10 +18,10 @@android:layout_width="wrap_content"android:layout_height="match_parent"android:layout_gravity="start"- android:fitsSystemWindows="true"android:background="@color/colorBackground"- app:itemTextColor="@color/colorDrawerText"+ android:fitsSystemWindows="true"app:headerLayout="@layout/drawer_header"+ app:itemTextColor="@color/colorDrawerText"app:menu="@menu/drawer_menu" /></androidx.drawerlayout.widget.DrawerLayout>diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xmlindex d41e2801..939fdda7 100644--- a/app/src/main/res/layout/app_bar_main.xml+++ b/app/src/main/res/layout/app_bar_main.xml@@ -21,13 +21,13 @@<androidx.constraintlayout.widget.ConstraintLayoutandroid:id="@+id/timer_layout"android:layout_width="match_parent"- android:layout_height="match_parent">+ android:layout_height="wrap_content"+ android:layout_marginEnd="16dp"><TextViewandroid:id="@+id/time_to_aos"android:layout_width="0dp"android:layout_height="wrap_content"- android:layout_marginEnd="16dp"android:gravity="center"android:text="@string/next_aos_pattern"android:textSize="24sp"@@ -45,13 +45,4 @@<include layout="@layout/content_main" />- <com.google.android.material.floatingactionbutton.FloatingActionButton- android:id="@+id/fab"- android:layout_width="wrap_content"- android:layout_height="wrap_content"- android:layout_gravity="bottom|end"- android:layout_margin="@dimen/fab_margin"- app:backgroundTint="@color/colorPrimary"- app:srcCompat="@drawable/ic_sat_up" />-</androidx.coordinatorlayout.widget.CoordinatorLayout>\ No newline at end of filediff --git a/app/src/main/res/layout/drawer_header.xml b/app/src/main/res/layout/drawer_header.xmlindex 9b7bd287..31a489f5 100644--- a/app/src/main/res/layout/drawer_header.xml+++ b/app/src/main/res/layout/drawer_header.xml@@ -16,7 +16,7 @@android:contentDescription="@string/app_name"app:layout_constraintStart_toStartOf="parent"app:layout_constraintTop_toTopOf="parent"- app:srcCompat="@drawable/ic_sat_down" />+ app:srcCompat="@drawable/ic_sat_desc_right" /><TextViewandroid:id="@+id/drawer_title"diff --git a/app/src/main/res/layout/fragment_sky.xml b/app/src/main/res/layout/fragment_sky.xmlindex 0accb62f..837256f6 100644--- a/app/src/main/res/layout/fragment_sky.xml+++ b/app/src/main/res/layout/fragment_sky.xml@@ -1,6 +1,20 @@<?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:layout_width="match_parent"android:layout_height="match_parent"- tools:context=".ui.SkyFragment" />\ No newline at end of file+ tools:context=".ui.SkyFragment">++ <com.google.android.material.floatingactionbutton.FloatingActionButton+ android:id="@+id/sky_fab"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"+ android:layout_gravity="bottom|end"+ android:layout_marginEnd="@dimen/fab_margin"+ android:layout_marginBottom="@dimen/fab_margin"+ app:backgroundTint="@color/colorPrimary"+ app:layout_constraintBottom_toBottomOf="parent"+ app:layout_constraintEnd_toEndOf="parent"+ app:srcCompat="@drawable/ic_sat_asc_left" />+</androidx.constraintlayout.widget.ConstraintLayout>\ No newline at end of filediff --git a/app/src/main/res/layout/fragment_worldmap.xml b/app/src/main/res/layout/fragment_worldmap.xmlindex 54f77ef9..26f765e8 100644--- a/app/src/main/res/layout/fragment_worldmap.xml+++ b/app/src/main/res/layout/fragment_worldmap.xml@@ -1,6 +1,32 @@<?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:layout_width="match_parent"android:layout_height="match_parent"- tools:context=".ui.WorldMapFragment" />\ No newline at end of file+ tools:context=".ui.WorldMapFragment">++ <ImageView+ android:id="@+id/worldmap_img"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"+ android:contentDescription="@string/map_content"+ android:scaleType="fitXY"+ android:src="@drawable/map_nasa"+ app:layout_constraintBottom_toBottomOf="parent"+ app:layout_constraintEnd_toEndOf="parent"+ app:layout_constraintStart_toStartOf="parent"+ app:layout_constraintTop_toTopOf="parent" />++ <com.google.android.material.floatingactionbutton.FloatingActionButton+ android:id="@+id/worldmap_fab"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"+ android:layout_gravity="bottom|start"+ android:layout_marginStart="@dimen/fab_margin"+ android:layout_marginBottom="@dimen/fab_margin"+ app:backgroundTint="@color/colorPrimary"+ app:layout_constraintBottom_toBottomOf="parent"+ app:layout_constraintStart_toStartOf="parent"+ app:srcCompat="@drawable/ic_sat_asc_right" />+</androidx.constraintlayout.widget.ConstraintLayout>\ No newline at end of filediff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xmlindex 69b941ce..deebf664 100644--- a/app/src/main/res/values/colors.xml+++ b/app/src/main/res/values/colors.xml@@ -2,8 +2,8 @@<resources><color name="colorPrimary">#000020</color><color name="colorPrimaryDark">#000010</color>- <color name="colorAccent">#A4A4A4</color>+ <color name="colorAccent">#C0C0C0</color>- <color name="colorDrawerText">#A4A4A4</color>+ <color name="colorDrawerText">#C0C0C0</color><color name="colorBackground">#181818</color></resources>diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xmlindex 8c94b1cf..504fd211 100644--- a/app/src/main/res/values/strings.xml+++ b/app/src/main/res/values/strings.xml@@ -23,5 +23,6 @@<string name="height_summary">Ground station height in meters AMSL</string><string name="next_aos_pattern">Next AOS in %02d:%02d:%02d</string>+ <string name="map_content">Nasa Map</string><string name="placeholder">Placeholder</string></resources>