diff --git a/app/src/main/ic_icon-web.png b/app/src/main/ic_icon-web.png new file mode 100644 index 00000000..71370b12 Binary files /dev/null and b/app/src/main/ic_icon-web.png differ diff --git a/app/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png index 7f2a7246..0c45aea9 100644 Binary files a/app/src/main/ic_launcher-web.png and b/app/src/main/ic_launcher-web.png differ diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index 9b3a91d4..00000000 --- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/side_nav_bar.xml b/app/src/main/res/drawable/drawer_gradient.xml similarity index 51% rename from app/src/main/res/drawable/side_nav_bar.xml rename to app/src/main/res/drawable/drawer_gradient.xml index 61197a33..73fe2d2f 100644 --- a/app/src/main/res/drawable/side_nav_bar.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_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml index 61197a33..73fe2d2f 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 new file mode 100644 index 00000000..901801c5 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,16 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_sat.xml b/app/src/main/res/drawable/ic_sat.xml index ceb6995f..8a1dda24 100644 --- a/app/src/main/res/drawable/ic_sat.xml +++ b/app/src/main/res/drawable/ic_sat.xml @@ -1,36 +1,36 @@ + android:viewportWidth="128" + android:viewportHeight="128"> diff --git a/app/src/main/res/drawable/ic_sat_down.xml b/app/src/main/res/drawable/ic_sat_down.xml new file mode 100644 index 00000000..cc78a6af --- /dev/null +++ b/app/src/main/res/drawable/ic_sat_down.xml @@ -0,0 +1,36 @@ + + + + + + + diff --git a/app/src/main/res/drawable/ic_sat_up.xml b/app/src/main/res/drawable/ic_sat_up.xml new file mode 100644 index 00000000..2b676c19 --- /dev/null +++ b/app/src/main/res/drawable/ic_sat_up.xml @@ -0,0 +1,36 @@ + + + + + + + diff --git a/app/src/main/res/drawable/ic_sputnik.xml b/app/src/main/res/drawable/ic_sputnik.xml new file mode 100644 index 00000000..ea6ddcdf --- /dev/null +++ b/app/src/main/res/drawable/ic_sputnik.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 573b6d07..4241d0a4 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -19,6 +19,8 @@ android:layout_height="match_parent" android:layout_gravity="start" android:fitsSystemWindows="true" + android:background="@color/colorBackground" + app:itemTextColor="@color/colorDrawerText" app:headerLayout="@layout/drawer_header" 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 bb71ebde..353840fb 100644 --- a/app/src/main/res/layout/app_bar_main.xml +++ b/app/src/main/res/layout/app_bar_main.xml @@ -28,6 +28,7 @@ android:layout_height="wrap_content" android:layout_gravity="bottom|end" android:layout_margin="@dimen/fab_margin" - app:srcCompat="@drawable/ic_sat" /> + app:backgroundTint="@color/colorPrimary" + app:srcCompat="@drawable/ic_sat_up" /> \ No newline at end of file diff --git a/app/src/main/res/layout/drawer_header.xml b/app/src/main/res/layout/drawer_header.xml index 52fac8e9..9b7bd287 100644 --- a/app/src/main/res/layout/drawer_header.xml +++ b/app/src/main/res/layout/drawer_header.xml @@ -2,43 +2,98 @@ + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:srcCompat="@drawable/ic_sat_down" /> + android:textColor="@color/colorDrawerText" + android:textSize="24sp" + app:layout_constraintStart_toStartOf="@+id/drawer_subtitle" + app:layout_constraintTop_toBottomOf="@+id/drawer_img" /> + + + + + + + + + app:layout_constraintStart_toEndOf="@+id/drawer_img" + app:layout_constraintTop_toBottomOf="@+id/drawer_lon" /> diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index d135db39..ebb8ce81 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png index ab1a04c3..a811060e 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png index 80fd9b5b..0e32cb07 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png index e8436192..a76d18d2 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png index bdafbe95..a74ad7b5 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png index 9bcd078f..c05b50e7 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 2287210d..ddd6afd6 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png index 534fa0e3..574d16b1 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index eb082f1d..3c541e96 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png index 1fc35464..449eba13 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 0eda446f..69b941ce 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,7 +1,9 @@ - #021B79 - #061161 - #021B79 - @android:color/white + #000020 + #000010 + #A4A4A4 + + #A4A4A4 + #181818 diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index c69a1a96..377b512b 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -1,7 +1,4 @@ - 16dp - 16dp - 16dp - 240dp + 232dp 16dp diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b400a68a..f63f7de3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,7 +1,7 @@ LookingSat - L∞kingSat - https://github.com/rt-bishop/LookingSat + L∞kingSat + https://github.com/rt-bishop/LookingSat Sky at a Glance Radar View @@ -11,5 +11,10 @@ GitHub Credits + Latitude: + -90.0000 + Longitude: + -180.0000 + Placeholder diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 1fa325a1..8bd30b66 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -4,6 +4,7 @@ @color/colorPrimary @color/colorPrimaryDark @color/colorAccent + @color/colorBackground