mckero/Look4Sat-mckero
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 20 Wiki Activity

Added sat and map drawables. Modified map fragment layout.

Browse Source
This commit is contained in:
Arty Bishop committed 2019-10-20 20:26:30 +01:00
1 parent 1d219ab841
commit ad3900a17f
14 files changed
+147 -37
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/res/layout/activity_main.xml
+2 -2
View File
@@ -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>
app/src/main/res/layout/app_bar_main.xml
+2 -11
View File
@@ -21,13 +21,13 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/timer_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="wrap_content"
android:layout_marginEnd="16dp">
<TextView
android: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>
app/src/main/res/layout/drawer_header.xml
+1 -1
View File
@@ -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" />
<TextView
android:id="@+id/drawer_title"
app/src/main/res/layout/fragment_sky.xml
+15 -1
View File
@@ -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" />
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>
app/src/main/res/layout/fragment_worldmap.xml
+27 -1
View File
@@ -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" />
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>