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

added locations to map

Browse Source
This commit is contained in:
Sem van der Hoeven
2021-01-05 13:43:10 +01:00
parent 65d2f31e3f d53f63a6d7
commit 16bd30f785
22 changed files with 166 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/res/layout-land/fragment_route_detail.xml
View File

@@ -13,14 +13,14 @@
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:background="@drawable/ic_back_button_24"
app:layout_constraintBottom_toBottomOf="@+id/routeTitle"
app:layout_constraintBottom_toBottomOf="@+id/route_title"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/routeTitle"
app:layout_constraintEnd_toStartOf="@id/routeTitle"
app:layout_constraintTop_toTopOf="@+id/route_title"
app:layout_constraintEnd_toStartOf="@id/route_title"
/>
<TextView
android:id="@+id/routeTitle"
android:id="@+id/route_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="250dp"

24
app/src/main/res/layout/activity_main.xml
View File

@@ -10,15 +10,15 @@
android:id="@+id/fragment_layout"
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintTop_toBottomOf="@+id/topBar"
app:layout_constraintBottom_toTopOf="@id/navbar"
app:layout_constraintTop_toBottomOf="@+id/top_bar"
app:layout_constraintBottom_toTopOf="@id/navigation_bar"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
/>
<com.google.android.material.bottomnavigation.BottomNavigationView
android:showAsAction="always|withText"
android:id="@+id/navbar"
android:id="@+id/navigation_bar"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:background="@color/white"
@@ -31,7 +31,7 @@
/>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/topBar"
android:id="@+id/top_bar"
android:layout_width="match_parent"
android:layout_height="50dp"
app:layout_constraintTop_toTopOf="parent"
@@ -41,27 +41,27 @@
android:background="@color/primaryColour"/>
<ImageButton
android:id="@+id/infoButton"
android:id="@+id/info_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_baseline_info_24"
android:backgroundTint="@color/primaryColour"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/topBar"
app:layout_constraintBottom_toBottomOf="@id/topBar"
app:layout_constraintTop_toTopOf="@id/top_bar"
app:layout_constraintBottom_toBottomOf="@id/top_bar"
android:tint="@color/secondaryColour"
/>
<TextView
android:id="@+id/text_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toEndOf="@id/infoButton"
app:layout_constraintTop_toTopOf="@id/topBar"
app:layout_constraintBottom_toBottomOf="@id/topBar"
android:text="@string/app_name"
android:textSize="25dp"
android:textColor="@color/secondaryColour"
/>
android:textSize="25dp"
app:layout_constraintBottom_toBottomOf="@id/top_bar"
app:layout_constraintStart_toEndOf="@id/info_button"
app:layout_constraintTop_toTopOf="@id/top_bar" />
</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -5,7 +5,7 @@
android:layout_height="wrap_content">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/Box1"
android:id="@+id/name_box"
android:layout_width="match_parent"
android:layout_height="70dp"
android:layout_marginHorizontal="20dp"

12
app/src/main/res/layout/fragment_coupon.xml
View File

@@ -12,28 +12,30 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="9dp"
android:layout_marginTop="20dp"
android:text="Statistics"
android:textSize="20sp"
app:layout_constraintStart_toEndOf="@id/couponBackButton"
app:layout_constraintStart_toEndOf="@id/coupon_back_button"
app:layout_constraintTop_toTopOf="parent" />
<ImageButton
android:id="@+id/couponBackButton"
android:id="@+id/coupon_back_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="12dp"
android:background="@drawable/ic_back_button_24"
android:backgroundTint="@color/buttonColour"
android:text="Back"
android:layout_margin="10dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.recyclerview.widget.RecyclerView
android:layout_width="0dp"
android:layout_height="0dp"
android:id="@+id/couponRecyclerView"
android:id="@+id/coupon_recyclerview"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/couponBackButton" />
app:layout_constraintTop_toBottomOf="@+id/coupon_back_button" />
</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -6,9 +6,8 @@
android:layout_height="match_parent"
tools:context=".fragments.HomeFragment">
<org.osmdroid.views.MapView
android:id="@+id/mapView"
android:id="@+id/map_view"
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -24,6 +23,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_marginEnd="20dp"
android:backgroundTint="@color/secondaryColour"
android:src="@drawable/ic_baseline_outlined_flag_24"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />

19
app/src/main/res/layout/fragment_location.xml
View File

@@ -12,28 +12,31 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="9dp"
android:layout_marginTop="20dp"
android:text="Locations"
android:textSize="20sp"
app:layout_constraintStart_toEndOf="@id/locationBackButton"
app:layout_constraintStart_toEndOf="@id/location_back_button"
app:layout_constraintTop_toTopOf="parent" />
<ImageButton
android:id="@+id/locationBackButton"
android:id="@+id/location_back_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="12dp"
android:background="@drawable/ic_back_button_24"
android:backgroundTint="@color/buttonColour"
android:text="Back"
android:layout_margin="10dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.recyclerview.widget.RecyclerView
android:layout_width="0dp"
android:layout_height="0dp"
android:id="@+id/locationRecyclerView"
app:layout_constraintBottom_toBottomOf="parent"
android:id="@+id/location_recyclerview"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="60dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/routeBackButton" />
app:layout_constraintTop_toBottomOf="@+id/location_RV" />
</androidx.constraintlayout.widget.ConstraintLayout>

