Merge remote-tracking branch 'origin/main'

This commit is contained in:
Niels Gras
2024-05-22 15:06:37 +02:00

View File

@@ -9,67 +9,77 @@
tools:context=".ui.activities.MainActivity" tools:context=".ui.activities.MainActivity"
tools:openDrawer="start"> tools:openDrawer="start">
<LinearLayout <android.support.constraint.ConstraintLayout
android:id="@+id/linearLayout2"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="horizontal">
<include <include
android:id="@+id/toolbar" android:id="@+id/toolbar"
layout="@layout/toolbar" /> layout="@layout/toolbar"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView <TextView
android:id="@+id/textView2" android:id="@+id/textView2"
android:layout_width="524dp" android:layout_width="wrap_content"
android:layout_height="77dp" android:layout_height="wrap_content"
android:layout_marginStart="378dp" android:layout_marginStart="300dp"
android:layout_marginTop="80dp"
android:text="@string/welkom_bij_fitbot" android:text="@string/welkom_bij_fitbot"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="64sp" /> android:textSize="64sp"
app:layout_constraintStart_toStartOf="parent" />
<TextView <TextView
android:id="@+id/textView3" android:id="@+id/textView3"
android:layout_width="510dp" android:layout_width="wrap_content"
android:layout_height="39dp" android:layout_height="wrap_content"
android:layout_marginStart="385dp" android:layout_marginStart="300dp"
android:layout_marginTop="0dp" android:layout_marginTop="80dp"
android:text="@string/robot_helpt" android:text="@string/robot_helpt"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="32sp" /> android:textSize="32sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<Button <Button
android:id="@+id/startButton" android:id="@+id/startButton"
android:layout_width="300dp" android:layout_width="wrap_content"
android:layout_height="150dp" android:layout_height="wrap_content"
android:layout_marginStart="490dp" android:layout_marginStart="400dp"
android:layout_marginTop="100dp" android:layout_marginTop="350dp"
android:background="@drawable/red_button_gradient"
android:text="@string/start" android:text="@string/start"
android:textAllCaps="false"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="80sp" android:textSize="80sp"
android:textAllCaps="false" app:layout_constraintStart_toStartOf="parent"
android:background="@drawable/red_button_gradient"/> app:layout_constraintTop_toTopOf="parent" />
<Button <Button
android:id="@+id/helpButton" android:id="@+id/helpButton"
android:layout_width="160dp" android:layout_width="wrap_content"
android:layout_height="80dp" android:layout_height="wrap_content"
android:layout_marginStart="560dp" android:layout_marginStart="450dp"
android:layout_marginTop="20dp" android:layout_marginTop="500dp"
android:background="@drawable/darkred_button_gradient"
android:text="@string/help" android:text="@string/help"
android:textAllCaps="false"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="40sp" android:textSize="40sp"
android:textAllCaps="false" app:layout_constraintStart_toStartOf="parent"
android:background="@drawable/darkred_button_gradient"/> app:layout_constraintTop_toTopOf="parent" />
<ImageView <ImageView
android:id="@+id/imageView2" android:id="@+id/imageView2"
android:layout_width="375dp" android:layout_width="wrap_content"
android:layout_height="375dp" android:layout_height="wrap_content"
android:layout_marginStart="0dp" android:layout_marginTop="260dp"
android:layout_marginTop="-180dp" android:contentDescription="@string/todo"
app:srcCompat="@drawable/robot_logo_inverted" app:layout_constraintStart_toStartOf="parent"
android:contentDescription="@string/todo" /> app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/robot_logo_inverted" />
<!-- <Button--> <!-- <Button-->
<!-- android:id="@+id/menu_switch_btn"--> <!-- android:id="@+id/menu_switch_btn"-->
@@ -81,7 +91,7 @@
<!-- app:layout_constraintLeft_toLeftOf="parent"--> <!-- app:layout_constraintLeft_toLeftOf="parent"-->
<!-- android:focusable="true" />--> <!-- android:focusable="true" />-->
</LinearLayout> </android.support.constraint.ConstraintLayout>
<android.support.design.widget.NavigationView <android.support.design.widget.NavigationView
android:id="@+id/nav_view" android:id="@+id/nav_view"