Merge pull request #55 from MuindiStephen/ecl_app

modifications

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)

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) {

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)
+}
+

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>

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"

app/src/main/res/layout/detail_cycle_row.xml

@@ -13,46 +13,51 @@
         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"
                     app:layout_constraintTop_toTopOf="@+id/textView75" />
 
                 <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"

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"

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" />

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"

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>

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"
         />
 
 

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" />

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"

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"

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" />

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>