8
app/src/main/res/layout/fragment_location_detail.xml
View File

@@ -44,11 +44,11 @@
android:id="@+id/detail_location_back_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_back_button_24"
android:layout_marginStart="10dp"
android:layout_marginTop="12dp"
android:backgroundTint="@color/primaryColour"
app:layout_constraintBottom_toBottomOf="@+id/detail_location_name"
app:layout_constraintEnd_toStartOf="@+id/detail_location_name"
android:src="@drawable/ic_back_button_24"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/detail_location_name" />
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

10
app/src/main/res/layout/fragment_route.xml
View File

@@ -8,7 +8,7 @@
tools:context=".fragments.RouteFragment">
<ImageButton
android:id="@+id/routeBackButton"
android:id="@+id/route_back_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="10dp"
@@ -18,23 +18,23 @@
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/routeTitle"
android:id="@+id/route_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="9dp"
android:text="titel"
android:textSize="20sp"
app:layout_constraintStart_toEndOf="@id/routeBackButton"
app:layout_constraintStart_toEndOf="@id/route_back_button"
app:layout_constraintTop_toTopOf="parent" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/routeRecyclerView"
android:id="@+id/route_recyclerview"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@color/primaryColour"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/routeBackButton" />
app:layout_constraintTop_toBottomOf="@+id/route_back_button" />
</androidx.constraintlayout.widget.ConstraintLayout>

44
app/src/main/res/layout/fragment_route_detail.xml
View File

@@ -13,13 +13,13 @@
android:layout_height="wrap_content"
android:layout_marginEnd="100dp"
android:background="@drawable/ic_back_button_24"
app:layout_constraintBottom_toBottomOf="@id/routeTitle"
app:layout_constraintEnd_toStartOf="@id/routeTitle"
app:layout_constraintBottom_toBottomOf="@id/route_title"
app:layout_constraintEnd_toStartOf="@id/route_title"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/routeTitle" />
app:layout_constraintTop_toTopOf="@id/route_title" />
<TextView
android:id="@+id/routeTitle"
android:id="@+id/route_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="titel"
@@ -46,36 +46,24 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="20dp"
android:layout_marginBottom="100dp"
app:layout_constraintBottom_toTopOf="@id/startRouteText"
android:layout_marginTop="56dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.6"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/routeDetailImage" />
<ImageButton
android:id="@+id/startRouteButton"
android:backgroundTint="@color/primaryColour"
android:scaleX="5"
android:scaleY="5"
android:layout_width="70dp"
android:layout_height="70dp"
android:layout_margin="20dp"
app:layout_constraintBottom_toBottomOf="@+id/startRouteText"
app:layout_constraintEnd_toStartOf="@+id/startRouteText"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/startRouteText"
android:src="@drawable/ic_baseline_play_arrow_24"
/>
<TextView
android:id="@+id/startRouteText"
<Button
android:id="@+id/start_route_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="20dp"
android:text="@string/start_route"
android:textSize="50sp"
android:text="Start Route"
android:backgroundTint="@color/secondaryColour"
android:textColor="@color/buttonColour"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/startRouteButton"
app:layout_constraintTop_toBottomOf="@id/routeDetailText" />
app:layout_constraintHorizontal_bias="0.498"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/routeDetailText"
app:layout_constraintVertical_bias="0.671" />
</androidx.constraintlayout.widget.ConstraintLayout>

4
app/src/main/res/layout/fragment_settings.xml
View File

@@ -30,7 +30,7 @@
app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/Box1"
android:id="@+id/name_box"
android:layout_width="match_parent"
android:layout_height="70dp"
app:layout_constraintBottom_toTopOf="@id/Box2"
@@ -86,7 +86,7 @@
app:layout_constraintBottom_toTopOf="@id/Box3"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/Box1"
app:layout_constraintTop_toBottomOf="@id/name_box"
>

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

@@ -20,7 +20,7 @@
app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/Box1"
android:id="@+id/name_box"
android:layout_width="match_parent"
android:layout_height="70dp"
app:layout_constraintBottom_toTopOf="@id/Box2"
@@ -77,7 +77,7 @@
app:layout_constraintBottom_toTopOf="@id/Box3"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/Box1"
app:layout_constraintTop_toBottomOf="@id/name_box"
>

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

@@ -21,6 +21,6 @@
android:gravity="center"
android:text="location"
android:textSize="20dp"
app:layout_constraintStart_toEndOf="@+id/routeImage" />
app:layout_constraintStart_toEndOf="@+id/route_Image" />
</androidx.constraintlayout.widget.ConstraintLayout>

4
app/src/main/res/layout/route_item.xml
View File

@@ -9,7 +9,7 @@
<ImageView
android:layout_width="50dp"
android:layout_height="50dp"
android:id="@+id/routeImage"
android:id="@+id/route_Image"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
/>
@@ -21,7 +21,7 @@
android:text="test text"
android:gravity="center"
android:textSize="20dp"
app:layout_constraintStart_toEndOf="@+id/routeImage"
app:layout_constraintStart_toEndOf="@+id/route_Image"
/>
</androidx.constraintlayout.widget.ConstraintLayout>