commit

Sevayu01 · Apr 1, 2023 · ac53f87 · ac53f87
1 parent 20f0fae
commit ac53f87
Show file tree

Hide file tree

Showing 15 changed files with 549 additions and 14 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -2,9 +2,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.example.sevayu">
+
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.INTERNET" />
 
     <application
         android:name=".SevayuApplication"
@@ -18,25 +19,28 @@
         android:theme="@style/Theme.AppCompat.DayNight.NoActionBar"
         tools:targetApi="31">
         <activity
-            android:name=".ui.splashScreen.splashActivity"
+            android:name=".ui.Authentication.AuthActivity"
             android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
+        </activity>
+        <activity
+            android:name=".ui.splashScreen.splashActivity"
+            android:exported="false">
 
         </activity>
         <activity
             android:name=".ui.otp.otpActivity"
             android:exported="false"
-            android:theme="@style/Theme.AppCompat.DayNight.NoActionBar"/>
+            android:theme="@style/Theme.AppCompat.DayNight.NoActionBar" />
         <activity
             android:name=".ui.Main.MainActivity"
-            android:exported="false"
+            android:exported="true"
             android:theme="@style/Theme.AppCompat.DayNight.NoActionBar">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
 
-
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
         </activity>
     </application>
 

diff --git a/app/src/main/java/com/example/sevayu/ui/Authentication/AuthActivity.kt b/app/src/main/java/com/example/sevayu/ui/Authentication/AuthActivity.kt
@@ -0,0 +1,18 @@
+package com.example.sevayu.ui.Authentication
+
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import androidx.navigation.findNavController
+import com.example.sevayu.R
+import com.example.sevayu.databinding.ActivityAuthBinding
+import com.example.sevayu.ui.Authentication.authFragments.LoginFragment
+
+class AuthActivity : AppCompatActivity() {
+    var binding : ActivityAuthBinding ?= null
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = ActivityAuthBinding.inflate(layoutInflater)
+        setContentView(binding?.root)
+
+    }
+}
diff --git a/app/src/main/java/com/example/sevayu/ui/Authentication/authFragments/AddressFragment.kt b/app/src/main/java/com/example/sevayu/ui/Authentication/authFragments/AddressFragment.kt
@@ -0,0 +1,20 @@
+package com.example.sevayu.ui.Authentication.authFragments
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.example.sevayu.R
+
+class AddressFragment : Fragment() {
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        // Inflate the layout for this fragment
+        return inflater.inflate(R.layout.fragment_address, container, false)
+    }
+
+}
diff --git a/app/src/main/java/com/example/sevayu/ui/Authentication/authFragments/LoginFragment.kt b/app/src/main/java/com/example/sevayu/ui/Authentication/authFragments/LoginFragment.kt
@@ -0,0 +1,30 @@
+package com.example.sevayu.ui.Authentication.authFragments
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.navigation.fragment.findNavController
+import com.example.sevayu.R
+import com.example.sevayu.databinding.FragmentLoginBinding
+
+class LoginFragment : Fragment() {
+
+    var binding : FragmentLoginBinding ?= null
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        binding = FragmentLoginBinding.inflate(layoutInflater)
+
+        binding?.createAccount?.setOnClickListener {
+            findNavController().navigate(R.id.action_loginFragment_to_registerFragment)
+        }
+
+
+        return binding?.root
+    }
+
+}
diff --git a/app/src/main/java/com/example/sevayu/ui/Authentication/authFragments/RegisterFragment.kt b/app/src/main/java/com/example/sevayu/ui/Authentication/authFragments/RegisterFragment.kt
@@ -0,0 +1,28 @@
+package com.example.sevayu.ui.Authentication.authFragments
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.navigation.fragment.findNavController
+import com.example.sevayu.R
+import com.example.sevayu.databinding.FragmentRegisterBinding
+
+class RegisterFragment : Fragment() {
+
+    var binding : FragmentRegisterBinding ?= null
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        binding = FragmentRegisterBinding.inflate(layoutInflater)
+
+        binding?.goToLogin?.setOnClickListener {
+            findNavController().navigate(R.id.action_registerFragment_to_loginFragment)
+        }
+
+        return binding?.root
+    }
+}
diff --git a/app/src/main/java/com/example/sevayu/ui/Main/fragments/AppointmentFinalFragment.kt b/app/src/main/java/com/example/sevayu/ui/Main/fragments/AppointmentFinalFragment.kt
@@ -15,10 +15,8 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
-import android.widget.RemoteViews
-import androidx.core.content.ContextCompat.getSystemService
-import com.example.sevayu.MainActivity
 import com.example.sevayu.R
