Merge branch 'develop' of http://gitlab.pmf.kg.ac.rs/BrzoDoLokacije2022/odyssey/brzodolokacije into develop

2 files changed, 10 insertions, 13 deletions

diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityChangeUserData.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityChangeUserData.kt
index d84b850..2c31e8d 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityChangeUserData.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityChangeUserData.kt
@@ -153,6 +153,11 @@ class ActivityChangeUserData : AppCompatActivity() {
     }
 
     fun changeUsername(){
+        if(username.text==null || username.text.trim().toString()=="")
+        {
+            Toast.makeText(this@ActivityChangeUserData,"Unesite korisničko ime",Toast.LENGTH_SHORT).show()
+            return
+        }
         val api = RetrofitHelper.getInstance()
         val token = SharedPreferencesHelper.getValue("jwt", this@ActivityChangeUserData)
         var data = api.changeMyUsername("Bearer " + token,username.text.trim().toString());
@@ -200,6 +205,11 @@ class ActivityChangeUserData : AppCompatActivity() {
     }
 
     fun changeName(){
+        if(name.text==null || name.text.trim().toString()=="")
+        {
+            Toast.makeText(this@ActivityChangeUserData,"Unesite ime",Toast.LENGTH_SHORT).show()
+            return
+        }
         val api = RetrofitHelper.getInstance()
         val token = SharedPreferencesHelper.getValue("jwt", this@ActivityChangeUserData)
         var data = api.changeMyName("Bearer " + token,name.text.trim().toString());
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_change_user_data.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_change_user_data.xml
index 2ade677..648e4ef 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_change_user_data.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_change_user_data.xml
@@ -126,19 +126,6 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/changeDataUsername" />
 
-    <Button
-        android:id="@+id/button"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="140dp"
-        android:text="Izmeni lozinku"
-        app:layout_constraintBottom_toBottomOf="parent"
-        android:drawableLeft="@drawable/ic_outline_password_24"
-        android:drawableTint="@color/white"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tvActivityChangeUserDataUsername"
-        app:shapeAppearanceOverlay="@style/Circular" />
 
 
     <ImageView