From dc7642bc52f42f953a7b5855447725de3c97e081 Mon Sep 17 00:00:00 2001 From: Arty Bishop Date: Thu, 31 Oct 2019 22:00:28 +0000 Subject: [PATCH] Major look'n'feel update. Icons and buttons added to the drawer. Code cleanup. --- .../rtbishop/lookingsat/ui/MainActivity.kt | 15 --- app/src/main/res/anim/pulse.xml | 31 ------- app/src/main/res/drawable/ic_about.xml | 9 ++ app/src/main/res/drawable/ic_credits.xml | 9 ++ app/src/main/res/drawable/ic_exit.xml | 9 ++ app/src/main/res/drawable/ic_github.xml | 9 ++ .../res/drawable/ic_launcher_background.xml | 8 -- app/src/main/res/drawable/ic_location.xml | 6 +- app/src/main/res/drawable/ic_map.xml | 9 ++ app/src/main/res/drawable/ic_refresh.xml | 4 +- app/src/main/res/drawable/ic_sat_asc_left.xml | 10 +- .../main/res/drawable/ic_sat_asc_right.xml | 10 +- .../main/res/drawable/ic_sat_desc_left.xml | 8 +- app/src/main/res/drawable/ic_sky.xml | 9 ++ app/src/main/res/drawable/ic_tle.xml | 9 ++ app/src/main/res/drawable/ic_trans.xml | 9 ++ ...r_gradient.xml => launcher_background.xml} | 0 ...foreground.xml => launcher_foreground.xml} | 4 +- app/src/main/res/layout/app_bar_main.xml | 5 +- app/src/main/res/layout/drawer_header.xml | 93 +++++++++++++------ app/src/main/res/menu/drawer_menu.xml | 5 + .../res/mipmap-anydpi-v26/ic_launcher.xml | 4 +- app/src/main/res/values/dimens.xml | 2 +- app/src/main/res/values/styles.xml | 24 ++++- gradle.properties | 3 +- 25 files changed, 190 insertions(+), 114 deletions(-) delete mode 100644 app/src/main/res/anim/pulse.xml create mode 100644 app/src/main/res/drawable/ic_about.xml create mode 100644 app/src/main/res/drawable/ic_credits.xml create mode 100644 app/src/main/res/drawable/ic_exit.xml create mode 100644 app/src/main/res/drawable/ic_github.xml delete mode 100644 app/src/main/res/drawable/ic_launcher_background.xml create mode 100644 app/src/main/res/drawable/ic_map.xml create mode 100644 app/src/main/res/drawable/ic_sky.xml create mode 100644 app/src/main/res/drawable/ic_tle.xml create mode 100644 app/src/main/res/drawable/ic_trans.xml rename app/src/main/res/drawable/{drawer_gradient.xml => launcher_background.xml} (100%) rename app/src/main/res/drawable/{ic_launcher_foreground.xml => launcher_foreground.xml} (94%) diff --git a/app/src/main/java/com/rtbishop/lookingsat/ui/MainActivity.kt b/app/src/main/java/com/rtbishop/lookingsat/ui/MainActivity.kt index 720c936c..0d05866f 100644 --- a/app/src/main/java/com/rtbishop/lookingsat/ui/MainActivity.kt +++ b/app/src/main/java/com/rtbishop/lookingsat/ui/MainActivity.kt @@ -10,8 +10,6 @@ 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 import androidx.appcompat.app.AppCompatActivity @@ -46,8 +44,6 @@ class MainActivity : AppCompatActivity() { private lateinit var drawerLat: TextView private lateinit var drawerLon: TextView private lateinit var drawerHeight: TextView - private lateinit var drawerSubTitle: TextView - private lateinit var drawerGetLocation: ImageView override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -73,8 +69,6 @@ class MainActivity : AppCompatActivity() { drawerLat = header.findViewById(R.id.drawer_lat_value) drawerLon = header.findViewById(R.id.drawer_lon_value) drawerHeight = header.findViewById(R.id.drawer_height_value) - drawerSubTitle = header.findViewById(R.id.drawer_link) - drawerGetLocation = header.findViewById(R.id.drawer_get_location) val navController = findNavController(R.id.nav_host) appBarConfig = AppBarConfiguration(setOf(R.id.nav_sky, R.id.nav_single_sat), drawerLayout) @@ -100,15 +94,6 @@ class MainActivity : AppCompatActivity() { } private fun setupDrawer() { - drawerSubTitle.setOnClickListener { goToGithub() } - - drawerGetLocation.startAnimation(AnimationUtils.loadAnimation(this, R.anim.pulse)) - drawerGetLocation.setOnClickListener { - it.isEnabled = false - updateLocation() - it.postDelayed({ it.isEnabled = true }, 3600) - } - viewModel.gsp.observe(this, androidx.lifecycle.Observer { gsp -> drawerLat.text = String.format("%.4f", gsp.latitude) drawerLon.text = String.format("%.4f", gsp.longitude) diff --git a/app/src/main/res/anim/pulse.xml b/app/src/main/res/anim/pulse.xml deleted file mode 100644 index 9ff3476b..00000000 --- a/app/src/main/res/anim/pulse.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml new file mode 100644 index 00000000..6aff33d0 --- /dev/null +++ b/app/src/main/res/drawable/ic_about.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_credits.xml b/app/src/main/res/drawable/ic_credits.xml new file mode 100644 index 00000000..f99519bf --- /dev/null +++ b/app/src/main/res/drawable/ic_credits.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_exit.xml b/app/src/main/res/drawable/ic_exit.xml new file mode 100644 index 00000000..f607211c --- /dev/null +++ b/app/src/main/res/drawable/ic_exit.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_github.xml b/app/src/main/res/drawable/ic_github.xml new file mode 100644 index 00000000..ae3fdb61 --- /dev/null +++ b/app/src/main/res/drawable/ic_github.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index e37eedb0..00000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml index 3630c908..cb01fbe2 100644 --- a/app/src/main/res/drawable/ic_location.xml +++ b/app/src/main/res/drawable/ic_location.xml @@ -1,9 +1,9 @@ diff --git a/app/src/main/res/drawable/ic_map.xml b/app/src/main/res/drawable/ic_map.xml new file mode 100644 index 00000000..7f7a5a05 --- /dev/null +++ b/app/src/main/res/drawable/ic_map.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_refresh.xml b/app/src/main/res/drawable/ic_refresh.xml index 6ff7a0cc..3a766bc2 100644 --- a/app/src/main/res/drawable/ic_refresh.xml +++ b/app/src/main/res/drawable/ic_refresh.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> + android:fillColor="#C0C0C0" + android:pathData="M12,4L12,1L8,5l4,4L12,6c3.31,0 6,2.69 6,6 0,1.01 -0.25,1.97 -0.7,2.8l1.46,1.46C19.54,15.03 20,13.57 20,12c0,-4.42 -3.58,-8 -8,-8zM12,18c-3.31,0 -6,-2.69 -6,-6 0,-1.01 0.25,-1.97 0.7,-2.8L5.24,7.74C4.46,8.97 4,10.43 4,12c0,4.42 3.58,8 8,8v3l4,-4 -4,-4v3z" /> diff --git a/app/src/main/res/drawable/ic_sat_asc_left.xml b/app/src/main/res/drawable/ic_sat_asc_left.xml index d64687cd..1e48f81a 100644 --- a/app/src/main/res/drawable/ic_sat_asc_left.xml +++ b/app/src/main/res/drawable/ic_sat_asc_left.xml @@ -5,31 +5,31 @@ android:viewportHeight="128"> diff --git a/app/src/main/res/drawable/ic_sat_asc_right.xml b/app/src/main/res/drawable/ic_sat_asc_right.xml index a7cb41be..ac48dddd 100644 --- a/app/src/main/res/drawable/ic_sat_asc_right.xml +++ b/app/src/main/res/drawable/ic_sat_asc_right.xml @@ -5,31 +5,31 @@ android:viewportHeight="128"> diff --git a/app/src/main/res/drawable/ic_sat_desc_left.xml b/app/src/main/res/drawable/ic_sat_desc_left.xml index 8f8b0b5d..d8ab3691 100644 --- a/app/src/main/res/drawable/ic_sat_desc_left.xml +++ b/app/src/main/res/drawable/ic_sat_desc_left.xml @@ -11,25 +11,25 @@ android:strokeColor="#00000000" /> diff --git a/app/src/main/res/drawable/ic_sky.xml b/app/src/main/res/drawable/ic_sky.xml new file mode 100644 index 00000000..d852cf8a --- /dev/null +++ b/app/src/main/res/drawable/ic_sky.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_tle.xml b/app/src/main/res/drawable/ic_tle.xml new file mode 100644 index 00000000..5da64991 --- /dev/null +++ b/app/src/main/res/drawable/ic_tle.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_trans.xml b/app/src/main/res/drawable/ic_trans.xml new file mode 100644 index 00000000..2a221294 --- /dev/null +++ b/app/src/main/res/drawable/ic_trans.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/drawer_gradient.xml b/app/src/main/res/drawable/launcher_background.xml similarity index 100% rename from app/src/main/res/drawable/drawer_gradient.xml rename to app/src/main/res/drawable/launcher_background.xml diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/launcher_foreground.xml similarity index 94% rename from app/src/main/res/drawable/ic_launcher_foreground.xml rename to app/src/main/res/drawable/launcher_foreground.xml index ae3b91dd..4c44754d 100644 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ b/app/src/main/res/drawable/launcher_foreground.xml @@ -7,10 +7,10 @@ android:translateX="70.26573" android:translateY="70.26573"> diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml index 63dc4b58..dc67d8e4 100644 --- a/app/src/main/res/layout/app_bar_main.xml +++ b/app/src/main/res/layout/app_bar_main.xml @@ -22,12 +22,9 @@ + app:layout_constraintBottom_toTopOf="@+id/drawer_btn_loc" + app:layout_constraintStart_toStartOf="@+id/drawer_btn_loc" /> - - - + + + + + + + + diff --git a/app/src/main/res/menu/drawer_menu.xml b/app/src/main/res/menu/drawer_menu.xml index 0b7e08b7..60fa090e 100644 --- a/app/src/main/res/menu/drawer_menu.xml +++ b/app/src/main/res/menu/drawer_menu.xml @@ -6,12 +6,15 @@ @@ -19,9 +22,11 @@ diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index eca70cfe..112bd7f2 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 637d4c8c..5bdc6d2f 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -1,4 +1,4 @@ - 300dp + 288dp 16dp diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index ed749233..0572fdae 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -25,15 +25,33 @@ + + + + diff --git a/gradle.properties b/gradle.properties index 23339e0d..988bc560 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ # http://www.gradle.org/docs/current/userguide/build_environment.html # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx1536m +org.gradle.jvmargs=-Xmx2048m # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects @@ -19,3 +19,4 @@ android.useAndroidX=true android.enableJetifier=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official +kapt.incremental.apt=true \ No newline at end of file