Skip to content

Commit

Permalink
hiiiiiii
Browse files Browse the repository at this point in the history
  • Loading branch information
rushma58 authored Jul 21, 2023
1 parent 7d21479 commit 597af3a
Show file tree
Hide file tree
Showing 12 changed files with 538 additions and 145 deletions.
115 changes: 115 additions & 0 deletions app/src/main/res/layout/activity_add_fuel_refill.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".UpdateServiceDateActivity">

<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="match_parent"
android:orientation="vertical"
android:layout_height="match_parent">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/black"

app:title ="VEHICLE DETAIL UPDATE"
app:titleTextColor="@color/colorBottomBar"
app:titleMarginStart="40dp"/>

<TextView
android:id="@+id/number_plate"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="40dp"
android:layout_marginTop="50dp"
android:layout_marginBottom="20dp"
android:drawableLeft="@drawable/icons8_licence_plate_50"
android:drawablePadding="20dp"
android:text="Number Plate"
android:textSize="20dp"
app:layout_constraintBottom_toTopOf="@+id/brand"
tools:ignore="MissingConstraints" />

<EditText
android:id="@+id/fuel_date"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/number_plate"
android:layout_marginStart="20dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="10dp"
android:layout_marginBottom="10dp"
android:drawableLeft="@drawable/baseline_calendar_month_24"
android:drawablePadding="20dp"
android:hint="Enter your last fuel filled date"
android:padding="20dp"
android:textColor="@color/black"
android:textColorHint="#473F3F"
tools:layout_editor_absoluteX="0dp"
tools:layout_editor_absoluteY="130dp"
android:inputType="date"/>

<EditText
android:id="@+id/fuel_amount"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/number_plate"
android:layout_marginStart="20dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="10dp"
android:layout_marginBottom="10dp"
android:drawableLeft="@drawable/icons8_full_tank_50"
android:drawablePadding="20dp"
android:hint="Filled Amount (in litres)"
android:padding="20dp"
android:textColor="@color/black"
android:textColorHint="#473F3F"
tools:layout_editor_absoluteX="0dp"
tools:layout_editor_absoluteY="130dp"
android:inputType="numberDecimal"/>


<LinearLayout
android:id="@+id/childLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
tools:ignore="MissingConstraints"
tools:layout_editor_absoluteX="0dp"
tools:layout_editor_absoluteY="445dp">

<com.google.android.material.button.MaterialButton
android:id="@+id/btn_update"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_margin="20dp"
android:backgroundTint="@color/black"
android:text="Update Detail"
android:textColor="@color/colorBottomBar" />

<com.google.android.material.button.MaterialButton
android:id="@+id/btn_cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_margin="20dp"
android:backgroundTint="@color/black"
android:text="Cancel"
android:textColor="@color/colorBottomBar" />
</LinearLayout>


</LinearLayout>
</ScrollView>

<include layout="@layout/activity_bottom_navbar"/>

</RelativeLayout>
1 change: 0 additions & 1 deletion app/src/main/res/layout/activity_add_vehicle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
</com.google.android.material.appbar.AppBarLayout>

<com.google.android.material.textfield.TextInputLayout

android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/toolbar"
Expand Down
204 changes: 103 additions & 101 deletions app/src/main/res/layout/activity_bottom_navbar.xml
Original file line number Diff line number Diff line change
@@ -1,102 +1,104 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">

<com.google.android.material.bottomappbar.BottomAppBar
android:id="@+id/bottomAppBar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
app:backgroundTint="@color/colorBottomBar"
app:fabCradleRoundedCornerRadius="16dp"
app:fabAlignmentMode="center"
app:contentInsetLeft="0dp"
app:contentInsetStart="0dp">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center">

<TextView
style="?android:attr/borderlessButtonStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawable="@drawable/baseline_home_24"
android:drawableTop="@drawable/home"
android:gravity="center"
android:orientation="vertical"
android:textAllCaps="false"
android:text="Home">
</TextView>

<TextView
style="?android:attr/borderlessButtonStyle"
android:id="@+id/my_vehicle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawable="@drawable/baseline_directions_car_24"
android:drawableTop="@drawable/my_car"
android:gravity="center"
android:orientation="vertical"
android:textAllCaps="false"
android:text="My Car"
android:textColor="@color/black">
</TextView>

