From be6331256cf8ffabd45eaf60a3d635d2b1abba99 Mon Sep 17 00:00:00 2001
From: "muindi.stephen" <muindi.stephen@eclectics.io>
Date: Tue, 16 Apr 2024 08:42:28 +0300
Subject: [PATCH 1/2] added search functionality to enable farmer search
 through various cycles

---
 .../crop_cycle/CropCycleTasksListFragment.kt  | 32 +++++++++++++++
 .../ui/fragments/splash/SplashFragment.kt     |  3 +-
 .../smartmkulima/utils/ExtensionFunctions.kt  | 30 ++++++++++++++
 app/src/main/res/drawable/eclectics_svg.xml   | 22 ++++++++++
 app/src/main/res/drawable/group.xml           | 14 +++++++
 app/src/main/res/layout/custom_toolbar.xml    |  1 +
 .../fragment_auto_create_crop_cycle.xml       |  2 +-
 .../res/layout/fragment_change_password.xml   |  2 +-
 .../res/layout/fragment_crop_cycle_list.xml   | 40 ++++++++++++++++---
 .../layout/fragment_email_verification.xml    |  2 +-
 .../res/layout/fragment_home_dashboard.xml    |  1 +
 .../main/res/layout/fragment_login_main.xml   |  2 +-
 .../main/res/layout/fragment_main_auths.xml   |  2 +-
 .../layout/fragment_phone_verification.xml    |  2 +-
 .../fragment_recover_password_with_email.xml  |  4 +-
 .../fragment_recover_password_with_phone.xml  |  4 +-
 .../fragment_sign_in_details_with_email.xml   |  4 +-
 .../fragment_sign_in_details_with_phone.xml   |  2 +-
 .../fragment_sign_up_details_with_email.xml   |  2 +-
 .../fragment_sign_up_details_with_phone.xml   |  4 +-
 app/src/main/res/layout/fragment_splash.xml   | 21 ++--------
 app/src/main/res/layout/transaction_row.xml   |  1 +
 app/src/main/res/values/colors.xml            |  4 +-
 app/src/main/res/values/themes.xml            |  3 +-
 24 files changed, 160 insertions(+), 44 deletions(-)
 create mode 100644 app/src/main/res/drawable/eclectics_svg.xml
 create mode 100644 app/src/main/res/drawable/group.xml

diff --git a/app/src/main/java/com/steve_md/smartmkulima/ui/fragments/others/crop_cycle/CropCycleTasksListFragment.kt b/app/src/main/java/com/steve_md/smartmkulima/ui/fragments/others/crop_cycle/CropCycleTasksListFragment.kt
index f2e96b6..55b57c8 100644
--- a/app/src/main/java/com/steve_md/smartmkulima/ui/fragments/others/crop_cycle/CropCycleTasksListFragment.kt
+++ b/app/src/main/java/com/steve_md/smartmkulima/ui/fragments/others/crop_cycle/CropCycleTasksListFragment.kt
@@ -7,6 +7,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.view.inputmethod.EditorInfo
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
@@ -22,6 +23,7 @@ import com.steve_md.smartmkulima.model.CropCycleTask
 import com.steve_md.smartmkulima.model.Cycle
 import com.steve_md.smartmkulima.model.FarmEquipment
 import com.steve_md.smartmkulima.utils.displaySnackBar
+import com.steve_md.smartmkulima.utils.hideKeyboard
 import com.steve_md.smartmkulima.utils.toast
 import retrofit2.Call
 import retrofit2.Response
@@ -92,6 +94,36 @@ class CropCycleTasksListFragment : Fragment() {
             filterCycles("Livestock cycle")
         }
 
+        binding.searchProduct.setOnEditorActionListener { _, actionId, _ ->
+            if (actionId == EditorInfo.IME_ACTION_SEARCH) {
+
+                hideKeyboard()
+
+                val searchText = binding.searchView.editText?.text.toString().trim()
+
+                if (searchText.isEmpty()) {
+                    toast("Enter some text in order to search")
+                    false
+                }
+                filterCycles(searchText)
+                true
+            } else {
+                false
+            }
+
+        }
+
+        binding.searchView.setEndIconOnClickListener {
+            hideKeyboard()
+
+            if (binding.searchView.editText?.text.isNullOrEmpty()) {
+                return@setEndIconOnClickListener
+            }
+
+            binding.searchView.editText?.setText("")
+            getAllAvailableCropCycle()
+        }
+
     }
 
     // Fetch from remote API (web-service)
diff --git a/app/src/main/java/com/steve_md/smartmkulima/ui/fragments/splash/SplashFragment.kt b/app/src/main/java/com/steve_md/smartmkulima/ui/fragments/splash/SplashFragment.kt
index 37f1207..530b9b3 100644
--- a/app/src/main/java/com/steve_md/smartmkulima/ui/fragments/splash/SplashFragment.kt
+++ b/app/src/main/java/com/steve_md/smartmkulima/ui/fragments/splash/SplashFragment.kt
@@ -13,6 +13,7 @@ import androidx.navigation.fragment.findNavController
 import com.google.firebase.auth.FirebaseAuth
 import com.steve_md.smartmkulima.R
 import com.steve_md.smartmkulima.databinding.FragmentSplashBinding
+import com.steve_md.smartmkulima.utils.makeStatusBarTransparent
 import dagger.hilt.android.AndroidEntryPoint
 
 
@@ -33,10 +34,10 @@ class SplashFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+       // makeStatusBarTransparent()
 
         val userIsLoggedIn = FirebaseAuth.getInstance().currentUser
 
