diff options
5 files changed, 38 insertions, 9 deletions
diff --git a/Client/BrzoDoLokacije/app/build.gradle b/Client/BrzoDoLokacije/app/build.gradle index b27d299..d0eabb6 100644 --- a/Client/BrzoDoLokacije/app/build.gradle +++ b/Client/BrzoDoLokacije/app/build.gradle @@ -65,4 +65,5 @@ dependencies { //OSMDROID implementation 'org.osmdroid:osmdroid-android:6.1.14' + implementation 'com.github.MKergall:osmbonuspack:6.9.0' }
\ No newline at end of file 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 40d8f11..ca773ac 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 @@ -19,6 +19,7 @@ import com.example.brzodolokacije.R import com.example.brzodolokacije.Services.RetrofitHelper import com.example.brzodolokacije.Services.SharedPreferencesHelper import okhttp3.MediaType +import okhttp3.MediaType.Companion.toMediaTypeOrNull import okhttp3.MultipartBody import okhttp3.RequestBody import retrofit2.Call @@ -207,9 +208,9 @@ class ActivityAddPost : AppCompatActivity() { description.text.clear() //loc //desc - var locReq=RequestBody.create(MediaType.parse("text/plain"),loc) - var descReq=RequestBody.create(MediaType.parse("text/plain"),desc) - var idReq=RequestBody.create(MediaType.parse("text/plain"),"dsa") + var locReq=RequestBody.create("text/plain".toMediaTypeOrNull(),loc) + var descReq=RequestBody.create("text/plain".toMediaTypeOrNull(),desc) + var idReq=RequestBody.create("text/plain".toMediaTypeOrNull(),"dsa") val imagesParts = arrayOfNulls<MultipartBody.Part>( uploadedImages!!.size ) @@ -224,7 +225,7 @@ class ActivityAddPost : AppCompatActivity() { file!!.writeBytes(inputStream!!.readBytes()) - var imageBody=RequestBody.create(MediaType.parse("image/*"),file) + var imageBody=RequestBody.create("image/*".toMediaTypeOrNull(),file) imagesParts[i]=MultipartBody.Part.createFormData("images",file.name,imageBody) } var jwtString= SharedPreferencesHelper.getValue("jwt",this) diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentBrowse.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentBrowse.kt index 1c5b36e..ec6673c 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentBrowse.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentBrowse.kt @@ -3,19 +3,21 @@ package com.example.brzodolokacije.Fragments import android.Manifest import android.content.Context import android.content.pm.PackageManager -import android.location.Geocoder +import android.os.Build import android.os.Bundle +import android.os.StrictMode +import android.os.StrictMode.ThreadPolicy import android.preference.PreferenceManager import android.util.DisplayMetrics import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.Toast import androidx.core.app.ActivityCompat import androidx.core.content.ContextCompat import androidx.fragment.app.Fragment import com.example.brzodolokacije.R +import com.example.brzodolokacije.Services.GeocoderHelper import org.osmdroid.config.Configuration import org.osmdroid.tileprovider.tilesource.TileSourceFactory import org.osmdroid.util.GeoPoint @@ -68,15 +70,15 @@ class FragmentBrowse : Fragment(R.layout.fragment_browse) { map!!.setMultiTouchControls(true); val mapController = map!!.controller mapController.setZoom(15) - + fixNetworkPolicy() //my location //checkLocPerm() mLocationOverlay = MyLocationNewOverlay(GpsMyLocationProvider(context), map) mLocationOverlay!!.enableMyLocation() map!!.getOverlays().add(this.mLocationOverlay) - //var res=Geocoder(requireContext()).getFromLocationName("Paris",1) - //Log.d("Main",res.toString()) + var res= GeocoderHelper.getInstance() + Log.d("Main",res!!.getFromLocationName("Paris",1)[0].countryName) //start point val startPoint = GeoPoint(44.0107,20.9181)//dodati nasu lokaciju TODO mapController.setCenter(startPoint) @@ -114,5 +116,15 @@ class FragmentBrowse : Fragment(R.layout.fragment_browse) { } } + fun fixNetworkPolicy(){ + val SDK_INT = Build.VERSION.SDK_INT + if (SDK_INT > 8) { + val policy = ThreadPolicy.Builder() + .permitAll().build() + StrictMode.setThreadPolicy(policy) + //your codes here + } + } + }
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Services/GeocoderHelper.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Services/GeocoderHelper.kt new file mode 100644 index 0000000..f7a59fa --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Services/GeocoderHelper.kt @@ -0,0 +1,14 @@ +package com.example.brzodolokacije.Services + +import org.osmdroid.bonuspack.location.GeocoderNominatim + +object GeocoderHelper { + private var geocoder:GeocoderNominatim?=null + private val userAgent="Mozilla/5.0 (Linux; Android 11; SM-A326BR Build/RP1A.200720.012; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/100.0.4896.88 Mobile Safari/537.36" + public fun getInstance(): GeocoderNominatim? { + if(geocoder==null){ + geocoder= GeocoderNominatim(userAgent) + } + return geocoder + } +}
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/settings.gradle b/Client/BrzoDoLokacije/settings.gradle index dc8bcc0..1e867ec 100644 --- a/Client/BrzoDoLokacije/settings.gradle +++ b/Client/BrzoDoLokacije/settings.gradle @@ -10,6 +10,7 @@ dependencyResolutionManagement { repositories { google() mavenCentral() + maven{url "https://jitpack.io"} } } rootProject.name = "BrzoDoLokacije" |