diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1566c55..bc6a554 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -13,6 +13,11 @@ android:supportsRtl="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> + + + Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG) + .setAction("Action", null).show() + } + } + +} diff --git a/app/src/main/java/me/gilo/wc/viewmodels/ProductViewModel.java b/app/src/main/java/me/gilo/wc/viewmodels/ProductViewModel.java index 7ba0365..f8632bd 100644 --- a/app/src/main/java/me/gilo/wc/viewmodels/ProductViewModel.java +++ b/app/src/main/java/me/gilo/wc/viewmodels/ProductViewModel.java @@ -1,5 +1,6 @@ package me.gilo.wc.viewmodels; +import android.arch.lifecycle.MutableLiveData; import android.arch.lifecycle.ViewModel; import android.content.Context; import com.google.firebase.firestore.DocumentReference; @@ -10,6 +11,7 @@ import me.gilo.wc.models.CartLineItem; import me.gilo.wc.repo.CartRepository; import me.gilo.wc.repo.OrderRepository; import me.gilo.wc.repo.ProductRepository; +import me.gilo.wc.repo.ReviewRepository; import me.gilo.woodroid.models.LineItem; import me.gilo.woodroid.models.Product; import me.gilo.woodroid.models.ProductReview; @@ -25,16 +27,25 @@ public final class ProductViewModel extends ViewModel { private final OrderRepository orderRepository; private final CartRepository cartRepository; + private final MutableLiveData selectedProductId = new MutableLiveData(); + @Inject ProductViewModel(ProductRepository productRepository, OrderRepository orderRepository, - CartRepository cartRepository - ) { + CartRepository cartRepository) { this.productRepository = productRepository; this.orderRepository = orderRepository; this.cartRepository = cartRepository; } + public MutableLiveData getSelectedProduct() { + return selectedProductId; + } + + public void selectProduct(int productId) { + selectedProductId.setValue(productId); + } + public WooLiveData> products() { return productRepository.products(); } diff --git a/app/src/main/java/me/gilo/wc/viewmodels/ReviewViewModel.java b/app/src/main/java/me/gilo/wc/viewmodels/ReviewViewModel.java index 11cf6f4..7089831 100644 --- a/app/src/main/java/me/gilo/wc/viewmodels/ReviewViewModel.java +++ b/app/src/main/java/me/gilo/wc/viewmodels/ReviewViewModel.java @@ -1,5 +1,6 @@ package me.gilo.wc.viewmodels; +import android.arch.lifecycle.MutableLiveData; import android.arch.lifecycle.ViewModel; import android.content.Context; import me.gilo.wc.common.WooLiveData; diff --git a/app/src/main/res/layout/activity_checkout.xml b/app/src/main/res/layout/activity_checkout.xml new file mode 100644 index 0000000..a6b40f0 --- /dev/null +++ b/app/src/main/res/layout/activity_checkout.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/content_cart.xml b/app/src/main/res/layout/content_cart.xml index 1eb50c0..fc9957e 100644 --- a/app/src/main/res/layout/content_cart.xml +++ b/app/src/main/res/layout/content_cart.xml @@ -165,8 +165,85 @@ android:layout_marginBottom="16dp" /> + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/content_checkout.xml b/app/src/main/res/layout/content_checkout.xml new file mode 100644 index 0000000..ea7cb3e --- /dev/null +++ b/app/src/main/res/layout/content_checkout.xml @@ -0,0 +1,143 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 327fa59..a1c478a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -44,5 +44,6 @@ (555) 555 555 CartActivity + CheckoutActivity