-
         Handler(Looper.getMainLooper()).postDelayed({
 
             if (userIsLoggedIn != null) {
diff --git a/app/src/main/java/com/steve_md/smartmkulima/utils/ExtensionFunctions.kt b/app/src/main/java/com/steve_md/smartmkulima/utils/ExtensionFunctions.kt
index e5631a2..57154ee 100644
--- a/app/src/main/java/com/steve_md/smartmkulima/utils/ExtensionFunctions.kt
+++ b/app/src/main/java/com/steve_md/smartmkulima/utils/ExtensionFunctions.kt
@@ -1,9 +1,15 @@
 package com.steve_md.smartmkulima.utils
 
 import android.app.Activity
+import android.graphics.Color
+import android.os.Build
 import android.view.View
+import android.view.WindowManager
 import android.view.inputmethod.InputMethodManager
+import android.widget.FrameLayout
 import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.updateMargins
 import androidx.fragment.app.Fragment
 import com.google.android.material.snackbar.Snackbar
 
@@ -43,3 +49,27 @@ inline fun <T> safeCall(action: () -> Resource<T>): Resource<T> {
     }
 }
 
+fun Fragment.makeStatusBarTransparent() {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+        requireActivity().window.apply {
+            clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS)
+            addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                decorView.systemUiVisibility =
+                    View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or
+                            View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
+            } else {
+                decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+            }
+            statusBarColor = Color.TRANSPARENT
+        }
+    }
+}
+
+
+fun Fragment.hideSupportActionBar() {
+    (requireActivity() as AppCompatActivity).supportActionBar?.hide()
+    val layoutparams = view!!.layoutParams as FrameLayout.LayoutParams
+    layoutparams.updateMargins(top = 0)
+}
+
diff --git a/app/src/main/res/drawable/eclectics_svg.xml b/app/src/main/res/drawable/eclectics_svg.xml
new file mode 100644
index 0000000..7815308
--- /dev/null
+++ b/app/src/main/res/drawable/eclectics_svg.xml
@@ -0,0 +1,22 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="256.66dp"
+    android:height="49.53dp"
+    android:viewportWidth="256.66"
+    android:viewportHeight="49.53">
+  <path
+      android:pathData="M18.84,6.7c0.81,0.04 1.62,0.01 2.43,0a19.63,19.63 0,0 1,12.45 5.85,20.23 20.23,0 0,1 5.46,10 21.34,21.34 0,0 1,0.37 5.36A6.31,6.31 0,0 1,39.19 30.6a2.19,2.19 0,0 1,-1.47 1.11,12.51 12.51,0 0,1 -3.25,0.27L21.03,31.98a3.52,3.52 0,0 1,-3.46 -3.59h0q0,-0.52 0,-0.92 0,-0.52 0,-1.2h0a3.52,3.52 0,0 1,3.46 -3.59q4.58,0 7.21,-0.01a9.44,9.44 0,0 0,-5.56 -5.56,9.63 9.63,0 0,0 -6,0.23 9.27,9.27 0,0 0,-5.29 5.34c-1.15,2.78 -0.92,6.65 0,9.49a11.45,11.45 0,0 0,2.08 3.99,9.43 9.43,0 0,0 7.38,3.17q1.78,-0.01 3.06,0 -0.21,0.67 -0.26,0.87a9.5,9.5 0,0 0,-0.26 2.54,9.21 9.21,0 0,0 0.86,3.66 17.3,17.3 0,0 0,1.84 2.64c-4.43,0.54 -9.69,0.57 -13.98,-1.52A21.39,21.39 0,0 1,2.01 37.29,22 22,0 0,1 0.2,24.94 21.85,21.85 0,0 1,7.48 11.28,19.23 19.23,0 0,1 18.84,6.7Z"
+      android:fillColor="#02a7e1"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M37.23,36.08a7.07,7.07 0,0 1,3.65 4.1,7.7 7.7,0 0,1 0.18,3.85c-0.07,0.22 -0.13,0.45 -0.19,0.67a8.31,8.31 0,0 1,-1.68 2.73,7.23 7.23,0 0,1 -9.99,0 7.95,7.95 0,0 1,-1.88 -3.42,8.51 8.51,0 0,1 0,-3.16c0.07,-0.22 0.13,-0.45 0.19,-0.67a7.04,7.04 0,0 1,9.72 -4.11Z"
+      android:fillColor="#f69414"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M61.52,49.4a15.73,15.73 0,0 0,5.46 -0.95,19.65 19.65,0 0,0 4.75,-2.51 5.11,5.11 0,0 0,0.83 -0.7,1.42 1.42,0 0,0 0.38,-1.03 1.18,1.18 0,0 0,-0.12 -0.44,4.18 4.18,0 0,0 -0.25,-0.49h0l-2.96,-4.64a2.25,2.25 0,0 0,-0.77 -0.82,1.75 1.75,0 0,0 -0.82,-0.19 2.72,2.72 0,0 0,-0.52 0.07,1.83 1.83,0 0,0 -0.7,0.34 12.65,12.65 0,0 1,-2.51 1.4,7.31 7.31,0 0,1 -2.83,0.55 7,7 0,0 1,-3.07 -0.67A7.26,7.26 0,0 1,56 37.5a8.42,8.42 0,0 1,-1.55 -2.73,10.48 10.48,0 0,1 0,-6.73 9.07,9.07 0,0 1,1.55 -2.8,7.26 7.26,0 0,1 2.39,-1.91 6.77,6.77 0,0 1,3.07 -0.7,7.94 7.94,0 0,1 2.84,0.51 11.9,11.9 0,0 1,2.5 1.3,3.26 3.26,0 0,0 0.77,0.43 1.78,1.78 0,0 0,0.58 0.12,2.12 2.12,0 0,0 1.8,-1.34h0l2.35,-4.14a1.95,1.95 0,0 0,0.32 -1.01,2 2,0 0,0 -0.34,-1.19 3.13,3.13 0,0 0,-0.93 -0.84h0l0.08,0.08a16.29,16.29 0,0 0,-4.59 -2.36,17.15 17.15,0 0,0 -5.33,-0.8 16.62,16.62 0,0 0,-4.59 0.63,16.84 16.84,0 0,0 -4.11,1.78 17.46,17.46 0,0 0,-3.49 2.78,17.21 17.21,0 0,0 -2.7,3.62A19.09,19.09 0,0 0,44.89 36.22a19.02,19.02 0,0 0,1.73 4.32,17.06 17.06,0 0,0 2.7,3.63 17.86,17.86 0,0 0,3.49 2.8,16.62 16.62,0 0,0 8.7,2.43ZM85,5.23l0.11,0.01a1.31,1.31 0,0 1,0.45 0.14,1.96 1.96,0 0,1 0.54,0.42 2.39,2.39 0,0 1,0.42 0.64,1.98 1.98,0 0,1 0.17,0.83h0L86.69,47.45l0,0.14a1.93,1.93 0,0 1,-0.57 1.4,2.08 2.08,0 0,1 -1.47,0.52h-6.14l-0.14,0a1.68,1.68 0,0 1,-1.32 -0.52,2.42 2.42,0 0,1 -0.42,-1.55h0L76.64,7.27l0,-0.15a2.37,2.37 0,0 1,0.42 -1.3,1.67 1.67,0 0,1 1.46,-0.59h6.48ZM107.1,13.39a15.03,15.03 0,0 1,4.25 0.6,16.2 16.2,0 0,1 3.87,1.7 16.89,16.89 0,0 1,3.31 2.63,17.69 17.69,0 0,1 2.59,3.36 16.54,16.54 0,0 1,1.68 3.9,15.4 15.4,0 0,1 0.59,4.27q0,1.43 -0.04,2.33a2.71,2.71 0,0 1,-0.41 1.44,1.98 1.98,0 0,1 -1.23,0.74 11.57,11.57 0,0 1,-2.52 0.21L100.18,34.57l0.04,0.25a6.7,6.7 0,0 0,2.89 4.57,7.29 7.29,0 0,0 2.24,1 9.13,9.13 0,0 0,2.24 0.3,9.71 9.71,0 0,0 1.95,-0.21 13.57,13.57 0,0 0,1.94 -0.55,10.77 10.77,0 0,0 1.72,-0.8 5.72,5.72 0,0 0,1.25 -0.95,5.5 5.5,0 0,1 0.73,-0.54 1.26,1.26 0,0 1,0.65 -0.18,1.23 1.23,0 0,1 0.7,0.25 5.57,5.57 0,0 1,0.81 0.71h0l2.8,3.29 0.08,0.1a1.68,1.68 0,0 1,0.29 0.54,2.21 2.21,0 0,1 0.08,0.59 1.56,1.56 0,0 1,-0.29 0.95,3.38 3.38,0 0,1 -0.69,0.7 17.52,17.52 0,0 1,-5.23 3.47,15.41 15.41,0 0,1 -6.15,1.25 17.26,17.26 0,0 1,-6.84 -1.37,17.74 17.74,0 0,1 -5.65,-3.8 18.25,18.25 0,0 1,-3.85 -5.72,17.83 17.83,0 0,1 -1.42,-7.16 19.16,19.16 0,0 1,0.57 -4.68,18.88 18.88,0 0,1 1.61,-4.24 17.97,17.97 0,0 1,2.53 -3.64,16.04 16.04,0 0,1 7.35,-4.68A15.6,15.6 0,0 1,107.1 13.39ZM106.91,21.76a4.89,4.89 0,0 0,-1.99 0.43,7.47 7.47,0 0,0 -1.81,1.14 9.63,9.63 0,0 0,-1.52 1.62,10 10,0 0,0 -1.1,1.84L113.99,26.78a16.26,16.26 0,0 0,-1.2 -1.98,8.32 8.32,0 0,0 -1.48,-1.59 6.31,6.31 0,0 0,-1.9 -1.07A7.37,7.37 0,0 0,106.91 21.76ZM144.48,49.4a15.73,15.73 0,0 0,5.46 -0.95,19.65 19.65,0 0,0 4.75,-2.51 5.12,5.12 0,0 0,0.83 -0.7,1.42 1.42,0 0,0 0.38,-1.03 1.18,1.18 0,0 0,-0.12 -0.44,4.19 4.19,0 0,0 -0.25,-0.49h0l-2.96,-4.64a2.24,2.24 0,0 0,-0.77 -0.82,1.75 1.75,0 0,0 -0.82,-0.19 2.72,2.72 0,0 0,-0.52 0.07,1.83 1.83,0 0,0 -0.7,0.34 12.65,12.65 0,0 1,-2.51 1.4,7.31 7.31,0 0,1 -2.83,0.55 7,7 0,0 1,-3.07 -0.67,7.26 7.26,0 0,1 -2.39,-1.82 8.42,8.42 0,0 1,-1.55 -2.73,10.48 10.48,0 0,1 0,-6.73 9.07,9.07 0,0 1,1.55 -2.8,7.26 7.26,0 0,1 2.39,-1.91 6.77,6.77 0,0 1,3.07 -0.7,7.94 7.94,0 0,1 2.84,0.51 11.9,11.9 0,0 1,2.5 1.3,3.26 3.26,0 0,0 0.77,0.43 1.78,1.78 0,0 0,0.58 0.12,2.12 2.12,0 0,0 1.8,-1.34h0l2.35,-4.14a1.95,1.95 0,0 0,0.32 -1.01,2 2,0 0,0 -0.34,-1.19 3.13,3.13 0,0 0,-0.93 -0.84h0l0.08,0.08a16.29,16.29 0,0 0,-4.59 -2.36,17.15 17.15,0 0,0 -5.33,-0.8 16.62,16.62 0,0 0,-4.59 0.63,16.84 16.84,0 0,0 -4.11,1.78 17.46,17.46 0,0 0,-3.49 2.78,17.21 17.21,0 0,0 -2.7,3.62 19.09,19.09 0,0 0,-1.73 14.02,19.02 19.02,0 0,0 1.73,4.32 17.06,17.06 0,0 0,2.7 3.63,17.86 17.86,0 0,0 3.49,2.8 16.62,16.62 0,0 0,8.7 2.43ZM172.4,49.44a2.29,2.29 0,0 0,1.61 -0.54,2.04 2.04,0 0,0 0.58,-1.58l-0.03,-23.15L178.19,24.18a1.85,1.85 0,0 0,1.38 -0.54,2.32 2.32,0 0,0 0.53,-1.69L180.1,16.67a2.1,2.1 0,0 0,-0.53 -1.56,1.88 1.88,0 0,0 -1.38,-0.52h-3.62l0.03,-7.54a3.16,3.16 0,0 0,-0.33 -1.55,1.37 1.37,0 0,0 -1.31,-0.59h-0.22a1.24,1.24 0,0 0,-0.25 0.03l-6,2.17a6.03,6.03 0,0 0,-1.55 0.81,1.52 1.52,0 0,0 -0.54,1.27l-0.03,5.4h-2.72a1.82,1.82 0,0 0,-2.04 2.08v5.29q0,2.22 2.04,2.22h2.72l0.03,23.15q0,2.11 2.04,2.11ZM191.65,9.87a1.89,1.89 0,0 0,1.1 -0.5,3.55 3.55,0 0,0 0.65,-0.79 4.43,4.43 0,0 0,0.41 -0.87,2.4 2.4,0 0,0 0.14,-0.76L193.96,1.62q0,-1.15 -0.57,-1.46A1.93,1.93 0,0 0,191.89 0.14l-6.14,1.87a2.83,2.83 0,0 0,-1.48 0.93,2.88 2.88,0 0,0 -0.48,1.78L183.8,8.05c0,1.52 0.68,1.82 1.96,1.82ZM191.81,49.53A2.2,2.2 0,0 0,193.4 49a2.09,2.09 0,0 0,0.56 -1.58h0L193.95,16.84a1.7,1.7 0,0 0,-0.22 -0.88,2.84 2.84,0 0,0 -0.54,-0.67 2.33,2.33 0,0 0,-0.69 -0.44,1.83 1.83,0 0,0 -0.69,-0.15h-6.06a1.74,1.74 0,0 0,-1.48 0.63,2.43 2.43,0 0,0 -0.48,1.51h0L183.8,47.42q0,2.11 1.96,2.11h6.06ZM215.18,49.4a15.73,15.73 0,0 0,5.46 -0.95,19.65 19.65,0 0,0 4.75,-2.51 5.11,5.11 0,0 0,0.83 -0.7,1.42 1.42,0 0,0 0.38,-1.03 1.18,1.18 0,0 0,-0.12 -0.44,4.18 4.18,0 0,0 -0.25,-0.49h0l-2.96,-4.64a2.24,2.24 0,0 0,-0.77 -0.82,1.75 1.75,0 0,0 -0.82,-0.19 2.72,2.72 0,0 0,-0.52 0.07,1.83 1.83,0 0,0 -0.7,0.34 12.65,12.65 0,0 1,-2.51 1.4,7.31 7.31,0 0,1 -2.83,0.55 7,7 0,0 1,-3.07 -0.67,7.26 7.26,0 0,1 -2.39,-1.82 8.42,8.42 0,0 1,-1.55 -2.73,10.48 10.48,0 0,1 0,-6.73 9.07,9.07 0,0 1,1.55 -2.8,7.26 7.26,0 0,1 2.39,-1.91 6.77,6.77 0,0 1,3.07 -0.7,7.94 7.94,0 0,1 2.84,0.51 11.9,11.9 0,0 1,2.5 1.3,3.26 3.26,0 0,0 0.77,0.43 1.78,1.78 0,0 0,0.58 0.12,2.12 2.12,0 0,0 1.8,-1.34h0l2.35,-4.14a1.95,1.95 0,0 0,0.32 -1.01,2 2,0 0,0 -0.34,-1.19 3.13,3.13 0,0 0,-0.93 -0.84h0l0.08,0.08a16.29,16.29 0,0 0,-4.59 -2.36,17.15 17.15,0 0,0 -5.33,-0.8 16.62,16.62 0,0 0,-4.59 0.63,16.84 16.84,0 0,0 -4.11,1.78A17.46,17.46 0,0 0,202.99 18.59a17.21,17.21 0,0 0,-2.7 3.62,19.09 19.09,0 0,0 -1.73,14.02 19.02,19.02 0,0 0,1.73 4.32,17.06 17.06,0 0,0 2.7,3.63 17.86,17.86 0,0 0,3.49 2.8,16.62 16.62,0 0,0 8.7,2.43ZM243.04,49.4a18.35,18.35 0,0 0,5.38 -0.76,13.01 13.01,0 0,0 4.32,-2.21 10.26,10.26 0,0 0,2.87 -3.57,10.79 10.79,0 0,0 1.04,-4.82 11.59,11.59 0,0 0,-0.81 -4.58A9.4,9.4 0,0 0,253.59 30.24a13.27,13.27 0,0 0,-3.44 -2.28A40.41,40.41 0,0 0,245.79 26.25q-0.63,-0.19 -1.39,-0.34a9.72,9.72 0,0 1,-1.43 -0.4,3.66 3.66,0 0,1 -1.14,-0.64 1.53,1.53 0,0 1,-0.52 -1.1,1.44 1.44,0 0,1 0.71,-1.42 3.97,3.97 0,0 1,2.06 -0.46,7.55 7.55,0 0,1 2.22,0.37 4.59,4.59 0,0 1,2.12 1.43,2.32 2.32,0 0,0 0.48,0.46 1.76,1.76 0,0 0,0.56 0.27,1.25 1.25,0 0,0 0.61,0.01 1.46,1.46 0,0 0,0.63 -0.34q1,-1.03 1.94,-1.88t1.97,-1.72a1.42,1.42 0,0 0,0.6 -1.02,1.73 1.73,0 0,0 -0.46,-1.02 20.67,20.67 0,0 0,-2.5 -2.3,13.62 13.62,0 0,0 -2.58,-1.58 12.15,12.15 0,0 0,-2.78 -0.9,17.47 17.47,0 0,0 -8.12,0.44 11.63,11.63 0,0 0,-3.86 2.04,9.04 9.04,0 0,0 -2.49,3.17 9.53,9.53 0,0 0,-0.87 4.11,13.91 13.91,0 0,0 0.48,3.68 9.01,9.01 0,0 0,1.68 3.26,11.83 11.83,0 0,0 3.27,2.74 21.4,21.4 0,0 0,5.24 2.1q1,0.33 1.81,0.57a6.83,6.83 0,0 1,1.36 0.56,2.36 2.36,0 0,1 0.85,0.76 2.21,2.21 0,0 1,0.29 1.21,1.67 1.67,0 0,1 -0.52,1.31 3.08,3.08 0,0 1,-1.23 0.67,6.68 6.68,0 0,1 -1.49,0.25q-0.78,0.04 -1.28,0.04a4.27,4.27 0,0 1,-0.79 -0.14,9.18 9.18,0 0,1 -1.35,-0.45 11.55,11.55 0,0 1,-1.6 -0.82,7.73 7.73,0 0,1 -1.55,-1.24 3.74,3.74 0,0 0,-1.26 -0.93,1.18 1.18,0 0,0 -1.12,0.38h0l-3.41,3.51a1.46,1.46 0,0 0,-0.46 0.59,2.06 2.06,0 0,0 -0.16,0.75 2.31,2.31 0,0 0,0.13 0.83,2.86 2.86,0 0,0 0.44,0.8 12,12 0,0 0,2.54 2.55,14.73 14.73,0 0,0 3.02,1.72 15.32,15.32 0,0 0,3.28 0.97A19.09,19.09 0,0 0,243.04 49.4Z"
+      android:fillColor="#083273"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M61.52,49.4a15.73,15.73 0,0 0,5.46 -0.95,19.65 19.65,0 0,0 4.75,-2.51 5.11,5.11 0,0 0,0.83 -0.7,1.42 1.42,0 0,0 0.38,-1.03 1.18,1.18 0,0 0,-0.12 -0.44,4.18 4.18,0 0,0 -0.25,-0.49h0l-2.96,-4.64a2.25,2.25 0,0 0,-0.77 -0.82,1.75 1.75,0 0,0 -0.82,-0.19 2.72,2.72 0,0 0,-0.52 0.07,1.83 1.83,0 0,0 -0.7,0.34 12.65,12.65 0,0 1,-2.51 1.4,7.31 7.31,0 0,1 -2.83,0.55 7,7 0,0 1,-3.07 -0.67A7.26,7.26 0,0 1,56 37.5a8.42,8.42 0,0 1,-1.55 -2.73,10.48 10.48,0 0,1 0,-6.73 9.07,9.07 0,0 1,1.55 -2.8,7.26 7.26,0 0,1 2.39,-1.91 6.77,6.77 0,0 1,3.07 -0.7,7.94 7.94,0 0,1 2.84,0.51 11.9,11.9 0,0 1,2.5 1.3,3.26 3.26,0 0,0 0.77,0.43 1.78,1.78 0,0 0,0.58 0.12,2.12 2.12,0 0,0 1.8,-1.34h0l2.35,-4.14a1.95,1.95 0,0 0,0.32 -1.01,2 2,0 0,0 -0.34,-1.19 3.13,3.13 0,0 0,-0.93 -0.84h0l0.08,0.08a16.29,16.29 0,0 0,-4.59 -2.36,17.15 17.15,0 0,0 -5.33,-0.8 16.62,16.62 0,0 0,-4.59 0.63,16.84 16.84,0 0,0 -4.11,1.78 17.46,17.46 0,0 0,-3.49 2.78,17.21 17.21,0 0,0 -2.7,3.62A19.09,19.09 0,0 0,44.89 36.22a19.02,19.02 0,0 0,1.73 4.32,17.06 17.06,0 0,0 2.7,3.63 17.86,17.86 0,0 0,3.49 2.8,16.62 16.62,0 0,0 8.7,2.43ZM85,5.23l0.11,0.01a1.31,1.31 0,0 1,0.45 0.14,1.96 1.96,0 0,1 0.54,0.42 2.39,2.39 0,0 1,0.42 0.64,1.98 1.98,0 0,1 0.17,0.83h0L86.69,47.45l0,0.14a1.93,1.93 0,0 1,-0.57 1.4,2.08 2.08,0 0,1 -1.47,0.52h-6.14l-0.14,0a1.68,1.68 0,0 1,-1.32 -0.52,2.42 2.42,0 0,1 -0.42,-1.55h0L76.64,7.27l0,-0.15a2.37,2.37 0,0 1,0.42 -1.3,1.67 1.67,0 0,1 1.46,-0.59h6.48ZM107.1,13.39a15.03,15.03 0,0 1,4.25 0.6,16.2 16.2,0 0,1 3.87,1.7 16.89,16.89 0,0 1,3.31 2.63,17.69 17.69,0 0,1 2.59,3.36 16.54,16.54 0,0 1,1.68 3.9,15.4 15.4,0 0,1 0.59,4.27q0,1.43 -0.04,2.33a2.71,2.71 0,0 1,-0.41 1.44,1.98 1.98,0 0,1 -1.23,0.74 11.57,11.57 0,0 1,-2.52 0.21L100.18,34.57l0.04,0.25a6.7,6.7 0,0 0,2.89 4.57,7.29 7.29,0 0,0 2.24,1 9.13,9.13 0,0 0,2.24 0.3,9.71 9.71,0 0,0 1.95,-0.21 13.57,13.57 0,0 0,1.94 -0.55,10.77 10.77,0 0,0 1.72,-0.8 5.72,5.72 0,0 0,1.25 -0.95,5.5 5.5,0 0,1 0.73,-0.54 1.26,1.26 0,0 1,0.65 -0.18,1.23 1.23,0 0,1 0.7,0.25 5.57,5.57 0,0 1,0.81 0.71h0l2.8,3.29 0.08,0.1a1.68,1.68 0,0 1,0.29 0.54,2.21 2.21,0 0,1 0.08,0.59 1.56,1.56 0,0 1,-0.29 0.95,3.38 3.38,0 0,1 -0.69,0.7 17.52,17.52 0,0 1,-5.23 3.47,15.41 15.41,0 0,1 -6.15,1.25 17.26,17.26 0,0 1,-6.84 -1.37,17.74 17.74,0 0,1 -5.65,-3.8 18.25,18.25 0,0 1,-3.85 -5.72,17.83 17.83,0 0,1 -1.42,-7.16 19.16,19.16 0,0 1,0.57 -4.68,18.88 18.88,0 0,1 1.61,-4.24 17.97,17.97 0,0 1,2.53 -3.64,16.04 16.04,0 0,1 7.35,-4.68A15.6,15.6 0,0 1,107.1 13.39ZM106.91,21.76a4.89,4.89 0,0 0,-1.99 0.43,7.47 7.47,0 0,0 -1.81,1.14 9.63,9.63 0,0 0,-1.52 1.62,10 10,0 0,0 -1.1,1.84L113.99,26.78a16.26,16.26 0,0 0,-1.2 -1.98,8.32 8.32,0 0,0 -1.48,-1.59 6.31,6.31 0,0 0,-1.9 -1.07A7.37,7.37 0,0 0,106.91 21.76ZM144.48,49.4a15.73,15.73 0,0 0,5.46 -0.95,19.65 19.65,0 0,0 4.75,-2.51 5.12,5.12 0,0 0,0.83 -0.7,1.42 1.42,0 0,0 0.38,-1.03 1.18,1.18 0,0 0,-0.12 -0.44,4.19 4.19,0 0,0 -0.25,-0.49h0l-2.96,-4.64a2.24,2.24 0,0 0,-0.77 -0.82,1.75 1.75,0 0,0 -0.82,-0.19 2.72,2.72 0,0 0,-0.52 0.07,1.83 1.83,0 0,0 -0.7,0.34 12.65,12.65 0,0 1,-2.51 1.4,7.31 7.31,0 0,1 -2.83,0.55 7,7 0,0 1,-3.07 -0.67,7.26 7.26,0 0,1 -2.39,-1.82 8.42,8.42 0,0 1,-1.55 -2.73,10.48 10.48,0 0,1 0,-6.73 9.07,9.07 0,0 1,1.55 -2.8,7.26 7.26,0 0,1 2.39,-1.91 6.77,6.77 0,0 1,3.07 -0.7,7.94 7.94,0 0,1 2.84,0.51 11.9,11.9 0,0 1,2.5 1.3,3.26 3.26,0 0,0 0.77,0.43 1.78,1.78 0,0 0,0.58 0.12,2.12 2.12,0 0,0 1.8,-1.34h0l2.35,-4.14a1.95,1.95 0,0 0,0.32 -1.01,2 2,0 0,0 -0.34,-1.19 3.13,3.13 0,0 0,-0.93 -0.84h0l0.08,0.08a16.29,16.29 0,0 0,-4.59 -2.36,17.15 17.15,0 0,0 -5.33,-0.8 16.62,16.62 0,0 0,-4.59 0.63,16.84 16.84,0 0,0 -4.11,1.78 17.46,17.46 0,0 0,-3.49 2.78,17.21 17.21,0 0,0 -2.7,3.62 19.09,19.09 0,0 0,-1.73 14.02,19.02 19.02,0 0,0 1.73,4.32 17.06,17.06 0,0 0,2.7 3.63,17.86 17.86,0 0,0 3.49,2.8 16.62,16.62 0,0 0,8.7 2.43ZM172.4,49.44a2.29,2.29 0,0 0,1.61 -0.54,2.04 2.04,0 0,0 0.58,-1.58l-0.03,-23.15L178.19,24.18a1.85,1.85 0,0 0,1.38 -0.54,2.32 2.32,0 0,0 0.53,-1.69L180.1,16.67a2.1,2.1 0,0 0,-0.53 -1.56,1.88 1.88,0 0,0 -1.38,-0.52h-3.62l0.03,-7.54a3.16,3.16 0,0 0,-0.33 -1.55,1.37 1.37,0 0,0 -1.31,-0.59h-0.22a1.24,1.24 0,0 0,-0.25 0.03l-6,2.17a6.03,6.03 0,0 0,-1.55 0.81,1.52 1.52,0 0,0 -0.54,1.27l-0.03,5.4h-2.72a1.82,1.82 0,0 0,-2.04 2.08v5.29q0,2.22 2.04,2.22h2.72l0.03,23.15q0,2.11 2.04,2.11ZM191.65,9.87a1.89,1.89 0,0 0,1.1 -0.5,3.55 3.55,0 0,0 0.65,-0.79 4.43,4.43 0,0 0,0.41 -0.87,2.4 2.4,0 0,0 0.14,-0.76L193.96,1.62q0,-1.15 -0.57,-1.46A1.93,1.93 0,0 0,191.89 0.14l-6.14,1.87a2.83,2.83 0,0 0,-1.48 0.93,2.88 2.88,0 0,0 -0.48,1.78L183.8,8.05c0,1.52 0.68,1.82 1.96,1.82ZM191.81,49.53A2.2,2.2 0,0 0,193.4 49a2.09,2.09 0,0 0,0.56 -1.58h0L193.95,16.84a1.7,1.7 0,0 0,-0.22 -0.88,2.84 2.84,0 0,0 -0.54,-0.67 2.33,2.33 0,0 0,-0.69 -0.44,1.83 1.83,0 0,0 -0.69,-0.15h-6.06a1.74,1.74 0,0 0,-1.48 0.63,2.43 2.43,0 0,0 -0.48,1.51h0L183.8,47.42q0,2.11 1.96,2.11h6.06ZM215.18,49.4a15.73,15.73 0,0 0,5.46 -0.95,19.65 19.65,0 0,0 4.75,-2.51 5.11,5.11 0,0 0,0.83 -0.7,1.42 1.42,0 0,0 0.38,-1.03 1.18,1.18 0,0 0,-0.12 -0.44,4.18 4.18,0 0,0 -0.25,-0.49h0l-2.96,-4.64a2.24,2.24 0,0 0,-0.77 -0.82,1.75 1.75,0 0,0 -0.82,-0.19 2.72,2.72 0,0 0,-0.52 0.07,1.83 1.83,0 0,0 -0.7,0.34 12.65,12.65 0,0 1,-2.51 1.4,7.31 7.31,0 0,1 -2.83,0.55 7,7 0,0 1,-3.07 -0.67,7.26 7.26,0 0,1 -2.39,-1.82 8.42,8.42 0,0 1,-1.55 -2.73,10.48 10.48,0 0,1 0,-6.73 9.07,9.07 0,0 1,1.55 -2.8,7.26 7.26,0 0,1 2.39,-1.91 6.77,6.77 0,0 1,3.07 -0.7,7.94 7.94,0 0,1 2.84,0.51 11.9,11.9 0,0 1,2.5 1.3,3.26 3.26,0 0,0 0.77,0.43 1.78,1.78 0,0 0,0.58 0.12,2.12 2.12,0 0,0 1.8,-1.34h0l2.35,-4.14a1.95,1.95 0,0 0,0.32 -1.01,2 2,0 0,0 -0.34,-1.19 3.13,3.13 0,0 0,-0.93 -0.84h0l0.08,0.08a16.29,16.29 0,0 0,-4.59 -2.36,17.15 17.15,0 0,0 -5.33,-0.8 16.62,16.62 0,0 0,-4.59 0.63,16.84 16.84,0 0,0 -4.11,1.78A17.46,17.46 0,0 0,202.99 18.59a17.21,17.21 0,0 0,-2.7 3.62,19.09 19.09,0 0,0 -1.73,14.02 19.02,19.02 0,0 0,1.73 4.32,17.06 17.06,0 0,0 2.7,3.63 17.86,17.86 0,0 0,3.49 2.8,16.62 16.62,0 0,0 8.7,2.43ZM243.04,49.4a18.35,18.35 0,0 0,5.38 -0.76,13.01 13.01,0 0,0 4.32,-2.21 10.26,10.26 0,0 0,2.87 -3.57,10.79 10.79,0 0,0 1.04,-4.82 11.59,11.59 0,0 0,-0.81 -4.58A9.4,9.4 0,0 0,253.59 30.24a13.27,13.27 0,0 0,-3.44 -2.28A40.41,40.41 0,0 0,245.79 26.25q-0.63,-0.19 -1.39,-0.34a9.72,9.72 0,0 1,-1.43 -0.4,3.66 3.66,0 0,1 -1.14,-0.64 1.53,1.53 0,0 1,-0.52 -1.1,1.44 1.44,0 0,1 0.71,-1.42 3.97,3.97 0,0 1,2.06 -0.46,7.55 7.55,0 0,1 2.22,0.37 4.59,4.59 0,0 1,2.12 1.43,2.32 2.32,0 0,0 0.48,0.46 1.76,1.76 0,0 0,0.56 0.27,1.25 1.25,0 0,0 0.61,0.01 1.46,1.46 0,0 0,0.63 -0.34q1,-1.03 1.94,-1.88t1.97,-1.72a1.42,1.42 0,0 0,0.6 -1.02,1.73 1.73,0 0,0 -0.46,-1.02 20.67,20.67 0,0 0,-2.5 -2.3,13.62 13.62,0 0,0 -2.58,-1.58 12.15,12.15 0,0 0,-2.78 -0.9,17.47 17.47,0 0,0 -8.12,0.44 11.63,11.63 0,0 0,-3.86 2.04,9.04 9.04,0 0,0 -2.49,3.17 9.53,9.53 0,0 0,-0.87 4.11,13.91 13.91,0 0,0 0.48,3.68 9.01,9.01 0,0 0,1.68 3.26,11.83 11.83,0 0,0 3.27,2.74 21.4,21.4 0,0 0,5.24 2.1q1,0.33 1.81,0.57a6.83,6.83 0,0 1,1.36 0.56,2.36 2.36,0 0,1 0.85,0.76 2.21,2.21 0,0 1,0.29 1.21,1.67 1.67,0 0,1 -0.52,1.31 3.08,3.08 0,0 1,-1.23 0.67,6.68 6.68,0 0,1 -1.49,0.25q-0.78,0.04 -1.28,0.04a4.27,4.27 0,0 1,-0.79 -0.14,9.18 9.18,0 0,1 -1.35,-0.45 11.55,11.55 0,0 1,-1.6 -0.82,7.73 7.73,0 0,1 -1.55,-1.24 3.74,3.74 0,0 0,-1.26 -0.93,1.18 1.18,0 0,0 -1.12,0.38h0l-3.41,3.51a1.46,1.46 0,0 0,-0.46 0.59,2.06 2.06,0 0,0 -0.16,0.75 2.31,2.31 0,0 0,0.13 0.83,2.86 2.86,0 0,0 0.44,0.8 12,12 0,0 0,2.54 2.55,14.73 14.73,0 0,0 3.02,1.72 15.32,15.32 0,0 0,3.28 0.97A19.09,19.09 0,0 0,243.04 49.4Z"
+      android:fillColor="#fffffe"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/group.xml b/app/src/main/res/drawable/group.xml
new file mode 100644
index 0000000..d12ba3c
--- /dev/null
+++ b/app/src/main/res/drawable/group.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="47dp"
+    android:height="47dp"
+    android:viewportWidth="47"
+    android:viewportHeight="47">
+  <path
+      android:pathData="M21.234,0.529C22.148,0.57 23.063,0.542 23.978,0.53C29.223,0.895 34.278,3.219 38.02,6.891C41.049,9.833 43.275,13.627 44.174,17.759C44.589,19.67 44.683,21.639 44.589,23.587C44.559,24.566 44.649,25.612 44.183,26.511C43.865,27.155 43.203,27.55 42.523,27.717C41.327,28.013 40.086,28.018 38.86,28.006C35.303,28.005 30.252,28.005 23.706,28.006C21.553,28.006 19.808,26.261 19.808,24.108C19.808,24.108 19.808,24.107 19.808,24.107C19.808,23.732 19.808,23.397 19.808,23.102C19.808,22.728 19.808,22.292 19.808,21.797C19.808,19.644 21.553,17.899 23.706,17.899C27.148,17.899 29.858,17.896 31.836,17.891C30.693,15.153 28.47,12.766 25.569,11.846C23.553,11.237 20.803,11.308 18.804,12.092C15.833,13.257 14.076,15.143 12.84,17.898C11.539,20.92 11.808,25.123 12.84,28.219C13.368,29.765 14.066,31.324 15.184,32.56C17.193,34.982 20.44,35.976 23.503,36.004C24.838,35.994 25.986,35.994 26.948,36.004C26.788,36.489 26.689,36.806 26.651,36.953C26.43,37.814 26.358,38.503 26.358,39.717C26.358,40.78 26.652,42.317 27.324,43.698C27.931,44.944 28.975,45.944 29.402,46.569C24.412,47.153 18.476,47.188 13.638,44.916C8.712,42.653 4.617,38.656 2.27,33.78C0.204,29.655 -0.385,24.891 0.233,20.347C1.011,14.616 3.959,9.19 8.436,5.496C12.026,2.536 16.584,0.776 21.234,0.529Z"
+      android:fillColor="#02A7E1"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M41.974,31.924C43.913,32.819 45.402,34.544 46.094,36.552C46.525,37.955 46.601,39.455 46.296,40.89C46.222,41.144 46.151,41.397 46.078,41.65C45.673,42.8 44.994,43.822 44.188,44.728C42.6,46.206 40.451,47.125 38.259,46.986C36.259,46.979 34.38,46.049 32.92,44.732C31.927,43.632 31.158,42.328 30.806,40.879C30.584,39.701 30.581,38.49 30.806,37.312C30.882,37.058 30.951,36.807 31.017,36.554C31.696,34.568 33.162,32.884 35.047,31.955C37.203,30.923 39.816,30.877 41.974,31.924Z"
+      android:fillColor="#F69414"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/layout/custom_toolbar.xml b/app/src/main/res/layout/custom_toolbar.xml
index e3ff7b0..5a695e9 100644
--- a/app/src/main/res/layout/custom_toolbar.xml
+++ b/app/src/main/res/layout/custom_toolbar.xml
@@ -53,6 +53,7 @@
                 android:alpha="1"
                 android:textSize="12sp"
                 android:textStyle="bold"
