From 1844b4238ca59eb8d7ce8f2c1fc0b858157ebd14 Mon Sep 17 00:00:00 2001
From: "branislav.radivojevic" <wafflemynxyt@gmail.com>
Date: Mon, 12 Dec 2022 16:00:31 +0100
Subject: login and register on submit/enter, minor fixes

---
 .../com/example/brzodolokacije/Fragments/FragmentLogin.kt     | 11 +++++++++++
 .../com/example/brzodolokacije/Fragments/FragmentRegister.kt  | 11 +++++++++++
 .../BrzoDoLokacije/app/src/main/res/layout/fragment_login.xml |  1 +
 .../app/src/main/res/layout/fragment_my_profile_info.xml      |  2 +-
 .../BrzoDoLokacije/app/src/main/res/layout/post_preview.xml   |  2 +-
 5 files changed, 25 insertions(+), 2 deletions(-)

(limited to 'Client')

diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentLogin.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentLogin.kt
index 199fcc5..35309c4 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentLogin.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentLogin.kt
@@ -3,6 +3,7 @@ package com.example.brzodolokacije.Fragments
 import android.content.Intent
 import android.graphics.Color
 import android.os.Bundle
+import android.view.KeyEvent
 import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
@@ -49,6 +50,16 @@ class FragmentLogin : Fragment() {
         forgottenPassword = view.findViewById<View>(R.id.tvFragmentLoginForgottenPassword) as TextView
         login=view.findViewById<View>(R.id.btnFragmentLoginLogin) as Button
 
+        password.setOnKeyListener(View.OnKeyListener{v, keyCode, event ->
+            if (keyCode == KeyEvent.KEYCODE_ENTER && event.action == KeyEvent.ACTION_UP){
+                //Start your action
+                login.performClick()
+                //End action
+                return@OnKeyListener true
+            }
+            false
+        })
+
         //osluskivanje unosa
 
         login.setOnClickListener{
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentRegister.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentRegister.kt
index e166d38..ac08d9c 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentRegister.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentRegister.kt
@@ -2,6 +2,7 @@ package com.example.brzodolokacije.Fragments
 
 import android.graphics.Color
 import android.os.Bundle
+import android.view.KeyEvent
 import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
@@ -42,6 +43,16 @@ class FragmentRegister : Fragment() {
         name = view.findViewById<View>(R.id.etFragmentRegisterName) as EditText
         register=view.findViewById<View>(R.id.btnFragmentRegisterRegister) as Button
 
+        password.setOnKeyListener(View.OnKeyListener{v, keyCode, event ->
+            if (keyCode == KeyEvent.KEYCODE_ENTER && event.action == KeyEvent.ACTION_UP){
+                //Start your action
+                register.performClick()
+                //End action
+                return@OnKeyListener true
+            }
+            false
+        })
+
         //osluskivanje unosa
 
         register.setOnClickListener{
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_login.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_login.xml
index c45051b..8db797c 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_login.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_login.xml
@@ -54,6 +54,7 @@
             android:layout_marginTop="0dp"
             android:ems="10"
             android:hint="*********"
+            android:nextFocusDown="@+id/btnFragmentLoginLogin"
             android:inputType="textPassword"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="1.0"
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_my_profile_info.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_my_profile_info.xml
index eaf014d..34da5ff 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_my_profile_info.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_my_profile_info.xml
@@ -55,7 +55,7 @@
         android:layout_gravity="bottom"
         android:layout_marginStart="16dp"
         android:layout_marginEnd="16dp"
-        android:layout_marginBottom="16dp"
+        android:layout_marginBottom="0dp"
         android:drawableLeft="@drawable/ic_baseline_logout_24"
         android:text="Izlogujte se"
         android:drawableTint="@color/white"
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/post_preview.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/post_preview.xml
index 2d7d604..3821869 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/post_preview.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/post_preview.xml
@@ -19,7 +19,7 @@
     <com.google.android.material.imageview.ShapeableImageView
         android:id="@+id/locationImage"
         android:layout_width="match_parent"
-        android:layout_height="239dp"
+        android:layout_height="180dp"
         android:layout_marginStart="16dp"
         android:layout_marginTop="16dp"
         android:layout_marginEnd="16dp"
-- 
cgit v1.2.3