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

Improved fragments

Browse Source
This commit is contained in:
RemoMeijer
2021-01-05 10:47:35 +01:00
parent a75b81033f
commit d63b150275
5 changed files with 23 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,6 +12,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="9dp" android:layout_margin="9dp"
android:layout_marginTop="20dp"
android:text="Statistics" android:text="Statistics"
android:textSize="20sp" android:textSize="20sp"
app:layout_constraintStart_toEndOf="@id/couponBackButton" app:layout_constraintStart_toEndOf="@id/couponBackButton"
@@ -21,10 +22,11 @@
android:id="@+id/couponBackButton" android:id="@+id/couponBackButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="12dp"
android:background="@drawable/ic_back_button_24" android:background="@drawable/ic_back_button_24"
android:backgroundTint="@color/buttonColour" android:backgroundTint="@color/buttonColour"
android:text="Back" android:text="Back"
android:layout_margin="10dp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />

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

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

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

@@ -12,6 +12,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="9dp" android:layout_margin="9dp"
android:layout_marginTop="20dp"
android:text="Locations" android:text="Locations"
android:textSize="20sp" android:textSize="20sp"
app:layout_constraintStart_toEndOf="@id/locationBackButton" app:layout_constraintStart_toEndOf="@id/locationBackButton"
@@ -21,10 +22,11 @@
android:id="@+id/locationBackButton" android:id="@+id/locationBackButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="12dp"
android:background="@drawable/ic_back_button_24" android:background="@drawable/ic_back_button_24"
android:backgroundTint="@color/buttonColour" android:backgroundTint="@color/buttonColour"
android:text="Back" android:text="Back"
android:layout_margin="10dp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />

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

@@ -44,11 +44,11 @@
android:id="@+id/detail_location_back_button" android:id="@+id/detail_location_back_button"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="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" android:backgroundTint="@color/primaryColour"
app:layout_constraintBottom_toBottomOf="@+id/detail_location_name" android:src="@drawable/ic_back_button_24"
app:layout_constraintEnd_toStartOf="@+id/detail_location_name"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/detail_location_name" /> app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -46,36 +46,24 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="20dp" android:layout_marginHorizontal="20dp"
android:layout_marginBottom="100dp" android:layout_marginTop="56dp"
app:layout_constraintBottom_toTopOf="@id/startRouteText"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.6"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/routeDetailImage" /> app:layout_constraintTop_toBottomOf="@id/routeDetailImage" />
<ImageButton <Button
android:id="@+id/startRouteButton" android:id="@+id/start_route_button"
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"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="20dp" android:text="Start Route"
android:text="@string/start_route" android:backgroundTint="@color/secondaryColour"
android:textSize="50sp" android:textColor="@color/buttonColour"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/startRouteButton" app:layout_constraintHorizontal_bias="0.498"
app:layout_constraintTop_toBottomOf="@id/routeDetailText" /> app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/routeDetailText"
app:layout_constraintVertical_bias="0.671" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>