add Toolbar menu to HomeFragment

SmartToolFactory · SmartToolFactory · commit f548a392a11c · 2020-09-08T00:32:25.000+03:00
diff --git a/app/src/main/java/com/smarttoolfactory/propertyfindar/Constants.kt b/app/src/main/java/com/smarttoolfactory/propertyfindar/Constants.kt
@@ -0,0 +1,7 @@
+package com.smarttoolfactory.propertyfindar
+
+const val ORDER_BY_NONE = com.smarttoolfactory.data.constant.ORDER_BY_NONE
+const val ORDER_BY_PRICE_ASCENDING = com.smarttoolfactory.data.constant.ORDER_BY_PRICE_ASCENDING
+const val ORDER_BY_PRICE_DESCENDING = com.smarttoolfactory.data.constant.ORDER_BY_PRICE_DESCENDING
+const val ORDER_BY_BEDS_ASCENDING = com.smarttoolfactory.data.constant.ORDER_BY_BEDS_ASCENDING
+const val ORDER_BY_DES_DESCENDING = com.smarttoolfactory.data.constant.ORDER_BY_DES_DESCENDING
diff --git a/features/home/src/main/java/com/smarttoolfactory/home/HomeFragment.kt b/features/home/src/main/java/com/smarttoolfactory/home/HomeFragment.kt
@@ -1,7 +1,6 @@
 package com.smarttoolfactory.home
 
-import android.os.Bundle
-import android.view.View
+import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.Observer
@@ -40,8 +39,7 @@ class HomeFragment : DynamicNavigationFragment<FragmentHomeBinding>() {
 
     private val navControllerViewModel by activityViewModels<NavControllerViewModel>()
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
+    override fun bindViews() {
 
         // ViewPager2
         val viewPager = dataBinding!!.viewPager
@@ -59,6 +57,17 @@ class HomeFragment : DynamicNavigationFragment<FragmentHomeBinding>() {
         viewPager.adapter =
             HomeViewPager2FragmentStateAdapter(childFragmentManager, viewLifecycleOwner.lifecycle)
 
+        dataBinding!!.toolbar.inflateMenu(R.menu.menu_home)
+
+        dataBinding!!.toolbar.setOnMenuItemClickListener {
+            if (it.itemId == R.id.menu_item_sort) {
+                Toast.makeText(requireContext(), "Toast", Toast.LENGTH_SHORT).show()
+                true
+            }
+
+            false
+        }
+
         // Bind tabs and viewpager
         TabLayoutMediator(tabLayout, viewPager, tabConfigurationStrategy).attach()
 
@@ -101,14 +110,18 @@ class HomeFragment : DynamicNavigationFragment<FragmentHomeBinding>() {
             it.adapter = null
         }
 
+        // Remove menu item click listener
+        dataBinding!!.toolbar.setOnMenuItemClickListener(null)
+
         super.onDestroyView()
     }
 
     private val tabConfigurationStrategy =
         TabLayoutMediator.TabConfigurationStrategy { tab, position ->
             when (position) {
-                0 -> tab.text = "Properties With Flow"
-                else -> tab.text = "Properties With RxJava3"
+                0 -> tab.text = "Flow"
+                1 -> tab.text = "RxJava3"
+                else -> tab.text = "Flow+Pagination"
             }
         }
 }
diff --git a/features/home/src/main/java/com/smarttoolfactory/home/propertylist/PropertyListFlowFragment.kt b/features/home/src/main/java/com/smarttoolfactory/home/propertylist/PropertyListFlowFragment.kt
@@ -37,7 +37,12 @@ class PropertyListFlowFragment : DynamicNavigationFragment<FragmentPropertyListB
 
             // Set RecyclerViewAdapter
             this.adapter =
-                PropertyItemListAdapter(R.layout.row_property, viewModel::onClick)
+                PropertyItemListAdapter(
+                    R.layout.row_property,
+                    viewModel::onClick,
+                    viewModel::onLikeButtonClick
+
+                )
         }
 
         val swipeRefreshLayout = dataBinding.swipeRefreshLayout
diff --git a/features/home/src/main/java/com/smarttoolfactory/home/propertylist/PropertyListRxjava3Fragment.kt b/features/home/src/main/java/com/smarttoolfactory/home/propertylist/PropertyListRxjava3Fragment.kt
@@ -37,7 +37,12 @@ class PropertyListRxjava3Fragment : DynamicNavigationFragment<FragmentPropertyLi
 
             // Set RecyclerViewAdapter
             this.adapter =
-                PropertyItemListAdapter(R.layout.row_property, viewModel::onClick)
+                PropertyItemListAdapter(
+                    R.layout.row_property,
+                    viewModel::onClick,
+                    viewModel::onLikeButtonClick
+
+                )
         }
 
         val swipeRefreshLayout = dataBinding.swipeRefreshLayout
diff --git a/features/home/src/main/java/com/smarttoolfactory/home/viewbindings/ViewBindings.kt b/features/home/src/main/java/com/smarttoolfactory/home/viewbindings/ViewBindings.kt
@@ -64,8 +64,8 @@ fun View.visibilityBasedOn(condition: Boolean) {
 @BindingAdapter("favoriteImageSrc")
 fun ImageButton.setFavoriteImageSrc(favorite: Boolean) {
 
-    val imageResource = if (favorite) R.drawable.ic_baseline_favorite_24
-    else R.drawable.ic_baseline_favorite_border_24
+    val imageResource = if (favorite) R.drawable.ic_baseline_favorite_30
+    else R.drawable.ic_baseline_favorite_border_30
 
     setImageResource(imageResource)
 }
diff --git a/features/home/src/main/java/com/smarttoolfactory/home/viewmodel/AbstractPropertyListVM.kt b/features/home/src/main/java/com/smarttoolfactory/home/viewmodel/AbstractPropertyListVM.kt
@@ -14,12 +14,6 @@ abstract class AbstractPropertyListVM : ViewModel() {
     companion object {
         const val PROPERTY_LIST = "PROPERTY_LIST"
         const val PROPERTY_DETAIL = "PROPERTY_DETAIL"
-
-        const val ORDER_BY_NONE = ""
-        const val ORDER_BY_PRICE_ASCENDING = "pa"
-        const val ORDER_BY_PRICE_DESCENDING = "pd"
-        const val ORDER_BY_BEDS_ASCENDING = "ba"
-        const val ORDER_BY_DES_DESCENDING = "bd"
     }
 
     abstract val goToDetailScreen: LiveData<Event<PropertyItem>>
diff --git a/features/home/src/main/java/com/smarttoolfactory/home/viewmodel/HomeToolbarVM.kt b/features/home/src/main/java/com/smarttoolfactory/home/viewmodel/HomeToolbarVM.kt
@@ -0,0 +1,11 @@
+package com.smarttoolfactory.home.viewmodel
+
+import androidx.hilt.lifecycle.ViewModelInject
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import com.smarttoolfactory.core.util.Event
+
+class HomeToolbarVM @ViewModelInject constructor() : ViewModel() {
+
+    val setFilter = MutableLiveData<Event<String>>()
+}
diff --git a/features/home/src/main/java/com/smarttoolfactory/home/viewmodel/PropertyListViewModelFlow.kt b/features/home/src/main/java/com/smarttoolfactory/home/viewmodel/PropertyListViewModelFlow.kt
@@ -9,6 +9,7 @@ import com.smarttoolfactory.core.viewstate.Status
 import com.smarttoolfactory.core.viewstate.ViewState
 import com.smarttoolfactory.domain.model.PropertyItem
 import com.smarttoolfactory.domain.usecase.GetPropertiesUseCaseFlow
+import com.smarttoolfactory.propertyfindar.ORDER_BY_NONE
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
@@ -42,7 +43,7 @@ class PropertyListViewModelFlow @ViewModelInject constructor(
      */
     override fun getPropertyList() {
 
-        getPropertiesUseCase.getPropertiesOfflineFirst("")
+        getPropertiesUseCase.getPropertiesOfflineFirst(orderBy = ORDER_BY_NONE)
             .convertToFlowViewState()
             .onStart {
                 _propertyViewState.value = ViewState(status = Status.LOADING)
@@ -68,4 +69,8 @@ class PropertyListViewModelFlow @ViewModelInject constructor(
     override fun onClick(item: PropertyItem) {
         _goToDetailScreen.value = Event(item)
     }
+
+    fun onLikeButtonClick(item: PropertyItem) {
+        println("🔥 Like: $item")
+    }
 }
diff --git a/features/home/src/main/java/com/smarttoolfactory/home/viewmodel/PropertyListViewModelRxJava3.kt b/features/home/src/main/java/com/smarttoolfactory/home/viewmodel/PropertyListViewModelRxJava3.kt
@@ -9,6 +9,7 @@ import com.smarttoolfactory.core.viewstate.Status
 import com.smarttoolfactory.core.viewstate.ViewState
 import com.smarttoolfactory.domain.model.PropertyItem
 import com.smarttoolfactory.domain.usecase.GetPropertiesUseCaseRxJava3
+import com.smarttoolfactory.propertyfindar.ORDER_BY_NONE
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 
 class PropertyListViewModelRxJava3 @ViewModelInject constructor(
@@ -26,7 +27,7 @@ class PropertyListViewModelRxJava3 @ViewModelInject constructor(
         get() = _propertyListViewState
 
     override fun getPropertyList() {
-        getPropertiesUseCase.getPropertiesOfflineFirst(ORDER_BY_NONE)
+        getPropertiesUseCase.getPropertiesOfflineFirst((ORDER_BY_NONE))
             .convertFromSingleToObservableViewStateWithLoading()
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe(
@@ -56,4 +57,8 @@ class PropertyListViewModelRxJava3 @ViewModelInject constructor(
     override fun onClick(item: PropertyItem) {
         _goToDetailScreen.value = Event(item)
     }
+
+    fun onLikeButtonClick(item: PropertyItem) {
+        println("🔥 Like: $item")
+    }
 }
diff --git a/features/home/src/main/res/drawable/ic_baseline_favorite_30.xml b/features/home/src/main/res/drawable/ic_baseline_favorite_30.xml
@@ -0,0 +1,5 @@
+<vector android:height="30dp" android:tint="?attr/colorControlNormal"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="30dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,21.35l-1.45,-1.32C5.4,15.36 2,12.28 2,8.5 2,5.42 4.42,3 7.5,3c1.74,0 3.41,0.81 4.5,2.09C13.09,3.81 14.76,3 16.5,3 19.58,3 22,5.42 22,8.5c0,3.78 -3.4,6.86 -8.55,11.54L12,21.35z"/>
+</vector>
diff --git a/features/home/src/main/res/drawable/ic_baseline_favorite_border_30.xml b/features/home/src/main/res/drawable/ic_baseline_favorite_border_30.xml
@@ -0,0 +1,5 @@
+<vector android:height="30dp" android:tint="?attr/colorControlNormal"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="30dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M16.5,3c-1.74,0 -3.41,0.81 -4.5,2.09C10.91,3.81 9.24,3 7.5,3 4.42,3 2,5.42 2,8.5c0,3.78 3.4,6.86 8.55,11.54L12,21.35l1.45,-1.32C18.6,15.36 22,12.28 22,8.5 22,5.42 19.58,3 16.5,3zM12.1,18.55l-0.1,0.1 -0.1,-0.1C7.14,14.24 4,11.39 4,8.5 4,6.5 5.5,5 7.5,5c1.54,0 3.04,0.99 3.57,2.36h1.87C13.46,5.99 14.96,5 16.5,5c2,0 3.5,1.5 3.5,3.5 0,2.89 -3.14,5.74 -7.9,10.05z"/>
+</vector>
diff --git a/features/home/src/main/res/drawable/ic_baseline_sort_24.xml b/features/home/src/main/res/drawable/ic_baseline_sort_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M3,18h6v-2L3,16v2zM3,6v2h18L21,6L3,6zM3,13h12v-2L3,11v2z"/>
+</vector>
diff --git a/features/home/src/main/res/layout/fragment_property_list.xml b/features/home/src/main/res/layout/fragment_property_list.xml
@@ -26,7 +26,7 @@
                 visibilityBasedOn="@{viewModel.propertyListViewState.success}"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:paddingTop="16dp"
+                android:layout_marginTop="18dp"
                 app:items="@{viewModel.propertyListViewState.data}"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
diff --git a/features/home/src/main/res/layout/row_property.xml b/features/home/src/main/res/layout/row_property.xml
@@ -14,6 +14,8 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="150dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
         android:layout_marginBottom="4dp"
         android:padding="2dp">
 
@@ -29,7 +31,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintWidth_percent=".4">
+            app:layout_constraintWidth_percent=".45">
 
             <ImageView
                 imageSrc="@{item.thumbnail}"
@@ -41,6 +43,29 @@
 
         </androidx.cardview.widget.CardView>
 
+        <androidx.cardview.widget.CardView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            app:layout_constraintStart_toStartOf="@+id/cvThumbnail"
+            app:layout_constraintTop_toTopOf="@+id/cvThumbnail">
+
+            <TextView
+                visibilityBasedOn="@{item.verified}"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginStart="-4dp"
+                android:background="#66BB6A"
+                android:paddingStart="8dp"
+                android:paddingTop="1dp"
+                android:paddingEnd="8dp"
+                android:paddingBottom="1dp"
+                android:translationZ="5dp"
+                android:textSize="10sp"
+                android:text="VERIFIED"
+                android:textColor="@color/white" />
+        </androidx.cardview.widget.CardView>
+
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/tvTitle"
             android:layout_width="0dp"
@@ -64,7 +89,8 @@
             android:layout_marginTop="4dp"
             android:maxLines="1"
             android:text="@{item.price + ` `+ item.currency}"
-            android:textSize="20sp"
+            android:textColor="@color/black"
+            android:textSize="18sp"
             app:layout_constraintEnd_toStartOf="@id/ivLike"
             app:layout_constraintStart_toStartOf="@+id/tvTitle"
             app:layout_constraintTop_toBottomOf="@+id/tvTitle"
@@ -73,12 +99,11 @@
         <androidx.appcompat.widget.AppCompatImageButton
             android:id="@+id/ivLike"
             favoriteImageSrc="@{item.isFavorite}"
-            android:layout_width="50dp"
-            android:layout_height="50dp"
-            android:layout_marginEnd="12dp"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
             android:background="#00ffffff"
             android:padding="2dp"
-            android:src="@drawable/ic_baseline_favorite_border_24"
+            android:src="@drawable/ic_baseline_favorite_border_30"
             android:tint="#29B6F6"
             app:layout_constraintBottom_toBottomOf="@+id/tvPrice"
             app:layout_constraintEnd_toEndOf="parent"
@@ -89,11 +114,11 @@
             android:id="@+id/tvLocation"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
+            android:layout_marginTop="3dp"
             android:maxLines="2"
             android:text="@{item.location}"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/ivLike"
+            android:textColor="#000"
+            app:layout_constraintEnd_toEndOf="@id/ivLike"
             app:layout_constraintStart_toStartOf="@+id/tvTitle"
             app:layout_constraintTop_toBottomOf="@+id/tvPrice"
             tools:text="Casa, Arabian Ranches 2, Dubai" />
@@ -105,13 +130,15 @@
             android:layout_marginTop="4dp"
             android:src="@drawable/ic_outline_airline_seat_individual_suite_24"
             app:layout_constraintStart_toStartOf="@+id/tvTitle"
-            app:layout_constraintTop_toBottomOf="@+id/tvLocation" />
+            app:layout_constraintTop_toBottomOf="@+id/tvLocation"
+            app:tint="@color/black" />
 
         <com.google.android.material.textview.MaterialTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
             android:text="@{item.bedrooms}"
+            android:textColor="@color/black"
             app:layout_constraintBottom_toBottomOf="@id/ivBeds"
             app:layout_constraintStart_toEndOf="@+id/ivBeds"
             app:layout_constraintTop_toTopOf="@+id/ivBeds"
diff --git a/features/home/src/main/res/menu/menu_home.xml b/features/home/src/main/res/menu/menu_home.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/menu_item_sort"
+        android:icon="@drawable/ic_baseline_sort_24"
+        app:showAsAction="always"
+        android:title="Sort" />
+</menu>

Original file line number	Diff line number	Diff line change
`@@ -64,8 +64,8 @@ fun View.visibilityBasedOn(condition: Boolean) {`
`64`	`64`	`@BindingAdapter("favoriteImageSrc")`
`65`	`65`	`fun ImageButton.setFavoriteImageSrc(favorite: Boolean) {`
`66`	`66`
`67`		`- val imageResource = if (favorite) R.drawable.ic_baseline_favorite_24`
`68`		`- else R.drawable.ic_baseline_favorite_border_24`
	`67`	`+ val imageResource = if (favorite) R.drawable.ic_baseline_favorite_30`
	`68`	`+ else R.drawable.ic_baseline_favorite_border_30`
`69`	`69`
`70`	`70`	`setImageResource(imageResource)`
`71`	`71`	`}`