From a2d1ecfc71e1fb5e0612bfdc68261930efc4f611 Mon Sep 17 00:00:00 2001 From: sebas Date: Mon, 14 Dec 2020 14:38:47 +0100 Subject: [PATCH 1/4] [Added] layout created for routedetailfragment --- .../res/layout-land/fragment_route_detail.xml | 70 +++++++++++++++++++ app/src/main/res/layout/fragment_route.xml | 68 ++++++++---------- .../main/res/layout/fragment_route_detail.xml | 67 ++++++++++++++++-- 3 files changed, 162 insertions(+), 43 deletions(-) create mode 100644 app/src/main/res/layout-land/fragment_route_detail.xml diff --git a/app/src/main/res/layout-land/fragment_route_detail.xml b/app/src/main/res/layout-land/fragment_route_detail.xml new file mode 100644 index 0000000..ff7d785 --- /dev/null +++ b/app/src/main/res/layout-land/fragment_route_detail.xml @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_route.xml b/app/src/main/res/layout/fragment_route.xml index 7bc6a69..a64cb46 100644 --- a/app/src/main/res/layout/fragment_route.xml +++ b/app/src/main/res/layout/fragment_route.xml @@ -1,48 +1,40 @@ - - + - + - + - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_route_detail.xml b/app/src/main/res/layout/fragment_route_detail.xml index 53b95a9..0d526e6 100644 --- a/app/src/main/res/layout/fragment_route_detail.xml +++ b/app/src/main/res/layout/fragment_route_detail.xml @@ -1,14 +1,71 @@ - - + + + + + + + android:layout_height="wrap_content" + android:layout_margin="20dp" + android:id="@+id/routeDetailText" + app:layout_constraintTop_toBottomOf="@id/routeDetailImage" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toEndOf="parent" + /> - \ No newline at end of file + + + + \ No newline at end of file From 75b7ff47cd48b0cd5bcc1d2b6ab00fbe60b9c743 Mon Sep 17 00:00:00 2001 From: sebas Date: Mon, 14 Dec 2020 14:51:43 +0100 Subject: [PATCH 2/4] [Added] small changes to route detail, location detail --- app/src/main/res/layout-land/fragment_route_detail.xml | 5 ++--- app/src/main/res/layout/fragment_location_detail.xml | 10 ++++------ app/src/main/res/layout/fragment_route_detail.xml | 5 ++--- app/src/main/res/values/strings.xml | 1 + 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/app/src/main/res/layout-land/fragment_route_detail.xml b/app/src/main/res/layout-land/fragment_route_detail.xml index ff7d785..af51f6b 100644 --- a/app/src/main/res/layout-land/fragment_route_detail.xml +++ b/app/src/main/res/layout-land/fragment_route_detail.xml @@ -13,7 +13,6 @@ android:layout_height="wrap_content" android:layout_margin="10dp" android:background="@drawable/ic_back_button_24" - android:text="Back" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -61,8 +60,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="20dp" - android:text="Start Route" - android:textSize="50dp" + android:text="@string/start_route" + android:textSize="50sp" android:id="@+id/startRouteText" app:layout_constraintTop_toBottomOf="@id/routeDetailImage" app:layout_constraintStart_toEndOf="@id/startRouteButton" diff --git a/app/src/main/res/layout/fragment_location_detail.xml b/app/src/main/res/layout/fragment_location_detail.xml index 104e680..17b7203 100644 --- a/app/src/main/res/layout/fragment_location_detail.xml +++ b/app/src/main/res/layout/fragment_location_detail.xml @@ -31,16 +31,14 @@ + app:layout_constraintTop_toBottomOf="@+id/detail_location_image" /> @@ -61,8 +60,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="20dp" - android:text="Start Route" - android:textSize="50dp" + android:text="@string/start_route" + android:textSize="50sp" android:id="@+id/startRouteText" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/routeDetailText" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 584e8ed..c322028 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -16,4 +16,5 @@ Totale tijd: Coupons gespaard: Coupons + Start Route \ No newline at end of file From 4229acf87cf5781666be3b771d624bde09bf473e Mon Sep 17 00:00:00 2001 From: Robin Koedood Date: Wed, 16 Dec 2020 11:20:52 +0100 Subject: [PATCH 3/4] [ADD] Route Detail Contraints --- .../drawable/ic_baseline_play_arrow_24.xml | 10 ++++ .../main/res/layout/fragment_route_detail.xml | 53 +++++++++++-------- 2 files changed, 42 insertions(+), 21 deletions(-) create mode 100644 app/src/main/res/drawable/ic_baseline_play_arrow_24.xml diff --git a/app/src/main/res/drawable/ic_baseline_play_arrow_24.xml b/app/src/main/res/drawable/ic_baseline_play_arrow_24.xml new file mode 100644 index 0000000..13c137a --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_play_arrow_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/layout/fragment_route_detail.xml b/app/src/main/res/layout/fragment_route_detail.xml index 5d37443..197630c 100644 --- a/app/src/main/res/layout/fragment_route_detail.xml +++ b/app/src/main/res/layout/fragment_route_detail.xml @@ -11,21 +11,24 @@ android:id="@+id/routeDetailBackButton" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_margin="10dp" + 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_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="@id/routeTitle" /> - + - - + + + app:layout_constraintTop_toBottomOf="@id/routeDetailText" /> \ No newline at end of file From 4f68398f33679d45a8974a54ca231d850adea9a6 Mon Sep 17 00:00:00 2001 From: Robin Koedood Date: Wed, 16 Dec 2020 11:38:24 +0100 Subject: [PATCH 4/4] [ADD] route detail landscape mode --- .../res/layout-land/fragment_route_detail.xml | 62 ++++++++++++------- 1 file changed, 38 insertions(+), 24 deletions(-) diff --git a/app/src/main/res/layout-land/fragment_route_detail.xml b/app/src/main/res/layout-land/fragment_route_detail.xml index af51f6b..b5863ad 100644 --- a/app/src/main/res/layout-land/fragment_route_detail.xml +++ b/app/src/main/res/layout-land/fragment_route_detail.xml @@ -13,57 +13,71 @@ android:layout_height="wrap_content" android:layout_margin="10dp" android:background="@drawable/ic_back_button_24" + app:layout_constraintBottom_toBottomOf="@+id/routeTitle" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="@+id/routeTitle" + app:layout_constraintEnd_toStartOf="@id/routeTitle" + /> - + - + app:layout_constraintTop_toTopOf="parent" /> + + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="@+id/startRouteText" /> + app:layout_constraintTop_toBottomOf="@id/routeDetailImage" /> \ No newline at end of file