+                android:textColor="@color/main"
                 android:layout_marginTop="4dp"
                 android:fontFamily="@font/montserrat_medium"
                 app:layout_constraintStart_toStartOf="@+id/textViewUserNameProfile"
diff --git a/app/src/main/res/layout/fragment_auto_create_crop_cycle.xml b/app/src/main/res/layout/fragment_auto_create_crop_cycle.xml
index b36b908..dd453f7 100644
--- a/app/src/main/res/layout/fragment_auto_create_crop_cycle.xml
+++ b/app/src/main/res/layout/fragment_auto_create_crop_cycle.xml
@@ -139,7 +139,7 @@
                 android:fontFamily="@font/montserrat_medium"
                 android:padding="16dp"
                 android:text="Schedule"
-                android:textColor="@color/main1"
+                android:textColor="@color/main"
                 android:textSize="12sp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_bias="1.0"
diff --git a/app/src/main/res/layout/fragment_change_password.xml b/app/src/main/res/layout/fragment_change_password.xml
index 99726d0..718259f 100644
--- a/app/src/main/res/layout/fragment_change_password.xml
+++ b/app/src/main/res/layout/fragment_change_password.xml
@@ -25,7 +25,7 @@
         android:layout_width="38.75dp"
         android:layout_height="50.45dp"
         android:layout_marginTop="1dp"
-        android:src="@drawable/ic_plant_growing_svgrepo_com2"
+        android:src="@drawable/group"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/mainAuthsToolbar" />
diff --git a/app/src/main/res/layout/fragment_crop_cycle_list.xml b/app/src/main/res/layout/fragment_crop_cycle_list.xml
index 4fab4cb..182f8db 100644
--- a/app/src/main/res/layout/fragment_crop_cycle_list.xml
+++ b/app/src/main/res/layout/fragment_crop_cycle_list.xml
@@ -39,17 +39,45 @@
             android:textSize="18sp" />
     </LinearLayout>
 
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/searchView"
+        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="16dp"
+        android:textColor="@color/white"
+        app:endIconDrawable="@drawable/ic_search"
+        app:endIconMode="custom"
+        app:endIconTint="#aaaaaa"
+        app:hintEnabled="false"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/textView74">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/search_product"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="Search farm cycles"
+            android:inputType="text"
+            android:imeOptions="actionSearch"
+            android:textColorHint="@color/main" />
+
+    </com.google.android.material.textfield.TextInputLayout>
+
+
+
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/cropCycleRecyclerView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="110dp"
+        android:layout_marginTop="170dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="1.0"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/linearLayoutCropCycleList"
-        app:layout_constraintVertical_bias="0.883"
+        app:layout_constraintTop_toBottomOf="@+id/searchView"
         tools:listitem="@layout/crop_cycle_task_row" />
 
     <TextView
