From 60f537d9862b0e9ac4b122bd80faf2530fb41895 Mon Sep 17 00:00:00 2001 From: AnKiTk203 Date: Thu, 11 Jan 2024 08:47:04 +0530 Subject: [PATCH 01/28] Branch Push --- .idea/misc.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 0ad17cb..8978d23 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,3 @@ - From 46773f7f870d7e79526f961bc0063ea43cdb81ef Mon Sep 17 00:00:00 2001 From: AnKiTk203 Date: Thu, 11 Jan 2024 08:47:43 +0530 Subject: [PATCH 02/28] Branch Push --- .idea/gradle.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 6d89050..0897082 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -1,18 +1,18 @@ + From 361530fc6623ba489a8c6b5b83a6cdefab79a6f4 Mon Sep 17 00:00:00 2001 From: AnKiTk203 Date: Thu, 11 Jan 2024 08:57:39 +0530 Subject: [PATCH 03/28] Hello --- .idea/deploymentTargetDropDown.xml | 10 ++++++++++ .idea/migrations.xml | 10 ++++++++++ 2 files changed, 20 insertions(+) create mode 100644 .idea/deploymentTargetDropDown.xml create mode 100644 .idea/migrations.xml diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml new file mode 100644 index 0000000..0c0c338 --- /dev/null +++ b/.idea/deploymentTargetDropDown.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/migrations.xml b/.idea/migrations.xml new file mode 100644 index 0000000..f8051a6 --- /dev/null +++ b/.idea/migrations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file From bb1c615544a960e765e424369217905d358420a7 Mon Sep 17 00:00:00 2001 From: AnKiTk203 Date: Mon, 15 Jan 2024 19:47:36 +0530 Subject: [PATCH 04/28] Branch Push --- app/build.gradle.kts | 6 +- app/src/main/AndroidManifest.xml | 2 +- ...MainActivity.kt => UserProfileActivity.kt} | 5 +- .../userprofile/AddressFragment.kt | 60 ++++++++ .../userprofile/EditProfileFragment.kt | 60 ++++++++ .../userprofile/LocationFragment.kt | 60 ++++++++ .../userprofile/ProfileListFragment.kt | 60 ++++++++ app/src/main/res/drawable/feedback.xml | 9 ++ app/src/main/res/drawable/ic_orders.xml | 9 ++ app/src/main/res/drawable/ic_ratings.xml | 9 ++ app/src/main/res/drawable/info.xml | 9 ++ app/src/main/res/drawable/location.xml | 9 ++ app/src/main/res/drawable/settings.xml | 9 ++ app/src/main/res/drawable/user.xml | 12 ++ app/src/main/res/drawable/wallet.xml | 9 ++ app/src/main/res/layout/activity_main.xml | 9 -- .../main/res/layout/activity_user_profile.xml | 17 +++ app/src/main/res/layout/fragment_address.xml | 14 ++ .../main/res/layout/fragment_edit_profile.xml | 14 ++ app/src/main/res/layout/fragment_location.xml | 14 ++ .../main/res/layout/fragment_profile_list.xml | 142 ++++++++++++++++++ app/src/main/res/menu/bottom_menue.xml | 26 ++++ app/src/main/res/values/colors.xml | 42 ++++++ app/src/main/res/values/strings.xml | 2 + 24 files changed, 593 insertions(+), 15 deletions(-) rename app/src/main/java/com/example/deliveryapp/{MainActivity.kt => UserProfileActivity.kt} (66%) create mode 100644 app/src/main/java/com/example/deliveryapp/userprofile/AddressFragment.kt create mode 100644 app/src/main/java/com/example/deliveryapp/userprofile/EditProfileFragment.kt create mode 100644 app/src/main/java/com/example/deliveryapp/userprofile/LocationFragment.kt create mode 100644 app/src/main/java/com/example/deliveryapp/userprofile/ProfileListFragment.kt create mode 100644 app/src/main/res/drawable/feedback.xml create mode 100644 app/src/main/res/drawable/ic_orders.xml create mode 100644 app/src/main/res/drawable/ic_ratings.xml create mode 100644 app/src/main/res/drawable/info.xml create mode 100644 app/src/main/res/drawable/location.xml create mode 100644 app/src/main/res/drawable/settings.xml create mode 100644 app/src/main/res/drawable/user.xml create mode 100644 app/src/main/res/drawable/wallet.xml delete mode 100644 app/src/main/res/layout/activity_main.xml create mode 100644 app/src/main/res/layout/activity_user_profile.xml create mode 100644 app/src/main/res/layout/fragment_address.xml create mode 100644 app/src/main/res/layout/fragment_edit_profile.xml create mode 100644 app/src/main/res/layout/fragment_location.xml create mode 100644 app/src/main/res/layout/fragment_profile_list.xml create mode 100644 app/src/main/res/menu/bottom_menue.xml diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 8320cea..f14c1a2 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -6,7 +6,7 @@ plugins { android { namespace = "com.example.deliveryapp" - compileSdk = 33 + compileSdk = 34 defaultConfig { applicationId = "com.example.deliveryapp" @@ -38,9 +38,9 @@ android { dependencies { - implementation("androidx.core:core-ktx:1.9.0") + implementation("androidx.core:core-ktx:1.12.0") implementation("androidx.appcompat:appcompat:1.6.1") - implementation("com.google.android.material:material:1.9.0") + implementation("com.google.android.material:material:1.11.0") implementation("androidx.constraintlayout:constraintlayout:2.1.4") testImplementation("junit:junit:4.13.2") androidTestImplementation("androidx.test.ext:junit:1.1.5") diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 84e0cfa..edb93b6 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -13,7 +13,7 @@ android:theme="@style/Theme.DeliveryApp" tools:targetApi="31"> diff --git a/app/src/main/java/com/example/deliveryapp/MainActivity.kt b/app/src/main/java/com/example/deliveryapp/UserProfileActivity.kt similarity index 66% rename from app/src/main/java/com/example/deliveryapp/MainActivity.kt rename to app/src/main/java/com/example/deliveryapp/UserProfileActivity.kt index 1c4a4bf..837f994 100644 --- a/app/src/main/java/com/example/deliveryapp/MainActivity.kt +++ b/app/src/main/java/com/example/deliveryapp/UserProfileActivity.kt @@ -3,9 +3,10 @@ package com.example.deliveryapp import androidx.appcompat.app.AppCompatActivity import android.os.Bundle -class MainActivity : AppCompatActivity() { +class UserProfileActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setContentView(R.layout.activity_main) + setContentView(R.layout.activity_user_profile) + } } \ No newline at end of file diff --git a/app/src/main/java/com/example/deliveryapp/userprofile/AddressFragment.kt b/app/src/main/java/com/example/deliveryapp/userprofile/AddressFragment.kt new file mode 100644 index 0000000..82c9bba --- /dev/null +++ b/app/src/main/java/com/example/deliveryapp/userprofile/AddressFragment.kt @@ -0,0 +1,60 @@ +package com.example.deliveryapp.userprofile + +import android.os.Bundle +import androidx.fragment.app.Fragment +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import com.example.deliveryapp.R + +// TODO: Rename parameter arguments, choose names that match +// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER +private const val ARG_PARAM1 = "param1" +private const val ARG_PARAM2 = "param2" + +/** + * A simple [Fragment] subclass. + * Use the [AddressFragment.newInstance] factory method to + * create an instance of this fragment. + */ +class AddressFragment : Fragment() { + // TODO: Rename and change types of parameters + private var param1: String? = null + private var param2: String? = null + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + arguments?.let { + param1 = it.getString(ARG_PARAM1) + param2 = it.getString(ARG_PARAM2) + } + } + + 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) + } + + companion object { + /** + * Use this factory method to create a new instance of + * this fragment using the provided parameters. + * + * @param param1 Parameter 1. + * @param param2 Parameter 2. + * @return A new instance of fragment AddressFragment. + */ + // TODO: Rename and change types and number of parameters + @JvmStatic + fun newInstance(param1: String, param2: String) = + AddressFragment().apply { + arguments = Bundle().apply { + putString(ARG_PARAM1, param1) + putString(ARG_PARAM2, param2) + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/deliveryapp/userprofile/EditProfileFragment.kt b/app/src/main/java/com/example/deliveryapp/userprofile/EditProfileFragment.kt new file mode 100644 index 0000000..bbbe8a6 --- /dev/null +++ b/app/src/main/java/com/example/deliveryapp/userprofile/EditProfileFragment.kt @@ -0,0 +1,60 @@ +package com.example.deliveryapp.userprofile + +import android.os.Bundle +import androidx.fragment.app.Fragment +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import com.example.deliveryapp.R + +// TODO: Rename parameter arguments, choose names that match +// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER +private const val ARG_PARAM1 = "param1" +private const val ARG_PARAM2 = "param2" + +/** + * A simple [Fragment] subclass. + * Use the [EditProfileFragment.newInstance] factory method to + * create an instance of this fragment. + */ +class EditProfileFragment : Fragment() { + // TODO: Rename and change types of parameters + private var param1: String? = null + private var param2: String? = null + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + arguments?.let { + param1 = it.getString(ARG_PARAM1) + param2 = it.getString(ARG_PARAM2) + } + } + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + // Inflate the layout for this fragment + return inflater.inflate(R.layout.fragment_edit_profile, container, false) + } + + companion object { + /** + * Use this factory method to create a new instance of + * this fragment using the provided parameters. + * + * @param param1 Parameter 1. + * @param param2 Parameter 2. + * @return A new instance of fragment EditProfileFragment. + */ + // TODO: Rename and change types and number of parameters + @JvmStatic + fun newInstance(param1: String, param2: String) = + EditProfileFragment().apply { + arguments = Bundle().apply { + putString(ARG_PARAM1, param1) + putString(ARG_PARAM2, param2) + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/deliveryapp/userprofile/LocationFragment.kt b/app/src/main/java/com/example/deliveryapp/userprofile/LocationFragment.kt new file mode 100644 index 0000000..38b4c36 --- /dev/null +++ b/app/src/main/java/com/example/deliveryapp/userprofile/LocationFragment.kt @@ -0,0 +1,60 @@ +package com.example.deliveryapp.userprofile + +import android.os.Bundle +import androidx.fragment.app.Fragment +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import com.example.deliveryapp.R + +// TODO: Rename parameter arguments, choose names that match +// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER +private const val ARG_PARAM1 = "param1" +private const val ARG_PARAM2 = "param2" + +/** + * A simple [Fragment] subclass. + * Use the [LocationFragment.newInstance] factory method to + * create an instance of this fragment. + */ +class LocationFragment : Fragment() { + // TODO: Rename and change types of parameters + private var param1: String? = null + private var param2: String? = null + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + arguments?.let { + param1 = it.getString(ARG_PARAM1) + param2 = it.getString(ARG_PARAM2) + } + } + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + // Inflate the layout for this fragment + return inflater.inflate(R.layout.fragment_location, container, false) + } + + companion object { + /** + * Use this factory method to create a new instance of + * this fragment using the provided parameters. + * + * @param param1 Parameter 1. + * @param param2 Parameter 2. + * @return A new instance of fragment LocationFragment. + */ + // TODO: Rename and change types and number of parameters + @JvmStatic + fun newInstance(param1: String, param2: String) = + LocationFragment().apply { + arguments = Bundle().apply { + putString(ARG_PARAM1, param1) + putString(ARG_PARAM2, param2) + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/deliveryapp/userprofile/ProfileListFragment.kt b/app/src/main/java/com/example/deliveryapp/userprofile/ProfileListFragment.kt new file mode 100644 index 0000000..b1ea58d --- /dev/null +++ b/app/src/main/java/com/example/deliveryapp/userprofile/ProfileListFragment.kt @@ -0,0 +1,60 @@ +package com.example.deliveryapp.userprofile + +import android.os.Bundle +import androidx.fragment.app.Fragment +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import com.example.deliveryapp.R + +// TODO: Rename parameter arguments, choose names that match +// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER +private const val ARG_PARAM1 = "param1" +private const val ARG_PARAM2 = "param2" + +/** + * A simple [Fragment] subclass. + * Use the [ProfileListFragment.newInstance] factory method to + * create an instance of this fragment. + */ +class ProfileListFragment : Fragment() { + // TODO: Rename and change types of parameters + private var param1: String? = null + private var param2: String? = null + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + arguments?.let { + param1 = it.getString(ARG_PARAM1) + param2 = it.getString(ARG_PARAM2) + } + } + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + // Inflate the layout for this fragment + return inflater.inflate(R.layout.fragment_profile_list, container, false) + } + + companion object { + /** + * Use this factory method to create a new instance of + * this fragment using the provided parameters. + * + * @param param1 Parameter 1. + * @param param2 Parameter 2. + * @return A new instance of fragment ProfileListFragment. + */ + // TODO: Rename and change types and number of parameters + @JvmStatic + fun newInstance(param1: String, param2: String) = + ProfileListFragment().apply { + arguments = Bundle().apply { + putString(ARG_PARAM1, param1) + putString(ARG_PARAM2, param2) + } + } + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/feedback.xml b/app/src/main/res/drawable/feedback.xml new file mode 100644 index 0000000..6269336 --- /dev/null +++ b/app/src/main/res/drawable/feedback.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_orders.xml b/app/src/main/res/drawable/ic_orders.xml new file mode 100644 index 0000000..107c690 --- /dev/null +++ b/app/src/main/res/drawable/ic_orders.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_ratings.xml b/app/src/main/res/drawable/ic_ratings.xml new file mode 100644 index 0000000..1ac36d9 --- /dev/null +++ b/app/src/main/res/drawable/ic_ratings.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/info.xml b/app/src/main/res/drawable/info.xml new file mode 100644 index 0000000..66c9a71 --- /dev/null +++ b/app/src/main/res/drawable/info.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/location.xml b/app/src/main/res/drawable/location.xml new file mode 100644 index 0000000..165799b --- /dev/null +++ b/app/src/main/res/drawable/location.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/settings.xml b/app/src/main/res/drawable/settings.xml new file mode 100644 index 0000000..fc8e3b7 --- /dev/null +++ b/app/src/main/res/drawable/settings.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/user.xml b/app/src/main/res/drawable/user.xml new file mode 100644 index 0000000..4cad0d5 --- /dev/null +++ b/app/src/main/res/drawable/user.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/wallet.xml b/app/src/main/res/drawable/wallet.xml new file mode 100644 index 0000000..e40e374 --- /dev/null +++ b/app/src/main/res/drawable/wallet.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml deleted file mode 100644 index 6efd9ce..0000000 --- a/app/src/main/res/layout/activity_main.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_user_profile.xml b/app/src/main/res/layout/activity_user_profile.xml new file mode 100644 index 0000000..c466c4a --- /dev/null +++ b/app/src/main/res/layout/activity_user_profile.xml @@ -0,0 +1,17 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_address.xml b/app/src/main/res/layout/fragment_address.xml new file mode 100644 index 0000000..ae57c61 --- /dev/null +++ b/app/src/main/res/layout/fragment_address.xml @@ -0,0 +1,14 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_edit_profile.xml b/app/src/main/res/layout/fragment_edit_profile.xml new file mode 100644 index 0000000..449f75c --- /dev/null +++ b/app/src/main/res/layout/fragment_edit_profile.xml @@ -0,0 +1,14 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_location.xml b/app/src/main/res/layout/fragment_location.xml new file mode 100644 index 0000000..b573ae2 --- /dev/null +++ b/app/src/main/res/layout/fragment_location.xml @@ -0,0 +1,14 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_profile_list.xml b/app/src/main/res/layout/fragment_profile_list.xml new file mode 100644 index 0000000..ad21cf1 --- /dev/null +++ b/app/src/main/res/layout/fragment_profile_list.xml @@ -0,0 +1,142 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/bottom_menue.xml b/app/src/main/res/menu/bottom_menue.xml new file mode 100644 index 0000000..2da3294 --- /dev/null +++ b/app/src/main/res/menu/bottom_menue.xml @@ -0,0 +1,26 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index c8524cd..0768a55 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -2,4 +2,46 @@ #FF000000 #FFFFFFFF + #FF000000 + #FFFFFF + + #D32F2F + #F44336 + #EF5350 + + + #01579B + #2196F3 + #03A9F4 + + + #388E3C + #4CAF50 + #81C784 + + + #FBC02D + #FFEB3B + #FFF176 + + + #512DA8 + #673AB7 + #9575CD + + + #E64A19 + #F17A2E + #FFB74D + + + #424242 + #757575 + #BDBDBD + + + #5D4037 + #795548 + #A1887F + #C0C0C0 \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7a015f2..ba10265 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,3 +1,5 @@ Delivery App + + Hello blank fragment \ No newline at end of file From cad3d9ef8646430183c48c890b227bc00692a6ab Mon Sep 17 00:00:00 2001 From: AnKiTk203 Date: Mon, 15 Jan 2024 19:54:13 +0530 Subject: [PATCH 05/28] Branch Push --- app/src/main/res/layout/activity_user_profile.xml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/layout/activity_user_profile.xml b/app/src/main/res/layout/activity_user_profile.xml index c466c4a..18a5110 100644 --- a/app/src/main/res/layout/activity_user_profile.xml +++ b/app/src/main/res/layout/activity_user_profile.xml @@ -7,11 +7,19 @@ tools:context=".UserProfileActivity"> - + android:layout_height="match_parent" + app:layout_constraintBottom_toTopOf="@id/bvNavBar" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintLeft_toLeftOf="parent"> + android:layout_height="wrap_content" + app:menu="@menu/bottom_menue" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintBottom_toBottomOf="parent"/> \ No newline at end of file From 9658f5dcaa9f74db7b81a6f933cd93389db2abee Mon Sep 17 00:00:00 2001 From: AnKiTk203 Date: Wed, 24 Jan 2024 03:52:54 +0530 Subject: [PATCH 06/28] Updating --- .../deliveryapp/UserProfileActivity.kt | 11 +- app/src/main/res/color/navbar_color.xml | 5 + .../res/drawable/bottom_nav_bar_layout.xml | 5 + .../main/res/drawable/cart_navbar_icon.xml | 5 + .../main/res/drawable/home_navbar_icon.xml | 9 + app/src/main/res/drawable/logout_icon.xml | 12 + .../main/res/drawable/profile_navbar_icon.xml | 9 + .../main/res/drawable/search_navbar_icon.xml | 9 + .../main/res/layout/activity_user_profile.xml | 8 +- .../main/res/layout/fragment_profile_list.xml | 311 +++++++++++------- app/src/main/res/menu/bottom_menue.xml | 1 - 11 files changed, 254 insertions(+), 131 deletions(-) create mode 100644 app/src/main/res/color/navbar_color.xml create mode 100644 app/src/main/res/drawable/bottom_nav_bar_layout.xml create mode 100644 app/src/main/res/drawable/cart_navbar_icon.xml create mode 100644 app/src/main/res/drawable/home_navbar_icon.xml create mode 100644 app/src/main/res/drawable/logout_icon.xml create mode 100644 app/src/main/res/drawable/profile_navbar_icon.xml create mode 100644 app/src/main/res/drawable/search_navbar_icon.xml diff --git a/app/src/main/java/com/example/deliveryapp/UserProfileActivity.kt b/app/src/main/java/com/example/deliveryapp/UserProfileActivity.kt index 837f994..a0863ca 100644 --- a/app/src/main/java/com/example/deliveryapp/UserProfileActivity.kt +++ b/app/src/main/java/com/example/deliveryapp/UserProfileActivity.kt @@ -1,12 +1,21 @@ package com.example.deliveryapp -import androidx.appcompat.app.AppCompatActivity + import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity +import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentTransaction +import com.example.deliveryapp.userprofile.ProfileListFragment + class UserProfileActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_user_profile) + val fragmentManager: FragmentManager = supportFragmentManager + val fragmentTransaction: FragmentTransaction = fragmentManager.beginTransaction() + fragmentTransaction.replace(R.id.fvFragment, ProfileListFragment()) + fragmentTransaction.commit() } } \ No newline at end of file diff --git a/app/src/main/res/color/navbar_color.xml b/app/src/main/res/color/navbar_color.xml new file mode 100644 index 0000000..e5b1da2 --- /dev/null +++ b/app/src/main/res/color/navbar_color.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bottom_nav_bar_layout.xml b/app/src/main/res/drawable/bottom_nav_bar_layout.xml new file mode 100644 index 0000000..33d803f --- /dev/null +++ b/app/src/main/res/drawable/bottom_nav_bar_layout.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/cart_navbar_icon.xml b/app/src/main/res/drawable/cart_navbar_icon.xml new file mode 100644 index 0000000..6e3a32b --- /dev/null +++ b/app/src/main/res/drawable/cart_navbar_icon.xml @@ -0,0 +1,5 @@ + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/home_navbar_icon.xml b/app/src/main/res/drawable/home_navbar_icon.xml new file mode 100644 index 0000000..43e2cf2 --- /dev/null +++ b/app/src/main/res/drawable/home_navbar_icon.xml @@ -0,0 +1,9 @@ + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/logout_icon.xml b/app/src/main/res/drawable/logout_icon.xml new file mode 100644 index 0000000..4499d9a --- /dev/null +++ b/app/src/main/res/drawable/logout_icon.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/profile_navbar_icon.xml b/app/src/main/res/drawable/profile_navbar_icon.xml new file mode 100644 index 0000000..5629c43 --- /dev/null +++ b/app/src/main/res/drawable/profile_navbar_icon.xml @@ -0,0 +1,9 @@ + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/search_navbar_icon.xml b/app/src/main/res/drawable/search_navbar_icon.xml new file mode 100644 index 0000000..bdceba9 --- /dev/null +++ b/app/src/main/res/drawable/search_navbar_icon.xml @@ -0,0 +1,9 @@ + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_user_profile.xml b/app/src/main/res/layout/activity_user_profile.xml index 18a5110..5569ba1 100644 --- a/app/src/main/res/layout/activity_user_profile.xml +++ b/app/src/main/res/layout/activity_user_profile.xml @@ -6,17 +6,23 @@ android:layout_height="match_parent" tools:context=".UserProfileActivity"> + app:layout_constraintLeft_toLeftOf="parent" + tools:layout="@layout/fragment_profile_list"> - - - - - - - - - - - - - - + app:cardElevation="30000dp" + android:layout_marginTop="120dp"> + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/bottom_menue.xml b/app/src/main/res/menu/bottom_menue.xml index 2da3294..5351fb7 100644 --- a/app/src/main/res/menu/bottom_menue.xml +++ b/app/src/main/res/menu/bottom_menue.xml @@ -5,7 +5,6 @@ android:title="Home" android:icon="@drawable/home_navbar_icon" /> - Date: Wed, 24 Jan 2024 03:54:49 +0530 Subject: [PATCH 07/28] Updating --- app/src/main/res/layout/activity_user_profile.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/layout/activity_user_profile.xml b/app/src/main/res/layout/activity_user_profile.xml index 5569ba1..aabb163 100644 --- a/app/src/main/res/layout/activity_user_profile.xml +++ b/app/src/main/res/layout/activity_user_profile.xml @@ -18,7 +18,7 @@ Date: Thu, 1 Feb 2024 05:20:45 +0530 Subject: [PATCH 08/28] Updating --- app/build.gradle.kts | 2 +- .../deliveryapp/UserProfileActivity.kt | 2 +- .../main/res/drawable/baseline_call_24.xml | 5 + .../res/drawable/baseline_chevron_left_24.xml | 5 + app/src/main/res/drawable/circle.xml | 24 ++ app/src/main/res/drawable/email.xml | 12 + .../main/res/drawable/rounded_back_button.xml | 5 + .../main/res/layout/fragment_edit_profile.xml | 218 +++++++++++++++++- app/src/main/res/values/strings.xml | 6 + 9 files changed, 273 insertions(+), 6 deletions(-) create mode 100644 app/src/main/res/drawable/baseline_call_24.xml create mode 100644 app/src/main/res/drawable/baseline_chevron_left_24.xml create mode 100644 app/src/main/res/drawable/circle.xml create mode 100644 app/src/main/res/drawable/email.xml create mode 100644 app/src/main/res/drawable/rounded_back_button.xml diff --git a/app/build.gradle.kts b/app/build.gradle.kts index f14c1a2..f223698 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -47,5 +47,5 @@ dependencies { androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") implementation(platform("com.google.firebase:firebase-bom:32.7.0")) implementation("com.google.firebase:firebase-analytics") - + implementation ("androidx.appcompat:appcompat:1.6.1") } \ No newline at end of file diff --git a/app/src/main/java/com/example/deliveryapp/UserProfileActivity.kt b/app/src/main/java/com/example/deliveryapp/UserProfileActivity.kt index a0863ca..11ce2ca 100644 --- a/app/src/main/java/com/example/deliveryapp/UserProfileActivity.kt +++ b/app/src/main/java/com/example/deliveryapp/UserProfileActivity.kt @@ -5,6 +5,7 @@ import android.os.Bundle import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentTransaction +import com.example.deliveryapp.userprofile.EditProfileFragment import com.example.deliveryapp.userprofile.ProfileListFragment @@ -16,6 +17,5 @@ class UserProfileActivity : AppCompatActivity() { val fragmentTransaction: FragmentTransaction = fragmentManager.beginTransaction() fragmentTransaction.replace(R.id.fvFragment, ProfileListFragment()) fragmentTransaction.commit() - } } \ No newline at end of file diff --git a/app/src/main/res/drawable/baseline_call_24.xml b/app/src/main/res/drawable/baseline_call_24.xml new file mode 100644 index 0000000..55b8393 --- /dev/null +++ b/app/src/main/res/drawable/baseline_call_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/baseline_chevron_left_24.xml b/app/src/main/res/drawable/baseline_chevron_left_24.xml new file mode 100644 index 0000000..50d628d --- /dev/null +++ b/app/src/main/res/drawable/baseline_chevron_left_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/circle.xml b/app/src/main/res/drawable/circle.xml new file mode 100644 index 0000000..33a618f --- /dev/null +++ b/app/src/main/res/drawable/circle.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/email.xml b/app/src/main/res/drawable/email.xml new file mode 100644 index 0000000..0fb6db5 --- /dev/null +++ b/app/src/main/res/drawable/email.xml @@ -0,0 +1,12 @@ + + + diff --git a/app/src/main/res/drawable/rounded_back_button.xml b/app/src/main/res/drawable/rounded_back_button.xml new file mode 100644 index 0000000..ffd9b19 --- /dev/null +++ b/app/src/main/res/drawable/rounded_back_button.xml @@ -0,0 +1,5 @@ + + + + diff --git a/app/src/main/res/layout/fragment_edit_profile.xml b/app/src/main/res/layout/fragment_edit_profile.xml index 449f75c..4695369 100644 --- a/app/src/main/res/layout/fragment_edit_profile.xml +++ b/app/src/main/res/layout/fragment_edit_profile.xml @@ -1,14 +1,224 @@ - - + android:layout_height="match_parent"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +