From a1a63fd9f3611d99e3a748467b191e4fad5f328d Mon Sep 17 00:00:00 2001 From: "muindi.stephen" Date: Thu, 11 Apr 2024 08:40:30 +0300 Subject: [PATCH] ui revamps --- .idea/misc.xml | 3 +- .../fragments/main/HomeDashboardFragment.kt | 5 ++ .../steve_md/smartmkulima/utils/DateFormat.kt | 11 +++ app/src/main/res/drawable/custom_cell.xml | 6 ++ app/src/main/res/layout/detail_cycle_row.xml | 85 ++++++++++++------- .../fragment_auto_create_crop_cycle.xml | 6 +- .../res/layout/fragment_crop_cycle_list.xml | 2 +- .../layout/fragment_detailed_farm_cycle.xml | 9 +- .../res/layout/fragment_home_dashboard.xml | 22 ++++- app/src/main/res/values/strings.xml | 1 + 10 files changed, 110 insertions(+), 40 deletions(-) create mode 100644 app/src/main/res/drawable/custom_cell.xml diff --git a/.idea/misc.xml b/.idea/misc.xml index 3b798c2..5701082 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,7 @@ + - + diff --git a/app/src/main/java/com/steve_md/smartmkulima/ui/fragments/main/HomeDashboardFragment.kt b/app/src/main/java/com/steve_md/smartmkulima/ui/fragments/main/HomeDashboardFragment.kt index dbbaa6f..acafb43 100644 --- a/app/src/main/java/com/steve_md/smartmkulima/ui/fragments/main/HomeDashboardFragment.kt +++ b/app/src/main/java/com/steve_md/smartmkulima/ui/fragments/main/HomeDashboardFragment.kt @@ -1,5 +1,6 @@ package com.steve_md.smartmkulima.ui.fragments.main +import android.annotation.SuppressLint import android.app.AlertDialog import android.os.Bundle import android.view.LayoutInflater @@ -17,6 +18,7 @@ import com.google.firebase.database.FirebaseDatabase import com.google.firebase.database.ValueEventListener import com.steve_md.smartmkulima.R import com.steve_md.smartmkulima.databinding.FragmentHomeDashboardBinding +import com.steve_md.smartmkulima.utils.DateFormat.getLastLoginDayAndDate import com.steve_md.smartmkulima.utils.displaySnackBar import com.steve_md.smartmkulima.utils.toast import dagger.hilt.android.AndroidEntryPoint @@ -116,6 +118,7 @@ class HomeDashboardFragment : Fragment() { } + @SuppressLint("SetTextI18n") private fun setUpBinding() { binding.apply { cardView1.setOnClickListener { @@ -124,6 +127,8 @@ class HomeDashboardFragment : Fragment() { cardView9.setOnClickListener { // TODO() } + + textViewLastLoggedInTimeDate.text = "Last login: " +getLastLoginDayAndDate() } } } \ No newline at end of file diff --git a/app/src/main/java/com/steve_md/smartmkulima/utils/DateFormat.kt b/app/src/main/java/com/steve_md/smartmkulima/utils/DateFormat.kt index 561f9cf..5b0c83d 100644 --- a/app/src/main/java/com/steve_md/smartmkulima/utils/DateFormat.kt +++ b/app/src/main/java/com/steve_md/smartmkulima/utils/DateFormat.kt @@ -1,5 +1,7 @@ package com.steve_md.smartmkulima.utils +import android.annotation.SuppressLint +import java.text.DateFormat import java.text.SimpleDateFormat import java.util.* @@ -16,4 +18,13 @@ object DateFormat { val date = Date(timestamp) return timeFormat.format(date) } + + @SuppressLint("SimpleDateFormat") + fun getLastLoginDayAndDate(): String? { + val cal = Calendar.getInstance() + val sdf = SimpleDateFormat("EEE, MMM d, yyyy") + val dateformat = DateFormat.getDateInstance(DateFormat.MEDIUM) + return dateformat.format(cal.time) + } + } \ No newline at end of file diff --git a/app/src/main/res/drawable/custom_cell.xml b/app/src/main/res/drawable/custom_cell.xml new file mode 100644 index 0000000..dbd6e39 --- /dev/null +++ b/app/src/main/res/drawable/custom_cell.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/detail_cycle_row.xml b/app/src/main/res/layout/detail_cycle_row.xml index d01e3c1..34d6d93 100644 --- a/app/src/main/res/layout/detail_cycle_row.xml +++ b/app/src/main/res/layout/detail_cycle_row.xml @@ -6,40 +6,61 @@ android:layout_width="wrap_content" android:layout_height="wrap_content"> - - + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent"> + + + + + + + + + + + + + + - - - \ No newline at end of file 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 bf990eb..5af8c22 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 @@ -60,7 +60,7 @@ android:layout_marginStart="16dp" android:layout_marginTop="8dp" android:layout_marginEnd="16dp" - android:background="@drawable/rounded_corner" + android:entries="@array/cycle_types" android:paddingHorizontal="12dp" android:paddingVertical="8dp" @@ -93,6 +93,8 @@ android:background="@drawable/rounded_corner" android:paddingHorizontal="12dp" android:paddingVertical="8dp" + android:hint="Farm name" + android:fontFamily="@font/montserrat_medium" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/cropCycleStartDay" @@ -179,7 +181,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="16dp" android:textAlignment="textEnd" - android:text="View cycles" + android:text="View cycles >>" android:textColor="@color/main" android:fontFamily="@font/montserrat_bold" android:layout_marginTop="8dp" 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 89c139a..c24ff16 100644 --- a/app/src/main/res/layout/fragment_crop_cycle_list.xml +++ b/app/src/main/res/layout/fragment_crop_cycle_list.xml @@ -33,7 +33,7 @@ android:layout_marginStart="20dp" android:fontFamily="@font/nunito_sans_semibold" android:gravity="center" - android:text="Crop Cycles Available" + android:text="Farm Cycles Available" android:textColor="#F1ECE7" android:textSize="18sp" /> 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 4b06c5d..434930a 100644 --- a/app/src/main/res/layout/fragment_detailed_farm_cycle.xml +++ b/app/src/main/res/layout/fragment_detailed_farm_cycle.xml @@ -73,7 +73,8 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="Tasks" - android:layout_marginStart="8dp" + android:textStyle="bold" + android:layout_marginStart="2dp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/textView78" /> @@ -93,7 +94,9 @@ android:layout_height="wrap_content" android:fontFamily="@font/montserrat_bold" android:text="TaskName" + android:padding="4dp" android:textSize="11sp" + android:textStyle="bold" android:layout_marginStart="2dp" app:layout_constraintBottom_toBottomOf="@+id/textView79" app:layout_constraintStart_toEndOf="@+id/textView79" @@ -104,6 +107,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="8dp" + android:padding="4dp" + android:textStyle="bold" android:fontFamily="@font/montserrat_bold" android:text="Start Date" android:textSize="11sp" @@ -116,6 +121,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="End Date" + android:padding="4dp" + android:textStyle="bold" android:textSize="11sp" android:fontFamily="@font/montserrat_bold" android:layout_marginStart="8dp" diff --git a/app/src/main/res/layout/fragment_home_dashboard.xml b/app/src/main/res/layout/fragment_home_dashboard.xml index 923f28b..22ac9c7 100644 --- a/app/src/main/res/layout/fragment_home_dashboard.xml +++ b/app/src/main/res/layout/fragment_home_dashboard.xml @@ -1,11 +1,13 @@ - @@ -28,7 +30,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="20dp" - android:layout_marginTop="1dp" + android:layout_marginTop="22dp" android:layout_marginEnd="60dp" android:fontFamily="@font/montserrat_semibold" android:text="What would you like to know??" @@ -195,6 +197,7 @@ android:layout_height="248dp" android:layout_marginTop="20dp" app:cardCornerRadius="20dp" + android:layout_marginBottom="16dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@+id/cardView" app:layout_constraintStart_toStartOf="@+id/cardView" @@ -256,6 +259,7 @@ android:layout_height="146dp" android:layout_marginTop="20dp" app:cardCornerRadius="20dp" + android:layout_marginBottom="16dp" app:layout_constraintEnd_toEndOf="@+id/cardView8" app:layout_constraintStart_toStartOf="@+id/cardView8" app:layout_constraintTop_toBottomOf="@+id/cardView8" @@ -292,5 +296,17 @@ app:layout_constraintTop_toTopOf="@+id/includeToolBar" app:layout_constraintVertical_bias="0.54" /> + + + - + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f7640c3..0dc408f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -26,6 +26,7 @@ Or View available crop cycles ? Block A TextView + Last login: Apr 10, 2024 Crop Cycle