Skip to content

Commit 26238eb

Browse files
author
DESKTOP-1G1DSBK\kentkart
committed
user done. room needed
1 parent 96ea62c commit 26238eb

12 files changed

+354
-65
lines changed

‎.idea/deploymentTargetDropDown.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/misc.xml

+3-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/src/main/java/com/mb/fooddelivery/ui/user/UserFragment.kt

+37-1
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,14 @@ import androidx.fragment.app.Fragment
66
import android.view.LayoutInflater
77
import android.view.View
88
import android.view.ViewGroup
9+
import android.widget.Toast
910
import androidx.fragment.app.viewModels
11+
import androidx.navigation.fragment.findNavController
12+
import com.bumptech.glide.Glide
13+
import com.mb.fooddelivery.R
1014
import com.mb.fooddelivery.databinding.FragmentUserBinding
1115
import com.mb.fooddelivery.model.data.user.UserBody
16+
import com.mb.fooddelivery.model.data.user.UserRequest
1217
import com.mb.fooddelivery.utils.Resource
1318
import dagger.hilt.android.AndroidEntryPoint
1419

@@ -29,7 +34,32 @@ class UserFragment : Fragment() {
2934
super.onViewCreated(view, savedInstanceState)
3035

3136
getUser()
37+
binding.updateBtn.setOnClickListener {
38+
updateUser()
39+
}
40+
}
41+
42+
private fun updateUser() {
43+
binding.apply {
44+
val name = outlinedTextField.editText?.text.toString()
45+
val surname = outlinedsurname.editText?.text.toString()
46+
val email = outlinedemail.editText?.text.toString()
47+
val addres = outlineAdress.editText?.text.toString()
48+
val username = outlinedusername.editText?.text.toString()
49+
val password = outlinepassword.editText?.text.toString()
50+
val phone = outlinePhone.editText?.text.toString()
51+
val user = UserRequest(name,surname,email,username,password,addres,phone)
52+
53+
viewModel.editUserSettings(user).observe(viewLifecycleOwner,{
3254

55+
when(it.status){
56+
Resource.Status.SUCCESS ->{
57+
Toast.makeText(requireContext(),"Updated!",Toast.LENGTH_SHORT).show()
58+
findNavController().navigate(R.id.global_home)
59+
}
60+
}
61+
})
62+
}
3363
}
3464