@@ -99,7 +127,7 @@
         android:background="@drawable/rounded_corner"
         android:clickable="true"
         android:fontFamily="@font/montserrat_medium"
-        android:padding="2dp"
+        android:padding="4dp"
         android:backgroundTint="@color/main"
         android:textColor="@color/whitish"
         android:layout_marginStart="2dp"
@@ -112,7 +140,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="Livestock"
-        android:layout_marginStart="8dp"
+        android:layout_marginStart="6dp"
         android:padding="4dp"
         android:backgroundTint="@color/gray"
         android:fontFamily="@font/montserrat_medium"
diff --git a/app/src/main/res/layout/fragment_email_verification.xml b/app/src/main/res/layout/fragment_email_verification.xml
index 0749f1c..4e07deb 100644
--- a/app/src/main/res/layout/fragment_email_verification.xml
+++ b/app/src/main/res/layout/fragment_email_verification.xml
@@ -28,7 +28,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         android:layout_marginTop="1dp"
-        android:src="@drawable/ic_plant_growing_svgrepo_com2"
+        android:src="@drawable/group"
         />
 
 
diff --git a/app/src/main/res/layout/fragment_home_dashboard.xml b/app/src/main/res/layout/fragment_home_dashboard.xml
index 22ac9c7..f611ef2 100644
--- a/app/src/main/res/layout/fragment_home_dashboard.xml
+++ b/app/src/main/res/layout/fragment_home_dashboard.xml
@@ -303,6 +303,7 @@
             android:layout_marginStart="22dp"
             android:text="@string/last_login_apr_10_2024"
             android:textSize="12sp"
