diff options
12 files changed, 15 insertions, 52 deletions
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityUserProfile.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityUserProfile.kt index bc923a4..bb1688a 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityUserProfile.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityUserProfile.kt @@ -188,9 +188,6 @@ class ActivityUserProfile : AppCompatActivity(),OnRefreshListener { updateUserData() } - Toast.makeText( - this@ActivityUserProfile, "PRATITE KORISNIKA", Toast.LENGTH_LONG - ).show(); } override fun onFailure(call: Call<Boolean>, t: Throwable) { @@ -219,9 +216,6 @@ class ActivityUserProfile : AppCompatActivity(),OnRefreshListener { followUser.isEnabled = true updateUserData() } - Toast.makeText( - this@ActivityUserProfile, "VIŠE NE PRATITE KORISNIKA", Toast.LENGTH_LONG - ).show(); } override fun onFailure(call: Call<Boolean>, t: Throwable) { diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/MapsActivity.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/MapsActivity.kt index 9fef0e9..a8fe567 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/MapsActivity.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/MapsActivity.kt @@ -398,16 +398,16 @@ class MapsActivity : AppCompatActivity() { //Log.d("Main",geocoder!!.getFromLocationName("Paris",1)[0].countryName) var locString=searchBar.text.toString().trim() if(locString==null || locString=="") - Toast.makeText(this,"Unesite naziv lokacije", Toast.LENGTH_LONG) + Toast.makeText(this@MapsActivity,"Unesite naziv lokacije", Toast.LENGTH_LONG) else{ var temp=geocoder!!.getFromLocationName(locString,1) if(temp.size<=0) { - Toast.makeText(this,"Nepostojeca lokacija",Toast.LENGTH_LONG) + Toast.makeText(this@MapsActivity,"Nepostojeca lokacija",Toast.LENGTH_LONG) return } var result=temp[0] if(result==null) - Toast.makeText(this,"Nepostojeca lokacija", Toast.LENGTH_LONG) + Toast.makeText(this@MapsActivity,"Nepostojeca lokacija", Toast.LENGTH_LONG) else{ //Move to spot val searchPoint = GeoPoint(result.latitude,result.longitude) diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/NavigationActivity.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/NavigationActivity.kt index adaf212..60768ff 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/NavigationActivity.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/NavigationActivity.kt @@ -4,7 +4,6 @@ import android.content.Intent import android.os.Bundle import android.view.View import android.widget.ImageButton -import android.widget.Toast import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.Fragment import com.example.brzodolokacije.Fragments.* @@ -68,17 +67,12 @@ class NavigationActivity : AppCompatActivity() { var capturePost=bottomSheetDialog2.findViewById<View>(R.id.btnBottomSheetAddNewPostOpenCapturePost) as ImageButton openAddPost.setOnClickListener{ - Toast.makeText( - applicationContext, "Open select from gallery ", Toast.LENGTH_LONG - ).show(); val intent = Intent (this, ActivityAddPost::class.java) startActivity(intent) } capturePost.setOnClickListener{ - Toast.makeText( - applicationContext, "Open capture ", Toast.LENGTH_LONG - ).show(); + val intent = Intent (this, ActivityCapturePost::class.java) startActivity(intent) } @@ -88,9 +82,7 @@ class NavigationActivity : AppCompatActivity() { } private fun showBottomSheetAddNew(){ - Toast.makeText( - applicationContext, "Open add new ", Toast.LENGTH_LONG - ).show(); + var bottomSheetDialog:BottomSheetDialog bottomSheetDialog=BottomSheetDialog(this) bottomSheetDialog.setContentView(R.layout.bottom_sheet_add_new) @@ -105,9 +97,7 @@ class NavigationActivity : AppCompatActivity() { } newLocation.setOnClickListener{ - Toast.makeText( - applicationContext, "Open capture ", Toast.LENGTH_LONG - ).show(); + val intent = Intent (this, MapsActivity::class.java) startActivity(intent) } diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ShowPostsAdapter.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ShowPostsAdapter.kt index 8605246..304379a 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ShowPostsAdapter.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Adapters/ShowPostsAdapter.kt @@ -51,7 +51,7 @@ class ShowPostsAdapter (val activity:Activity,val items : MutableList<PostPrevie //sets components of particular item holder.bind(getItem(position)!!) holder.itemView.setOnClickListener { - Toast.makeText(activity,getItem(position)!!._id,Toast.LENGTH_LONG).show() + val intent:Intent = Intent(activity,ActivitySinglePost::class.java) var b=Bundle() //getItem(position)!!.location.type=LocationType.ADA diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentAddNew.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentAddNew.kt index 8eaa469..a5c3e88 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentAddNew.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentAddNew.kt @@ -41,9 +41,7 @@ class FragmentAddNew : Fragment() { addNewPost.setOnClickListener{ - Toast.makeText( - activity, "Add new post", Toast.LENGTH_LONG - ).show(); + val intent = Intent (getActivity(), ActivityAddPost::class.java) getActivity()?.startActivity(intent) 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 cb213bc..bbfd583 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 @@ -337,7 +337,7 @@ class FragmentBrowse : Fragment(R.layout.fragment_browse) { .lastLocation // Set latitude map!!.controller.animateTo(GeoPoint(location1!!.latitude,location1!!.longitude)) - Toast.makeText(requireContext()," "+location1!!.latitude,Toast.LENGTH_LONG) + } } @@ -347,7 +347,7 @@ class FragmentBrowse : Fragment(R.layout.fragment_browse) { Looper.myLooper()); } else { map!!.controller.animateTo(GeoPoint(location!!.latitude,location!!.longitude)) - Toast.makeText(requireContext()," "+location.latitude,Toast.LENGTH_LONG) + } diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentFollowers.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentFollowers.kt index 767c192..2a92e97 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentFollowers.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentFollowers.kt @@ -39,9 +39,7 @@ class FragmentFollowers : Fragment() { val bundle = this.arguments if (bundle != null) { userId= bundle.getString("userId").toString() - Toast.makeText( - activity, bundle.getString("userId"), Toast.LENGTH_LONG - ).show(); + } getFollowers() diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentFollowing.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentFollowing.kt index fe52723..a31fb47 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentFollowing.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentFollowing.kt @@ -34,9 +34,7 @@ class FragmentFollowing : Fragment() { val bundle = this.arguments if (bundle != null) { userId= bundle.getString("userId").toString() - Toast.makeText( - activity, bundle.getString("userId"), Toast.LENGTH_LONG - ).show(); + } getFollowing() diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentHomePageMainScroll.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentHomePageMainScroll.kt index 0c822f1..3e42c2c 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentHomePageMainScroll.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentHomePageMainScroll.kt @@ -158,9 +158,6 @@ private lateinit var change:Button } private fun getAllPosts(){ - Toast.makeText( - activity," get all", Toast.LENGTH_LONG - ).show(); val api = Retrofit.Builder() .addConverterFactory(GsonConverterFactory.create()) .baseUrl(RetrofitHelper.baseUrl) @@ -233,9 +230,7 @@ private lateinit var change:Button // Toast.makeText( // activity, "get all r ", Toast.LENGTH_LONG // ).show(); - Toast.makeText( - activity," get all newest", Toast.LENGTH_LONG - ).show(); + val api = RetrofitHelper.getInstance() val token= SharedPreferencesHelper.getValue("jwt", requireActivity()) val data=api.get10Newest("Bearer "+token) @@ -266,9 +261,6 @@ private lateinit var change:Button // Toast.makeText( // activity, "get all br ", Toast.LENGTH_LONG // ).show(); - Toast.makeText( - activity," get all best", Toast.LENGTH_LONG - ).show(); val api = RetrofitHelper.getInstance() val token= SharedPreferencesHelper.getValue("jwt", requireActivity()) val data=api.get10Best("Bearer "+token) 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 01b3f1d..199fcc5 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 @@ -89,9 +89,6 @@ class FragmentLogin : Fragment() { override fun onResponse(call: Call<String?>, response: Response<String?>) { if(response.isSuccessful()){ val token=response.body().toString() - Toast.makeText( - activity, token, Toast.LENGTH_LONG - ).show(); SharedPreferencesHelper.addValue("jwt",token,activity!!) val intent= Intent(activity!!, NavigationActivity::class.java) startActivity(intent) diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentShowPostsByLocation.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentShowPostsByLocation.kt index f9accc8..6823f42 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentShowPostsByLocation.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentShowPostsByLocation.kt @@ -59,9 +59,7 @@ class FragmentShowPostsByLocation : Fragment() { data.enqueue(object : Callback<MutableList<PostPreview>> { override fun onResponse(call: Call<MutableList<PostPreview>>, response: Response<MutableList<PostPreview>>) { if (response.body() == null) { - Toast.makeText( - activity, "get all null", Toast.LENGTH_LONG - ).show(); + return } diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/MainActivity.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/MainActivity.kt index 885f7f2..b996b12 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/MainActivity.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/MainActivity.kt @@ -55,9 +55,7 @@ class MainActivity : AppCompatActivity() { override fun onResponse(call: Call<String?>, response: Response<String?>) { if(response.isSuccessful()){ val newToken=response.body().toString() - Toast.makeText( - applicationContext, token, Toast.LENGTH_LONG - ).show(); + SharedPreferencesHelper.addValue("jwt",newToken,this@MainActivity) }else{ if(response.errorBody()!=null) |