+import com.example.sevayu.ui.Main.MainActivity
 
 class AppointmentFinalFragment : Fragment() {
     lateinit var notificationManager: NotificationManager

diff --git a/app/src/main/res/drawable/ic_email.xml b/app/src/main/res/drawable/ic_email.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FF008A"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM20,8l-8,5 -8,-5L4,6l8,5 8,-5v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FF008A"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_person_24.xml b/app/src/main/res/drawable/ic_person_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FF008A"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_auth.xml b/app/src/main/res/layout/activity_auth.xml
@@ -0,0 +1,46 @@
+<?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"
+    android:orientation="vertical"
+    tools:context=".ui.Authentication.AuthActivity">
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="0.8"/>
+
+
+    <ImageView
+        android:id="@+id/sevayu_logo"
+        android:layout_width="122dp"
+        android:layout_height="0dp"
+        android:layout_weight="2"
+        android:layout_gravity="center"
+        app:srcCompat="@drawable/sevayu_logo_asset" />
+
+    <TextView
+        android:id="@+id/sevayu_title"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:text="Sevayu"
+        android:layout_marginEnd="5dp"
+        android:layout_gravity="center"
+        android:textColor="@color/black"
+        android:textSize="25sp"
+        android:textStyle="bold" />
+
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/fragmentContainerView"
+        android:name="androidx.navigation.fragment.NavHostFragment"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:defaultNavHost="true"
+        android:layout_weight="8"
+        app:navGraph="@navigation/auth_nav_graph" />
+
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_address.xml b/app/src/main/res/layout/fragment_address.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout 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=".ui.Authentication.authFragments.AddressFragment">
+
+
+    <TextView
+        android:id="@+id/addAddress"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="146dp"
+        android:layout_marginEnd="178dp"
+        android:text="Add Address"
+        android:textColor="@color/black"
+        android:textSize="25sp"
+        android:textStyle="bold"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <androidx.appcompat.widget.AppCompatEditText
+        android:id="@+id/etLocality"
+        android:layout_width="match_parent"
+        android:layout_height="40sp"
+        android:layout_marginTop="57dp"
+        android:background="@drawable/edit_button_border"
+        android:drawableStart="@drawable/ic_person_24"
+        android:drawablePadding="25dp"
+        android:hint="Locality"
+        android:inputType="text"
+        android:textSize="25sp"
+        android:layout_marginEnd="36dp"
+        android:layout_marginStart="36dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/addAddress" />
+
+    <androidx.appcompat.widget.AppCompatEditText
+        android:id="@+id/etCity"
+        android:layout_width="match_parent"
+        android:layout_height="40sp"
+        android:layout_marginTop="47dp"
+        android:background="@drawable/edit_button_border"
+        android:drawableStart="@drawable/ic_email"
+        android:drawablePadding="25dp"
+        android:hint="City"
+        android:inputType="text"
+        android:textSize="25sp"
+        android:layout_marginEnd="36dp"
+        android:layout_marginStart="36dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/etLocality" />
+
+    <androidx.appcompat.widget.AppCompatEditText
+        android:id="@+id/etState"
+        android:layout_width="match_parent"
+        android:layout_height="40sp"
+        android:layout_marginTop="55dp"
+        android:background="@drawable/edit_button_border"
+        android:drawableStart="@drawable/ic_lock"
+        android:drawablePadding="25dp"
+        android:hint="State"
+        android:inputType="text"
+        android:textSize="25sp"
+        android:layout_marginEnd="36dp"
+        android:layout_marginStart="36dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/etCity" />
+
+    <androidx.appcompat.widget.AppCompatEditText
+        android:id="@+id/etZipCode"
+        android:layout_width="match_parent"
+        android:layout_height="40sp"
+        android:layout_marginTop="45dp"
+        android:background="@drawable/edit_button_border"
+        android:drawableStart="@drawable/ic_lock"
+        android:drawablePadding="25dp"
+        android:hint="ZipCode"
+        android:inputType="text"
+        android:textSize="25sp"
+        android:layout_marginEnd="36dp"
+        android:layout_marginStart="36dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/etState" />
+
+    <Button
+        android:id="@+id/AddBtn"
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        android:layout_marginStart="36dp"
+        android:layout_marginTop="48dp"
+        android:layout_marginEnd="36dp"
+        android:layout_marginBottom="79dp"
+        android:background="@drawable/acrivity_card_design"
+        android:text="Add"
+        android:textColor="@color/white"
+        android:textSize="18sp"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/etZipCode"
+        app:layout_constraintVertical_bias="0.0" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>