+            android:textColor="@color/main"
             android:fontFamily="@font/montserrat_medium"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/includeToolBar" />
diff --git a/app/src/main/res/layout/fragment_login_main.xml b/app/src/main/res/layout/fragment_login_main.xml
index 70c4bcd..d54f524 100644
--- a/app/src/main/res/layout/fragment_login_main.xml
+++ b/app/src/main/res/layout/fragment_login_main.xml
@@ -28,7 +28,7 @@
         android:fontFamily="@font/montserrat_semibold"
         android:layout_marginStart="160.62dp"
         android:layout_marginEnd="160.62dp"
-        android:src="@drawable/ic_plant_growing_svgrepo_com2"
+        android:src="@drawable/group"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/mainAuthsToolbar"
diff --git a/app/src/main/res/layout/fragment_main_auths.xml b/app/src/main/res/layout/fragment_main_auths.xml
index 5bfb9ca..474ad1c 100644
--- a/app/src/main/res/layout/fragment_main_auths.xml
+++ b/app/src/main/res/layout/fragment_main_auths.xml
@@ -16,7 +16,7 @@
         android:fontFamily="@font/montserrat_semibold"
         android:layout_marginStart="160.62dp"
         android:layout_marginEnd="160.62dp"
-        android:src="@drawable/ic_plant_growing_svgrepo_com2"
+        android:src="@drawable/group"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/mainAuthsToolbar"
diff --git a/app/src/main/res/layout/fragment_phone_verification.xml b/app/src/main/res/layout/fragment_phone_verification.xml
index 3963d1a..458eb42 100644
--- a/app/src/main/res/layout/fragment_phone_verification.xml
+++ b/app/src/main/res/layout/fragment_phone_verification.xml
@@ -26,7 +26,7 @@
         android:layout_height="50.45dp"
         android:layout_marginTop="1dp"
         android:alpha="1"