3565
private fun getUser() {
@@ -43,7 +73,13 @@ class UserFragment : Fragment() {
4373
private fun onSucces(responseBody: UserBody) {
4474
binding.apply {
4575
//TODO
46-
Log.i("Mert",responseBody.toString())
76+
outlinedTextField.editText?.setText(responseBody.name)
77+
outlinedsurname.editText?.setText(responseBody.surname)
78+
outlinedemail.editText?.setText(responseBody.email)
79+
outlinedusername.editText?.setText(responseBody.username)
80+
outlinepassword.editText?.setText(responseBody.password)
81+
outlineAdress.editText?.setText(responseBody.address)
82+
outlinePhone.editText?.setText(responseBody.phone)
4783
}
4884
}
4985
}

‎app/src/main/java/com/mb/fooddelivery/ui/user/UserViewModel.kt

+3
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,14 @@ package com.mb.fooddelivery.ui.user
22

33
import androidx.lifecycle.ViewModel
44
import com.mb.fooddelivery.model.ApiRepository
5+
import com.mb.fooddelivery.model.data.user.UserRequest
56
import dagger.hilt.android.lifecycle.HiltViewModel
67
import javax.inject.Inject
78

89
@HiltViewModel
910
class UserViewModel @Inject constructor(private val apiRepository: ApiRepository) : ViewModel() {
1011

1112
fun getUser() = apiRepository.getUser()
13+
14+
fun editUserSettings(userRequest: UserRequest) = apiRepository.updateUser(userRequest)
1215
}

‎app/src/main/java/com/mb/fooddelivery/ui/usersettings/UserSettingsFragment.kt

-34
This file was deleted.

‎app/src/main/java/com/mb/fooddelivery/ui/usersettings/UserSettingsViewModel.kt

-13
This file was deleted.

‎app/src/main/res/drawable/ic_avatar.xml

+81
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
<vector android:height="32dp" android:viewportHeight="144.773"
2+
android:viewportWidth="144.773" android:width="32dp" xmlns:android="http://schemas.android.com/apk/res/android">
3+
<path android:fillColor="#FC611F" android:pathData="M72.387,72.386m-72.386,0a72.386,72.386 0,1 1,144.772 0a72.386,72.386 0,1 1,-144.772 0"/>
4+
<group>
5+
<clip-path android:pathData="M72.387,72.386m-72.386,0a72.386,72.386 0,1 1,144.772 0a72.386,72.386 0,1 1,-144.772 0"/>
6+
<path android:fillColor="#F1C9A5" android:pathData="M107.053,116.94c-4.666,-8.833 -34.666,-14.376 -34.666,-14.376s-30,5.543 -34.666,14.376c-3.449,12.258 -6.334,27.833 -6.334,27.833h41h41C113.387,144.773 111.438,128.073 107.053,116.94z"/>
7+
</group>
8+
<group>
9+
<clip-path android:pathData="M72.387,72.386m-72.386,0a72.386,72.386 0,1 1,144.772 0a72.386,72.386 0,1 1,-144.772 0"/>
10+
<path android:fillColor="#E4B692" android:pathData="M72.387,102.564c0,0 30,5.543 34.666,14.376c4.386,11.133 6.334,27.833 6.334,27.833h-41V102.564z"/>
11+
</group>
12+
<group>
13+
<clip-path android:pathData="M72.387,72.386m-72.386,0a72.386,72.386 0,1 1,144.772 0a72.386,72.386 0,1 1,-144.772 0"/>
14+
<path android:fillColor="#F1C9A5" android:pathData="M64.22,84.606h16.334v27.336h-16.334z"/>
15+
</group>
16+
<group>
17+
<clip-path android:pathData="M72.387,72.386m-72.386,0a72.386,72.386 0,1 1,144.772 0a72.386,72.386 0,1 1,-144.772 0"/>
18+
<path android:fillColor="#E4B692" android:pathData="M72.387,84.606h8.167v27.336h-8.167z"/>
19+
</group>
20+
<group>
21+
<clip-path android:pathData="M72.387,72.386m-72.386,0a72.386,72.386 0,1 1,144.772 0a72.386,72.386 0,1 1,-144.772 0"/>
22+
<path android:fillAlpha="0.1" android:fillColor="#DDAC8C"
23+
android:pathData="M64.22,97.273c1.469,4.217 7.397,6.634 11.751,6.634c1.575,0 3.107,-0.264 4.583,-0.747V84.606H64.22V97.273z" android:strokeAlpha="0.1"/>
24+
</group>
25+
<group>
26+
<clip-path android:pathData="M72.387,72.386m-72.386,0a72.386,72.386 0,1 1,144.772 0a72.386,72.386 0,1 1,-144.772 0"/>
27+
<path android:fillColor="#F1C9A5" android:pathData="M93.387,67.357c0,-17.074 -9.402,-26.783 -21,-26.783c-11.598,0 -21,9.709 -21,26.783c0,22.966 9.402,30.917 21,30.917C83.984,98.274 93.387,89.366 93.387,67.357z"/>
28+
</group>
29+
<group>
30+
<clip-path android:pathData="M72.387,72.386m-72.386,0a72.386,72.386 0,1 1,144.772 0a72.386,72.386 0,1 1,-144.772 0"/>
31+
<path android:fillColor="#E4B692" android:pathData="M90.19,79.197c-3.807,-0.398 -6.377,-4.5 -5.732,-9.156c0.637,-4.66 4.242,-8.12 8.051,-7.724c3.805,0.396 6.371,4.496 5.729,9.156C97.599,76.134 93.997,79.591 90.19,79.197z"/>
32+
</group>
33+
<group>
34+
<clip-path android:pathData="M72.387,72.386m-72.386,0a72.386,72.386 0,1 1,144.772 0a72.386,72.386 0,1 1,-144.772 0"/>
35+
<path android:fillColor="#F1C9A5" android:pathData="M46.685,71.474c-0.643,-4.66 1.924,-8.76 5.727,-9.156c3.811,-0.397 7.416,3.063 8.055,7.724c0.642,4.656 -1.93,8.758 -5.734,9.156C50.925,79.591 47.323,76.134 46.685,71.474z"/>
36+
</group>
37+
<group>
38+
<clip-path android:pathData="M72.387,72.386m-72.386,0a72.386,72.386 0,1 1,144.772 0a72.386,72.386 0,1 1,-144.772 0"/>
39+
<path android:fillColor="#E4B692" android:pathData="M93.387,67.357c0,-17.074 -9.402,-26.783 -21,-26.783v57.7C83.984,98.274 93.387,89.366 93.387,67.357z"/>
40+
</group>
41+
<group>
42+
<clip-path android:pathData="M72.387,72.386m-72.386,0a72.386,72.386 0,1 1,144.772 0a72.386,72.386 0,1 1,-144.772 0"/>
43+
<path android:fillColor="#2E5870" android:pathData="M91.277,81.668c-1.13,3.176 -3.041,6.994 -6.494,6.994c-4.316,0 -7.403,-3.508 -12.354,-3.508c-0.014,0 -0.027,0.002 -0.041,0.002c-0.015,0 -0.028,-0.002 -0.043,-0.002c-4.95,0 -8.036,3.508 -12.354,3.508c-3.453,0 -5.363,-3.818 -6.493,-6.994l-0.978,-6.118v7.321c0,0 1.641,8.622 4.79,10.705c2.565,2.279 10.938,6.183 15.033,6.183h0.001c0.014,0 0.028,-0.002 0.043,-0.002c0.014,0 0.028,0.002 0.041,0.002h0.002c4.096,0 12.469,-3.903 15.033,-6.183c3.149,-2.083 4.79,-10.705 4.79,-10.705V75.55L91.277,81.668z"/>
44+
</group>
45+
<group>
46+
<clip-path android:pathData="M72.387,72.386m-72.386,0a72.386,72.386 0,1 1,144.772 0a72.386,72.386 0,1 1,-144.772 0"/>
47+
<path android:fillColor="#11B2BC" android:pathData="M107.053,116.94c-2.726,-5.158 -14.082,-9.191 -23.065,-11.656c-0.351,6.11 -5.402,10.96 -11.6,10.96c-6.198,0 -11.249,-4.85 -11.601,-10.96c-8.983,2.465 -20.34,6.498 -23.065,11.656c-3.449,12.258 -6.334,27.833 -6.334,27.833h41h41C113.387,144.773 111.438,128.073 107.053,116.94z"/>
48+
</group>
49+
<group>
50+
<clip-path android:pathData="M72.387,72.386m-72.386,0a72.386,72.386 0,1 1,144.772 0a72.386,72.386 0,1 1,-144.772 0"/>
51+
<path android:fillColor="#1695A6" android:pathData="M32.264,140.273c-0.555,2.763 -0.877,4.5 -0.877,4.5h41h41c0,0 -0.205,-1.756 -0.631,-4.5H32.264z"/>
52+
</group>
53+
<group>
54+
<clip-path android:pathData="M72.387,72.386m-72.386,0a72.386,72.386 0,1 1,144.772 0a72.386,72.386 0,1 1,-144.772 0"/>
55+
<path android:fillColor="#1695A6" android:pathData="M33.192,135.773H112c-0.257,-1.414 -0.551,-2.93 -0.882,-4.5H34.17C33.817,132.855 33.49,134.367 33.192,135.773z"/>
56+
</group>
57+
<group>
58+
<clip-path android:pathData="M72.387,72.386m-72.386,0a72.386,72.386 0,1 1,144.772 0a72.386,72.386 0,1 1,-144.772 0"/>
59+
<path android:fillColor="#1695A6" android:pathData="M35.202,126.773h74.888c-0.374,-1.507 -0.78,-3.019 -1.221,-4.5H36.302C35.922,123.775 35.554,125.284 35.202,126.773z"/>
60+
</group>
61+
<group>
62+
<clip-path android:pathData="M72.387,72.386m-72.386,0a72.386,72.386 0,1 1,144.772 0a72.386,72.386 0,1 1,-144.772 0"/>
63+
<path android:fillColor="#1695A6" android:pathData="M72.387,116.244c-2.979,0 -5.687,-1.128 -7.741,-2.971h-23.41c-1.6,1.146 -2.83,2.371 -3.515,3.667c-0.077,0.275 -0.154,0.555 -0.231,0.833h69.881c-0.104,-0.28 -0.21,-0.56 -0.317,-0.833c-0.685,-1.296 -1.915,-2.521 -3.515,-3.667h-23.41C78.073,115.116 75.366,116.244 72.387,116.244z"/>
64+
</group>
65+
<group>
66+
<clip-path android:pathData="M72.387,72.386m-72.386,0a72.386,72.386 0,1 1,144.772 0a72.386,72.386 0,1 1,-144.772 0"/>
67+
<path android:fillColor="#1695A6" android:pathData="M50.066,108.773h11.477c-0.42,-1.095 -0.687,-2.265 -0.757,-3.489C57.354,106.226 53.577,107.398 50.066,108.773z"/>
68+
</group>
69+
<group>
70+
<clip-path android:pathData="M72.387,72.386m-72.386,0a72.386,72.386 0,1 1,144.772 0a72.386,72.386 0,1 1,-144.772 0"/>
71+
<path android:fillColor="#1695A6" android:pathData="M83.23,108.773h11.478c-3.512,-1.375 -7.288,-2.548 -10.721,-3.489C83.917,106.509 83.65,107.679 83.23,108.773z"/>
72+
</group>
73+
<group>
74+
<clip-path android:pathData="M72.387,72.386m-72.386,0a72.386,72.386 0,1 1,144.772 0a72.386,72.386 0,1 1,-144.772 0"/>
75+
<path android:fillColor="#1695A6" android:pathData="M57.37,106.269c1.138,7.28 7.418,12.856 15.017,12.856c7.599,0 13.879,-5.576 15.017,-12.856c-1.161,-0.352 -2.307,-0.68 -3.416,-0.984c-0.351,6.11 -5.402,10.96 -11.6,10.96c-6.198,0 -11.249,-4.85 -11.601,-10.96C59.677,105.589 58.531,105.917 57.37,106.269z"/>
76+
</group>
77+
<group>
78+
<clip-path android:pathData="M72.387,72.386m-72.386,0a72.386,72.386 0,1 1,144.772 0a72.386,72.386 0,1 1,-144.772 0"/>
79+
<path android:fillColor="#2E5870" android:pathData="M50.329,65.554c0,0 21.346,-4.051 32.558,-13.538c3.162,7.188 5.1,14.975 10.274,14.975c2.588,-14.373 -4.312,-26.663 -17.822,-26.663C61.827,40.327 50.616,47.154 50.329,65.554z"/>
80+
</group>
81+
</vector>

‎app/src/main/res/drawable/imageview_frame.xml

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<shape
3+
xmlns:android="http://schemas.android.com/apk/res/android"
4+
android:shape="oval">
5+
6+
<solid
7+
android:color="@color/white"
8+
/>
9+
10+
<stroke
11+
android:color="#666666"
12+
android:width="2dp"
13+
/>
14+
15+
<size
16+
android:width="120dp"
17+
android:height="120dp"/>
18+
</shape>

‎app/src/main/res/layout/fragment_cart.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
android:layout_height="match_parent"
77
tools:context=".ui.cart.CartFragment"
88
android:padding="16dp"
9-
android:background="#EDE6E6"
9+
android:background="@drawable/bg_login"
1010
>
1111

1212
<TextView

‎app/src/main/res/layout/fragment_login.xml

+15-11
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,23 @@
11
<?xml version="1.0" encoding="utf-8"?>
22

3-
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
44
xmlns:tools="http://schemas.android.com/tools"
55
android:layout_width="match_parent"
66
android:layout_height="match_parent"
77
xmlns:app="http://schemas.android.com/apk/res-auto"
88
tools:context=".ui.login.LoginFragment"
9-
android:orientation="vertical"
10-
android:padding="10dp"
11-
android:paddingLeft="30dp"
12-
android:paddingRight="30dp"
13-
android:background="@drawable/bg_login"
14-
android:gravity="top"
159
>
10+
<LinearLayout
11+
android:layout_width="match_parent"
12+
android:layout_height="wrap_content"
13+
tools:context=".ui.login.LoginFragment"
14+
android:orientation="vertical"
15+
android:padding="10dp"
16+
android:paddingLeft="30dp"
17+
android:paddingRight="30dp"
18+
android:background="@drawable/bg_login"
19+
android:gravity="top"
20+
>
1621

1722
<ImageView
1823
android:layout_width="188dp"
@@ -96,6 +101,7 @@
96101

97102
<TextView
98103
android:id="@+id/signUpText"
104+
android:clickable="true"
99105
android:layout_width="wrap_content"
100106
android:layout_height="wrap_content"
101107
android:text="@string/haventaccount"
@@ -104,7 +110,5 @@
104110
android:layout_marginTop="30dp"
105111
android:textColor="#8F8989"
106112
/>
107-
108-
109-
110-
</LinearLayout>
113+
</LinearLayout>
114+
</ScrollView>

0 commit comments

Comments
 (0)