sem/Next-Location
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

Merge branch 'follow-route' into RecyclerView

Browse Source 
# Conflicts:
#	app/src/main/java/com/a1/nextlocation/fragments/RouteDetailFragment.java
This commit is contained in:
sebas
2021-01-06 13:23:58 +01:00
parent 192f1a4c64 391792a5e2
commit f0f87af42b
33 changed files with 1384 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/res/layout/fragment_home.xml
View File

@@ -27,6 +27,17 @@
android:src="@drawable/ic_baseline_outlined_flag_24"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageButton
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/home_stop_route_button"
android:layout_marginTop="20dp"
android:layout_marginEnd="20dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/location_list_button"
android:backgroundTint="@color/secondaryColour"
android:src="@drawable/ic_stop_icon"/>
</androidx.constraintlayout.widget.ConstraintLayout>
</FrameLayout>

2
app/src/main/res/layout/fragment_statistic.xml
View File

@@ -54,6 +54,7 @@
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/statistics_km"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/km"
@@ -102,6 +103,7 @@
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/statistics_locations_visited"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/getal"