-        android:src="@drawable/ic_plant_growing_svgrepo_com2"
+        android:src="@drawable/group"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/mainAuthsToolbar" />
diff --git a/app/src/main/res/layout/fragment_recover_password_with_email.xml b/app/src/main/res/layout/fragment_recover_password_with_email.xml
index 5fa2f96..1d27d63 100644
--- a/app/src/main/res/layout/fragment_recover_password_with_email.xml
+++ b/app/src/main/res/layout/fragment_recover_password_with_email.xml
@@ -26,7 +26,7 @@
         android:layout_width="38.75dp"
         android:layout_height="50.45dp"
         android:layout_marginTop="1dp"
-        android:src="@drawable/ic_plant_growing_svgrepo_com2"
+        android:src="@drawable/group"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/mainAuthsToolbar"/>
@@ -116,7 +116,7 @@
         android:text="Use phone instead"
         android:fontFamily="@font/montserrat_medium"
         android:textSize="13sp"
-        android:textColor="@color/main"
+        android:textColor="@color/textColor"
         app:layout_constraintEnd_toEndOf="@+id/enterEmailAddress"
         app:layout_constraintTop_toBottomOf="@+id/enterEmailAddress" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_recover_password_with_phone.xml b/app/src/main/res/layout/fragment_recover_password_with_phone.xml
index 1375bd5..20bb0a6 100644
--- a/app/src/main/res/layout/fragment_recover_password_with_phone.xml
+++ b/app/src/main/res/layout/fragment_recover_password_with_phone.xml
@@ -25,7 +25,7 @@
         android:layout_width="38.75dp"
         android:layout_height="50.45dp"
         android:layout_marginTop="1dp"
-        android:src="@drawable/ic_plant_growing_svgrepo_com2"
+        android:src="@drawable/group"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/mainAuthsToolbar" />
@@ -113,7 +113,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
         android:fontFamily="@font/montserrat_medium"
-        android:textColor="@color/main"
+        android:textColor="@color/textColor"
         android:textSize="13sp"
         android:text="Use email instead"
         app:layout_constraintEnd_toEndOf="@+id/enterPhoneNumber"
diff --git a/app/src/main/res/layout/fragment_sign_in_details_with_email.xml b/app/src/main/res/layout/fragment_sign_in_details_with_email.xml
index bcf7eaa..066e71f 100644
--- a/app/src/main/res/layout/fragment_sign_in_details_with_email.xml
+++ b/app/src/main/res/layout/fragment_sign_in_details_with_email.xml
@@ -24,7 +24,7 @@
         android:layout_width="38.75dp"
         android:layout_height="50.45dp"
         android:layout_marginTop="1dp"
-        android:src="@drawable/ic_plant_growing_svgrepo_com2"
+        android:src="@drawable/group"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/mainAuthsToolbar" />
@@ -154,7 +154,7 @@
         android:layout_marginTop="8dp"
         android:fontFamily="@font/montserrat_medium"
         android:text="Forgot password?"
-        android:textColor="@color/main"
+        android:textColor="@color/textColor"
         android:textSize="14sp"
         app:layout_constraintEnd_toEndOf="@+id/enterLoginPassword"
         app:layout_constraintTop_toBottomOf="@+id/enterLoginPassword" />
diff --git a/app/src/main/res/layout/fragment_sign_in_details_with_phone.xml b/app/src/main/res/layout/fragment_sign_in_details_with_phone.xml
index f6c7a81..fcefd6a 100644
--- a/app/src/main/res/layout/fragment_sign_in_details_with_phone.xml
+++ b/app/src/main/res/layout/fragment_sign_in_details_with_phone.xml
@@ -24,7 +24,7 @@
         android:layout_width="38.75dp"
         android:layout_height="50.45dp"
         android:layout_marginTop="1dp"
-        android:src="@drawable/ic_plant_growing_svgrepo_com2"
+        android:src="@drawable/group"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/mainAuthsToolbar" />
diff --git a/app/src/main/res/layout/fragment_sign_up_details_with_email.xml b/app/src/main/res/layout/fragment_sign_up_details_with_email.xml
index d0186a7..8653a82 100644
--- a/app/src/main/res/layout/fragment_sign_up_details_with_email.xml
+++ b/app/src/main/res/layout/fragment_sign_up_details_with_email.xml
@@ -25,7 +25,7 @@
         android:layout_width="38.75dp"
         android:layout_height="50.45dp"
         android:layout_marginTop="1dp"
-        android:src="@drawable/ic_plant_growing_svgrepo_com2"
+        android:src="@drawable/group"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/mainAuthsToolbar"/>
diff --git a/app/src/main/res/layout/fragment_sign_up_details_with_phone.xml b/app/src/main/res/layout/fragment_sign_up_details_with_phone.xml
index 91cbf16..33cd25e 100644
--- a/app/src/main/res/layout/fragment_sign_up_details_with_phone.xml
+++ b/app/src/main/res/layout/fragment_sign_up_details_with_phone.xml
@@ -24,7 +24,7 @@
         android:layout_width="38.75dp"
         android:layout_height="50.45dp"
         android:layout_marginTop="1dp"
