From 3e7b07904a03afa0021227e800676fe7f8379b6a Mon Sep 17 00:00:00 2001 From: Arty Bishop Date: Sun, 27 Oct 2019 17:19:12 +0000 Subject: [PATCH] Updated drawer header, added minor animation. Switched to Material themes, major changes in colors. --- app/build.gradle | 2 +- .../com/rtbishop/lookingsat/MainActivity.kt | 19 +++++---- app/src/main/res/anim/pulse.xml | 31 +++++++++++++++ app/src/main/res/drawable/drawer_gradient.xml | 6 +-- app/src/main/res/drawable/ic_add.xml | 9 ----- .../res/drawable/ic_launcher_background.xml | 6 +-- .../res/drawable/ic_launcher_foreground.xml | 4 +- app/src/main/res/drawable/ic_location.xml | 2 +- .../main/res/drawable/ic_sat_desc_right.xml | 36 ------------------ app/src/main/res/drawable/ic_sputnik.xml | 12 ------ .../res/layout-land/fragment_worldmap.xml | 1 - app/src/main/res/layout/activity_main.xml | 2 - app/src/main/res/layout/app_bar_main.xml | 6 +-- app/src/main/res/layout/drawer_header.xml | 25 ++++++------ app/src/main/res/layout/fragment_sky.xml | 1 - app/src/main/res/layout/fragment_worldmap.xml | 1 - app/src/main/res/menu/drawer_menu.xml | 9 ++++- .../mipmap-anydpi-v26/ic_launcher_round.xml | 5 --- .../res/mipmap-hdpi/ic_launcher_round.png | Bin 3937 -> 0 bytes .../res/mipmap-mdpi/ic_launcher_round.png | Bin 2468 -> 0 bytes .../res/mipmap-xhdpi/ic_launcher_round.png | Bin 5488 -> 0 bytes .../res/mipmap-xxhdpi/ic_launcher_round.png | Bin 8519 -> 0 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.png | Bin 11824 -> 0 bytes app/src/main/res/navigation/nav_graph.xml | 12 ++++++ app/src/main/res/values/colors.xml | 11 +++--- app/src/main/res/values/dimens.xml | 2 +- app/src/main/res/values/strings.xml | 22 +++++------ app/src/main/res/values/styles.xml | 32 ++++++++-------- build.gradle | 1 + 29 files changed, 120 insertions(+), 137 deletions(-) create mode 100644 app/src/main/res/anim/pulse.xml delete mode 100644 app/src/main/res/drawable/ic_add.xml delete mode 100644 app/src/main/res/drawable/ic_sat_desc_right.xml delete mode 100644 app/src/main/res/drawable/ic_sputnik.xml delete mode 100644 app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml delete mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_round.png delete mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_round.png delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_round.png delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png diff --git a/app/build.gradle b/app/build.gradle index 9a8ce060..0121f553 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -32,7 +32,7 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation "com.google.android.material:material:$supportLib" + implementation "com.google.android.material:material:$material" implementation "androidx.appcompat:appcompat:$supportLib" implementation "androidx.legacy:legacy-support-v4:$supportLib" implementation "androidx.constraintlayout:constraintlayout:$constraintLayout" diff --git a/app/src/main/java/com/rtbishop/lookingsat/MainActivity.kt b/app/src/main/java/com/rtbishop/lookingsat/MainActivity.kt index 0f216d95..9f23368c 100644 --- a/app/src/main/java/com/rtbishop/lookingsat/MainActivity.kt +++ b/app/src/main/java/com/rtbishop/lookingsat/MainActivity.kt @@ -12,6 +12,7 @@ import android.os.CountDownTimer import android.view.Menu import android.view.MenuItem import android.view.View +import android.view.animation.AnimationUtils import android.widget.ImageView import android.widget.TextView import android.widget.Toast @@ -85,7 +86,7 @@ class MainActivity : AppCompatActivity() { drawerGetLocation = header.findViewById(R.id.drawer_get_location) val navController = findNavController(R.id.nav_host) - appBarConfig = AppBarConfiguration(setOf(R.id.nav_sky), drawerLayout) + appBarConfig = AppBarConfiguration(setOf(R.id.nav_sky, R.id.nav_single_sat), drawerLayout) setupActionBarWithNavController(navController, appBarConfig) navView.setupWithNavController(navController) @@ -110,8 +111,11 @@ class MainActivity : AppCompatActivity() { openGitHub() } + drawerGetLocation.startAnimation(AnimationUtils.loadAnimation(this, R.anim.pulse)) drawerGetLocation.setOnClickListener { + it.isEnabled = false updateLocation() + it.postDelayed({ it.isEnabled = true }, 3600) } } @@ -155,9 +159,9 @@ class MainActivity : AppCompatActivity() { private fun getPreciseLocation() { fusedLocationClient.lastLocation.addOnSuccessListener { location: Location? -> - val lat = location?.latitude ?: 0.0 - val lon = location?.longitude ?: 0.0 - val height = location?.altitude ?: 0.0 + val lat = location?.latitude ?: 51.5074 + val lon = location?.longitude ?: 0.1278 + val height = location?.altitude ?: 48.0 preferences.edit { putDouble("LATITUDE", lat) @@ -166,13 +170,14 @@ class MainActivity : AppCompatActivity() { apply() } updateDrawerValues() + Toast.makeText(this, "Location was set", Toast.LENGTH_SHORT).show() } } private fun updateDrawerValues() { - val lat = preferences.getDouble("LATITUDE", 0.0) - val lon = preferences.getDouble("LONGITUDE", 0.0) - val height = preferences.getDouble("HEIGHT", 0.0) + val lat = preferences.getDouble("LATITUDE", 51.5074) + val lon = preferences.getDouble("LONGITUDE", 0.1278) + val height = preferences.getDouble("HEIGHT", 48.0) drawerLat.text = String.format("%.4f", lat) drawerLon.text = String.format("%.4f", lon) diff --git a/app/src/main/res/anim/pulse.xml b/app/src/main/res/anim/pulse.xml new file mode 100644 index 00000000..9ff3476b --- /dev/null +++ b/app/src/main/res/anim/pulse.xml @@ -0,0 +1,31 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/drawer_gradient.xml b/app/src/main/res/drawable/drawer_gradient.xml index 73fe2d2f..e37eedb0 100644 --- a/app/src/main/res/drawable/drawer_gradient.xml +++ b/app/src/main/res/drawable/drawer_gradient.xml @@ -1,8 +1,8 @@ \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_add.xml b/app/src/main/res/drawable/ic_add.xml deleted file mode 100644 index 375680b6..00000000 --- a/app/src/main/res/drawable/ic_add.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml index 73fe2d2f..e37eedb0 100644 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -1,8 +1,8 @@ \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml index 901801c5..ae3b91dd 100644 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -7,10 +7,10 @@ android:translateX="70.26573" android:translateY="70.26573"> diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml index 5470c151..3630c908 100644 --- a/app/src/main/res/drawable/ic_location.xml +++ b/app/src/main/res/drawable/ic_location.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_sat_desc_right.xml b/app/src/main/res/drawable/ic_sat_desc_right.xml deleted file mode 100644 index 52eddad3..00000000 --- a/app/src/main/res/drawable/ic_sat_desc_right.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/ic_sputnik.xml b/app/src/main/res/drawable/ic_sputnik.xml deleted file mode 100644 index ea6ddcdf..00000000 --- a/app/src/main/res/drawable/ic_sputnik.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/layout-land/fragment_worldmap.xml b/app/src/main/res/layout-land/fragment_worldmap.xml index 26f765e8..bc30a868 100644 --- a/app/src/main/res/layout-land/fragment_worldmap.xml +++ b/app/src/main/res/layout-land/fragment_worldmap.xml @@ -25,7 +25,6 @@ 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" /> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index a379fe7e..573b6d07 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -18,10 +18,8 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_gravity="start" - android:background="@color/colorBackground" android:fitsSystemWindows="true" app:headerLayout="@layout/drawer_header" - app:itemTextColor="@color/colorDrawerText" app:menu="@menu/drawer_menu" /> diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml index 41ef0d5d..7ef133f7 100644 --- a/app/src/main/res/layout/app_bar_main.xml +++ b/app/src/main/res/layout/app_bar_main.xml @@ -13,8 +13,7 @@ + android:layout_height="?attr/actionBarSize"> diff --git a/app/src/main/res/layout/drawer_header.xml b/app/src/main/res/layout/drawer_header.xml index 29149bbc..b9608ce2 100644 --- a/app/src/main/res/layout/drawer_header.xml +++ b/app/src/main/res/layout/drawer_header.xml @@ -9,10 +9,10 @@ diff --git a/app/src/main/res/layout/fragment_worldmap.xml b/app/src/main/res/layout/fragment_worldmap.xml index 26f765e8..bc30a868 100644 --- a/app/src/main/res/layout/fragment_worldmap.xml +++ b/app/src/main/res/layout/fragment_worldmap.xml @@ -25,7 +25,6 @@ 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" /> diff --git a/app/src/main/res/menu/drawer_menu.xml b/app/src/main/res/menu/drawer_menu.xml index d811d233..0b7e08b7 100644 --- a/app/src/main/res/menu/drawer_menu.xml +++ b/app/src/main/res/menu/drawer_menu.xml @@ -7,17 +7,22 @@ + - + + - diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index eca70cfe..00000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index a811060e3781a915627658f61ffd996172287891..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3937 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 diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index a76d18d2e4cea91780b7b5b6be9312bd488eedb1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2468 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 BV_N_K diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index 449eba13eb0d7c87d8b1a47a2a940ab92e6a24c6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11824 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 + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index f5f7469b..a8056094 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,9 +1,8 @@ - #000020 - #000010 - #C0C0C0 - - #C0C0C0 - #212121 + #FFE082 + #101010 + #080808 + #C0C0C0 + #800000 diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index ba6c6979..637d4c8c 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -1,4 +1,4 @@ - 280dp + 300dp 16dp diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0a3c53b5..63e25968 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -7,24 +7,18 @@ Sky at a Glance Radar View - Map View - Settings - About the App - Go to GitHub + Single Sat Passes + World Map View Credits + About the App - Allow the app to get your location Latitude: - -90.0000 - Ground station latitude from -90 to 90 + 51.5074 Longitude: - -180.0000 - Ground station longitude from -180 to 180 + 0.1278 Height AMSL: - 51.0m - Ground station height in meters AMSL + 48.0m - Update location Fetch Transmitters Save to DB Load from DB @@ -32,7 +26,9 @@ Load TLE Exit - Next AOS in %02d:%02d:%02d + AOS in %02d:%02d:%02d + Drawer Locator Nasa Map Placeholder + About diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index ab618002..ed749233 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,10 +1,15 @@ - - - + + diff --git a/build.gradle b/build.gradle index a66a5bf5..3c59fa6d 100644 --- a/build.gradle +++ b/build.gradle @@ -25,6 +25,7 @@ task clean(type: Delete) { } ext { + material = '1.2.0-alpha01' supportLib = '1.0.0' constraintLayout = '1.1.3'