From 48e747cce3fc84cbaa57121f40d0cb12b6918679 Mon Sep 17 00:00:00 2001
From: Gilbert Kimutai <gilbertkimutai@gmail.com>
Date: Sun, 7 Apr 2019 16:46:00 +0300
Subject: [PATCH] UI updates to supports liquor store example

---
 app/src/main/java/me/gilo/wc/ui/home/CategoryFragment.kt  | 7 +++++--
 .../java/me/gilo/wc/viewmodels/CategoryViewModel.java     | 2 +-
 app/src/main/res/layout/content_product.xml               | 2 +-
 app/src/main/res/layout/single_home_product_item.xml      | 8 ++++++--
 app/src/main/res/layout/single_product_item.xml           | 4 +++-
 woodroid/src/main/java/me/gilo/woodroid/Woocommerce.java  | 6 ------
 6 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/me/gilo/wc/ui/home/CategoryFragment.kt b/app/src/main/java/me/gilo/wc/ui/home/CategoryFragment.kt
index fd2b183..aec83f9 100644
--- a/app/src/main/java/me/gilo/wc/ui/home/CategoryFragment.kt
+++ b/app/src/main/java/me/gilo/wc/ui/home/CategoryFragment.kt
@@ -12,6 +12,7 @@ import me.gilo.wc.adapter.CategoryAdapter
 import me.gilo.wc.common.Status
 import me.gilo.wc.viewmodels.CategoryViewModel
 import me.gilo.woodroid.models.Category
+import me.gilo.woodroid.models.filters.ProductCategoryFilter
 import java.util.*
 
 
@@ -60,8 +61,10 @@ class CategoryFragment : Fragment() {
 
     private fun categories() {
 
-        //TODO ('Exclude the uncategorized category')
-        viewModel.categories().observe(this, android.arch.lifecycle.Observer { response ->
+        val filter = ProductCategoryFilter()
+        filter.per_page = 50
+
+        viewModel.categories(filter).observe(this, android.arch.lifecycle.Observer { response ->
             when (response!!.status()) {
                 Status.LOADING -> {
                 }
diff --git a/app/src/main/java/me/gilo/wc/viewmodels/CategoryViewModel.java b/app/src/main/java/me/gilo/wc/viewmodels/CategoryViewModel.java
index ce14a5a..62d5e5e 100644
--- a/app/src/main/java/me/gilo/wc/viewmodels/CategoryViewModel.java
+++ b/app/src/main/java/me/gilo/wc/viewmodels/CategoryViewModel.java
@@ -33,7 +33,7 @@ public final class CategoryViewModel extends ViewModel {
     }
 
     public WooLiveData<List<Category>> categories(ProductCategoryFilter productCategoryFilter) {
-        return categoryRepository.categories();
+        return categoryRepository.categories(productCategoryFilter);
     }
 
     public WooLiveData<Category> update(int id, Category category) {
diff --git a/app/src/main/res/layout/content_product.xml b/app/src/main/res/layout/content_product.xml
index 4730ed8..2b049e6 100644
--- a/app/src/main/res/layout/content_product.xml
+++ b/app/src/main/res/layout/content_product.xml
@@ -19,7 +19,7 @@
 
 	<FrameLayout
 	  android:layout_width="match_parent"
-	  android:layout_height="320dp"
+	  android:layout_height="400dp"
 	  android:layout_marginBottom="16dp"
 	  android:layout_marginTop="16dp"
 
diff --git a/app/src/main/res/layout/single_home_product_item.xml b/app/src/main/res/layout/single_home_product_item.xml
index b4232c4..9870d5b 100644
--- a/app/src/main/res/layout/single_home_product_item.xml
+++ b/app/src/main/res/layout/single_home_product_item.xml
@@ -14,13 +14,15 @@
 
   <FrameLayout
 	android:layout_width="match_parent"
-	android:layout_height="160dp">
+	android:layout_height="180dp"
+	android:layout_marginTop="8dp"
+	>
 
 	<ImageView
 	  android:id="@+id/ivImage"
 	  android:layout_width="match_parent"
 	  android:layout_height="match_parent"
-	  android:scaleType="centerCrop"
+	  android:scaleType="center"
 	  />
 
 	<TextView
@@ -46,6 +48,7 @@
 	android:layout_marginTop="16dp"
 	android:layout_marginRight="16dp"
 	android:gravity="left"
+	android:lines="2"
 	android:textColor="@color/text"
 	android:textSize="18sp"/>
 
@@ -59,6 +62,7 @@
 	android:layout_marginRight="16dp"
 	android:gravity="left"
 	android:maxLines="2"
+	android:lines="2"
 	android:lineSpacingMultiplier="1.2"
 	android:textColor="@color/text_black_5"
 	android:textSize="14sp"/>
diff --git a/app/src/main/res/layout/single_product_item.xml b/app/src/main/res/layout/single_product_item.xml
index 9e92b31..339193c 100644
--- a/app/src/main/res/layout/single_product_item.xml
+++ b/app/src/main/res/layout/single_product_item.xml
@@ -14,7 +14,7 @@
 
   <FrameLayout
 	android:layout_width="match_parent"
-	android:layout_height="200dp">
+	android:layout_height="280dp">
 
 	<ImageView
 	  android:id="@+id/ivImage"
@@ -46,6 +46,7 @@
 	android:layout_marginTop="16dp"
 	android:layout_marginRight="16dp"
 	android:gravity="left"
+	android:lines="2"
 	android:textColor="@color/text"
 	android:textSize="18sp"/>
 
@@ -59,6 +60,7 @@
 	android:layout_marginRight="16dp"
 	android:gravity="left"
 	android:maxLines="2"
+	android:lines="2"
 	android:lineSpacingMultiplier="1.2"
 	android:textColor="@color/text_black_5"
 	android:textSize="14sp"/>
diff --git a/woodroid/src/main/java/me/gilo/woodroid/Woocommerce.java b/woodroid/src/main/java/me/gilo/woodroid/Woocommerce.java
index bd4a561..e09b927 100644
--- a/woodroid/src/main/java/me/gilo/woodroid/Woocommerce.java
+++ b/woodroid/src/main/java/me/gilo/woodroid/Woocommerce.java
@@ -21,22 +21,16 @@ public class Woocommerce {
     final AttributeRepository attributeRepository;
     final AttributeTermRepository attributeTermRepository;
     final CategoryRepository categoryRepository;
-
     final ShippingClassRepository shippingClassRepository;
     final TagRepository tagRepository;
     final VariationRepository variationRepository;
     final CouponRepository couponRepository;
     final CustomerRepository customerRepository;
-
     final OrderRepository orderRepository;
     final ProductRepository productRepository;
-
     final ReviewRepository reviewRepository;
-
     final ReportsRepository reportsRepository;
-
     final CartRepository cartRepository;
-
     final PaymentGatewayRepository paymentGatewayRepository;
     final SettingsRepository settingsRepository;
     final ShippingMethodRepository shippingMethodRepository;