<TextView
android:id="@+id/booking"
style="?android:attr/borderlessButtonStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawable="@drawable/booking"
android:drawableTop="@drawable/booking"
android:gravity="center"
android:orientation="vertical"
android:text="Booking"
android:textAllCaps="false"
android:textColor="@color/black">
</TextView>

<TextView
style="?android:attr/borderlessButtonStyle"
android:id="@+id/services"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawable="@drawable/baseline_build_24"
android:drawableTop="@drawable/services"
android:gravity="center"
android:orientation="vertical"
android:textAllCaps="false"
android:text="Services"
android:textColor="@color/black">
</TextView>

<TextView
style="?android:attr/borderlessButtonStyle"
android:id="@+id/my_profile"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawable="@drawable/baseline_person_24"
android:drawableTop="@drawable/profile"
android:gravity="center"
android:orientation="vertical"
android:textAllCaps="false"
android:text="Profile"
android:textColor="@color/black">
</TextView>

</LinearLayout>

</com.google.android.material.bottomappbar.BottomAppBar>

<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".BottomNavbarActivity">

<com.google.android.material.bottomappbar.BottomAppBar
android:id="@+id/bottomAppBar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
app:backgroundTint="@color/colorBottomBar"
app:fabCradleRoundedCornerRadius="16dp"
app:fabAlignmentMode="center"
app:contentInsetLeft="0dp"
app:contentInsetStart="0dp">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center">

<TextView
style="?android:attr/borderlessButtonStyle"
android:id="@+id/home"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawable="@drawable/baseline_home_24"
android:drawableTop="@drawable/home"
android:gravity="center"
android:orientation="vertical"
android:textAllCaps="false"
android:text="Home">
</TextView>

<TextView
style="?android:attr/borderlessButtonStyle"
android:id="@+id/my_car"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawable="@drawable/baseline_directions_car_24"
android:drawableTop="@drawable/my_car"
android:gravity="center"
android:orientation="vertical"
android:textAllCaps="false"
android:text="My Car"
android:textColor="@color/black">
</TextView>

<TextView
android:id="@+id/booking"
style="?android:attr/borderlessButtonStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawable="@drawable/booking"
android:drawableTop="@drawable/booking"
android:gravity="center"
android:orientation="vertical"
android:text="Booking"
android:textAllCaps="false"
android:textColor="@color/black">
</TextView>

<TextView
style="?android:attr/borderlessButtonStyle"
android:id="@+id/history"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawable="@drawable/baseline_build_24"
android:drawableTop="@drawable/calendar"
android:gravity="center"
android:orientation="vertical"
android:textAllCaps="false"
android:text="History"
android:textColor="@color/black">
</TextView>

<TextView
style="?android:attr/borderlessButtonStyle"
android:id="@+id/profile"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawable="@drawable/baseline_person_24"
android:drawableTop="@drawable/profile"
android:gravity="center"
android:orientation="vertical"
android:textAllCaps="false"
android:text="Profile"
android:textColor="@color/black">
</TextView>

</LinearLayout>

</com.google.android.material.bottomappbar.BottomAppBar>

</androidx.coordinatorlayout.widget.CoordinatorLayout>
16 changes: 16 additions & 0 deletions app/src/main/res/layout/activity_confirm_appointment.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".KhaltiTry">

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_products"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:listitem="@layout/recycler_item"
/>

</LinearLayout>
8 changes: 5 additions & 3 deletions app/src/main/res/layout/activity_my_vehicle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@

<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:layout_above="@+id/bottomAppBar">
<LinearLayout
android:layout_width="match_parent"
android:orientation="vertical"
Expand All @@ -26,7 +27,6 @@
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/black"

app:title ="MY VEHICLE"
app:titleTextColor="@color/colorBottomBar"
app:titleMarginStart="40dp"/>
Expand Down Expand Up @@ -186,6 +186,8 @@
</LinearLayout>
</ScrollView>

<include layout="@layout/activity_bottom_navbar"/>
<include
android:id="@+id/bottomAppBar"
layout="@layout/activity_bottom_navbar" />

</androidx.coordinatorlayout.widget.CoordinatorLayout>
Loading

0 comments on commit 597af3a

Please sign in to comment.