-        android:src="@drawable/ic_plant_growing_svgrepo_com2"
+        android:src="@drawable/group"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/mainAuthsToolbar" />
@@ -54,7 +54,7 @@
         android:textSize="13sp"
         android:layout_marginStart="60dp"
         android:layout_marginEnd="60dp"
-        android:textColor="@color/textColor"
+        android:textColor="@color/black"
         android:layout_marginTop="16dp"
         android:fontFamily="@font/montserrat"
         app:layout_constraintEnd_toEndOf="@+id/textView6"
diff --git a/app/src/main/res/layout/fragment_splash.xml b/app/src/main/res/layout/fragment_splash.xml
index fe2491f..8454f6f 100644
--- a/app/src/main/res/layout/fragment_splash.xml
+++ b/app/src/main/res/layout/fragment_splash.xml
@@ -10,28 +10,15 @@
 
     <ImageView
         android:id="@+id/splashScreenImageView"
-        android:layout_width="65.11dp"
-        android:layout_height="84.76dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         android:alpha="1"
-        android:rotation="0"
-        android:scaleType="centerCrop"
-        android:src="@drawable/ic_plant_growing_svgrepo_com"
+        android:src="@drawable/eclectics_svg"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <TextView
-        android:id="@+id/textView9"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        android:text="AGRI SASA"
-        android:textSize="22sp"
-        android:fontFamily="@font/noteworthy_bold"
-        android:textColor="@color/white"
-        app:layout_constraintEnd_toEndOf="@+id/splashScreenImageView"
-        app:layout_constraintStart_toStartOf="@+id/splashScreenImageView"
-        app:layout_constraintTop_toBottomOf="@+id/splashScreenImageView" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/transaction_row.xml b/app/src/main/res/layout/transaction_row.xml
index ee83b71..2f654b8 100644
--- a/app/src/main/res/layout/transaction_row.xml
+++ b/app/src/main/res/layout/transaction_row.xml
@@ -11,6 +11,7 @@
         android:layout_marginStart="16dp"
         android:layout_marginLeft="16dp"
         android:layout_marginTop="8dp"
+        android:visibility="invisible"
         android:layout_marginBottom="8dp"
         app:layout_constraintBottom_toBottomOf="@+id/tvDate"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 2af74d5..b626d89 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -8,8 +8,8 @@
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
 
-    <color name="main">#027373</color>
-    <color name="main1">#0E7373</color>
+    <color name="main">#083273</color>
+    <color name="main1">#083273</color>
     <color name="whitish">#FFFFFF</color>
     <color name="main_black">#FF0D0D0D</color>
     <color name="gray">#0D0D0D9A</color>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index aeae124..041af01 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -14,6 +14,5 @@
         <!-- Customize your theme here. -->
 
     </style>
-
-     <color name="textColor">@color/main</color>
+     <color name="textColor">@color/black</color>
 </resources>
\ No newline at end of file

From 8c099e80e03bbd1489ed31b67df88da89569e26d Mon Sep 17 00:00:00 2001
From: "muindi.stephen" <muindi.stephen@eclectics.io>
Date: Tue, 16 Apr 2024 09:07:04 +0300
Subject: [PATCH 2/2] tabular format and crop cycle statuses

---
 app/src/main/res/layout/detail_cycle_row.xml  | 19 ++++++++++------
 .../layout/fragment_detailed_farm_cycle.xml   | 22 +++++++++++++++----
 app/src/main/res/values/strings.xml           |  2 +-
 3 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/app/src/main/res/layout/detail_cycle_row.xml b/app/src/main/res/layout/detail_cycle_row.xml
index 34d6d93..9d27221 100644
--- a/app/src/main/res/layout/detail_cycle_row.xml
+++ b/app/src/main/res/layout/detail_cycle_row.xml
@@ -13,32 +13,36 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <TableRow>
+        <TableRow
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
             <androidx.constraintlayout.widget.ConstraintLayout>
             <TextView
                     android:id="@+id/textView75"
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:text="weeding"
-                android:padding="4dp"
+                    android:padding="4dp"
                     android:layout_marginStart="8dp"
-                android:background="@drawable/custom_cell"
+                    android:background="@drawable/custom_cell"
                     android:layout_marginTop="1dp"
                     android:textSize="11sp"
                     android:fontFamily="@font/montserrat_semibold"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
+                    app:layout_constraintTop_toTopOf="parent"
+                android:layout_weight="1"/>
 
                 <TextView
                     android:id="@+id/textView76"
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="0dp"
                     android:text="2024-04-08"
                     android:background="@drawable/custom_cell"
                     android:textSize="11sp"
                     android:padding="4dp"
+                    android:layout_weight="1"
                     android:fontFamily="@font/montserrat_semibold"
                     app:layout_constraintBottom_toBottomOf="@+id/textView75"
                     app:layout_constraintStart_toEndOf="@+id/textView75"
@@ -46,13 +50,14 @@
 
                 <TextView
                     android:id="@+id/textView77"
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="0dp"
                     android:text="2024-08-30"
                     android:background="@drawable/custom_cell"
                     android:textSize="11sp"
                     android:padding="4dp"
+                    android:layout_weight="1"
                     android:fontFamily="@font/montserrat_semibold"
                     app:layout_constraintBottom_toBottomOf="@+id/textView76"
                     app:layout_constraintStart_toEndOf="@+id/textView76"
diff --git a/app/src/main/res/layout/fragment_detailed_farm_cycle.xml b/app/src/main/res/layout/fragment_detailed_farm_cycle.xml
index 003aae2..5ea9d99 100644
--- a/app/src/main/res/layout/fragment_detailed_farm_cycle.xml
+++ b/app/src/main/res/layout/fragment_detailed_farm_cycle.xml
@@ -12,7 +12,7 @@
         android:id="@+id/showFarmId"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
+        android:layout_marginStart="24dp"
         android:layout_marginTop="40dp"
         android:fontFamily="@font/montserrat_semibold"
         android:text="@string/block_a"
@@ -48,10 +48,10 @@
         android:id="@+id/textView78"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="crop cycle/service cycle"
+        android:layout_marginTop="8dp"
         android:fontFamily="@font/montserrat_semibold"
+        android:text="crop cycle/service cycle"
         android:textSize="11sp"
-        android:layout_marginTop="8dp"
         app:layout_constraintStart_toStartOf="@+id/showFarmId"
         app:layout_constraintTop_toBottomOf="@+id/showFarmId" />
 
@@ -72,7 +72,7 @@
         android:id="@+id/viewSeparator"
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:layout_marginTop="4dp"
+        android:layout_marginTop="14dp"
         android:layout_marginStart="16dp"
         android:layout_marginEnd="50dp"
         android:background="@color/main"
@@ -133,4 +133,18 @@
         app:layout_constraintBottom_toBottomOf="@+id/textView81"
         app:layout_constraintStart_toEndOf="@+id/textView81"
         app:layout_constraintTop_toTopOf="@+id/textView81" />
+
+    <Spinner
+        android:id="@+id/spinnerStatusOfFarmCycle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:background="@drawable/rounded_corner"
+        android:entries="@array/statuses"
+        android:spinnerMode="dropdown"
+        app:layout_constraintBottom_toBottomOf="@+id/textView78"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/textView78"
+        app:layout_constraintTop_toTopOf="@+id/textView78" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9ddfb32..5efc03b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -62,7 +62,7 @@
     </string-array>
 
     <string-array name="statuses">
-        <item>UPCOMING</item>
+        <item>OPEN</item>
         <item>IN_PROGRESS</item>
         <item>COMPLETED</item>
         <item>OVERDUE</item>