diff options
Diffstat (limited to 'Client')
7 files changed, 267 insertions, 190 deletions
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentShowPosts.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentShowPosts.kt index 3b976ad..9d4da20 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentShowPosts.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentShowPosts.kt @@ -1,5 +1,8 @@ package com.example.brzodolokacije.Fragments + +import android.graphics.Color + import android.os.Bundle import android.util.Log import android.view.KeyEvent @@ -19,7 +22,7 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout import com.example.brzodolokacije.Activities.NavigationActivity import com.example.brzodolokacije.Adapters.ShowPostsAdapter import com.example.brzodolokacije.Adapters.ShowPostsGridViewAdapter -import com.example.brzodolokacije.Models.FilterSort + import com.example.brzodolokacije.Models.Location import com.example.brzodolokacije.Models.PostPreview import com.example.brzodolokacije.Models.SearchParams @@ -38,8 +41,6 @@ import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.launch import retrofit2.Call import retrofit2.Response -import java.util.Date - class FragmentShowPosts : Fragment(), SwipeRefreshLayout.OnRefreshListener { @@ -54,18 +55,24 @@ class FragmentShowPosts : Fragment(), SwipeRefreshLayout.OnRefreshListener { private var swipeRefreshLayout:SwipeRefreshLayout?=null private lateinit var searchButton: MaterialButton private lateinit var searchPostsViewModel:SearchPostsViewModel - private var searchParams:SearchParams?= SearchParams("-1",1,1) + private lateinit var btnFilter:ImageButton private lateinit var btnSort:ImageButton private lateinit var searchBar: AutoCompleteTextView var responseLocations:MutableList<com.example.brzodolokacije.Models.Location>?=null var selectedLocation:com.example.brzodolokacije.Models.Location?=null - private lateinit var obj:FilterSort + private lateinit var filter:Button - private lateinit var removeFilter:Button private lateinit var sort:Button + private var filterBool:Boolean=false + private var ratingFrom:Int=-1 + private var ratingTo:Int=-1 + private var viewsFrom:Int=-1 + private var viewsTo:Int=-1 + private var searchParams:SearchParams?= SearchParams("-1",filterBool,1,1,ratingFrom,ratingTo,viewsFrom,viewsTo) + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setUpViewModel() @@ -83,7 +90,7 @@ class FragmentShowPosts : Fragment(), SwipeRefreshLayout.OnRefreshListener { var act=requireActivity() as NavigationActivity act.searchQuery=searchBar.text.toString() act.searchId="" - searchParams=SearchParams(searchBar.text.toString(),1,1) + searchParams=SearchParams(searchBar.text.toString(),filterBool,1,1,ratingFrom,ratingTo,viewsFrom,viewsTo) requestToBack(searchParams!!) } fun onTextEnter(){ @@ -133,7 +140,7 @@ class FragmentShowPosts : Fragment(), SwipeRefreshLayout.OnRefreshListener { var act=requireActivity() as NavigationActivity act.searchQuery=selectedLocation!!.name act.searchId=selectedLocation!!._id - searchParams=SearchParams(selectedLocation!!._id,1,1)//to do sort type + searchParams=SearchParams(selectedLocation!!._id,filterBool,1,1,ratingFrom,ratingTo,viewsFrom,viewsTo)//to do sort type requestToBack(searchParams!!) }) @@ -197,26 +204,13 @@ class FragmentShowPosts : Fragment(), SwipeRefreshLayout.OnRefreshListener { ): View? { val rootView = inflater?.inflate(R.layout.fragment_show_posts, container, false) recyclerView = rootView?.findViewById(R.id.rvMain) + + // set recyclerView attributes // recyclerView?.setHasFixedSize(true) //recyclerView?.layoutManager = linearManagerVar recyclerView?.layoutManager = linearManagerVar recyclerView?.adapter = adapterVar - setUpListeners(rootView) - swipeRefreshLayout = rootView?.findViewById<View>(R.id.swipeContainer) as SwipeRefreshLayout - swipeRefreshLayout?.setOnRefreshListener(this) - swipeRefreshLayout?.setColorSchemeResources( - R.color.purple_200, - R.color.teal_200, - R.color.dark_blue_transparent, - R.color.purple_700 - ) - swipeRefreshLayout?.post(kotlinx.coroutines.Runnable { - swipeRefreshLayout?.isRefreshing=true - requestToBack(searchParams!!) - }) -////////////////////////////////////////////////////////////////// - //filter sort validacija //filter dialog @@ -229,75 +223,112 @@ class FragmentShowPosts : Fragment(), SwipeRefreshLayout.OnRefreshListener { bottomSheetDialogSort = BottomSheetDialog(requireContext()) bottomSheetDialogSort.setContentView(R.layout.bottom_sheet_sort) + var ratingFromInput=bottomSheetDialogFilter.findViewById<View>(R.id.filterRatingFrom) as EditText + var ratingToInput=bottomSheetDialogFilter.findViewById<View>(R.id.filterRatingTo) as EditText + var viewsFromInput=bottomSheetDialogFilter.findViewById<View>(R.id.filterViewsFrom) as EditText + var viewsToInput=bottomSheetDialogFilter.findViewById<View>(R.id.filterViewsTo) as EditText - - btnFilter=rootView.findViewById(R.id.btnSortType) - btnSort=rootView.findViewById(R.id.btnSortDirection) - - var dateFrom=bottomSheetDialogFilter.findViewById<View>(R.id.filterDateFrom)as EditText - var dateFromDate:Date - var dateTo=bottomSheetDialogFilter.findViewById<View>(R.id.filterDateTo) as EditText - var dateToDate:Date - var ratingFrom=bottomSheetDialogFilter.findViewById<View>(R.id.filterRatingFrom) as EditText - var ratingTo=bottomSheetDialogFilter.findViewById<View>(R.id.filterRatingTo) as EditText - var viewsFrom=bottomSheetDialogFilter.findViewById<View>(R.id.filterViewsFrom) as EditText - var viewsTo=bottomSheetDialogFilter.findViewById<View>(R.id.filterViewsTo) as EditText - - - var removeFilter = bottomSheetDialogFilter.findViewById<View>(R.id.btnBSFFilterRemove) as Button - - obj=FilterSort(false,false,0,5,0,1000000000,false,false,false,false) - obj.filter=false - obj.sort=false - + btnFilter= rootView!!.findViewById(R.id.btnSortType) + btnSort=rootView!!.findViewById(R.id.btnSortDirection) btnFilter.setOnClickListener{ bottomSheetDialogFilter.show() + var filter = bottomSheetDialogFilter.findViewById<View>(R.id.btnBSFFilter) as Button + var radioGroupF = bottomSheetDialogFilter.findViewById<View>(R.id.radioGroupFilter) as RadioGroup filter.setOnClickListener { - //validacija unosa - Toast.makeText(activity, "Method called From Fragment", Toast.LENGTH_LONG).show(); - if(!dateFrom.text.equals("")){ - obj.filter=true } - else if(!dateTo.text.equals("")){ - obj.filter=true - } - if(ratingFrom.text.toString().trim().toInt()>=0){ - obj.filter=true - obj.filterRatingFrom=ratingFrom.text.toString().toInt() + var selectedRadioButtonIdF: Int = radioGroupF.checkedRadioButtonId + if (selectedRadioButtonIdF != -1) { + var selectedRadioButtonF = + bottomSheetDialogFilter.findViewById<View>(selectedRadioButtonIdF) as RadioButton + val string: String = selectedRadioButtonF.text.toString().trim() + + if (string.equals("Prethodna nedelja")) { + searchParams!!.filterdate= 5 + } else if (string.equals("Prethodni mesec")) { + searchParams!!.filterdate=4 + } else if (string.equals("Prethodna tri meseca")) { + searchParams!!.filterdate=3 + } else if (string.equals("Prethodna godina")) { + searchParams!!.filterdate=2 + } else { + searchParams!!.filterdate=1 + } } - else{ - ///toast - } - if(ratingTo.text.toString().trim().toInt()>=0){ - obj.filter=true - obj.filterRatingTo=ratingTo.text.toString().toInt() - } - else{ - //toast - } - if(viewsFrom.text.toString().trim().toInt()>=0){ - obj.filter=true - obj.filterViewsFrom=viewsFrom.text.toString().toInt() + if(ratingFromInput.text.toString().isNotEmpty()) { + if (ratingFromInput.text.toString().trim().toInt() >= 0) { + filterBool = true + ratingFrom = ratingFromInput.text.toString().toInt() + } else { + Toast.makeText( + activity, + "Vrednost rejtinga ne može biti negativna", + Toast.LENGTH_LONG + ).show(); + var fromrating = + bottomSheetDialogFilter.findViewById<View>(R.id.ratingFromtxt) as TextView + fromrating.setTextColor(Color.RED) + } } - else{ - //toast + if(ratingToInput.text.toString().isNotEmpty()) { + if (ratingToInput.text.toString().trim().toInt() >= 0) { + filterBool = true + ratingTo = ratingToInput.text.toString().toInt() + } else { + Toast.makeText( + activity, + "Vrednost rejtinga ne može biti negativna", + Toast.LENGTH_LONG + ).show(); + var torating = + bottomSheetDialogFilter.findViewById<View>(R.id.ratingTotxt) as TextView + torating.setTextColor(Color.RED) + } } - if(viewsTo.text.toString().trim().toInt()>=0){ - obj.filter=true - obj.filterViewsTo=viewsTo.text.toString().trim().toInt() + if(viewsFromInput.text.toString().isNotEmpty()) { + if (viewsFromInput.text.toString().trim().toInt() >= 0) { + filterBool = true + viewsFrom = viewsFromInput.text.toString().toInt() + } else { + Toast.makeText( + activity, + "Vrednost broja pregleda ne može biti negativna", + Toast.LENGTH_LONG + ).show(); + var fromviews = + bottomSheetDialogFilter.findViewById<View>(R.id.viewsFromtxt) as TextView + fromviews.setTextColor(Color.RED) + } } - else{ - //toast + if(viewsToInput.text.toString().isNotEmpty()) { + if (viewsToInput.text.toString().trim().toInt() >= 0) { + filterBool = true + viewsTo = viewsToInput.text.toString().trim().toInt() + } else { + Toast.makeText( + activity, + "Vrednost broja pregleda ne može biti negativna", + Toast.LENGTH_LONG + ).show(); + var toviews = + bottomSheetDialogFilter.findViewById<View>(R.id.viewsTotxt) as TextView + toviews.setTextColor(Color.RED) + } } + searchParams!!.filter=filterBool + searchParams!!.ratingFrom=ratingFrom + searchParams!!.ratingTo=ratingTo + searchParams!!.viewsFrom=viewsFrom + searchParams!!.viewsTo=viewsTo - + bottomSheetDialogFilter.dismiss() } - } + + } btnSort.setOnClickListener{ bottomSheetDialogSort.show() var sort = bottomSheetDialogSort.findViewById<View>(R.id.btnSortPosts) as Button @@ -310,28 +341,41 @@ class FragmentShowPosts : Fragment(), SwipeRefreshLayout.OnRefreshListener { bottomSheetDialogSort.findViewById<View>(selectedRadioButtonId) as RadioButton val string: String = selectedRadioButton.text.toString().trim() if (string.equals("Najnovije")) { - obj.sort = true - obj.sortLatest = true + searchParams!!.sorttype = 3 } else if (string.equals("Najstarije")) { - obj.sort = true - obj.sortOldest = true + searchParams!!.sorttype=4 } else if (string.equals("Najbolje ocenjeno")) { - obj.sort = true - obj.sortBest = true + searchParams!!.sorttype=2 } else if (string.equals("Najviše pregleda")) { - obj.sort = true - obj.sortMostViews = true + searchParams!!.sorttype=1 } else { - obj.sort = false + searchParams!!.sorttype=1 } - - } else { - textView.text = "Nothing selected from the radio group" } } + bottomSheetDialogSort.dismiss() } + setUpListeners(rootView) + swipeRefreshLayout = rootView?.findViewById<View>(R.id.swipeContainer) as SwipeRefreshLayout + swipeRefreshLayout?.setOnRefreshListener(this) + swipeRefreshLayout?.setColorSchemeResources( + R.color.purple_200, + R.color.teal_200, + R.color.dark_blue_transparent, + R.color.purple_700 + ) + swipeRefreshLayout?.post(kotlinx.coroutines.Runnable { + swipeRefreshLayout?.isRefreshing=true + requestToBack(searchParams!!) + }) +////////////////////////////////////////////////////////////////// + + + + + ///////////////////////////////////////////////////////////////////////////// searchBar=rootView.findViewById(R.id.etFragmentShowPostsSearch) as AutoCompleteTextView @@ -374,48 +418,16 @@ class FragmentShowPosts : Fragment(), SwipeRefreshLayout.OnRefreshListener { if(act.searchId!=null && act.searchId.trim()!="") { searchBar.setText(act.searchQuery,TextView.BufferType.EDITABLE) - searchParams= SearchParams(act.searchId,1,1) + searchParams= SearchParams(act.searchId,filterBool,1,1,ratingFrom,ratingTo,viewsFrom,viewsTo) requestToBack(searchParams!!) }else if(act.searchQuery!=null && act.searchQuery.trim()!="") { searchBar.setText(act.searchQuery,TextView.BufferType.EDITABLE) - searchParams= SearchParams(act.searchQuery,1,1) + searchParams= SearchParams(act.searchQuery,filterBool,1,1,ratingFrom,ratingTo,viewsFrom,viewsTo) requestToBack(searchParams!!) } } -/* - private fun showBottomSheetFilter() { - var bottomSheetDialog: BottomSheetDialog - bottomSheetDialog = BottomSheetDialog(requireContext()) - bottomSheetDialog.setContentView(R.layout.bottom_sheet_filter) - bottomSheetDialog.show() - - var dateFrom=bottomSheetDialog.findViewById<View>(R.id.filterDateFrom)as EditText - var dateTo=bottomSheetDialog.findViewById<View>(R.id.filterDateTo) as EditText - var ratingFrom=bottomSheetDialog.findViewById<View>(R.id.filterRatingFrom) as EditText - var ratingTo=bottomSheetDialog.findViewById<View>(R.id.filterRatingTo) as EditText - var viewsFrom=bottomSheetDialog.findViewById<View>(R.id.filterViewsFrom) as EditText - var viewsTo=bottomSheetDialog.findViewById<View>(R.id.filterViewsTo) as EditText - var filter = bottomSheetDialog.findViewById<View>(R.id.btnBSFFilter) as Button - var removeFilter = bottomSheetDialog.findViewById<View>(R.id.btnBSFFilterRemove) as Button - - - filter.setOnClickListener { - //povezati sa back-om - - - - } - } - private fun showBottomSheetSort() { - var bottomSheetDialogSort: BottomSheetDialog - bottomSheetDialogSort = BottomSheetDialog(requireContext()) - bottomSheetDialogSort.setContentView(R.layout.bottom_sheet_sort) - bottomSheetDialogSort.show() - - } - */ }
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Interfaces/IBackendApi.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Interfaces/IBackendApi.kt index 51e8391..fe86da3 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Interfaces/IBackendApi.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Interfaces/IBackendApi.kt @@ -60,9 +60,16 @@ interface IBackendApi { @GET("/api/post/locations/{id}/posts") suspend fun getPagedPosts(@Header("Authorization") authHeader: String, @Path("id") locationId:String, + @Query("filter") filter:Boolean, @Query("page") page:Int, @Query("sorttype") sorttype:Int, - @Query("filterdate") filterdate:Int + @Query("filterdate") filterdate:Int, + @Query("ratingFrom") ratingFrom:Int, + @Query("ratingTo") ratingTo:Int, + @Query("viewsFrom") viewsFrom:Int, + @Query("viewsTo") viewsTo:Int, + + ):PagedPosts @POST("/api/message/add") fun sendMessage(@Header("Authorization") authHeader:String,@Body message:MessageSend):Call<Message> diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/Post.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/Post.kt index a3858a7..3df1621 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/Post.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/Post.kt @@ -3,6 +3,7 @@ package com.example.brzodolokacije.Models import android.os.Parcelable import kotlinx.android.parcel.Parcelize import okhttp3.MultipartBody +import retrofit2.http.Query import java.time.LocalDateTime import java.util.* @@ -91,10 +92,15 @@ data class PagedPosts( data class SearchParams( var locationId: String, + var filter:Boolean, var sorttype:Int, - var filterdate:Int + var filterdate:Int, + var ratingFrom:Int, + var ratingTo:Int, + var viewsFrom:Int, + var viewsTo:Int, ) - +/* data class FilterSort( //var posts: MutableList<PostPreview>, var sort:Boolean, @@ -111,4 +117,4 @@ data class FilterSort( var sortOldest:Boolean, var sortBest:Boolean, var sortMostViews:Boolean - )
\ No newline at end of file + )*/
\ No newline at end of file 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/java/com/example/brzodolokacije/paging/SearchPostsPagingSource.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/paging/SearchPostsPagingSource.kt index cee39ce..6a8fec2 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/paging/SearchPostsPagingSource.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/paging/SearchPostsPagingSource.kt @@ -21,8 +21,9 @@ class SearchPostsPagingSource( val page=params.key?:0 val token=SharedPreferencesHelper.getValue("jwt", activity) return try{ - val response=backend.getPagedPosts("Bearer "+token,searchParams.locationId, - page,searchParams.sorttype,searchParams.filterdate + val response=backend.getPagedPosts("Bearer "+token,searchParams.locationId,searchParams.filter, + page,searchParams.sorttype,searchParams.filterdate,searchParams.ratingFrom,searchParams.ratingTo, + searchParams.viewsFrom,searchParams.viewsTo ) Log.d("main","stranicenje: "+page.toString()) LoadResult.Page( diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/bottom_sheet_filter.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/bottom_sheet_filter.xml index 5862c60..85915f0 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/bottom_sheet_filter.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/bottom_sheet_filter.xml @@ -17,7 +17,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> - <TextView + <!-- <TextView android:id="@+id/textView8" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -43,54 +43,103 @@ app:layout_constraintTop_toBottomOf="@+id/textView8" tools:ignore="SpeakableTextPresentCheck" /> - <TextView - android:id="@+id/textView9" - android:layout_width="wrap_content" + <TextView + android:id="@+id/textView9" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:layout_marginTop="20dp" + android:text="Od:" + app:layout_constraintStart_toStartOf="parent" + app:layout_constrain_toBottomOf="@+id/textView8" /> + + <TextView + android:id="@+id/textView10" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="20dp" + android:layout_marginEnd="8dp" + android:text="Do:" + app:layout_constraintEnd_toStartOf="@+id/filterDateTo" + app:layout_constraintTop_toBottomOf="@+id/textView8" /> + + <EditText + android:id="@+id/filterDateTo" + android:layout_width="150dp" + android:layout_height="48dp" + android:layout_marginTop="8dp" + android:layout_marginEnd="16dp" + android:ems="10" + android:inputType="date" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toBottomOf="@+id/textView8" + tools:ignore="SpeakableTextPresentCheck" />--> + + <RadioGroup + android:id="@+id/radioGroupFilter" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginStart="16dp" - android:layout_marginTop="20dp" - android:text="Od:" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="1.0" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/textView8" /> + app:layout_constraintTop_toBottomOf="@+id/textView8"> - <TextView - android:id="@+id/textView10" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="20dp" - android:layout_marginEnd="8dp" - android:text="Do:" - app:layout_constraintEnd_toStartOf="@+id/filterDateTo" - app:layout_constraintTop_toBottomOf="@+id/textView8" /> + <RadioButton + android:id="@+id/filterLastweek" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:layout_marginTop="12dp" + android:text="Prethodna nedelja" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.0" + app:layout_constraintStart_toStartOf="parent" /> - <EditText - android:id="@+id/filterDateTo" - android:layout_width="150dp" - android:layout_height="48dp" - android:layout_marginTop="8dp" - android:layout_marginEnd="16dp" - android:ems="10" - android:inputType="date" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toBottomOf="@+id/textView8" - tools:ignore="SpeakableTextPresentCheck" /> + <RadioButton + android:id="@+id/filterLastMonth" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:text="Prethodni mesec" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/radioButton" /> + + <RadioButton + android:id="@+id/filterLastThreeMonths" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:text="Prethodna tri meseca" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintTop_toBottomOf="@+id/radioButton4" /> + + + <RadioButton + android:id="@+id/filterLastYear" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:text="Prethodna godina" + app:layout_constraintTop_toBottomOf="@+id/radioButton3" + tools:layout_editor_absoluteX="16dp" /> + + </RadioGroup> <TextView android:id="@+id/textView15" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="16dp" - android:layout_marginTop="8dp" android:text="Rejting" android:textSize="17sp" android:textStyle="bold" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/divider2" /> + app:layout_constraintTop_toBottomOf="@+id/radioGroupFilter" /> <TextView - android:id="@+id/textView16" + android:id="@+id/ratingFromtxt" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="16dp" @@ -100,7 +149,7 @@ app:layout_constraintTop_toBottomOf="@+id/textView15" /> <TextView - android:id="@+id/textView17" + android:id="@+id/ratingTotxt" android:layout_width="wrap_content" android:layout_height="19dp" android:layout_marginTop="20dp" @@ -109,7 +158,7 @@ app:layout_constraintEnd_toStartOf="@+id/filterRatingTo" app:layout_constraintTop_toBottomOf="@+id/textView15" /> - <View + <!-- <View android:id="@+id/divider2" android:layout_width="409dp" android:layout_height="1dp" @@ -117,7 +166,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/filterDateFrom" /> - +--> <View android:id="@+id/divider4" android:layout_width="409dp" @@ -134,11 +183,13 @@ android:layout_marginTop="8dp" android:layout_marginBottom="16dp" android:orientation="horizontal" - android:weightSum="2" + android:weightSum="1" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/divider4"> + app:layout_constraintTop_toBottomOf="@+id/divider4" + app:layout_constraintVertical_bias="1.0"> <Button android:id="@+id/btnBSFFilter" @@ -152,18 +203,6 @@ tools:ignore="TouchTargetSizeCheck" /> - <Button - android:id="@+id/btnBSFFilterRemove" - android:layout_width="10dp" - android:layout_height="39dp" - android:layout_marginHorizontal="10dp" - android:layout_marginTop="16dp" - android:layout_weight="1" - android:background="@drawable/view_corner_radius" - android:text="Poništi" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toBottomOf="@+id/divider4" - tools:ignore="TouchTargetSizeCheck" /> </LinearLayout> <EditText @@ -173,7 +212,7 @@ android:layout_marginStart="8dp" android:ems="10" android:inputType="number" - app:layout_constraintStart_toEndOf="@+id/textView16" + app:layout_constraintStart_toEndOf="@+id/ratingFromtxt" app:layout_constraintTop_toBottomOf="@+id/textView15" /> <ImageView @@ -222,7 +261,7 @@ app:layout_constraintTop_toBottomOf="@+id/divider8" /> <TextView - android:id="@+id/textView21" + android:id="@+id/viewsFromtxt" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="16dp" @@ -232,7 +271,7 @@ app:layout_constraintTop_toBottomOf="@+id/textView20" /> <TextView - android:id="@+id/textView22" + android:id="@+id/viewsTotxt" android:layout_width="wrap_content" android:layout_height="19dp" android:layout_marginTop="20dp" @@ -258,7 +297,7 @@ android:layout_marginTop="5dp" android:ems="10" android:inputType="number" - app:layout_constraintStart_toEndOf="@+id/textView21" + app:layout_constraintStart_toEndOf="@+id/viewsFromtxt" app:layout_constraintTop_toBottomOf="@+id/textView20" /> <EditText @@ -272,5 +311,26 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@+id/textView20" /> + <TextView + android:id="@+id/textView8" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:text="Datum" + android:textSize="17sp" + android:textStyle="bold" + android:layout_marginStart="16dp" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/textView7" /> + + <View + android:id="@+id/divider2" + android:layout_width="match_parent" + android:layout_height="1dp" + android:background="?android:attr/listDivider" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/radioGroupFilter" /> + </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/bottom_sheet_sort.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/bottom_sheet_sort.xml index b8577fc..72fac70 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/bottom_sheet_sort.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/bottom_sheet_sort.xml @@ -52,15 +52,6 @@ app:layout_constraintTop_toBottomOf="@+id/radioButton3" tools:layout_editor_absoluteX="16dp" /> - <RadioButton - android:id="@+id/noSort" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="16dp" - android:text="Poništi sortiranje" - app:layout_constraintTop_toBottomOf="@+id/radioButton3" - tools:layout_editor_absoluteX="16dp" /> - </RadioGroup> <Button |