diff --git a/app/build.gradle b/app/build.gradle index 21e5f1b..63ae14f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,7 +9,7 @@ apply plugin: 'kotlin-kapt' android { compileSdkVersion 28 defaultConfig { - applicationId "me.gilo.wc" + applicationId "me.gilo.woodroid.app" minSdkVersion 16 targetSdkVersion 28 versionCode 1 diff --git a/app/google-services.json b/app/google-services.json index 5c388b1..631305a 100644 --- a/app/google-services.json +++ b/app/google-services.json @@ -10,7 +10,7 @@ "client_info": { "mobilesdk_app_id": "1:159460744011:android:6480f4108da5caac", "android_client_info": { - "package_name": "me.gilo.wc" + "package_name": "me.gilo.woodroid.app" } }, "oauth_client": [ diff --git a/app/src/androidTest/java/me/gilo/wc/ExampleInstrumentedTest.kt b/app/src/androidTest/java/me/gilo/woodroid/ExampleInstrumentedTest.kt similarity index 96% rename from app/src/androidTest/java/me/gilo/wc/ExampleInstrumentedTest.kt rename to app/src/androidTest/java/me/gilo/woodroid/ExampleInstrumentedTest.kt index 307a0c7..bd3fc6e 100644 --- a/app/src/androidTest/java/me/gilo/wc/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/java/me/gilo/woodroid/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package me.gilo.wc +package me.gilo.woodroid import android.support.test.InstrumentationRegistry import android.support.test.runner.AndroidJUnit4 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index fd686bd..4ae78bd 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,12 +1,12 @@ + package="me.gilo.woodroid.app"> @@ -91,12 +91,12 @@ android:theme="@style/AppTheme.NoActionBar"> @@ -104,34 +104,34 @@ - + diff --git a/app/src/main/java/me/gilo/wc/Config.java b/app/src/main/java/me/gilo/wc/Config.java deleted file mode 100644 index 6997b2c..0000000 --- a/app/src/main/java/me/gilo/wc/Config.java +++ /dev/null @@ -1,10 +0,0 @@ -package me.gilo.wc; - -public class Config { - public static String currencySymbol = "Ksh."; - - public static String siteUrl = "http://aklin.ir/wp"; - public static String consumerKey = "ck_c559b86adc5460395e3ae483b852201615d29712"; - public static String consumerSecret = "cs_5aaa22e54cd35fd42e490ab12c22afb4d99b6225"; - -} diff --git a/app/src/main/java/me/gilo/woodroid/app/Config.java b/app/src/main/java/me/gilo/woodroid/app/Config.java new file mode 100644 index 0000000..2386203 --- /dev/null +++ b/app/src/main/java/me/gilo/woodroid/app/Config.java @@ -0,0 +1,10 @@ +package me.gilo.woodroid.app; + +public class Config { + public static String CURRENCY_SYMBOL = "Ksh."; + + public static String siteUrl = "http://192.168.100.61/shop/index.php"; + public static String consumerKey = "ck_da34628a4a69128001876492b842be4cd3c76bf8"; + public static String consumerSecret = "cs_c3c70248288a60bc21a0cddc81acdc018df1632d"; + +} diff --git a/app/src/main/java/me/gilo/wc/MainActivity.kt b/app/src/main/java/me/gilo/woodroid/app/MainActivity.kt similarity index 58% rename from app/src/main/java/me/gilo/wc/MainActivity.kt rename to app/src/main/java/me/gilo/woodroid/app/MainActivity.kt index 0a62793..884cc13 100644 --- a/app/src/main/java/me/gilo/wc/MainActivity.kt +++ b/app/src/main/java/me/gilo/woodroid/app/MainActivity.kt @@ -1,11 +1,15 @@ -package me.gilo.wc +package me.gilo.woodroid.app import android.content.Intent import android.os.Bundle import android.support.v7.app.AppCompatActivity +import android.util.Log import com.google.firebase.auth.FirebaseAuth -import me.gilo.wc.ui.onboarding.AnonymousSignInActivity -import me.gilo.wc.ui.order.MyOrdersActivity +import me.gilo.raison.ui.user.onboarding.SignInActivity +import me.gilo.woodroid.app.R +import me.gilo.woodroid.app.ui.home.HomeActivity +import me.gilo.woodroid.app.ui.onboarding.AnonymousSignInActivity +import me.gilo.woodroid.app.ui.order.MyOrdersActivity class MainActivity : AppCompatActivity() { @@ -14,7 +18,7 @@ class MainActivity : AppCompatActivity() { setContentView(R.layout.activity_main) if (FirebaseAuth.getInstance().currentUser != null) { - startActivity(Intent(baseContext, MyOrdersActivity::class.java)) + startActivity(Intent(baseContext, HomeActivity::class.java)) } else { startActivity(Intent(baseContext, AnonymousSignInActivity::class.java)) } diff --git a/app/src/main/java/me/gilo/wc/WcApp.kt b/app/src/main/java/me/gilo/woodroid/app/WcApp.kt similarity index 89% rename from app/src/main/java/me/gilo/wc/WcApp.kt rename to app/src/main/java/me/gilo/woodroid/app/WcApp.kt index d477448..ac7558d 100644 --- a/app/src/main/java/me/gilo/wc/WcApp.kt +++ b/app/src/main/java/me/gilo/woodroid/app/WcApp.kt @@ -1,12 +1,12 @@ -package me.gilo.wc +package me.gilo.woodroid.app -import android.app.Application import dagger.android.AndroidInjector import dagger.android.DaggerApplication import io.github.inflationx.calligraphy3.CalligraphyConfig import io.github.inflationx.calligraphy3.CalligraphyInterceptor import io.github.inflationx.viewpump.ViewPump -import me.gilo.wc.di.DaggerAppComponent +import me.gilo.woodroid.app.R +import me.gilo.woodroid.app.di.DaggerAppComponent class WcApp : DaggerApplication() { diff --git a/app/src/main/java/me/gilo/wc/adapter/CartAdapter.kt b/app/src/main/java/me/gilo/woodroid/app/adapter/CartAdapter.kt similarity index 72% rename from app/src/main/java/me/gilo/wc/adapter/CartAdapter.kt rename to app/src/main/java/me/gilo/woodroid/app/adapter/CartAdapter.kt index df7330f..750d354 100644 --- a/app/src/main/java/me/gilo/wc/adapter/CartAdapter.kt +++ b/app/src/main/java/me/gilo/woodroid/app/adapter/CartAdapter.kt @@ -1,14 +1,11 @@ -package me.gilo.wc.adapter +package me.gilo.woodroid.app.adapter import android.support.v7.widget.RecyclerView import android.view.LayoutInflater import android.view.ViewGroup -import me.gilo.wc.R -import me.gilo.wc.adapter.viewholder.CartViewHolder -import me.gilo.wc.adapter.viewholder.CategoryViewHolder -import me.gilo.wc.models.CartLineItem -import me.gilo.woodroid.models.CartItem -import me.gilo.woodroid.models.Category +import me.gilo.woodroid.app.R +import me.gilo.woodroid.app.adapter.viewholder.CartViewHolder +import me.gilo.woodroid.app.models.CartLineItem class CartAdapter(private val cartLineItems: List) : RecyclerView.Adapter() { diff --git a/app/src/main/java/me/gilo/wc/adapter/CategoryAdapter.kt b/app/src/main/java/me/gilo/woodroid/app/adapter/CategoryAdapter.kt similarity index 85% rename from app/src/main/java/me/gilo/wc/adapter/CategoryAdapter.kt rename to app/src/main/java/me/gilo/woodroid/app/adapter/CategoryAdapter.kt index 22152d0..61e22d0 100644 --- a/app/src/main/java/me/gilo/wc/adapter/CategoryAdapter.kt +++ b/app/src/main/java/me/gilo/woodroid/app/adapter/CategoryAdapter.kt @@ -1,10 +1,10 @@ -package me.gilo.wc.adapter +package me.gilo.woodroid.app.adapter import android.support.v7.widget.RecyclerView import android.view.LayoutInflater import android.view.ViewGroup -import me.gilo.wc.R -import me.gilo.wc.adapter.viewholder.CategoryViewHolder +import me.gilo.woodroid.app.R +import me.gilo.woodroid.app.adapter.viewholder.CategoryViewHolder import me.gilo.woodroid.models.Category class CategoryAdapter(private val categories: List) : RecyclerView.Adapter() { diff --git a/app/src/main/java/me/gilo/wc/adapter/CouponAdapter.kt b/app/src/main/java/me/gilo/woodroid/app/adapter/CouponAdapter.kt similarity index 85% rename from app/src/main/java/me/gilo/wc/adapter/CouponAdapter.kt rename to app/src/main/java/me/gilo/woodroid/app/adapter/CouponAdapter.kt index 1004a28..9ac85f2 100644 --- a/app/src/main/java/me/gilo/wc/adapter/CouponAdapter.kt +++ b/app/src/main/java/me/gilo/woodroid/app/adapter/CouponAdapter.kt @@ -1,10 +1,10 @@ -package me.gilo.wc.adapter +package me.gilo.woodroid.app.adapter import android.support.v7.widget.RecyclerView import android.view.LayoutInflater import android.view.ViewGroup -import me.gilo.wc.R -import me.gilo.wc.adapter.viewholder.CouponViewHolder +import me.gilo.woodroid.app.R +import me.gilo.woodroid.app.adapter.viewholder.CouponViewHolder import me.gilo.woodroid.models.Coupon class CouponAdapter(private val coupons: List) : RecyclerView.Adapter() { diff --git a/app/src/main/java/me/gilo/wc/adapter/HomeProductAdapter.kt b/app/src/main/java/me/gilo/woodroid/app/adapter/HomeProductAdapter.kt similarity index 85% rename from app/src/main/java/me/gilo/wc/adapter/HomeProductAdapter.kt rename to app/src/main/java/me/gilo/woodroid/app/adapter/HomeProductAdapter.kt index eeea87d..caaf7b1 100644 --- a/app/src/main/java/me/gilo/wc/adapter/HomeProductAdapter.kt +++ b/app/src/main/java/me/gilo/woodroid/app/adapter/HomeProductAdapter.kt @@ -1,10 +1,10 @@ -package me.gilo.wc.adapter +package me.gilo.woodroid.app.adapter import android.support.v7.widget.RecyclerView import android.view.LayoutInflater import android.view.ViewGroup -import me.gilo.wc.R -import me.gilo.wc.adapter.viewholder.ProductViewHolder +import me.gilo.woodroid.app.R +import me.gilo.woodroid.app.adapter.viewholder.ProductViewHolder import me.gilo.woodroid.models.Product class HomeProductAdapter(private val products: List) : RecyclerView.Adapter() { diff --git a/app/src/main/java/me/gilo/wc/adapter/ImagePagerAdapter.kt b/app/src/main/java/me/gilo/woodroid/app/adapter/ImagePagerAdapter.kt similarity index 84% rename from app/src/main/java/me/gilo/wc/adapter/ImagePagerAdapter.kt rename to app/src/main/java/me/gilo/woodroid/app/adapter/ImagePagerAdapter.kt index 9881c57..c3dca86 100644 --- a/app/src/main/java/me/gilo/wc/adapter/ImagePagerAdapter.kt +++ b/app/src/main/java/me/gilo/woodroid/app/adapter/ImagePagerAdapter.kt @@ -1,4 +1,4 @@ -package me.gilo.wc.adapter +package me.gilo.woodroid.app.adapter import android.content.Context @@ -8,7 +8,7 @@ import android.view.View import android.view.ViewGroup import android.widget.ImageView import com.squareup.picasso.Picasso -import me.gilo.wc.R +import me.gilo.woodroid.app.R import me.gilo.woodroid.models.Image @@ -22,12 +22,10 @@ class ImagePagerAdapter(val context: Context, private val images: List) : val ivImage = layout.findViewById(R.id.ivImage) val image = images[position] - if (image != null) { - Picasso - .with(context) - .load(image!!.src) - .into(ivImage) - } + Picasso + .with(context) + .load(image.src) + .into(ivImage) collection.addView(layout) return layout diff --git a/app/src/main/java/me/gilo/wc/adapter/ListAdapter.kt b/app/src/main/java/me/gilo/woodroid/app/adapter/ListAdapter.kt similarity index 85% rename from app/src/main/java/me/gilo/wc/adapter/ListAdapter.kt rename to app/src/main/java/me/gilo/woodroid/app/adapter/ListAdapter.kt index 1047194..a349f44 100644 --- a/app/src/main/java/me/gilo/wc/adapter/ListAdapter.kt +++ b/app/src/main/java/me/gilo/woodroid/app/adapter/ListAdapter.kt @@ -1,10 +1,10 @@ -package me.gilo.wc.adapter +package me.gilo.woodroid.app.adapter import android.support.v7.widget.RecyclerView import android.view.LayoutInflater import android.view.ViewGroup -import me.gilo.wc.R -import me.gilo.wc.adapter.viewholder.ProductViewHolder +import me.gilo.woodroid.app.R +import me.gilo.woodroid.app.adapter.viewholder.ProductViewHolder import me.gilo.woodroid.models.Product class ListAdapter(private val products: List) : RecyclerView.Adapter() { diff --git a/app/src/main/java/me/gilo/wc/adapter/MenuAdapter.kt b/app/src/main/java/me/gilo/woodroid/app/adapter/MenuAdapter.kt similarity index 77% rename from app/src/main/java/me/gilo/wc/adapter/MenuAdapter.kt rename to app/src/main/java/me/gilo/woodroid/app/adapter/MenuAdapter.kt index 50f077b..f3d7547 100644 --- a/app/src/main/java/me/gilo/wc/adapter/MenuAdapter.kt +++ b/app/src/main/java/me/gilo/woodroid/app/adapter/MenuAdapter.kt @@ -1,14 +1,10 @@ -package me.gilo.wc.adapter +package me.gilo.woodroid.app.adapter -import android.app.Activity -import android.support.v7.app.AppCompatActivity import android.support.v7.widget.RecyclerView import android.view.LayoutInflater import android.view.ViewGroup -import me.gilo.wc.R -import me.gilo.wc.adapter.viewholder.MenuViewHolder - -import java.util.HashMap +import me.gilo.woodroid.app.R +import me.gilo.woodroid.app.adapter.viewholder.MenuViewHolder class MenuAdapter(private val titles: List) : RecyclerView.Adapter() { diff --git a/app/src/main/java/me/gilo/wc/adapter/OrderAdapter.kt b/app/src/main/java/me/gilo/woodroid/app/adapter/OrderAdapter.kt similarity index 79% rename from app/src/main/java/me/gilo/wc/adapter/OrderAdapter.kt rename to app/src/main/java/me/gilo/woodroid/app/adapter/OrderAdapter.kt index e041665..a366a7f 100644 --- a/app/src/main/java/me/gilo/wc/adapter/OrderAdapter.kt +++ b/app/src/main/java/me/gilo/woodroid/app/adapter/OrderAdapter.kt @@ -1,12 +1,10 @@ -package me.gilo.wc.adapter +package me.gilo.woodroid.app.adapter import android.support.v7.widget.RecyclerView import android.view.LayoutInflater import android.view.ViewGroup -import me.gilo.wc.R -import me.gilo.wc.adapter.viewholder.CategoryViewHolder -import me.gilo.wc.adapter.viewholder.OrderViewHolder -import me.gilo.woodroid.models.Category +import me.gilo.woodroid.app.R +import me.gilo.woodroid.app.adapter.viewholder.OrderViewHolder import me.gilo.woodroid.models.Order class OrderAdapter(private val orders: List) : RecyclerView.Adapter() { diff --git a/app/src/main/java/me/gilo/wc/adapter/ProductAdapter.kt b/app/src/main/java/me/gilo/woodroid/app/adapter/ProductAdapter.kt similarity index 83% rename from app/src/main/java/me/gilo/wc/adapter/ProductAdapter.kt rename to app/src/main/java/me/gilo/woodroid/app/adapter/ProductAdapter.kt index 20b0887..527e809 100644 --- a/app/src/main/java/me/gilo/wc/adapter/ProductAdapter.kt +++ b/app/src/main/java/me/gilo/woodroid/app/adapter/ProductAdapter.kt @@ -1,11 +1,10 @@ -package me.gilo.wc.adapter +package me.gilo.woodroid.app.adapter import android.support.v7.widget.RecyclerView import android.view.LayoutInflater import android.view.ViewGroup -import me.gilo.wc.R -import me.gilo.wc.adapter.viewholder.MenuViewHolder -import me.gilo.wc.adapter.viewholder.ProductViewHolder +import me.gilo.woodroid.app.R +import me.gilo.woodroid.app.adapter.viewholder.ProductViewHolder import me.gilo.woodroid.models.Product class ProductAdapter(private val products: List) : RecyclerView.Adapter() { diff --git a/app/src/main/java/me/gilo/wc/adapter/ProductReviewAdapter.kt b/app/src/main/java/me/gilo/woodroid/app/adapter/ProductReviewAdapter.kt similarity index 79% rename from app/src/main/java/me/gilo/wc/adapter/ProductReviewAdapter.kt rename to app/src/main/java/me/gilo/woodroid/app/adapter/ProductReviewAdapter.kt index f76fcd9..e8dfde3 100644 --- a/app/src/main/java/me/gilo/wc/adapter/ProductReviewAdapter.kt +++ b/app/src/main/java/me/gilo/woodroid/app/adapter/ProductReviewAdapter.kt @@ -1,12 +1,10 @@ -package me.gilo.wc.adapter +package me.gilo.woodroid.app.adapter import android.support.v7.widget.RecyclerView import android.view.LayoutInflater import android.view.ViewGroup -import me.gilo.wc.R -import me.gilo.wc.adapter.viewholder.ProductReviewViewHolder -import me.gilo.wc.adapter.viewholder.ProductViewHolder -import me.gilo.woodroid.models.Product +import me.gilo.woodroid.app.R +import me.gilo.woodroid.app.adapter.viewholder.ProductReviewViewHolder import me.gilo.woodroid.models.ProductReview class ProductReviewAdapter(private val reviews: List) : RecyclerView.Adapter() { diff --git a/app/src/main/java/me/gilo/wc/adapter/viewholder/CartViewHolder.kt b/app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/CartViewHolder.kt similarity index 79% rename from app/src/main/java/me/gilo/wc/adapter/viewholder/CartViewHolder.kt rename to app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/CartViewHolder.kt index 09ce27f..0e1277a 100644 --- a/app/src/main/java/me/gilo/wc/adapter/viewholder/CartViewHolder.kt +++ b/app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/CartViewHolder.kt @@ -1,4 +1,4 @@ -package me.gilo.wc.adapter.viewholder +package me.gilo.woodroid.app.adapter.viewholder import android.content.Context import android.content.Intent @@ -8,20 +8,12 @@ import android.view.View import android.widget.ImageView import android.widget.TextView import com.squareup.picasso.Picasso -import me.gilo.woodroid.models.Product -import android.text.Spannable -import android.text.style.ForegroundColorSpan import android.text.SpannableString -import android.graphics.Color -import kotlinx.android.synthetic.main.content_product.* -import me.gilo.wc.R -import me.gilo.wc.events.AddQuantityEvent -import me.gilo.wc.events.LessQuantityEvent -import me.gilo.wc.events.ProductEvent -import me.gilo.wc.models.CartLineItem -import me.gilo.wc.ui.coupon.CouponActivity -import me.gilo.wc.ui.product.ProductActivity -import me.gilo.woodroid.models.CartItem +import me.gilo.woodroid.app.R +import me.gilo.woodroid.app.events.AddQuantityEvent +import me.gilo.woodroid.app.events.LessQuantityEvent +import me.gilo.woodroid.app.models.CartLineItem +import me.gilo.woodroid.app.ui.product.ProductActivity import org.greenrobot.eventbus.EventBus diff --git a/app/src/main/java/me/gilo/wc/adapter/viewholder/CategoryViewHolder.kt b/app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/CategoryViewHolder.kt similarity index 84% rename from app/src/main/java/me/gilo/wc/adapter/viewholder/CategoryViewHolder.kt rename to app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/CategoryViewHolder.kt index 44f38b4..89309ee 100644 --- a/app/src/main/java/me/gilo/wc/adapter/viewholder/CategoryViewHolder.kt +++ b/app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/CategoryViewHolder.kt @@ -1,13 +1,12 @@ -package me.gilo.wc.adapter.viewholder +package me.gilo.woodroid.app.adapter.viewholder import android.content.Context import android.content.Intent import android.support.v7.widget.RecyclerView -import android.text.Html import android.view.View import android.widget.TextView -import me.gilo.wc.R -import me.gilo.wc.ui.product.ShopActivity +import me.gilo.woodroid.app.R +import me.gilo.woodroid.app.ui.product.ShopActivity import me.gilo.woodroid.models.Category class CategoryViewHolder(val context: Context, itemView: View) : diff --git a/app/src/main/java/me/gilo/wc/adapter/viewholder/CouponViewHolder.kt b/app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/CouponViewHolder.kt similarity index 86% rename from app/src/main/java/me/gilo/wc/adapter/viewholder/CouponViewHolder.kt rename to app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/CouponViewHolder.kt index 5eaa7bd..c0f3681 100644 --- a/app/src/main/java/me/gilo/wc/adapter/viewholder/CouponViewHolder.kt +++ b/app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/CouponViewHolder.kt @@ -1,4 +1,4 @@ -package me.gilo.wc.adapter.viewholder +package me.gilo.woodroid.app.adapter.viewholder import android.content.Context import android.content.Intent @@ -6,8 +6,8 @@ import android.support.v7.widget.RecyclerView import android.text.Html import android.view.View import android.widget.TextView -import me.gilo.wc.R -import me.gilo.wc.ui.coupon.CouponActivity +import me.gilo.woodroid.app.R +import me.gilo.woodroid.app.ui.coupon.CouponActivity import me.gilo.woodroid.models.Coupon class CouponViewHolder(val context: Context, itemView: View) : diff --git a/app/src/main/java/me/gilo/wc/adapter/viewholder/MenuViewHolder.java b/app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/MenuViewHolder.java similarity index 85% rename from app/src/main/java/me/gilo/wc/adapter/viewholder/MenuViewHolder.java rename to app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/MenuViewHolder.java index a3f2b06..9e0c85e 100644 --- a/app/src/main/java/me/gilo/wc/adapter/viewholder/MenuViewHolder.java +++ b/app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/MenuViewHolder.java @@ -1,13 +1,13 @@ -package me.gilo.wc.adapter.viewholder; +package me.gilo.woodroid.app.adapter.viewholder; import android.content.Context; import android.content.Intent; import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.TextView; -import me.gilo.wc.R; -import me.gilo.wc.ui.coupon.CouponsActivity; -import me.gilo.wc.ui.product.ShopActivity; +import me.gilo.woodroid.app.R; +import me.gilo.woodroid.app.ui.coupon.CouponsActivity; +import me.gilo.woodroid.app.ui.product.ShopActivity; public class MenuViewHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/me/gilo/wc/adapter/viewholder/OrderViewHolder.kt b/app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/OrderViewHolder.kt similarity index 83% rename from app/src/main/java/me/gilo/wc/adapter/viewholder/OrderViewHolder.kt rename to app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/OrderViewHolder.kt index c44aedf..80ab1a5 100644 --- a/app/src/main/java/me/gilo/wc/adapter/viewholder/OrderViewHolder.kt +++ b/app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/OrderViewHolder.kt @@ -1,18 +1,14 @@ -package me.gilo.wc.adapter.viewholder +package me.gilo.woodroid.app.adapter.viewholder import android.content.Context import android.content.Intent import android.support.v7.widget.RecyclerView -import android.text.Html import android.text.SpannableString import android.view.View import android.widget.TextView -import me.gilo.wc.R -import me.gilo.wc.ui.order.OrderActivity -import me.gilo.wc.ui.product.ShopActivity -import me.gilo.wc.utils.DateUtils -import me.gilo.wc.utils.StringFormatter -import me.gilo.woodroid.models.Category +import me.gilo.woodroid.app.R +import me.gilo.woodroid.app.ui.order.OrderActivity +import me.gilo.woodroid.app.utils.DateUtils import me.gilo.woodroid.models.Order class OrderViewHolder(val context: Context, itemView: View) : diff --git a/app/src/main/java/me/gilo/wc/adapter/viewholder/ProductReviewViewHolder.kt b/app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/ProductReviewViewHolder.kt similarity index 85% rename from app/src/main/java/me/gilo/wc/adapter/viewholder/ProductReviewViewHolder.kt rename to app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/ProductReviewViewHolder.kt index 3cab354..f91cb0a 100644 --- a/app/src/main/java/me/gilo/wc/adapter/viewholder/ProductReviewViewHolder.kt +++ b/app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/ProductReviewViewHolder.kt @@ -1,7 +1,6 @@ -package me.gilo.wc.adapter.viewholder +package me.gilo.woodroid.app.adapter.viewholder import android.content.Context -import android.content.Intent import android.support.v7.widget.RecyclerView import android.text.Html import android.view.View @@ -9,10 +8,8 @@ import android.widget.ImageView import android.widget.RatingBar import android.widget.TextView import com.squareup.picasso.Picasso -import me.gilo.wc.R -import me.gilo.wc.ui.product.ShopActivity -import me.gilo.wc.utils.DateUtils -import me.gilo.woodroid.models.Category +import me.gilo.woodroid.app.R +import me.gilo.woodroid.app.utils.DateUtils import me.gilo.woodroid.models.ProductReview class ProductReviewViewHolder(val context: Context, itemView: View) : diff --git a/app/src/main/java/me/gilo/wc/adapter/viewholder/ProductViewHolder.kt b/app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/ProductViewHolder.kt similarity index 85% rename from app/src/main/java/me/gilo/wc/adapter/viewholder/ProductViewHolder.kt rename to app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/ProductViewHolder.kt index 5bf2320..ab4dabf 100644 --- a/app/src/main/java/me/gilo/wc/adapter/viewholder/ProductViewHolder.kt +++ b/app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/ProductViewHolder.kt @@ -1,4 +1,4 @@ -package me.gilo.wc.adapter.viewholder +package me.gilo.woodroid.app.adapter.viewholder import android.content.Context import android.content.Intent @@ -9,14 +9,9 @@ import android.widget.ImageView import android.widget.TextView import com.squareup.picasso.Picasso import me.gilo.woodroid.models.Product -import android.text.Spannable -import android.text.style.ForegroundColorSpan import android.text.SpannableString -import android.graphics.Color -import kotlinx.android.synthetic.main.content_product.* -import me.gilo.wc.R -import me.gilo.wc.ui.coupon.CouponActivity -import me.gilo.wc.ui.product.ProductActivity +import me.gilo.woodroid.app.R +import me.gilo.woodroid.app.ui.product.ProductActivity class ProductViewHolder(val context: Context, itemView: View) : diff --git a/app/src/main/java/me/gilo/wc/common/BaseActivity.java b/app/src/main/java/me/gilo/woodroid/app/common/BaseActivity.java similarity index 91% rename from app/src/main/java/me/gilo/wc/common/BaseActivity.java rename to app/src/main/java/me/gilo/woodroid/app/common/BaseActivity.java index 33e9434..aeb81c2 100644 --- a/app/src/main/java/me/gilo/wc/common/BaseActivity.java +++ b/app/src/main/java/me/gilo/woodroid/app/common/BaseActivity.java @@ -1,4 +1,4 @@ -package me.gilo.wc.common; +package me.gilo.woodroid.app.common; import android.annotation.SuppressLint; import android.arch.lifecycle.ViewModel; @@ -7,7 +7,6 @@ import android.arch.lifecycle.ViewModelProviders; import android.content.Context; import dagger.android.support.DaggerAppCompatActivity; import io.github.inflationx.viewpump.ViewPumpContextWrapper; -import me.gilo.wc.ui.state.ProgressDialogFragment; import javax.inject.Inject; diff --git a/app/src/main/java/me/gilo/wc/common/CompletionDocLiveData.java b/app/src/main/java/me/gilo/woodroid/app/common/CompletionDocLiveData.java similarity index 95% rename from app/src/main/java/me/gilo/wc/common/CompletionDocLiveData.java rename to app/src/main/java/me/gilo/woodroid/app/common/CompletionDocLiveData.java index 712b7a1..2e9beea 100644 --- a/app/src/main/java/me/gilo/wc/common/CompletionDocLiveData.java +++ b/app/src/main/java/me/gilo/woodroid/app/common/CompletionDocLiveData.java @@ -1,4 +1,4 @@ -package me.gilo.wc.common; +package me.gilo.woodroid.app.common; import android.arch.lifecycle.LiveData; import android.support.annotation.NonNull; diff --git a/app/src/main/java/me/gilo/wc/common/CompletionGenericLiveData.kt b/app/src/main/java/me/gilo/woodroid/app/common/CompletionGenericLiveData.kt similarity index 93% rename from app/src/main/java/me/gilo/wc/common/CompletionGenericLiveData.kt rename to app/src/main/java/me/gilo/woodroid/app/common/CompletionGenericLiveData.kt index 0857976..6d0ce65 100644 --- a/app/src/main/java/me/gilo/wc/common/CompletionGenericLiveData.kt +++ b/app/src/main/java/me/gilo/woodroid/app/common/CompletionGenericLiveData.kt @@ -1,4 +1,4 @@ -package me.gilo.wc.common +package me.gilo.woodroid.app.common import android.arch.lifecycle.LiveData import com.google.android.gms.tasks.OnCompleteListener diff --git a/app/src/main/java/me/gilo/wc/common/CompletionLiveData.java b/app/src/main/java/me/gilo/woodroid/app/common/CompletionLiveData.java similarity index 94% rename from app/src/main/java/me/gilo/wc/common/CompletionLiveData.java rename to app/src/main/java/me/gilo/woodroid/app/common/CompletionLiveData.java index bc7ea1b..eb4d446 100644 --- a/app/src/main/java/me/gilo/wc/common/CompletionLiveData.java +++ b/app/src/main/java/me/gilo/woodroid/app/common/CompletionLiveData.java @@ -1,4 +1,4 @@ -package me.gilo.wc.common; +package me.gilo.woodroid.app.common; import android.arch.lifecycle.LiveData; import android.support.annotation.NonNull; diff --git a/app/src/main/java/me/gilo/wc/common/DocumentLiveData.java b/app/src/main/java/me/gilo/woodroid/app/common/DocumentLiveData.java similarity index 96% rename from app/src/main/java/me/gilo/wc/common/DocumentLiveData.java rename to app/src/main/java/me/gilo/woodroid/app/common/DocumentLiveData.java index 9163d8b..e900d43 100644 --- a/app/src/main/java/me/gilo/wc/common/DocumentLiveData.java +++ b/app/src/main/java/me/gilo/woodroid/app/common/DocumentLiveData.java @@ -1,4 +1,4 @@ -package me.gilo.wc.common; +package me.gilo.woodroid.app.common; import android.arch.lifecycle.LiveData; import com.google.firebase.firestore.*; diff --git a/app/src/main/java/me/gilo/wc/common/NetworkException.java b/app/src/main/java/me/gilo/woodroid/app/common/NetworkException.java similarity index 90% rename from app/src/main/java/me/gilo/wc/common/NetworkException.java rename to app/src/main/java/me/gilo/woodroid/app/common/NetworkException.java index 8dca6d3..6da6ec9 100644 --- a/app/src/main/java/me/gilo/wc/common/NetworkException.java +++ b/app/src/main/java/me/gilo/woodroid/app/common/NetworkException.java @@ -1,4 +1,4 @@ -package me.gilo.wc.common; +package me.gilo.woodroid.app.common; public class NetworkException extends Exception{ diff --git a/app/src/main/java/me/gilo/wc/common/OnItemClickedListener.java b/app/src/main/java/me/gilo/woodroid/app/common/OnItemClickedListener.java similarity index 87% rename from app/src/main/java/me/gilo/wc/common/OnItemClickedListener.java rename to app/src/main/java/me/gilo/woodroid/app/common/OnItemClickedListener.java index eb79371..4480191 100644 --- a/app/src/main/java/me/gilo/wc/common/OnItemClickedListener.java +++ b/app/src/main/java/me/gilo/woodroid/app/common/OnItemClickedListener.java @@ -1,4 +1,4 @@ -package me.gilo.wc.common; +package me.gilo.woodroid.app.common; import android.support.v7.widget.RecyclerView; diff --git a/app/src/main/java/me/gilo/wc/common/QueryLiveData.java b/app/src/main/java/me/gilo/woodroid/app/common/QueryLiveData.java similarity index 95% rename from app/src/main/java/me/gilo/wc/common/QueryLiveData.java rename to app/src/main/java/me/gilo/woodroid/app/common/QueryLiveData.java index 7d5221d..48c486e 100644 --- a/app/src/main/java/me/gilo/wc/common/QueryLiveData.java +++ b/app/src/main/java/me/gilo/woodroid/app/common/QueryLiveData.java @@ -1,9 +1,9 @@ -package me.gilo.wc.common; +package me.gilo.woodroid.app.common; import android.arch.lifecycle.LiveData; import android.support.annotation.NonNull; import com.google.firebase.firestore.*; -import me.gilo.wc.models.Model; +import me.gilo.woodroid.app.models.Model; import java.util.ArrayList; diff --git a/app/src/main/java/me/gilo/wc/common/Resource.java b/app/src/main/java/me/gilo/woodroid/app/common/Resource.java similarity index 97% rename from app/src/main/java/me/gilo/wc/common/Resource.java rename to app/src/main/java/me/gilo/woodroid/app/common/Resource.java index a04918f..d847e24 100644 --- a/app/src/main/java/me/gilo/wc/common/Resource.java +++ b/app/src/main/java/me/gilo/woodroid/app/common/Resource.java @@ -1,4 +1,4 @@ -package me.gilo.wc.common; +package me.gilo.woodroid.app.common; import android.support.annotation.NonNull; import android.support.annotation.Nullable; diff --git a/app/src/main/java/me/gilo/wc/common/Status.java b/app/src/main/java/me/gilo/woodroid/app/common/Status.java similarity index 78% rename from app/src/main/java/me/gilo/wc/common/Status.java rename to app/src/main/java/me/gilo/woodroid/app/common/Status.java index b840b91..e8e44c3 100644 --- a/app/src/main/java/me/gilo/wc/common/Status.java +++ b/app/src/main/java/me/gilo/woodroid/app/common/Status.java @@ -1,4 +1,4 @@ -package me.gilo.wc.common; +package me.gilo.woodroid.app.common; public enum Status { EMPTY, diff --git a/app/src/main/java/me/gilo/wc/common/WooLiveData.java b/app/src/main/java/me/gilo/woodroid/app/common/WooLiveData.java similarity index 96% rename from app/src/main/java/me/gilo/wc/common/WooLiveData.java rename to app/src/main/java/me/gilo/woodroid/app/common/WooLiveData.java index 036f186..c34a89f 100644 --- a/app/src/main/java/me/gilo/wc/common/WooLiveData.java +++ b/app/src/main/java/me/gilo/woodroid/app/common/WooLiveData.java @@ -1,4 +1,4 @@ -package me.gilo.wc.common; +package me.gilo.woodroid.app.common; import android.arch.lifecycle.LiveData; import retrofit2.Call; diff --git a/app/src/main/java/me/gilo/wc/di/ActivitiesModule.kt b/app/src/main/java/me/gilo/woodroid/app/di/ActivitiesModule.kt similarity index 71% rename from app/src/main/java/me/gilo/wc/di/ActivitiesModule.kt rename to app/src/main/java/me/gilo/woodroid/app/di/ActivitiesModule.kt index 749e344..59bc8e0 100644 --- a/app/src/main/java/me/gilo/wc/di/ActivitiesModule.kt +++ b/app/src/main/java/me/gilo/woodroid/app/di/ActivitiesModule.kt @@ -1,22 +1,21 @@ -package me.gilo.wc.di +package me.gilo.woodroid.app.di import dagger.Module import dagger.android.ContributesAndroidInjector import me.gilo.raison.ui.user.onboarding.SignInActivity import me.gilo.raison.ui.user.onboarding.SignUpActivity -import me.gilo.wc.MainActivity -import me.gilo.wc.ui.WooDroidActivity -import me.gilo.wc.ui.customer.BasicCustomerDetailsActivity -import me.gilo.wc.ui.customer.BillingAddressActivity -import me.gilo.wc.ui.customer.ProfileActivity -import me.gilo.wc.ui.customer.ShippingAddressActivity -import me.gilo.wc.ui.home.HomeActivity -import me.gilo.wc.ui.onboarding.AnonymousSignInActivity -import me.gilo.wc.ui.order.MyOrdersActivity -import me.gilo.wc.ui.order.OrderActivity -import me.gilo.wc.ui.product.CartActivity -import me.gilo.wc.ui.product.ProductActivity -import me.gilo.wc.ui.product.ShopActivity +import me.gilo.woodroid.app.MainActivity +import me.gilo.woodroid.app.ui.customer.BasicCustomerDetailsActivity +import me.gilo.woodroid.app.ui.customer.BillingAddressActivity +import me.gilo.woodroid.app.ui.customer.ProfileActivity +import me.gilo.woodroid.app.ui.customer.ShippingAddressActivity +import me.gilo.woodroid.app.ui.home.HomeActivity +import me.gilo.woodroid.app.ui.onboarding.AnonymousSignInActivity +import me.gilo.woodroid.app.ui.order.MyOrdersActivity +import me.gilo.woodroid.app.ui.order.OrderActivity +import me.gilo.woodroid.app.ui.product.CartActivity +import me.gilo.woodroid.app.ui.product.ProductActivity +import me.gilo.woodroid.app.ui.product.ShopActivity @Module internal abstract class ActivitiesModule { diff --git a/app/src/main/java/me/gilo/wc/di/AppComponent.kt b/app/src/main/java/me/gilo/woodroid/app/di/AppComponent.kt similarity index 87% rename from app/src/main/java/me/gilo/wc/di/AppComponent.kt rename to app/src/main/java/me/gilo/woodroid/app/di/AppComponent.kt index 271ebd4..ce34ec8 100644 --- a/app/src/main/java/me/gilo/wc/di/AppComponent.kt +++ b/app/src/main/java/me/gilo/woodroid/app/di/AppComponent.kt @@ -1,11 +1,11 @@ -package me.gilo.wc.di +package me.gilo.woodroid.app.di import dagger.Component import dagger.android.AndroidInjector import dagger.android.DaggerApplication import dagger.android.support.AndroidSupportInjectionModule -import me.gilo.wc.WcApp +import me.gilo.woodroid.app.WcApp import javax.inject.Singleton diff --git a/app/src/main/java/me/gilo/wc/di/AppModule.kt b/app/src/main/java/me/gilo/woodroid/app/di/AppModule.kt similarity index 87% rename from app/src/main/java/me/gilo/wc/di/AppModule.kt rename to app/src/main/java/me/gilo/woodroid/app/di/AppModule.kt index e519053..6b141a9 100644 --- a/app/src/main/java/me/gilo/wc/di/AppModule.kt +++ b/app/src/main/java/me/gilo/woodroid/app/di/AppModule.kt @@ -1,9 +1,9 @@ -package me.gilo.wc.di +package me.gilo.woodroid.app.di import dagger.Module import dagger.Provides -import me.gilo.wc.Config -import me.gilo.wc.WcApp +import me.gilo.woodroid.app.Config +import me.gilo.woodroid.app.WcApp import me.gilo.woodroid.Woocommerce import javax.inject.Singleton diff --git a/app/src/main/java/me/gilo/wc/di/FirebaseModule.kt b/app/src/main/java/me/gilo/woodroid/app/di/FirebaseModule.kt similarity index 96% rename from app/src/main/java/me/gilo/wc/di/FirebaseModule.kt rename to app/src/main/java/me/gilo/woodroid/app/di/FirebaseModule.kt index e4037f3..0ceeded 100644 --- a/app/src/main/java/me/gilo/wc/di/FirebaseModule.kt +++ b/app/src/main/java/me/gilo/woodroid/app/di/FirebaseModule.kt @@ -1,4 +1,4 @@ -package me.gilo.wc.di +package me.gilo.woodroid.app.di import com.google.firebase.firestore.CollectionReference import com.google.firebase.firestore.FirebaseFirestore diff --git a/app/src/main/java/me/gilo/wc/di/ViewModelKey.java b/app/src/main/java/me/gilo/woodroid/app/di/ViewModelKey.java similarity index 88% rename from app/src/main/java/me/gilo/wc/di/ViewModelKey.java rename to app/src/main/java/me/gilo/woodroid/app/di/ViewModelKey.java index 3e1e5fc..ce8c0e1 100644 --- a/app/src/main/java/me/gilo/wc/di/ViewModelKey.java +++ b/app/src/main/java/me/gilo/woodroid/app/di/ViewModelKey.java @@ -1,4 +1,4 @@ -package me.gilo.wc.di; +package me.gilo.woodroid.app.di; import android.arch.lifecycle.ViewModel; import dagger.MapKey; diff --git a/app/src/main/java/me/gilo/wc/di/ViewModelModule.kt b/app/src/main/java/me/gilo/woodroid/app/di/ViewModelModule.kt similarity index 83% rename from app/src/main/java/me/gilo/wc/di/ViewModelModule.kt rename to app/src/main/java/me/gilo/woodroid/app/di/ViewModelModule.kt index 4377015..5a7abef 100644 --- a/app/src/main/java/me/gilo/wc/di/ViewModelModule.kt +++ b/app/src/main/java/me/gilo/woodroid/app/di/ViewModelModule.kt @@ -1,18 +1,12 @@ -package me.gilo.wc.di +package me.gilo.woodroid.app.di import android.arch.lifecycle.ViewModel import android.arch.lifecycle.ViewModelProvider -import com.google.firebase.firestore.CollectionReference import dagger.Binds import dagger.Module -import dagger.Provides import dagger.multibindings.IntoMap -import me.gilo.wc.ui.order.MyOrdersActivity -import me.gilo.wc.utils.ViewModelFactory -import me.gilo.wc.viewmodels.* - -import javax.inject.Named -import javax.inject.Singleton +import me.gilo.woodroid.app.utils.ViewModelFactory +import me.gilo.woodroid.app.viewmodels.* @Module diff --git a/app/src/main/java/me/gilo/wc/events/AddQuantityEvent.java b/app/src/main/java/me/gilo/woodroid/app/events/AddQuantityEvent.java similarity index 76% rename from app/src/main/java/me/gilo/wc/events/AddQuantityEvent.java rename to app/src/main/java/me/gilo/woodroid/app/events/AddQuantityEvent.java index 81c7f7e..1b11021 100644 --- a/app/src/main/java/me/gilo/wc/events/AddQuantityEvent.java +++ b/app/src/main/java/me/gilo/woodroid/app/events/AddQuantityEvent.java @@ -1,7 +1,6 @@ -package me.gilo.wc.events; +package me.gilo.woodroid.app.events; -import me.gilo.wc.models.CartLineItem; -import me.gilo.woodroid.models.ProductReview; +import me.gilo.woodroid.app.models.CartLineItem; public class AddQuantityEvent { diff --git a/app/src/main/java/me/gilo/wc/events/LessQuantityEvent.java b/app/src/main/java/me/gilo/woodroid/app/events/LessQuantityEvent.java similarity index 76% rename from app/src/main/java/me/gilo/wc/events/LessQuantityEvent.java rename to app/src/main/java/me/gilo/woodroid/app/events/LessQuantityEvent.java index 614f2b6..30e2d80 100644 --- a/app/src/main/java/me/gilo/wc/events/LessQuantityEvent.java +++ b/app/src/main/java/me/gilo/woodroid/app/events/LessQuantityEvent.java @@ -1,7 +1,6 @@ -package me.gilo.wc.events; +package me.gilo.woodroid.app.events; -import me.gilo.wc.models.CartLineItem; -import me.gilo.woodroid.models.ProductReview; +import me.gilo.woodroid.app.models.CartLineItem; public class LessQuantityEvent { diff --git a/app/src/main/java/me/gilo/wc/events/ProductEvent.java b/app/src/main/java/me/gilo/woodroid/app/events/ProductEvent.java similarity index 89% rename from app/src/main/java/me/gilo/wc/events/ProductEvent.java rename to app/src/main/java/me/gilo/woodroid/app/events/ProductEvent.java index 7516281..78bcf63 100644 --- a/app/src/main/java/me/gilo/wc/events/ProductEvent.java +++ b/app/src/main/java/me/gilo/woodroid/app/events/ProductEvent.java @@ -1,4 +1,4 @@ -package me.gilo.wc.events; +package me.gilo.woodroid.app.events; import me.gilo.woodroid.models.Product; diff --git a/app/src/main/java/me/gilo/wc/events/ReviewEvent.java b/app/src/main/java/me/gilo/woodroid/app/events/ReviewEvent.java similarity index 83% rename from app/src/main/java/me/gilo/wc/events/ReviewEvent.java rename to app/src/main/java/me/gilo/woodroid/app/events/ReviewEvent.java index bcff1de..635a7ef 100644 --- a/app/src/main/java/me/gilo/wc/events/ReviewEvent.java +++ b/app/src/main/java/me/gilo/woodroid/app/events/ReviewEvent.java @@ -1,6 +1,5 @@ -package me.gilo.wc.events; +package me.gilo.woodroid.app.events; -import me.gilo.woodroid.models.Product; import me.gilo.woodroid.models.ProductReview; public class ReviewEvent { diff --git a/app/src/main/java/me/gilo/wc/models/CartLineItem.java b/app/src/main/java/me/gilo/woodroid/app/models/CartLineItem.java similarity index 88% rename from app/src/main/java/me/gilo/wc/models/CartLineItem.java rename to app/src/main/java/me/gilo/woodroid/app/models/CartLineItem.java index 6080ea6..e347730 100644 --- a/app/src/main/java/me/gilo/wc/models/CartLineItem.java +++ b/app/src/main/java/me/gilo/woodroid/app/models/CartLineItem.java @@ -1,12 +1,7 @@ -package me.gilo.wc.models; +package me.gilo.woodroid.app.models; -import com.google.gson.annotations.SerializedName; -import me.gilo.woodroid.models.Metum; import me.gilo.woodroid.models.Product; -import java.util.ArrayList; -import java.util.List; - public class CartLineItem extends Model{ diff --git a/app/src/main/java/me/gilo/wc/models/Identifiable.java b/app/src/main/java/me/gilo/woodroid/app/models/Identifiable.java similarity index 93% rename from app/src/main/java/me/gilo/wc/models/Identifiable.java rename to app/src/main/java/me/gilo/woodroid/app/models/Identifiable.java index 7eeff74..d2ec0c2 100644 --- a/app/src/main/java/me/gilo/wc/models/Identifiable.java +++ b/app/src/main/java/me/gilo/woodroid/app/models/Identifiable.java @@ -1,4 +1,4 @@ -package me.gilo.wc.models; +package me.gilo.woodroid.app.models; import com.google.firebase.firestore.Exclude; diff --git a/app/src/main/java/me/gilo/wc/models/Model.java b/app/src/main/java/me/gilo/woodroid/app/models/Model.java similarity index 94% rename from app/src/main/java/me/gilo/wc/models/Model.java rename to app/src/main/java/me/gilo/woodroid/app/models/Model.java index 8451ef6..96eeff1 100644 --- a/app/src/main/java/me/gilo/wc/models/Model.java +++ b/app/src/main/java/me/gilo/woodroid/app/models/Model.java @@ -1,4 +1,4 @@ -package me.gilo.wc.models; +package me.gilo.woodroid.app.models; import android.support.annotation.NonNull; import com.google.firebase.firestore.IgnoreExtraProperties; diff --git a/app/src/main/java/me/gilo/wc/models/Repository.java b/app/src/main/java/me/gilo/woodroid/app/models/Repository.java similarity index 97% rename from app/src/main/java/me/gilo/wc/models/Repository.java rename to app/src/main/java/me/gilo/woodroid/app/models/Repository.java index 3a450a8..22cfe9c 100644 --- a/app/src/main/java/me/gilo/wc/models/Repository.java +++ b/app/src/main/java/me/gilo/woodroid/app/models/Repository.java @@ -1,4 +1,4 @@ -package me.gilo.wc.models; +package me.gilo.woodroid.app.models; import com.google.android.gms.tasks.Task; diff --git a/app/src/main/java/me/gilo/wc/models/User.java b/app/src/main/java/me/gilo/woodroid/app/models/User.java similarity index 97% rename from app/src/main/java/me/gilo/wc/models/User.java rename to app/src/main/java/me/gilo/woodroid/app/models/User.java index 173bd79..da83445 100644 --- a/app/src/main/java/me/gilo/wc/models/User.java +++ b/app/src/main/java/me/gilo/woodroid/app/models/User.java @@ -1,4 +1,4 @@ -package me.gilo.wc.models; +package me.gilo.woodroid.app.models; public class User{ String id; diff --git a/app/src/main/java/me/gilo/wc/repo/CartRepository.kt b/app/src/main/java/me/gilo/woodroid/app/repo/CartRepository.kt similarity index 89% rename from app/src/main/java/me/gilo/wc/repo/CartRepository.kt rename to app/src/main/java/me/gilo/woodroid/app/repo/CartRepository.kt index 49f1973..bdbe273 100644 --- a/app/src/main/java/me/gilo/wc/repo/CartRepository.kt +++ b/app/src/main/java/me/gilo/woodroid/app/repo/CartRepository.kt @@ -1,4 +1,4 @@ -package me.gilo.wc.repo +package me.gilo.woodroid.app.repo import android.content.Context @@ -7,10 +7,10 @@ import com.google.firebase.auth.FirebaseAuth import com.google.firebase.firestore.CollectionReference import com.google.firebase.firestore.DocumentReference import com.google.firebase.firestore.FirebaseFirestore -import me.gilo.wc.common.CompletionGenericLiveData -import me.gilo.wc.common.QueryLiveData -import me.gilo.wc.common.WooLiveData -import me.gilo.wc.models.CartLineItem +import me.gilo.woodroid.app.common.CompletionGenericLiveData +import me.gilo.woodroid.app.common.QueryLiveData +import me.gilo.woodroid.app.common.WooLiveData +import me.gilo.woodroid.app.models.CartLineItem import me.gilo.woodroid.Woocommerce import me.gilo.woodroid.models.LineItem import me.gilo.woodroid.models.Product @@ -88,7 +88,7 @@ constructor() { fun cart(context: Context): WooLiveData> { val callBack = WooLiveData>() - woocommerce!!.CartRepository(context).cart().enqueue(callBack) + woocommerce.CartRepository(context).cart().enqueue(callBack) return callBack } diff --git a/app/src/main/java/me/gilo/wc/repo/CategoryRepository.kt b/app/src/main/java/me/gilo/woodroid/app/repo/CategoryRepository.kt similarity index 95% rename from app/src/main/java/me/gilo/wc/repo/CategoryRepository.kt rename to app/src/main/java/me/gilo/woodroid/app/repo/CategoryRepository.kt index d557fc4..010fc53 100644 --- a/app/src/main/java/me/gilo/wc/repo/CategoryRepository.kt +++ b/app/src/main/java/me/gilo/woodroid/app/repo/CategoryRepository.kt @@ -1,7 +1,7 @@ -package me.gilo.wc.repo +package me.gilo.woodroid.app.repo -import me.gilo.wc.common.WooLiveData +import me.gilo.woodroid.app.common.WooLiveData import me.gilo.woodroid.Woocommerce import me.gilo.woodroid.models.Category import me.gilo.woodroid.models.filters.ProductCategoryFilter diff --git a/app/src/main/java/me/gilo/wc/repo/CustomerRepository.kt b/app/src/main/java/me/gilo/woodroid/app/repo/CustomerRepository.kt similarity index 96% rename from app/src/main/java/me/gilo/wc/repo/CustomerRepository.kt rename to app/src/main/java/me/gilo/woodroid/app/repo/CustomerRepository.kt index 578ccb8..3bc21b0 100644 --- a/app/src/main/java/me/gilo/wc/repo/CustomerRepository.kt +++ b/app/src/main/java/me/gilo/woodroid/app/repo/CustomerRepository.kt @@ -1,8 +1,8 @@ -package me.gilo.wc.repo +package me.gilo.woodroid.app.repo import com.google.firebase.auth.FirebaseAuth -import me.gilo.wc.common.WooLiveData +import me.gilo.woodroid.app.common.WooLiveData import me.gilo.woodroid.Woocommerce import me.gilo.woodroid.models.Customer import me.gilo.woodroid.models.filters.CustomerFilter diff --git a/app/src/main/java/me/gilo/wc/repo/FirebaseRepository.kt b/app/src/main/java/me/gilo/woodroid/app/repo/FirebaseRepository.kt similarity index 90% rename from app/src/main/java/me/gilo/wc/repo/FirebaseRepository.kt rename to app/src/main/java/me/gilo/woodroid/app/repo/FirebaseRepository.kt index f53ea16..1fd3665 100644 --- a/app/src/main/java/me/gilo/wc/repo/FirebaseRepository.kt +++ b/app/src/main/java/me/gilo/woodroid/app/repo/FirebaseRepository.kt @@ -1,15 +1,11 @@ -package me.gilo.wc.repo +package me.gilo.woodroid.app.repo import android.util.Log -import com.google.android.gms.tasks.Continuation -import com.google.android.gms.tasks.OnFailureListener import com.google.android.gms.tasks.Task import com.google.firebase.firestore.CollectionReference -import com.google.firebase.firestore.DocumentReference -import com.google.firebase.firestore.DocumentSnapshot import com.google.firebase.firestore.FirebaseFirestore -import me.gilo.wc.models.Identifiable -import me.gilo.wc.models.Repository +import me.gilo.woodroid.app.models.Identifiable +import me.gilo.woodroid.app.models.Repository /** diff --git a/app/src/main/java/me/gilo/wc/repo/FirebaseUserRepository.java b/app/src/main/java/me/gilo/woodroid/app/repo/FirebaseUserRepository.java similarity index 92% rename from app/src/main/java/me/gilo/wc/repo/FirebaseUserRepository.java rename to app/src/main/java/me/gilo/woodroid/app/repo/FirebaseUserRepository.java index ff1f058..054120a 100644 --- a/app/src/main/java/me/gilo/wc/repo/FirebaseUserRepository.java +++ b/app/src/main/java/me/gilo/woodroid/app/repo/FirebaseUserRepository.java @@ -1,4 +1,4 @@ -package me.gilo.wc.repo; +package me.gilo.woodroid.app.repo; import com.google.android.gms.tasks.OnFailureListener; import com.google.android.gms.tasks.OnSuccessListener; @@ -7,10 +7,10 @@ import com.google.firebase.auth.FirebaseAuth; import com.google.firebase.firestore.CollectionReference; import com.google.firebase.firestore.DocumentReference; import com.google.firebase.storage.StorageReference; -import me.gilo.wc.common.CompletionGenericLiveData; -import me.gilo.wc.common.CompletionLiveData; -import me.gilo.wc.common.DocumentLiveData; -import me.gilo.wc.models.User; +import me.gilo.woodroid.app.common.CompletionGenericLiveData; +import me.gilo.woodroid.app.common.CompletionLiveData; +import me.gilo.woodroid.app.common.DocumentLiveData; +import me.gilo.woodroid.app.models.User; import javax.inject.Inject; import javax.inject.Named; diff --git a/app/src/main/java/me/gilo/wc/repo/OrderRepository.java b/app/src/main/java/me/gilo/woodroid/app/repo/OrderRepository.java similarity index 92% rename from app/src/main/java/me/gilo/wc/repo/OrderRepository.java rename to app/src/main/java/me/gilo/woodroid/app/repo/OrderRepository.java index c418009..882d8ac 100644 --- a/app/src/main/java/me/gilo/wc/repo/OrderRepository.java +++ b/app/src/main/java/me/gilo/woodroid/app/repo/OrderRepository.java @@ -1,7 +1,7 @@ -package me.gilo.wc.repo; +package me.gilo.woodroid.app.repo; -import me.gilo.wc.common.WooLiveData; +import me.gilo.woodroid.app.common.WooLiveData; import me.gilo.woodroid.Woocommerce; import me.gilo.woodroid.models.Order; import me.gilo.woodroid.models.filters.OrderFilter; @@ -23,7 +23,7 @@ public class OrderRepository { public WooLiveData addToCart(int productId) { final WooLiveData callBack = new WooLiveData(); - woocommerce.OrderRepository().addToCart(productId).enqueue(callBack); + woocommerce.OrderRepository().addToCart(productId, null).enqueue(callBack); return callBack; } diff --git a/app/src/main/java/me/gilo/wc/repo/ProductRepository.java b/app/src/main/java/me/gilo/woodroid/app/repo/ProductRepository.java similarity index 95% rename from app/src/main/java/me/gilo/wc/repo/ProductRepository.java rename to app/src/main/java/me/gilo/woodroid/app/repo/ProductRepository.java index a06494c..259b90e 100644 --- a/app/src/main/java/me/gilo/wc/repo/ProductRepository.java +++ b/app/src/main/java/me/gilo/woodroid/app/repo/ProductRepository.java @@ -1,7 +1,7 @@ -package me.gilo.wc.repo; +package me.gilo.woodroid.app.repo; -import me.gilo.wc.common.WooLiveData; +import me.gilo.woodroid.app.common.WooLiveData; import me.gilo.woodroid.Woocommerce; import me.gilo.woodroid.models.Product; import me.gilo.woodroid.models.ProductReview; diff --git a/app/src/main/java/me/gilo/wc/repo/ReviewRepository.java b/app/src/main/java/me/gilo/woodroid/app/repo/ReviewRepository.java similarity index 86% rename from app/src/main/java/me/gilo/wc/repo/ReviewRepository.java rename to app/src/main/java/me/gilo/woodroid/app/repo/ReviewRepository.java index a1d3494..2be3747 100644 --- a/app/src/main/java/me/gilo/wc/repo/ReviewRepository.java +++ b/app/src/main/java/me/gilo/woodroid/app/repo/ReviewRepository.java @@ -1,11 +1,9 @@ -package me.gilo.wc.repo; +package me.gilo.woodroid.app.repo; -import me.gilo.wc.common.WooLiveData; +import me.gilo.woodroid.app.common.WooLiveData; import me.gilo.woodroid.Woocommerce; -import me.gilo.woodroid.models.Product; import me.gilo.woodroid.models.ProductReview; -import me.gilo.woodroid.models.filters.ProductFilter; import me.gilo.woodroid.models.filters.ProductReviewFilter; import javax.inject.Inject; diff --git a/app/src/main/java/me/gilo/wc/ui/BaseActivity.kt b/app/src/main/java/me/gilo/woodroid/app/ui/BaseActivity.kt similarity index 89% rename from app/src/main/java/me/gilo/wc/ui/BaseActivity.kt rename to app/src/main/java/me/gilo/woodroid/app/ui/BaseActivity.kt index 1cb0912..32fc067 100644 --- a/app/src/main/java/me/gilo/wc/ui/BaseActivity.kt +++ b/app/src/main/java/me/gilo/woodroid/app/ui/BaseActivity.kt @@ -1,10 +1,10 @@ -package me.gilo.wc.ui +package me.gilo.woodroid.app.ui import android.content.Context import android.support.v7.app.AppCompatActivity import io.github.inflationx.viewpump.ViewPumpContextWrapper -import me.gilo.wc.Config -import me.gilo.wc.ui.state.ProgressDialogFragment +import me.gilo.woodroid.app.Config +import me.gilo.woodroid.app.ui.state.ProgressDialogFragment import me.gilo.woodroid.Woocommerce open class BaseActivity : AppCompatActivity() { diff --git a/app/src/main/java/me/gilo/wc/ui/MenuActivity.kt b/app/src/main/java/me/gilo/woodroid/app/ui/MenuActivity.kt similarity index 77% rename from app/src/main/java/me/gilo/wc/ui/MenuActivity.kt rename to app/src/main/java/me/gilo/woodroid/app/ui/MenuActivity.kt index 66a2219..95c73c9 100644 --- a/app/src/main/java/me/gilo/wc/ui/MenuActivity.kt +++ b/app/src/main/java/me/gilo/woodroid/app/ui/MenuActivity.kt @@ -1,16 +1,12 @@ -package me.gilo.wc.ui +package me.gilo.woodroid.app.ui -import android.app.Activity import android.os.Bundle -import android.support.design.widget.Snackbar -import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.LinearLayoutManager -import android.support.v7.widget.RecyclerView -import me.gilo.wc.R +import me.gilo.woodroid.app.R import kotlinx.android.synthetic.main.activity_menu.* import kotlinx.android.synthetic.main.content_menu.* -import me.gilo.wc.adapter.MenuAdapter +import me.gilo.woodroid.app.adapter.MenuAdapter import java.util.ArrayList class MenuActivity : BaseActivity() { diff --git a/app/src/main/java/me/gilo/wc/ui/WooDroidActivity.kt b/app/src/main/java/me/gilo/woodroid/app/ui/WooDroidActivity.kt similarity index 88% rename from app/src/main/java/me/gilo/wc/ui/WooDroidActivity.kt rename to app/src/main/java/me/gilo/woodroid/app/ui/WooDroidActivity.kt index e34e221..894ff96 100644 --- a/app/src/main/java/me/gilo/wc/ui/WooDroidActivity.kt +++ b/app/src/main/java/me/gilo/woodroid/app/ui/WooDroidActivity.kt @@ -1,10 +1,8 @@ -package me.gilo.wc.ui +package me.gilo.woodroid.app.ui import android.arch.lifecycle.ViewModel import android.content.Context import android.content.Intent -import android.os.Bundle -import android.os.PersistableBundle import android.view.Menu import android.view.MenuItem import android.view.View @@ -14,13 +12,12 @@ import android.widget.Toast import com.google.firebase.auth.FirebaseAuth import io.github.inflationx.viewpump.ViewPumpContextWrapper import me.gilo.raison.ui.user.onboarding.SignInActivity -import me.gilo.wc.R -import me.gilo.wc.common.BaseActivity -import me.gilo.wc.common.Status -import me.gilo.wc.ui.product.CartActivity -import me.gilo.wc.ui.state.ProgressDialogFragment -import me.gilo.wc.viewmodels.CartViewModel -import me.gilo.wc.viewmodels.ProductViewModel +import me.gilo.woodroid.app.R +import me.gilo.woodroid.app.common.BaseActivity +import me.gilo.woodroid.app.common.Status +import me.gilo.woodroid.app.ui.product.CartActivity +import me.gilo.woodroid.app.ui.state.ProgressDialogFragment +import me.gilo.woodroid.app.viewmodels.CartViewModel abstract class WooDroidActivity : BaseActivity() { @@ -40,7 +37,7 @@ abstract class WooDroidActivity : BaseActivity() { startActivity(Intent(baseContext, SignInActivity::class.java)) finish() } - cart() + //cart() } fun showLoading() { @@ -67,7 +64,7 @@ abstract class WooDroidActivity : BaseActivity() { override fun onCreateOptionsMenu(menu: Menu): Boolean { menuInflater.inflate(R.menu.product, menu) - val item = menu.findItem(me.gilo.wc.R.id.menu_cart) + val item = menu.findItem(R.id.menu_cart) val rootView = item.actionView as FrameLayout tvCartCounter = rootView.findViewById(R.id.tvCart_counter) diff --git a/app/src/main/java/me/gilo/wc/ui/checkout/CheckoutActivity.kt b/app/src/main/java/me/gilo/woodroid/app/ui/checkout/CheckoutActivity.kt similarity index 79% rename from app/src/main/java/me/gilo/wc/ui/checkout/CheckoutActivity.kt rename to app/src/main/java/me/gilo/woodroid/app/ui/checkout/CheckoutActivity.kt index b0bc0bf..d8823e0 100644 --- a/app/src/main/java/me/gilo/wc/ui/checkout/CheckoutActivity.kt +++ b/app/src/main/java/me/gilo/woodroid/app/ui/checkout/CheckoutActivity.kt @@ -1,9 +1,8 @@ -package me.gilo.wc.ui.checkout +package me.gilo.woodroid.app.ui.checkout import android.os.Bundle -import android.support.design.widget.Snackbar import android.support.v7.app.AppCompatActivity -import me.gilo.wc.R +import me.gilo.woodroid.app.R import kotlinx.android.synthetic.main.activity_checkout.* diff --git a/app/src/main/java/me/gilo/wc/ui/coupon/AddCouponActivity.kt b/app/src/main/java/me/gilo/woodroid/app/ui/coupon/AddCouponActivity.kt similarity index 92% rename from app/src/main/java/me/gilo/wc/ui/coupon/AddCouponActivity.kt rename to app/src/main/java/me/gilo/woodroid/app/ui/coupon/AddCouponActivity.kt index 7c99868..51d489f 100644 --- a/app/src/main/java/me/gilo/wc/ui/coupon/AddCouponActivity.kt +++ b/app/src/main/java/me/gilo/woodroid/app/ui/coupon/AddCouponActivity.kt @@ -1,10 +1,10 @@ -package me.gilo.wc.ui.coupon +package me.gilo.woodroid.app.ui.coupon import android.os.Bundle import kotlinx.android.synthetic.main.activity_add_coupon.* import kotlinx.android.synthetic.main.content_add_coupon.* -import me.gilo.wc.R -import me.gilo.wc.ui.BaseActivity +import me.gilo.woodroid.app.R +import me.gilo.woodroid.app.ui.BaseActivity import me.gilo.woodroid.models.Coupon import retrofit2.Call import retrofit2.Callback diff --git a/app/src/main/java/me/gilo/wc/ui/coupon/CouponActivity.kt b/app/src/main/java/me/gilo/woodroid/app/ui/coupon/CouponActivity.kt similarity index 96% rename from app/src/main/java/me/gilo/wc/ui/coupon/CouponActivity.kt rename to app/src/main/java/me/gilo/woodroid/app/ui/coupon/CouponActivity.kt index e57348e..aa400aa 100644 --- a/app/src/main/java/me/gilo/wc/ui/coupon/CouponActivity.kt +++ b/app/src/main/java/me/gilo/woodroid/app/ui/coupon/CouponActivity.kt @@ -1,11 +1,11 @@ -package me.gilo.wc.ui.coupon +package me.gilo.woodroid.app.ui.coupon import android.os.Bundle import android.widget.Toast import kotlinx.android.synthetic.main.activity_coupon.* import kotlinx.android.synthetic.main.content_coupon.* -import me.gilo.wc.R -import me.gilo.wc.ui.BaseActivity +import me.gilo.woodroid.app.R +import me.gilo.woodroid.app.ui.BaseActivity import me.gilo.woodroid.models.Coupon import retrofit2.Call import retrofit2.Callback diff --git a/app/src/main/java/me/gilo/wc/ui/coupon/CouponsActivity.kt b/app/src/main/java/me/gilo/woodroid/app/ui/coupon/CouponsActivity.kt similarity index 92% rename from app/src/main/java/me/gilo/wc/ui/coupon/CouponsActivity.kt rename to app/src/main/java/me/gilo/woodroid/app/ui/coupon/CouponsActivity.kt index b5af115..c6be2e3 100644 --- a/app/src/main/java/me/gilo/wc/ui/coupon/CouponsActivity.kt +++ b/app/src/main/java/me/gilo/woodroid/app/ui/coupon/CouponsActivity.kt @@ -1,13 +1,13 @@ -package me.gilo.wc.ui.coupon +package me.gilo.woodroid.app.ui.coupon import android.content.Intent import android.os.Bundle import android.support.v7.widget.LinearLayoutManager import kotlinx.android.synthetic.main.activity_coupons.* import kotlinx.android.synthetic.main.content_coupons.* -import me.gilo.wc.R -import me.gilo.wc.adapter.CouponAdapter -import me.gilo.wc.ui.BaseActivity +import me.gilo.woodroid.app.R +import me.gilo.woodroid.app.adapter.CouponAdapter +import me.gilo.woodroid.app.ui.BaseActivity import me.gilo.woodroid.models.Coupon import me.gilo.woodroid.models.filters.CouponFilter import retrofit2.Call diff --git a/app/src/main/java/me/gilo/wc/ui/customer/BasicCustomerDetailsActivity.kt b/app/src/main/java/me/gilo/woodroid/app/ui/customer/BasicCustomerDetailsActivity.kt similarity index 94% rename from app/src/main/java/me/gilo/wc/ui/customer/BasicCustomerDetailsActivity.kt rename to app/src/main/java/me/gilo/woodroid/app/ui/customer/BasicCustomerDetailsActivity.kt index 94dce72..073eea6 100644 --- a/app/src/main/java/me/gilo/wc/ui/customer/BasicCustomerDetailsActivity.kt +++ b/app/src/main/java/me/gilo/woodroid/app/ui/customer/BasicCustomerDetailsActivity.kt @@ -1,20 +1,15 @@ -package me.gilo.wc.ui.customer +package me.gilo.woodroid.app.ui.customer import android.arch.lifecycle.Observer import android.content.Context -import android.content.Intent import android.os.Bundle -import android.support.v4.content.ContextCompat.startActivity import android.widget.Toast -import com.google.firebase.auth.FirebaseAuth import io.github.inflationx.viewpump.ViewPumpContextWrapper import kotlinx.android.synthetic.main.customer_basic_details.* -import me.gilo.wc.R -import me.gilo.wc.common.Status -import me.gilo.wc.models.User -import me.gilo.wc.ui.WooDroidActivity -import me.gilo.wc.ui.home.HomeActivity -import me.gilo.wc.viewmodels.CustomerViewModel +import me.gilo.woodroid.app.R +import me.gilo.woodroid.app.common.Status +import me.gilo.woodroid.app.ui.WooDroidActivity +import me.gilo.woodroid.app.viewmodels.CustomerViewModel import me.gilo.woodroid.models.Customer import java.util.regex.Matcher import java.util.regex.Pattern diff --git a/app/src/main/java/me/gilo/wc/ui/customer/BillingAddressActivity.kt b/app/src/main/java/me/gilo/woodroid/app/ui/customer/BillingAddressActivity.kt similarity index 96% rename from app/src/main/java/me/gilo/wc/ui/customer/BillingAddressActivity.kt rename to app/src/main/java/me/gilo/woodroid/app/ui/customer/BillingAddressActivity.kt index 3a17fcf..7bcd3db 100644 --- a/app/src/main/java/me/gilo/wc/ui/customer/BillingAddressActivity.kt +++ b/app/src/main/java/me/gilo/woodroid/app/ui/customer/BillingAddressActivity.kt @@ -1,18 +1,16 @@ -package me.gilo.wc.ui.customer +package me.gilo.woodroid.app.ui.customer import android.arch.lifecycle.Observer import android.content.Context -import android.content.Intent import android.os.Bundle import android.widget.Toast import com.google.firebase.auth.FirebaseAuth import io.github.inflationx.viewpump.ViewPumpContextWrapper import kotlinx.android.synthetic.main.customer_billing_address.* -import kotlinx.android.synthetic.main.drawer_filter.view.* -import me.gilo.wc.R -import me.gilo.wc.common.Status -import me.gilo.wc.ui.WooDroidActivity -import me.gilo.wc.viewmodels.CustomerViewModel +import me.gilo.woodroid.app.R +import me.gilo.woodroid.app.common.Status +import me.gilo.woodroid.app.ui.WooDroidActivity +import me.gilo.woodroid.app.viewmodels.CustomerViewModel import me.gilo.woodroid.models.BillingAddress import me.gilo.woodroid.models.Customer diff --git a/app/src/main/java/me/gilo/wc/ui/customer/ProfileActivity.kt b/app/src/main/java/me/gilo/woodroid/app/ui/customer/ProfileActivity.kt similarity index 91% rename from app/src/main/java/me/gilo/wc/ui/customer/ProfileActivity.kt rename to app/src/main/java/me/gilo/woodroid/app/ui/customer/ProfileActivity.kt index 8a87fbc..21b1e53 100644 --- a/app/src/main/java/me/gilo/wc/ui/customer/ProfileActivity.kt +++ b/app/src/main/java/me/gilo/woodroid/app/ui/customer/ProfileActivity.kt @@ -1,4 +1,4 @@ -package me.gilo.wc.ui.customer +package me.gilo.woodroid.app.ui.customer import android.arch.lifecycle.Observer import android.content.Context @@ -8,10 +8,10 @@ import android.widget.Toast import io.github.inflationx.viewpump.ViewPumpContextWrapper import kotlinx.android.synthetic.main.activity_profile.* import kotlinx.android.synthetic.main.content_profile.* -import me.gilo.wc.R -import me.gilo.wc.common.Status -import me.gilo.wc.ui.WooDroidActivity -import me.gilo.wc.viewmodels.CustomerViewModel +import me.gilo.woodroid.app.R +import me.gilo.woodroid.app.common.Status +import me.gilo.woodroid.app.ui.WooDroidActivity +import me.gilo.woodroid.app.viewmodels.CustomerViewModel class ProfileActivity : WooDroidActivity() { diff --git a/app/src/main/java/me/gilo/wc/ui/customer/ShippingAddressActivity.kt b/app/src/main/java/me/gilo/woodroid/app/ui/customer/ShippingAddressActivity.kt similarity index 96% rename from app/src/main/java/me/gilo/wc/ui/customer/ShippingAddressActivity.kt rename to app/src/main/java/me/gilo/woodroid/app/ui/customer/ShippingAddressActivity.kt index 4386c3e..b8c1596 100644 --- a/app/src/main/java/me/gilo/wc/ui/customer/ShippingAddressActivity.kt +++ b/app/src/main/java/me/gilo/woodroid/app/ui/customer/ShippingAddressActivity.kt @@ -1,16 +1,15 @@ -package me.gilo.wc.ui.customer +package me.gilo.woodroid.app.ui.customer import android.arch.lifecycle.Observer import android.content.Context -import android.content.Intent import android.os.Bundle import android.widget.Toast import io.github.inflationx.viewpump.ViewPumpContextWrapper import kotlinx.android.synthetic.main.customer_shipping_address.* -import me.gilo.wc.R -import me.gilo.wc.common.Status -import me.gilo.wc.ui.WooDroidActivity -import me.gilo.wc.viewmodels.CustomerViewModel +import me.gilo.woodroid.app.R +import me.gilo.woodroid.app.common.Status +import me.gilo.woodroid.app.ui.WooDroidActivity +import me.gilo.woodroid.app.viewmodels.CustomerViewModel import me.gilo.woodroid.models.Customer import me.gilo.woodroid.models.ShippingAddress diff --git a/app/src/main/java/me/gilo/wc/ui/home/CategoryFragment.kt b/app/src/main/java/me/gilo/woodroid/app/ui/home/CategoryFragment.kt similarity index 92% rename from app/src/main/java/me/gilo/wc/ui/home/CategoryFragment.kt rename to app/src/main/java/me/gilo/woodroid/app/ui/home/CategoryFragment.kt index aec83f9..95c2d27 100644 --- a/app/src/main/java/me/gilo/wc/ui/home/CategoryFragment.kt +++ b/app/src/main/java/me/gilo/woodroid/app/ui/home/CategoryFragment.kt @@ -1,4 +1,4 @@ -package me.gilo.wc.ui.home +package me.gilo.woodroid.app.ui.home import android.os.Bundle import android.support.v4.app.Fragment @@ -7,10 +7,10 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import kotlinx.android.synthetic.main.fragment_category.* -import me.gilo.wc.R -import me.gilo.wc.adapter.CategoryAdapter -import me.gilo.wc.common.Status -import me.gilo.wc.viewmodels.CategoryViewModel +import me.gilo.woodroid.app.R +import me.gilo.woodroid.app.adapter.CategoryAdapter +import me.gilo.woodroid.app.common.Status +import me.gilo.woodroid.app.viewmodels.CategoryViewModel import me.gilo.woodroid.models.Category import me.gilo.woodroid.models.filters.ProductCategoryFilter import java.util.* diff --git a/app/src/main/java/me/gilo/wc/ui/home/HomeActivity.kt b/app/src/main/java/me/gilo/woodroid/app/ui/home/HomeActivity.kt similarity index 82% rename from app/src/main/java/me/gilo/wc/ui/home/HomeActivity.kt rename to app/src/main/java/me/gilo/woodroid/app/ui/home/HomeActivity.kt index 5e1096f..314b688 100644 --- a/app/src/main/java/me/gilo/wc/ui/home/HomeActivity.kt +++ b/app/src/main/java/me/gilo/woodroid/app/ui/home/HomeActivity.kt @@ -1,17 +1,12 @@ -package me.gilo.wc.ui.home +package me.gilo.woodroid.app.ui.home import android.os.Bundle import android.support.design.widget.BottomNavigationView import android.support.v4.app.Fragment -import android.view.View import kotlinx.android.synthetic.main.activity_home.* -import me.gilo.wc.R -import me.gilo.wc.common.Status -import me.gilo.wc.models.CartLineItem -import me.gilo.wc.ui.WooDroidActivity -import me.gilo.wc.viewmodels.CartViewModel -import me.gilo.wc.viewmodels.ProductViewModel -import me.gilo.woodroid.models.CartItem +import me.gilo.woodroid.app.R +import me.gilo.woodroid.app.ui.WooDroidActivity +import me.gilo.woodroid.app.viewmodels.CartViewModel class HomeActivity : WooDroidActivity() { override lateinit var viewModel: CartViewModel diff --git a/app/src/main/java/me/gilo/wc/ui/home/HomeFragment.kt b/app/src/main/java/me/gilo/woodroid/app/ui/home/HomeFragment.kt similarity index 94% rename from app/src/main/java/me/gilo/wc/ui/home/HomeFragment.kt rename to app/src/main/java/me/gilo/woodroid/app/ui/home/HomeFragment.kt index 28075ff..91f83e2 100644 --- a/app/src/main/java/me/gilo/wc/ui/home/HomeFragment.kt +++ b/app/src/main/java/me/gilo/woodroid/app/ui/home/HomeFragment.kt @@ -1,4 +1,4 @@ -package me.gilo.wc.ui.home +package me.gilo.woodroid.app.ui.home import android.os.Bundle import android.support.v4.app.Fragment @@ -8,10 +8,10 @@ import android.view.View import android.view.ViewGroup import com.squareup.picasso.Picasso import kotlinx.android.synthetic.main.fragment_home.* -import me.gilo.wc.R -import me.gilo.wc.adapter.HomeProductAdapter -import me.gilo.wc.common.Status -import me.gilo.wc.viewmodels.ProductViewModel +import me.gilo.woodroid.app.R +import me.gilo.woodroid.app.adapter.HomeProductAdapter +import me.gilo.woodroid.app.common.Status +import me.gilo.woodroid.app.viewmodels.ProductViewModel import me.gilo.woodroid.models.Product import me.gilo.woodroid.models.filters.ProductFilter import java.util.* diff --git a/app/src/main/java/me/gilo/wc/ui/home/ProfileFragment.kt b/app/src/main/java/me/gilo/woodroid/app/ui/home/ProfileFragment.kt similarity index 89% rename from app/src/main/java/me/gilo/wc/ui/home/ProfileFragment.kt rename to app/src/main/java/me/gilo/woodroid/app/ui/home/ProfileFragment.kt index bf61cb7..cf48c45 100644 --- a/app/src/main/java/me/gilo/wc/ui/home/ProfileFragment.kt +++ b/app/src/main/java/me/gilo/woodroid/app/ui/home/ProfileFragment.kt @@ -1,4 +1,4 @@ -package me.gilo.wc.ui.home +package me.gilo.woodroid.app.ui.home import android.content.Intent import android.os.Bundle @@ -9,11 +9,10 @@ import android.view.ViewGroup import com.google.firebase.auth.FirebaseAuth import kotlinx.android.synthetic.main.fragment_profile.* import me.gilo.raison.ui.user.onboarding.SignUpActivity -import me.gilo.wc.R -import me.gilo.wc.ui.customer.ProfileActivity -import me.gilo.wc.ui.order.MyOrdersActivity -import me.gilo.wc.viewmodels.ProductViewModel -import me.gilo.wc.viewmodels.UserViewModel +import me.gilo.woodroid.app.R +import me.gilo.woodroid.app.ui.customer.ProfileActivity +import me.gilo.woodroid.app.ui.order.MyOrdersActivity +import me.gilo.woodroid.app.viewmodels.UserViewModel class ProfileFragment : Fragment() { diff --git a/app/src/main/java/me/gilo/wc/ui/onboarding/AnonymousSignInActivity.kt b/app/src/main/java/me/gilo/woodroid/app/ui/onboarding/AnonymousSignInActivity.kt similarity index 85% rename from app/src/main/java/me/gilo/wc/ui/onboarding/AnonymousSignInActivity.kt rename to app/src/main/java/me/gilo/woodroid/app/ui/onboarding/AnonymousSignInActivity.kt index a14ea7a..e6d6cc5 100644 --- a/app/src/main/java/me/gilo/wc/ui/onboarding/AnonymousSignInActivity.kt +++ b/app/src/main/java/me/gilo/woodroid/app/ui/onboarding/AnonymousSignInActivity.kt @@ -1,4 +1,4 @@ -package me.gilo.wc.ui.onboarding +package me.gilo.woodroid.app.ui.onboarding import android.arch.lifecycle.Observer import android.content.Context @@ -6,11 +6,11 @@ import android.content.Intent import android.os.Bundle import android.widget.Toast import io.github.inflationx.viewpump.ViewPumpContextWrapper -import me.gilo.wc.R -import me.gilo.wc.common.Status -import me.gilo.wc.ui.WooDroidActivity -import me.gilo.wc.ui.home.HomeActivity -import me.gilo.wc.viewmodels.UserViewModel +import me.gilo.woodroid.app.R +import me.gilo.woodroid.app.common.Status +import me.gilo.woodroid.app.ui.WooDroidActivity +import me.gilo.woodroid.app.ui.home.HomeActivity +import me.gilo.woodroid.app.viewmodels.UserViewModel class AnonymousSignInActivity : WooDroidActivity() { diff --git a/app/src/main/java/me/gilo/wc/ui/onboarding/SignInActivity.kt b/app/src/main/java/me/gilo/woodroid/app/ui/onboarding/SignInActivity.kt similarity index 88% rename from app/src/main/java/me/gilo/wc/ui/onboarding/SignInActivity.kt rename to app/src/main/java/me/gilo/woodroid/app/ui/onboarding/SignInActivity.kt index cbd79f6..a653206 100644 --- a/app/src/main/java/me/gilo/wc/ui/onboarding/SignInActivity.kt +++ b/app/src/main/java/me/gilo/woodroid/app/ui/onboarding/SignInActivity.kt @@ -4,19 +4,15 @@ import android.arch.lifecycle.Observer import android.content.Context import android.content.Intent import android.os.Bundle -import android.support.v4.content.ContextCompat.startActivity import android.widget.Toast import io.github.inflationx.viewpump.ViewPumpContextWrapper import kotlinx.android.synthetic.main.content_sign_in.* -import me.gilo.wc.R -import me.gilo.wc.common.BaseActivity -import me.gilo.wc.common.Status -import me.gilo.wc.ui.WooDroidActivity -import me.gilo.wc.ui.home.HomeActivity -import me.gilo.wc.ui.state.ProgressDialogFragment -import me.gilo.wc.viewmodels.CustomerViewModel -import me.gilo.wc.viewmodels.UserViewModel -import org.json.JSONObject +import me.gilo.woodroid.app.R +import me.gilo.woodroid.app.common.Status +import me.gilo.woodroid.app.ui.WooDroidActivity +import me.gilo.woodroid.app.ui.home.HomeActivity +import me.gilo.woodroid.app.ui.state.ProgressDialogFragment +import me.gilo.woodroid.app.viewmodels.UserViewModel import java.util.regex.Matcher import java.util.regex.Pattern diff --git a/app/src/main/java/me/gilo/wc/ui/onboarding/SignUpActivity.kt b/app/src/main/java/me/gilo/woodroid/app/ui/onboarding/SignUpActivity.kt similarity index 93% rename from app/src/main/java/me/gilo/wc/ui/onboarding/SignUpActivity.kt rename to app/src/main/java/me/gilo/woodroid/app/ui/onboarding/SignUpActivity.kt index b4ff499..ad4b093 100644 --- a/app/src/main/java/me/gilo/wc/ui/onboarding/SignUpActivity.kt +++ b/app/src/main/java/me/gilo/woodroid/app/ui/onboarding/SignUpActivity.kt @@ -4,19 +4,17 @@ import android.arch.lifecycle.Observer import android.content.Context import android.content.Intent import android.os.Bundle -import android.support.v4.content.ContextCompat.startActivity import android.widget.Toast import io.github.inflationx.viewpump.ViewPumpContextWrapper import kotlinx.android.synthetic.main.content_sign_up.* -import me.gilo.wc.R -import me.gilo.wc.common.BaseActivity -import me.gilo.wc.common.Status +import me.gilo.woodroid.app.R +import me.gilo.woodroid.app.common.Status -import me.gilo.wc.models.User -import me.gilo.wc.ui.WooDroidActivity -import me.gilo.wc.ui.home.HomeActivity -import me.gilo.wc.ui.state.ProgressDialogFragment -import me.gilo.wc.viewmodels.UserViewModel +import me.gilo.woodroid.app.models.User +import me.gilo.woodroid.app.ui.WooDroidActivity +import me.gilo.woodroid.app.ui.home.HomeActivity +import me.gilo.woodroid.app.ui.state.ProgressDialogFragment +import me.gilo.woodroid.app.viewmodels.UserViewModel import java.util.regex.Matcher import java.util.regex.Pattern diff --git a/app/src/main/java/me/gilo/wc/ui/onboarding/UserDetailsActivity.kt b/app/src/main/java/me/gilo/woodroid/app/ui/onboarding/UserDetailsActivity.kt similarity index 89% rename from app/src/main/java/me/gilo/wc/ui/onboarding/UserDetailsActivity.kt rename to app/src/main/java/me/gilo/woodroid/app/ui/onboarding/UserDetailsActivity.kt index 006c4f2..94a20f0 100644 --- a/app/src/main/java/me/gilo/wc/ui/onboarding/UserDetailsActivity.kt +++ b/app/src/main/java/me/gilo/woodroid/app/ui/onboarding/UserDetailsActivity.kt @@ -1,9 +1,9 @@ -package me.gilo.wc.ui.onboarding +package me.gilo.woodroid.app.ui.onboarding import android.os.Bundle import android.support.design.widget.Snackbar import android.support.v7.app.AppCompatActivity -import me.gilo.wc.R +import me.gilo.woodroid.app.R import kotlinx.android.synthetic.main.activity_user_details.* diff --git a/app/src/main/java/me/gilo/wc/ui/order/MyOrdersActivity.kt b/app/src/main/java/me/gilo/woodroid/app/ui/order/MyOrdersActivity.kt similarity index 87% rename from app/src/main/java/me/gilo/wc/ui/order/MyOrdersActivity.kt rename to app/src/main/java/me/gilo/woodroid/app/ui/order/MyOrdersActivity.kt index f6998f5..a0938a2 100644 --- a/app/src/main/java/me/gilo/wc/ui/order/MyOrdersActivity.kt +++ b/app/src/main/java/me/gilo/woodroid/app/ui/order/MyOrdersActivity.kt @@ -1,20 +1,18 @@ -package me.gilo.wc.ui.order +package me.gilo.woodroid.app.ui.order -import android.content.Context import android.content.Intent import android.os.Bundle import android.support.v7.widget.LinearLayoutManager import android.view.View -import io.github.inflationx.viewpump.ViewPumpContextWrapper import kotlinx.android.synthetic.main.activity_my_orders.* import kotlinx.android.synthetic.main.content_my_orders.* import kotlinx.android.synthetic.main.state_empty.* -import me.gilo.wc.R -import me.gilo.wc.adapter.OrderAdapter -import me.gilo.wc.common.Status -import me.gilo.wc.ui.WooDroidActivity -import me.gilo.wc.ui.home.HomeActivity -import me.gilo.wc.viewmodels.OrderViewModel +import me.gilo.woodroid.app.R +import me.gilo.woodroid.app.adapter.OrderAdapter +import me.gilo.woodroid.app.common.Status +import me.gilo.woodroid.app.ui.WooDroidActivity +import me.gilo.woodroid.app.ui.home.HomeActivity +import me.gilo.woodroid.app.viewmodels.OrderViewModel import me.gilo.woodroid.models.Order class MyOrdersActivity : WooDroidActivity() { diff --git a/app/src/main/java/me/gilo/wc/ui/order/OrderActivity.kt b/app/src/main/java/me/gilo/woodroid/app/ui/order/OrderActivity.kt similarity index 93% rename from app/src/main/java/me/gilo/wc/ui/order/OrderActivity.kt rename to app/src/main/java/me/gilo/woodroid/app/ui/order/OrderActivity.kt index ba22ba6..c61300d 100644 --- a/app/src/main/java/me/gilo/wc/ui/order/OrderActivity.kt +++ b/app/src/main/java/me/gilo/woodroid/app/ui/order/OrderActivity.kt @@ -1,15 +1,15 @@ -package me.gilo.wc.ui.order +package me.gilo.woodroid.app.ui.order import android.os.Bundle import android.support.v7.widget.LinearLayoutManager import kotlinx.android.synthetic.main.activity_order.* import kotlinx.android.synthetic.main.content_order.* -import me.gilo.wc.R -import me.gilo.wc.adapter.CartAdapter -import me.gilo.wc.common.Status -import me.gilo.wc.models.CartLineItem -import me.gilo.wc.ui.WooDroidActivity -import me.gilo.wc.viewmodels.OrderViewModel +import me.gilo.woodroid.app.R +import me.gilo.woodroid.app.adapter.CartAdapter +import me.gilo.woodroid.app.common.Status +import me.gilo.woodroid.app.models.CartLineItem +import me.gilo.woodroid.app.ui.WooDroidActivity +import me.gilo.woodroid.app.viewmodels.OrderViewModel import me.gilo.woodroid.models.Order import me.gilo.woodroid.models.filters.ProductFilter diff --git a/app/src/main/java/me/gilo/wc/ui/product/CartActivity.kt b/app/src/main/java/me/gilo/woodroid/app/ui/product/CartActivity.kt similarity index 92% rename from app/src/main/java/me/gilo/wc/ui/product/CartActivity.kt rename to app/src/main/java/me/gilo/woodroid/app/ui/product/CartActivity.kt index 51a1a43..b8c5e62 100644 --- a/app/src/main/java/me/gilo/wc/ui/product/CartActivity.kt +++ b/app/src/main/java/me/gilo/woodroid/app/ui/product/CartActivity.kt @@ -1,30 +1,25 @@ -package me.gilo.wc.ui.product +package me.gilo.woodroid.app.ui.product import android.arch.lifecycle.Observer import android.content.Context import android.content.Intent import android.os.Bundle import android.support.v7.widget.LinearLayoutManager -import android.text.SpannableString import android.view.View import android.widget.Toast -import com.google.common.primitives.UnsignedBytes.toInt import io.github.inflationx.viewpump.ViewPumpContextWrapper import kotlinx.android.synthetic.main.activity_cart.* import kotlinx.android.synthetic.main.content_cart.* -import kotlinx.android.synthetic.main.content_profile.* -import kotlinx.android.synthetic.main.single_cart_item.* import kotlinx.android.synthetic.main.state_empty.* import me.gilo.raison.ui.user.onboarding.SignUpActivity -import me.gilo.wc.R -import me.gilo.wc.adapter.CartAdapter -import me.gilo.wc.common.Status -import me.gilo.wc.events.AddQuantityEvent -import me.gilo.wc.events.LessQuantityEvent -import me.gilo.wc.events.ProductEvent -import me.gilo.wc.models.CartLineItem -import me.gilo.wc.ui.WooDroidActivity -import me.gilo.wc.viewmodels.CartViewModel +import me.gilo.woodroid.app.R +import me.gilo.woodroid.app.adapter.CartAdapter +import me.gilo.woodroid.app.common.Status +import me.gilo.woodroid.app.events.AddQuantityEvent +import me.gilo.woodroid.app.events.LessQuantityEvent +import me.gilo.woodroid.app.models.CartLineItem +import me.gilo.woodroid.app.ui.WooDroidActivity +import me.gilo.woodroid.app.viewmodels.CartViewModel import me.gilo.woodroid.models.Customer import me.gilo.woodroid.models.LineItem import me.gilo.woodroid.models.Order diff --git a/app/src/main/java/me/gilo/wc/ui/product/ProductActivity.kt b/app/src/main/java/me/gilo/woodroid/app/ui/product/ProductActivity.kt similarity index 91% rename from app/src/main/java/me/gilo/wc/ui/product/ProductActivity.kt rename to app/src/main/java/me/gilo/woodroid/app/ui/product/ProductActivity.kt index c9c67da..ac6d990 100644 --- a/app/src/main/java/me/gilo/wc/ui/product/ProductActivity.kt +++ b/app/src/main/java/me/gilo/woodroid/app/ui/product/ProductActivity.kt @@ -1,4 +1,4 @@ -package me.gilo.wc.ui.product +package me.gilo.woodroid.app.ui.product import android.content.Intent import android.content.res.ColorStateList @@ -13,14 +13,14 @@ import android.widget.TextView import android.widget.Toast import kotlinx.android.synthetic.main.activity_product.* import kotlinx.android.synthetic.main.content_product.* -import me.gilo.wc.R -import me.gilo.wc.adapter.ImagePagerAdapter -import me.gilo.wc.common.BaseActivity -import me.gilo.wc.common.Status -import me.gilo.wc.events.ProductEvent -import me.gilo.wc.models.CartLineItem -import me.gilo.wc.ui.state.ProgressDialogFragment -import me.gilo.wc.viewmodels.ProductViewModel +import me.gilo.woodroid.app.R +import me.gilo.woodroid.app.adapter.ImagePagerAdapter +import me.gilo.woodroid.app.common.BaseActivity +import me.gilo.woodroid.app.common.Status +import me.gilo.woodroid.app.events.ProductEvent +import me.gilo.woodroid.app.models.CartLineItem +import me.gilo.woodroid.app.ui.state.ProgressDialogFragment +import me.gilo.woodroid.app.viewmodels.ProductViewModel import me.gilo.woodroid.models.Product import org.greenrobot.eventbus.EventBus @@ -61,7 +61,7 @@ class ProductActivity : BaseActivity() { private fun addToCart(product: Product) { - viewModel.addToCart(product).observe(this, android.arch.lifecycle.Observer { response -> + viewModel.addToCart(product.id).observe(this, android.arch.lifecycle.Observer { response -> when (response!!.status()) { Status.LOADING -> { @@ -261,11 +261,11 @@ class ProductActivity : BaseActivity() { var tvCartCounter : TextView? = null override fun onCreateOptionsMenu(menu: Menu): Boolean { - menuInflater.inflate(me.gilo.wc.R.menu.product, menu) + menuInflater.inflate(R.menu.product, menu) - val item = menu.findItem(me.gilo.wc.R.id.menu_cart) + val item = menu.findItem(R.id.menu_cart) val rootView = item.actionView as FrameLayout - tvCartCounter = rootView.findViewById(me.gilo.wc.R.id.tvCart_counter) + tvCartCounter = rootView.findViewById(R.id.tvCart_counter) rootView.setOnClickListener{startActivity(Intent(baseContext, CartActivity::class.java))} diff --git a/app/src/main/java/me/gilo/wc/ui/product/ProductSearchActivity.kt b/app/src/main/java/me/gilo/woodroid/app/ui/product/ProductSearchActivity.kt similarity index 88% rename from app/src/main/java/me/gilo/wc/ui/product/ProductSearchActivity.kt rename to app/src/main/java/me/gilo/woodroid/app/ui/product/ProductSearchActivity.kt index ac28ecd..d499d6f 100644 --- a/app/src/main/java/me/gilo/wc/ui/product/ProductSearchActivity.kt +++ b/app/src/main/java/me/gilo/woodroid/app/ui/product/ProductSearchActivity.kt @@ -1,28 +1,22 @@ -package me.gilo.wc.ui.product +package me.gilo.woodroid.app.ui.product import android.app.SearchManager import android.content.Context import android.content.Intent import android.os.Bundle -import android.support.design.widget.Snackbar -import android.support.v4.view.GravityCompat import android.support.v7.app.ActionBarDrawerToggle -import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.GridLayoutManager -import android.support.v7.widget.SearchView -import android.view.Menu -import android.view.MenuItem import android.widget.Toast import io.github.inflationx.viewpump.ViewPumpContextWrapper -import me.gilo.wc.R +import me.gilo.woodroid.app.R import kotlinx.android.synthetic.main.activity_product_search.* import kotlinx.android.synthetic.main.content_shop.* -import me.gilo.wc.adapter.ProductAdapter -import me.gilo.wc.common.BaseActivity -import me.gilo.wc.common.Status -import me.gilo.wc.ui.state.ProgressDialogFragment -import me.gilo.wc.viewmodels.ProductViewModel +import me.gilo.woodroid.app.adapter.ProductAdapter +import me.gilo.woodroid.app.common.BaseActivity +import me.gilo.woodroid.app.common.Status +import me.gilo.woodroid.app.ui.state.ProgressDialogFragment +import me.gilo.woodroid.app.viewmodels.ProductViewModel import me.gilo.woodroid.models.Product import org.json.JSONObject import java.util.ArrayList diff --git a/app/src/main/java/me/gilo/wc/ui/product/ShopActivity.kt b/app/src/main/java/me/gilo/woodroid/app/ui/product/ShopActivity.kt similarity index 94% rename from app/src/main/java/me/gilo/wc/ui/product/ShopActivity.kt rename to app/src/main/java/me/gilo/woodroid/app/ui/product/ShopActivity.kt index 105cfd1..9a89b58 100644 --- a/app/src/main/java/me/gilo/wc/ui/product/ShopActivity.kt +++ b/app/src/main/java/me/gilo/woodroid/app/ui/product/ShopActivity.kt @@ -1,10 +1,9 @@ -package me.gilo.wc.ui.product +package me.gilo.woodroid.app.ui.product import android.content.Context import android.os.Bundle import android.support.v4.view.GravityCompat import android.support.v7.widget.GridLayoutManager -import android.support.v7.widget.LinearLayoutManager import android.view.Menu import android.view.MenuItem import android.widget.Toast @@ -12,13 +11,12 @@ import io.github.inflationx.viewpump.ViewPumpContextWrapper import kotlinx.android.synthetic.main.activity_shop.* import kotlinx.android.synthetic.main.content_shop.* import kotlinx.android.synthetic.main.drawer_filter.* -import me.gilo.wc.R -import me.gilo.wc.adapter.HomeProductAdapter -import me.gilo.wc.adapter.ProductAdapter -import me.gilo.wc.common.BaseActivity -import me.gilo.wc.common.Status -import me.gilo.wc.ui.state.ProgressDialogFragment -import me.gilo.wc.viewmodels.ProductViewModel +import me.gilo.woodroid.app.R +import me.gilo.woodroid.app.adapter.ProductAdapter +import me.gilo.woodroid.app.common.BaseActivity +import me.gilo.woodroid.app.common.Status +import me.gilo.woodroid.app.ui.state.ProgressDialogFragment +import me.gilo.woodroid.app.viewmodels.ProductViewModel import me.gilo.woodroid.models.Product import me.gilo.woodroid.models.filters.ProductFilter import java.util.* diff --git a/app/src/main/java/me/gilo/wc/ui/product/section/AddAReviewDialogFragment.kt b/app/src/main/java/me/gilo/woodroid/app/ui/product/section/AddAReviewDialogFragment.kt similarity index 93% rename from app/src/main/java/me/gilo/wc/ui/product/section/AddAReviewDialogFragment.kt rename to app/src/main/java/me/gilo/woodroid/app/ui/product/section/AddAReviewDialogFragment.kt index 444226c..e295252 100644 --- a/app/src/main/java/me/gilo/wc/ui/product/section/AddAReviewDialogFragment.kt +++ b/app/src/main/java/me/gilo/woodroid/app/ui/product/section/AddAReviewDialogFragment.kt @@ -1,4 +1,4 @@ -package me.gilo.wc.ui.product.section +package me.gilo.woodroid.app.ui.product.section import android.os.Bundle import android.support.v4.app.DialogFragment @@ -6,8 +6,8 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import kotlinx.android.synthetic.main.section_add_a_review.* -import me.gilo.wc.R -import me.gilo.wc.events.ReviewEvent +import me.gilo.woodroid.app.R +import me.gilo.woodroid.app.events.ReviewEvent import me.gilo.woodroid.models.ProductReview import org.greenrobot.eventbus.EventBus diff --git a/app/src/main/java/me/gilo/wc/ui/product/section/ProductReviewsFragment.kt b/app/src/main/java/me/gilo/woodroid/app/ui/product/section/ProductReviewsFragment.kt similarity index 89% rename from app/src/main/java/me/gilo/wc/ui/product/section/ProductReviewsFragment.kt rename to app/src/main/java/me/gilo/woodroid/app/ui/product/section/ProductReviewsFragment.kt index 1925230..f99b5ee 100644 --- a/app/src/main/java/me/gilo/wc/ui/product/section/ProductReviewsFragment.kt +++ b/app/src/main/java/me/gilo/woodroid/app/ui/product/section/ProductReviewsFragment.kt @@ -1,4 +1,4 @@ -package me.gilo.wc.ui.product.section +package me.gilo.woodroid.app.ui.product.section import android.os.Bundle import android.support.v4.app.Fragment @@ -8,14 +8,13 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import kotlinx.android.synthetic.main.section_product_reviews.* -import me.gilo.wc.R -import me.gilo.wc.adapter.ProductReviewAdapter -import me.gilo.wc.common.BaseActivity -import me.gilo.wc.common.Status -import me.gilo.wc.events.ReviewEvent -import me.gilo.wc.ui.product.ProductActivity -import me.gilo.wc.viewmodels.ProductViewModel -import me.gilo.wc.viewmodels.ReviewViewModel +import me.gilo.woodroid.app.R +import me.gilo.woodroid.app.adapter.ProductReviewAdapter +import me.gilo.woodroid.app.common.BaseActivity +import me.gilo.woodroid.app.common.Status +import me.gilo.woodroid.app.events.ReviewEvent +import me.gilo.woodroid.app.ui.product.ProductActivity +import me.gilo.woodroid.app.viewmodels.ReviewViewModel import me.gilo.woodroid.models.ProductReview import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe @@ -115,7 +114,8 @@ class ProductReviewsFragment : Fragment() { private fun addAReviewDialog() { val manager = childFragmentManager - addAReviewFragment = AddAReviewDialogFragment.newInstance(productId) + addAReviewFragment = + AddAReviewDialogFragment.newInstance(productId) addAReviewFragment.isCancelable = true addAReviewFragment.show(manager, "add Review") } diff --git a/app/src/main/java/me/gilo/wc/ui/product/section/RelatedProductsFragment.kt b/app/src/main/java/me/gilo/woodroid/app/ui/product/section/RelatedProductsFragment.kt similarity index 90% rename from app/src/main/java/me/gilo/wc/ui/product/section/RelatedProductsFragment.kt rename to app/src/main/java/me/gilo/woodroid/app/ui/product/section/RelatedProductsFragment.kt index b338df9..92d687a 100644 --- a/app/src/main/java/me/gilo/wc/ui/product/section/RelatedProductsFragment.kt +++ b/app/src/main/java/me/gilo/woodroid/app/ui/product/section/RelatedProductsFragment.kt @@ -1,4 +1,4 @@ -package me.gilo.wc.ui.product.section +package me.gilo.woodroid.app.ui.product.section import android.os.Bundle import android.support.v4.app.Fragment @@ -7,12 +7,12 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import kotlinx.android.synthetic.main.section_related_products.* -import me.gilo.wc.R -import me.gilo.wc.adapter.HomeProductAdapter -import me.gilo.wc.common.BaseActivity -import me.gilo.wc.common.Status -import me.gilo.wc.events.ProductEvent -import me.gilo.wc.viewmodels.ProductViewModel +import me.gilo.woodroid.app.R +import me.gilo.woodroid.app.adapter.HomeProductAdapter +import me.gilo.woodroid.app.common.BaseActivity +import me.gilo.woodroid.app.common.Status +import me.gilo.woodroid.app.events.ProductEvent +import me.gilo.woodroid.app.viewmodels.ProductViewModel import me.gilo.woodroid.models.Product import me.gilo.woodroid.models.filters.ProductFilter import org.greenrobot.eventbus.EventBus diff --git a/app/src/main/java/me/gilo/wc/ui/state/ProgressDialogFragment.java b/app/src/main/java/me/gilo/woodroid/app/ui/state/ProgressDialogFragment.java similarity index 95% rename from app/src/main/java/me/gilo/wc/ui/state/ProgressDialogFragment.java rename to app/src/main/java/me/gilo/woodroid/app/ui/state/ProgressDialogFragment.java index 876e981..a7963ca 100644 --- a/app/src/main/java/me/gilo/wc/ui/state/ProgressDialogFragment.java +++ b/app/src/main/java/me/gilo/woodroid/app/ui/state/ProgressDialogFragment.java @@ -1,4 +1,4 @@ -package me.gilo.wc.ui.state; +package me.gilo.woodroid.app.ui.state; import android.os.Bundle; import android.support.v4.app.DialogFragment; @@ -6,7 +6,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; -import me.gilo.wc.R; +import me.gilo.woodroid.app.R; public class ProgressDialogFragment extends DialogFragment { diff --git a/app/src/main/java/me/gilo/wc/utils/AppUtils.java b/app/src/main/java/me/gilo/woodroid/app/utils/AppUtils.java similarity index 99% rename from app/src/main/java/me/gilo/wc/utils/AppUtils.java rename to app/src/main/java/me/gilo/woodroid/app/utils/AppUtils.java index f2413f0..e668774 100644 --- a/app/src/main/java/me/gilo/wc/utils/AppUtils.java +++ b/app/src/main/java/me/gilo/woodroid/app/utils/AppUtils.java @@ -1,4 +1,4 @@ -package me.gilo.wc.utils; +package me.gilo.woodroid.app.utils; import android.app.Activity; import android.content.Context; diff --git a/app/src/main/java/me/gilo/wc/utils/DateTextWatcher.java b/app/src/main/java/me/gilo/woodroid/app/utils/DateTextWatcher.java similarity index 98% rename from app/src/main/java/me/gilo/wc/utils/DateTextWatcher.java rename to app/src/main/java/me/gilo/woodroid/app/utils/DateTextWatcher.java index e30c20d..32e7968 100644 --- a/app/src/main/java/me/gilo/wc/utils/DateTextWatcher.java +++ b/app/src/main/java/me/gilo/woodroid/app/utils/DateTextWatcher.java @@ -1,4 +1,4 @@ -package me.gilo.wc.utils; +package me.gilo.woodroid.app.utils; import android.text.Editable; import android.text.TextWatcher; diff --git a/app/src/main/java/me/gilo/wc/utils/DateUtils.java b/app/src/main/java/me/gilo/woodroid/app/utils/DateUtils.java similarity index 98% rename from app/src/main/java/me/gilo/wc/utils/DateUtils.java rename to app/src/main/java/me/gilo/woodroid/app/utils/DateUtils.java index d82a623..c889134 100644 --- a/app/src/main/java/me/gilo/wc/utils/DateUtils.java +++ b/app/src/main/java/me/gilo/woodroid/app/utils/DateUtils.java @@ -1,4 +1,4 @@ -package me.gilo.wc.utils; +package me.gilo.woodroid.app.utils; import org.joda.time.DateMidnight; import org.joda.time.DateTime; diff --git a/app/src/main/java/me/gilo/wc/utils/OnItemClickListener.java b/app/src/main/java/me/gilo/woodroid/app/utils/OnItemClickListener.java similarity index 67% rename from app/src/main/java/me/gilo/wc/utils/OnItemClickListener.java rename to app/src/main/java/me/gilo/woodroid/app/utils/OnItemClickListener.java index b7ee433..b2a8e63 100644 --- a/app/src/main/java/me/gilo/wc/utils/OnItemClickListener.java +++ b/app/src/main/java/me/gilo/woodroid/app/utils/OnItemClickListener.java @@ -1,4 +1,4 @@ -package me.gilo.wc.utils; +package me.gilo.woodroid.app.utils; public interface OnItemClickListener { void onItemClick(T data); diff --git a/app/src/main/java/me/gilo/wc/utils/RecyclerItemClickListener.java b/app/src/main/java/me/gilo/woodroid/app/utils/RecyclerItemClickListener.java similarity index 98% rename from app/src/main/java/me/gilo/wc/utils/RecyclerItemClickListener.java rename to app/src/main/java/me/gilo/woodroid/app/utils/RecyclerItemClickListener.java index 4268c07..2ae6ceb 100644 --- a/app/src/main/java/me/gilo/wc/utils/RecyclerItemClickListener.java +++ b/app/src/main/java/me/gilo/woodroid/app/utils/RecyclerItemClickListener.java @@ -1,4 +1,4 @@ -package me.gilo.wc.utils; +package me.gilo.woodroid.app.utils; import android.content.Context; import android.support.v7.widget.RecyclerView; diff --git a/app/src/main/java/me/gilo/wc/utils/StringFormatter.java b/app/src/main/java/me/gilo/woodroid/app/utils/StringFormatter.java similarity index 93% rename from app/src/main/java/me/gilo/wc/utils/StringFormatter.java rename to app/src/main/java/me/gilo/woodroid/app/utils/StringFormatter.java index 0a36a0d..ef97b5d 100644 --- a/app/src/main/java/me/gilo/wc/utils/StringFormatter.java +++ b/app/src/main/java/me/gilo/woodroid/app/utils/StringFormatter.java @@ -1,4 +1,4 @@ -package me.gilo.wc.utils; +package me.gilo.woodroid.app.utils; import java.text.DecimalFormat; diff --git a/app/src/main/java/me/gilo/wc/utils/ViewModelFactory.java b/app/src/main/java/me/gilo/woodroid/app/utils/ViewModelFactory.java similarity index 98% rename from app/src/main/java/me/gilo/wc/utils/ViewModelFactory.java rename to app/src/main/java/me/gilo/woodroid/app/utils/ViewModelFactory.java index 7ba60fe..6a26949 100644 --- a/app/src/main/java/me/gilo/wc/utils/ViewModelFactory.java +++ b/app/src/main/java/me/gilo/woodroid/app/utils/ViewModelFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package me.gilo.wc.utils; +package me.gilo.woodroid.app.utils; import android.arch.lifecycle.ViewModel; import android.arch.lifecycle.ViewModelProvider; diff --git a/app/src/main/java/me/gilo/wc/viewmodels/CartViewModel.java b/app/src/main/java/me/gilo/woodroid/app/viewmodels/CartViewModel.java similarity index 80% rename from app/src/main/java/me/gilo/wc/viewmodels/CartViewModel.java rename to app/src/main/java/me/gilo/woodroid/app/viewmodels/CartViewModel.java index 58437b5..02e7a5e 100644 --- a/app/src/main/java/me/gilo/wc/viewmodels/CartViewModel.java +++ b/app/src/main/java/me/gilo/woodroid/app/viewmodels/CartViewModel.java @@ -1,18 +1,16 @@ -package me.gilo.wc.viewmodels; +package me.gilo.woodroid.app.viewmodels; import android.arch.lifecycle.ViewModel; import android.content.Context; import com.google.firebase.firestore.DocumentReference; -import me.gilo.wc.common.CompletionGenericLiveData; -import me.gilo.wc.common.QueryLiveData; -import me.gilo.wc.common.WooLiveData; -import me.gilo.wc.models.CartLineItem; -import me.gilo.wc.repo.CartRepository; -import me.gilo.wc.repo.CustomerRepository; -import me.gilo.wc.repo.OrderRepository; -import me.gilo.wc.repo.ProductRepository; +import me.gilo.woodroid.app.common.CompletionGenericLiveData; +import me.gilo.woodroid.app.common.QueryLiveData; +import me.gilo.woodroid.app.common.WooLiveData; +import me.gilo.woodroid.app.models.CartLineItem; +import me.gilo.woodroid.app.repo.CartRepository; +import me.gilo.woodroid.app.repo.CustomerRepository; +import me.gilo.woodroid.app.repo.OrderRepository; import me.gilo.woodroid.models.*; -import me.gilo.woodroid.models.filters.ProductFilter; import javax.inject.Inject; import java.util.List; diff --git a/app/src/main/java/me/gilo/wc/viewmodels/CategoryViewModel.java b/app/src/main/java/me/gilo/woodroid/app/viewmodels/CategoryViewModel.java similarity index 90% rename from app/src/main/java/me/gilo/wc/viewmodels/CategoryViewModel.java rename to app/src/main/java/me/gilo/woodroid/app/viewmodels/CategoryViewModel.java index 62d5e5e..3655530 100644 --- a/app/src/main/java/me/gilo/wc/viewmodels/CategoryViewModel.java +++ b/app/src/main/java/me/gilo/woodroid/app/viewmodels/CategoryViewModel.java @@ -1,8 +1,8 @@ -package me.gilo.wc.viewmodels; +package me.gilo.woodroid.app.viewmodels; import android.arch.lifecycle.ViewModel; -import me.gilo.wc.common.WooLiveData; -import me.gilo.wc.repo.CategoryRepository; +import me.gilo.woodroid.app.common.WooLiveData; +import me.gilo.woodroid.app.repo.CategoryRepository; import me.gilo.woodroid.models.Category; import me.gilo.woodroid.models.filters.ProductCategoryFilter; diff --git a/app/src/main/java/me/gilo/wc/viewmodels/CustomerViewModel.java b/app/src/main/java/me/gilo/woodroid/app/viewmodels/CustomerViewModel.java similarity index 89% rename from app/src/main/java/me/gilo/wc/viewmodels/CustomerViewModel.java rename to app/src/main/java/me/gilo/woodroid/app/viewmodels/CustomerViewModel.java index e5ae957..39d0699 100644 --- a/app/src/main/java/me/gilo/wc/viewmodels/CustomerViewModel.java +++ b/app/src/main/java/me/gilo/woodroid/app/viewmodels/CustomerViewModel.java @@ -1,9 +1,8 @@ -package me.gilo.wc.viewmodels; +package me.gilo.woodroid.app.viewmodels; import android.arch.lifecycle.ViewModel; -import com.google.firebase.auth.FirebaseAuth; -import me.gilo.wc.common.WooLiveData; -import me.gilo.wc.repo.CustomerRepository; +import me.gilo.woodroid.app.common.WooLiveData; +import me.gilo.woodroid.app.repo.CustomerRepository; import me.gilo.woodroid.models.Customer; import me.gilo.woodroid.models.filters.CustomerFilter; diff --git a/app/src/main/java/me/gilo/wc/viewmodels/OrderViewModel.java b/app/src/main/java/me/gilo/woodroid/app/viewmodels/OrderViewModel.java similarity index 87% rename from app/src/main/java/me/gilo/wc/viewmodels/OrderViewModel.java rename to app/src/main/java/me/gilo/woodroid/app/viewmodels/OrderViewModel.java index 2c4d00a..930c824 100644 --- a/app/src/main/java/me/gilo/wc/viewmodels/OrderViewModel.java +++ b/app/src/main/java/me/gilo/woodroid/app/viewmodels/OrderViewModel.java @@ -1,13 +1,11 @@ -package me.gilo.wc.viewmodels; +package me.gilo.woodroid.app.viewmodels; import android.arch.lifecycle.ViewModel; -import me.gilo.wc.common.WooLiveData; -import me.gilo.wc.repo.OrderRepository; -import me.gilo.wc.repo.ProductRepository; -import me.gilo.wc.repo.ReviewRepository; +import me.gilo.woodroid.app.common.WooLiveData; +import me.gilo.woodroid.app.repo.OrderRepository; +import me.gilo.woodroid.app.repo.ProductRepository; import me.gilo.woodroid.models.Order; import me.gilo.woodroid.models.Product; -import me.gilo.woodroid.models.ProductReview; import me.gilo.woodroid.models.filters.OrderFilter; import me.gilo.woodroid.models.filters.ProductFilter; diff --git a/app/src/main/java/me/gilo/wc/viewmodels/ProductViewModel.java b/app/src/main/java/me/gilo/woodroid/app/viewmodels/ProductViewModel.java similarity index 82% rename from app/src/main/java/me/gilo/wc/viewmodels/ProductViewModel.java rename to app/src/main/java/me/gilo/woodroid/app/viewmodels/ProductViewModel.java index f8632bd..85367ff 100644 --- a/app/src/main/java/me/gilo/wc/viewmodels/ProductViewModel.java +++ b/app/src/main/java/me/gilo/woodroid/app/viewmodels/ProductViewModel.java @@ -1,18 +1,18 @@ -package me.gilo.wc.viewmodels; +package me.gilo.woodroid.app.viewmodels; import android.arch.lifecycle.MutableLiveData; import android.arch.lifecycle.ViewModel; import android.content.Context; import com.google.firebase.firestore.DocumentReference; -import me.gilo.wc.common.CompletionGenericLiveData; -import me.gilo.wc.common.QueryLiveData; -import me.gilo.wc.common.WooLiveData; -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.app.common.CompletionGenericLiveData; +import me.gilo.woodroid.app.common.QueryLiveData; +import me.gilo.woodroid.app.common.WooLiveData; +import me.gilo.woodroid.app.models.CartLineItem; +import me.gilo.woodroid.app.repo.CartRepository; +import me.gilo.woodroid.app.repo.OrderRepository; +import me.gilo.woodroid.app.repo.ProductRepository; import me.gilo.woodroid.models.LineItem; +import me.gilo.woodroid.models.Order; import me.gilo.woodroid.models.Product; import me.gilo.woodroid.models.ProductReview; import me.gilo.woodroid.models.filters.ProductFilter; @@ -54,6 +54,10 @@ public final class ProductViewModel extends ViewModel { return cartRepository.addToCart(product); } + public WooLiveData addToCart(int productId) { + return orderRepository.addToCart(productId); + } + public QueryLiveData cart() { return cartRepository.cart(); } diff --git a/app/src/main/java/me/gilo/wc/viewmodels/ReviewViewModel.java b/app/src/main/java/me/gilo/woodroid/app/viewmodels/ReviewViewModel.java similarity index 57% rename from app/src/main/java/me/gilo/wc/viewmodels/ReviewViewModel.java rename to app/src/main/java/me/gilo/woodroid/app/viewmodels/ReviewViewModel.java index 7089831..bfb8283 100644 --- a/app/src/main/java/me/gilo/wc/viewmodels/ReviewViewModel.java +++ b/app/src/main/java/me/gilo/woodroid/app/viewmodels/ReviewViewModel.java @@ -1,21 +1,12 @@ -package me.gilo.wc.viewmodels; +package me.gilo.woodroid.app.viewmodels; -import android.arch.lifecycle.MutableLiveData; import android.arch.lifecycle.ViewModel; -import android.content.Context; -import me.gilo.wc.common.WooLiveData; -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.app.common.WooLiveData; +import me.gilo.woodroid.app.repo.ReviewRepository; import me.gilo.woodroid.models.ProductReview; -import me.gilo.woodroid.models.filters.ProductFilter; import javax.inject.Inject; import java.util.List; -import java.util.Map; public final class ReviewViewModel extends ViewModel { diff --git a/app/src/main/java/me/gilo/wc/viewmodels/UserViewModel.java b/app/src/main/java/me/gilo/woodroid/app/viewmodels/UserViewModel.java similarity index 86% rename from app/src/main/java/me/gilo/wc/viewmodels/UserViewModel.java rename to app/src/main/java/me/gilo/woodroid/app/viewmodels/UserViewModel.java index 7d3c314..751295c 100644 --- a/app/src/main/java/me/gilo/wc/viewmodels/UserViewModel.java +++ b/app/src/main/java/me/gilo/woodroid/app/viewmodels/UserViewModel.java @@ -1,4 +1,4 @@ -package me.gilo.wc.viewmodels; +package me.gilo.woodroid.app.viewmodels; import android.arch.lifecycle.MutableLiveData; import android.arch.lifecycle.ViewModel; @@ -6,11 +6,11 @@ import com.google.android.gms.tasks.OnFailureListener; import com.google.android.gms.tasks.OnSuccessListener; import com.google.firebase.auth.AuthResult; import com.google.firebase.auth.FirebaseAuth; -import me.gilo.wc.common.CompletionGenericLiveData; -import me.gilo.wc.common.CompletionLiveData; -import me.gilo.wc.common.DocumentLiveData; -import me.gilo.wc.models.User; -import me.gilo.wc.repo.FirebaseUserRepository; +import me.gilo.woodroid.app.common.CompletionGenericLiveData; +import me.gilo.woodroid.app.common.CompletionLiveData; +import me.gilo.woodroid.app.common.DocumentLiveData; +import me.gilo.woodroid.app.models.User; +import me.gilo.woodroid.app.repo.FirebaseUserRepository; import javax.inject.Inject; diff --git a/app/src/main/res/layout/activity_add_coupon.xml b/app/src/main/res/layout/activity_add_coupon.xml index ab1dce9..df65874 100644 --- a/app/src/main/res/layout/activity_add_coupon.xml +++ b/app/src/main/res/layout/activity_add_coupon.xml @@ -5,7 +5,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".ui.coupon.AddCouponActivity"> + tools:context=".app.ui.coupon.AddCouponActivity"> + tools:context=".app.ui.onboarding.AnonymousSignInActivity"> + tools:context=".app.ui.customer.BasicCustomerDetailsActivity"> diff --git a/app/src/main/res/layout/activity_billing_address.xml b/app/src/main/res/layout/activity_billing_address.xml index 1aa46d1..621940b 100644 --- a/app/src/main/res/layout/activity_billing_address.xml +++ b/app/src/main/res/layout/activity_billing_address.xml @@ -5,7 +5,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".ui.customer.BillingAddressActivity"> + tools:context=".app.ui.customer.BillingAddressActivity"> diff --git a/app/src/main/res/layout/activity_cart.xml b/app/src/main/res/layout/activity_cart.xml index 205ecfe..6dc6b29 100644 --- a/app/src/main/res/layout/activity_cart.xml +++ b/app/src/main/res/layout/activity_cart.xml @@ -5,7 +5,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".ui.product.CartActivity"> + tools:context=".app.ui.product.CartActivity"> + tools:context=".app.ui.checkout.CheckoutActivity"> + tools:context=".app.ui.coupon.CouponActivity"> + tools:context=".app.ui.coupon.CouponsActivity"> + tools:context=".app.ui.home.HomeActivity"> diff --git a/app/src/main/res/layout/activity_menu.xml b/app/src/main/res/layout/activity_menu.xml index 1dfe5c4..261f3dd 100644 --- a/app/src/main/res/layout/activity_menu.xml +++ b/app/src/main/res/layout/activity_menu.xml @@ -5,7 +5,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".ui.MenuActivity"> + tools:context=".app.ui.MenuActivity"> + tools:context=".app.ui.order.MyOrdersActivity"> + tools:context=".app.ui.order.OrderActivity"> + tools:context=".app.ui.product.ProductActivity"> + tools:context=".app.ui.product.ProductSearchActivity"> + tools:context=".app.ui.customer.ProfileActivity"> + tools:context=".app.ui.customer.ShippingAddressActivity"> diff --git a/app/src/main/res/layout/activity_shop.xml b/app/src/main/res/layout/activity_shop.xml index f65f848..bc390f4 100644 --- a/app/src/main/res/layout/activity_shop.xml +++ b/app/src/main/res/layout/activity_shop.xml @@ -6,7 +6,7 @@ android:id="@+id/drawer_layout" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".ui.product.ShopActivity" + tools:context=".app.ui.product.ShopActivity" tools:openDrawer="end"> + tools:context=".app.ui.onboarding.UserDetailsActivity"> diff --git a/app/src/main/res/layout/content_anonymous_sign_in.xml b/app/src/main/res/layout/content_anonymous_sign_in.xml index e862d92..39bdd64 100644 --- a/app/src/main/res/layout/content_anonymous_sign_in.xml +++ b/app/src/main/res/layout/content_anonymous_sign_in.xml @@ -8,6 +8,6 @@ android:background="@color/bg" app:layout_behavior="@string/appbar_scrolling_view_behavior" tools:showIn="@layout/activity_anonymous_sign_in" - tools:context=".ui.onboarding.AnonymousSignInActivity"> + tools:context=".app.ui.onboarding.AnonymousSignInActivity"> \ No newline at end of file diff --git a/app/src/main/res/layout/content_basic_customer_details.xml b/app/src/main/res/layout/content_basic_customer_details.xml index 277b2b7..2371ff5 100644 --- a/app/src/main/res/layout/content_basic_customer_details.xml +++ b/app/src/main/res/layout/content_basic_customer_details.xml @@ -7,6 +7,6 @@ android:layout_height="match_parent" app:layout_behavior="@string/appbar_scrolling_view_behavior" tools:showIn="@layout/activity_basic_customer_details" - tools:context=".ui.customer.BasicCustomerDetailsActivity"> + tools:context=".app.ui.customer.BasicCustomerDetailsActivity"> \ No newline at end of file diff --git a/app/src/main/res/layout/content_billing_address.xml b/app/src/main/res/layout/content_billing_address.xml index f3046e2..ce5e76e 100644 --- a/app/src/main/res/layout/content_billing_address.xml +++ b/app/src/main/res/layout/content_billing_address.xml @@ -7,6 +7,6 @@ android:layout_height="match_parent" app:layout_behavior="@string/appbar_scrolling_view_behavior" tools:showIn="@layout/activity_billing_address" - tools:context=".ui.customer.BillingAddressActivity"> + tools:context=".app.ui.customer.BillingAddressActivity"> \ No newline at end of file diff --git a/app/src/main/res/layout/content_coupon.xml b/app/src/main/res/layout/content_coupon.xml index 61421d8..608d1a8 100644 --- a/app/src/main/res/layout/content_coupon.xml +++ b/app/src/main/res/layout/content_coupon.xml @@ -7,7 +7,7 @@ android:background="@color/bg" android:orientation="vertical" tools:showIn="@layout/activity_coupon" - tools:context=".ui.coupon.AddCouponActivity" + tools:context=".app.ui.coupon.AddCouponActivity" app:layout_behavior="@string/appbar_scrolling_view_behavior" > diff --git a/app/src/main/res/layout/content_coupons.xml b/app/src/main/res/layout/content_coupons.xml index c779708..4dc3768 100644 --- a/app/src/main/res/layout/content_coupons.xml +++ b/app/src/main/res/layout/content_coupons.xml @@ -7,7 +7,7 @@ android:layout_height="match_parent" app:layout_behavior="@string/appbar_scrolling_view_behavior" tools:showIn="@layout/activity_coupons" - tools:context=".ui.coupon.CouponsActivity"> + tools:context=".app.ui.coupon.CouponsActivity"> + tools:context=".app.ui.home.HomeActivity"> \ No newline at end of file diff --git a/app/src/main/res/layout/content_menu.xml b/app/src/main/res/layout/content_menu.xml index 3f7bc58..ddfb6de 100644 --- a/app/src/main/res/layout/content_menu.xml +++ b/app/src/main/res/layout/content_menu.xml @@ -8,7 +8,7 @@ app:layout_behavior="@string/appbar_scrolling_view_behavior" tools:showIn="@layout/activity_menu" android:background="@color/bg" - tools:context=".ui.MenuActivity"> + tools:context=".app.ui.MenuActivity"> diff --git a/app/src/main/res/layout/content_product_search.xml b/app/src/main/res/layout/content_product_search.xml index a0df100..07f3219 100644 --- a/app/src/main/res/layout/content_product_search.xml +++ b/app/src/main/res/layout/content_product_search.xml @@ -7,7 +7,7 @@ android:layout_height="match_parent" app:layout_behavior="@string/appbar_scrolling_view_behavior" tools:showIn="@layout/activity_shop" - tools:context=".ui.product.ShopActivity"> + tools:context=".app.ui.product.ShopActivity"> + tools:context=".app.ui.customer.ShippingAddressActivity"> \ No newline at end of file diff --git a/app/src/main/res/layout/content_shop.xml b/app/src/main/res/layout/content_shop.xml index 1330c10..2c0b6aa 100644 --- a/app/src/main/res/layout/content_shop.xml +++ b/app/src/main/res/layout/content_shop.xml @@ -7,7 +7,7 @@ android:layout_height="match_parent" app:layout_behavior="@string/appbar_scrolling_view_behavior" tools:showIn="@layout/activity_shop" - tools:context=".ui.product.ShopActivity"> + tools:context=".app.ui.product.ShopActivity"> - - diff --git a/app/src/test/java/me/gilo/wc/ExampleUnitTest.kt b/app/src/test/java/me/gilo/woodroid/ExampleUnitTest.kt similarity index 92% rename from app/src/test/java/me/gilo/wc/ExampleUnitTest.kt rename to app/src/test/java/me/gilo/woodroid/ExampleUnitTest.kt index b84c951..d79b486 100644 --- a/app/src/test/java/me/gilo/wc/ExampleUnitTest.kt +++ b/app/src/test/java/me/gilo/woodroid/ExampleUnitTest.kt @@ -1,4 +1,4 @@ -package me.gilo.wc +package me.gilo.woodroid import org.junit.Test diff --git a/woodroid/src/main/java/me/gilo/woodroid/repo/OrderRepository.java b/woodroid/src/main/java/me/gilo/woodroid/repo/OrderRepository.java index e6e2951..013a91d 100644 --- a/woodroid/src/main/java/me/gilo/woodroid/repo/OrderRepository.java +++ b/woodroid/src/main/java/me/gilo/woodroid/repo/OrderRepository.java @@ -30,16 +30,29 @@ public class OrderRepository extends WooRepository { return apiService.create(order); } - public Call addToCart(int productId) { - Order order = new Order(); - + public Call addToCart(int productId, Order cartOrder) { LineItem lineItem = new LineItem(); lineItem.setProductId(productId); lineItem.setQuantity(1); - order.addLineItem(lineItem); + if (cartOrder != null) { + cartOrder.addLineItem(lineItem); + return apiService.update(cartOrder.getId(), cartOrder); + }else { + cartOrder = new Order(); + cartOrder.setOrderNumber("Cart"); + cartOrder.setStatus("on-hold"); + cartOrder.addLineItem(lineItem); + return apiService.create(cartOrder); + } - return apiService.create(order); + } + + public Call> cart() { + OrderFilter orderFilter = new OrderFilter(); + orderFilter.setStatus("on-hold"); + + return apiService.filter(orderFilter.getFilters()); } public Call order(int id) {