diff options
Diffstat (limited to 'Client')
4 files changed, 37 insertions, 17 deletions
diff --git a/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml b/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml index 1ec64ec..8c796e2 100644 --- a/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml +++ b/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml @@ -111,7 +111,8 @@ android:windowSoftInputMode="stateAlwaysHidden|adjustPan" /> <activity android:name=".Activities.ActivityAddPost" - android:screenOrientation="portrait" /> + android:screenOrientation="portrait" + android:windowSoftInputMode="stateAlwaysHidden|adjustPan"/> <activity android:name=".Activities.SplashPage" android:exported="true" diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityAddPost.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityAddPost.kt index 746d8b0..99bb4f1 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityAddPost.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityAddPost.kt @@ -2,6 +2,7 @@ package com.example.brzodolokacije.Activities import android.Manifest import android.app.ProgressDialog +import android.content.Context import android.content.Intent import android.content.pm.PackageManager import android.graphics.Color @@ -11,19 +12,16 @@ import android.util.Log import android.util.TypedValue import android.view.KeyEvent import android.view.View +import android.view.inputmethod.InputMethodManager import android.widget.* import androidx.appcompat.app.AppCompatActivity -import androidx.appcompat.widget.AppCompatImageView import androidx.core.app.ActivityCompat import androidx.core.content.ContextCompat import androidx.core.view.isGone import androidx.core.view.isVisible import androidx.core.view.setMargins -import com.example.brzodolokacije.Models.Location -import com.example.brzodolokacije.Models.LocationType import com.example.brzodolokacije.Models.PostPreview import com.example.brzodolokacije.R -import com.example.brzodolokacije.Services.GeocoderHelper import com.example.brzodolokacije.Services.RetrofitHelper import com.example.brzodolokacije.Services.SharedPreferencesHelper import okhttp3.MediaType.Companion.toMediaTypeOrNull @@ -109,17 +107,23 @@ class ActivityAddPost : AppCompatActivity() { addDescription.setOnClickListener { description.isGone=false description.isVisible=true + description.requestFocus() + showKeyboard(description) } //dodavanje i brisanje tagova tagButtonAdd.setOnClickListener { addTag() + tagText.requestFocus() + showKeyboard(tagText) } tagText.setOnKeyListener(View.OnKeyListener { v1, keyCode, event -> // If the event is a key-down event on the "enter" button - if (event.action === KeyEvent.ACTION_DOWN && + if (event.action === KeyEvent.ACTION_UP && keyCode == KeyEvent.KEYCODE_ENTER ) { // Perform action on key press addTag() + tagText.requestFocus() + showKeyboard(tagText) return@OnKeyListener true } false @@ -188,6 +192,17 @@ class ActivityAddPost : AppCompatActivity() { } } } + + fun showKeyboard(item:EditText){ + var imm: InputMethodManager =this.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager + imm.showSoftInput(item, InputMethodManager.SHOW_IMPLICIT) + } + + fun hideKeyboard(item: EditText){ + var imm: InputMethodManager =this.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager + imm.hideSoftInputFromWindow(item.windowToken, InputMethodManager.HIDE_NOT_ALWAYS) + } + fun addTag(){ tagText.isGone=false tagText.isVisible=true diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Services/RetrofitHelper.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Services/RetrofitHelper.kt index 43c2109..88685e4 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Services/RetrofitHelper.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Services/RetrofitHelper.kt @@ -7,8 +7,8 @@ import retrofit2.converter.gson.GsonConverterFactory object RetrofitHelper { - val baseUrl="http://10.0.2.2:5279" - //val baseUrl="http://147.91.204.115:10082" + //val baseUrl="http://10.0.2.2:5279" + val baseUrl="http://147.91.204.115:10082" private var retrofit_noauth: IBackendApi? = null private var retrofit_auth: IBackendApi? = null diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_add_post.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_add_post.xml index d6faa7e..06b96ca 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_add_post.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_add_post.xml @@ -14,7 +14,7 @@ app:layout_constraintBottom_toTopOf="@+id/btnActivityAddPostUploadFromGallery" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent"/> <Button android:id="@+id/nextImage" @@ -53,7 +53,7 @@ android:text="Otvori galeriju" android:visibility="invisible" app:cornerRadius="20dp" - app:layout_constraintBottom_toTopOf="@+id/btnActivityAddPostAddLocation" + app:layout_constraintBottom_toTopOf="@+id/llTags" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.497" app:layout_constraintStart_toStartOf="parent" /> @@ -68,7 +68,7 @@ android:drawableLeft="@drawable/ic_baseline_location_on_24" android:text="Dodaj lokaciju" android:textColor="#757471" - app:layout_constraintBottom_toTopOf="@+id/tvActivityAddPostDescriptiontext" + app:layout_constraintBottom_toTopOf="@+id/btnActivityAddPostAddTag" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.074" app:layout_constraintStart_toStartOf="parent" /> @@ -109,7 +109,8 @@ android:maxLines="100" android:minHeight="50dp" android:visibility="gone" - app:layout_constraintBottom_toTopOf="@+id/llTags" + android:inputType="textCapSentences|textMultiLine" + app:layout_constraintBottom_toTopOf="@+id/btnActivityAddPostPost" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" /> @@ -148,7 +149,7 @@ android:layout_marginLeft="20dp" android:layout_marginRight="20dp" android:orientation="horizontal" - app:layout_constraintBottom_toTopOf="@+id/btnActivityAddPostAddTag" + app:layout_constraintBottom_toTopOf="@+id/btnActivityAddPostAddLocation" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent"></LinearLayout> @@ -157,12 +158,15 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="28dp" - android:hint="Planina,Reka,Park..." + android:hint="Planina, Reka, Park..." + android:inputType="text" android:maxLength="12" android:minHeight="48dp" + android:singleLine="true" android:visibility="gone" - app:layout_constraintBottom_toTopOf="@+id/btnActivityAddPostPost" - app:layout_constraintStart_toStartOf="parent" /> + app:layout_constraintBottom_toBottomOf="@+id/btnActivityAddPostAddTag" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@+id/btnActivityAddPostAddTag" /> <Button android:id="@+id/btnActivityAddPostAddTag" @@ -175,7 +179,7 @@ android:text="Dodaj tag" android:textColor="#757471" - app:layout_constraintBottom_toTopOf="@+id/acTags" + app:layout_constraintBottom_toTopOf="@+id/tvActivityAddPostDescriptiontext" app:layout_constraintStart_toStartOf="parent" /> |