igiqr/WooDroid
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

migrated the package names

Browse Source
This commit is contained in:
Gilbert Kimutai 2019-06-01 10:37:22 +03:00
parent 8e49de29da
commit 33b5a96a69
137 changed files with 436 additions and 529 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -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

2
app/google-services.json
View File

@ -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": [

2
app/src/androidTest/java/me/gilo/wc/ExampleInstrumentedTest.kt → app/src/androidTest/java/me/gilo/woodroid/ExampleInstrumentedTest.kt
View File

@ -1,4 +1,4 @@
package me.gilo.wc
package me.gilo.woodroid
import android.support.test.InstrumentationRegistry
import android.support.test.runner.AndroidJUnit4

42
app/src/main/AndroidManifest.xml
View File

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="me.gilo.wc">
package="me.gilo.woodroid.app">
<uses-permission android:name="android.permission.INTERNET"/>
<application
android:name=".WcApp"
android:name="me.gilo.woodroid.app.WcApp"
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
@ -16,57 +16,57 @@
android:usesCleartextTraffic="true"
tools:ignore="GoogleAppIndexingWarning">
<activity
android:name=".ui.order.OrderActivity"
android:name="me.gilo.woodroid.app.ui.order.OrderActivity"
android:label="@string/title_activity_order"
android:theme="@style/AppTheme.NoActionBar">
</activity>
<activity
android:name=".ui.onboarding.AnonymousSignInActivity"
android:name="me.gilo.woodroid.app.ui.onboarding.AnonymousSignInActivity"
android:label="@string/title_activity_anonymous_sign_in"
android:theme="@style/AppTheme.NoActionBar">
</activity>
<activity
android:name=".ui.checkout.CheckoutActivity"
android:name="me.gilo.woodroid.app.ui.checkout.CheckoutActivity"
android:label="@string/title_activity_checkout"
android:theme="@style/AppTheme.NoActionBar">
</activity>
<activity
android:name=".ui.product.CartActivity"
android:name="me.gilo.woodroid.app.ui.product.CartActivity"
android:label="@string/title_activity_cart"
android:theme="@style/AppTheme.NoActionBar">
</activity>
<activity
android:name=".ui.customer.ProfileActivity"
android:name="me.gilo.woodroid.app.ui.customer.ProfileActivity"
android:label="@string/title_activity_profile"
android:theme="@style/AppTheme.NoActionBar">
</activity>
<activity
android:name=".ui.customer.ShippingAddressActivity"
android:name="me.gilo.woodroid.app.ui.customer.ShippingAddressActivity"
android:label="@string/title_activity_shipping_address"
android:theme="@style/AppTheme.NoActionBar">
</activity>
<activity
android:name=".ui.customer.BillingAddressActivity"
android:name="me.gilo.woodroid.app.ui.customer.BillingAddressActivity"
android:label="@string/title_activity_billing_address"
android:theme="@style/AppTheme.NoActionBar">
</activity>
<activity
android:name=".ui.customer.BasicCustomerDetailsActivity"
android:name="me.gilo.woodroid.app.ui.customer.BasicCustomerDetailsActivity"
android:label="@string/title_activity_basic_customer_details"
android:theme="@style/AppTheme.NoActionBar">
</activity>
<activity
android:name=".ui.onboarding.UserDetailsActivity"
android:name="me.gilo.woodroid.app.ui.onboarding.UserDetailsActivity"
android:label="@string/title_activity_user_details"
android:theme="@style/AppTheme.NoActionBar">
</activity>
<activity
android:name=".ui.order.MyOrdersActivity"
android:name="me.gilo.woodroid.app.ui.order.MyOrdersActivity"
android:label="@string/title_activity_my_orders"
android:theme="@style/AppTheme.NoActionBar">
</activity>
<activity
android:name=".ui.home.HomeActivity"
android:name="me.gilo.woodroid.app.ui.home.HomeActivity"
android:label="@string/title_activity_home"
android:theme="@style/AppTheme.NoActionBar">
</activity>
@ -91,12 +91,12 @@
android:theme="@style/AppTheme.NoActionBar">
</activity>
<activity
android:name=".ui.product.ProductActivity"
android:name="me.gilo.woodroid.app.ui.product.ProductActivity"
android:label="@string/title_activity_product"
android:theme="@style/AppTheme.NoActionBar">
</activity>
<activity
android:name=".ui.product.ProductSearchActivity"
android:name="me.gilo.woodroid.app.ui.product.ProductSearchActivity"
android:label="@string/title_activity_product_search"
android:theme="@style/AppTheme.NoActionBar">
<intent-filter>
@ -104,34 +104,34 @@
</intent-filter>
</activity>
<activity
android:name=".ui.coupon.CouponActivity"
android:name="me.gilo.woodroid.app.ui.coupon.CouponActivity"
android:label="@string/title_activity_coupon"
android:theme="@style/AppTheme.NoActionBar">
</activity>
<activity
android:name=".ui.coupon.CouponsActivity"
android:name="me.gilo.woodroid.app.ui.coupon.CouponsActivity"
android:label="@string/title_activity_coupons"
android:theme="@style/AppTheme.NoActionBar">
</activity>
<activity
android:name=".ui.coupon.AddCouponActivity"
android:name="me.gilo.woodroid.app.ui.coupon.AddCouponActivity"
android:label="@string/title_activity_add_coupon"
android:theme="@style/AppTheme.NoActionBar">
</activity>
<activity
android:name=".ui.MenuActivity"
android:name="me.gilo.woodroid.app.ui.MenuActivity"
android:label="@string/title_activity_menu"
android:theme="@style/AppTheme.NoActionBar">
</activity>
<activity
android:name=".ui.product.ShopActivity"
android:name="me.gilo.woodroid.app.ui.product.ShopActivity"
android:label="@string/title_activity_shop"
android:theme="@style/AppTheme.NoActionBar">
<meta-data
android:name="android.app.searchable"
android:resource="@xml/searchable"/>
</activity>
<activity android:name=".MainActivity">
<activity android:name="me.gilo.woodroid.app.MainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>

10
app/src/main/java/me/gilo/wc/Config.java
View File

@ -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";
}

10
app/src/main/java/me/gilo/woodroid/app/Config.java Normal file
View File

@ -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";
}

12
app/src/main/java/me/gilo/wc/MainActivity.kt → app/src/main/java/me/gilo/woodroid/app/MainActivity.kt
View File

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

6
app/src/main/java/me/gilo/wc/WcApp.kt → app/src/main/java/me/gilo/woodroid/app/WcApp.kt
View File

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

11
app/src/main/java/me/gilo/wc/adapter/CartAdapter.kt → app/src/main/java/me/gilo/woodroid/app/adapter/CartAdapter.kt
View File

@ -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<CartLineItem>) : RecyclerView.Adapter<CartViewHolder>() {

6
app/src/main/java/me/gilo/wc/adapter/CategoryAdapter.kt → app/src/main/java/me/gilo/woodroid/app/adapter/CategoryAdapter.kt
View File

@ -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<Category>) : RecyclerView.Adapter<CategoryViewHolder>() {

6
app/src/main/java/me/gilo/wc/adapter/CouponAdapter.kt → app/src/main/java/me/gilo/woodroid/app/adapter/CouponAdapter.kt
View File

@ -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<Coupon>) : RecyclerView.Adapter<CouponViewHolder>() {

6
app/src/main/java/me/gilo/wc/adapter/HomeProductAdapter.kt → app/src/main/java/me/gilo/woodroid/app/adapter/HomeProductAdapter.kt
View File

@ -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<Product>) : RecyclerView.Adapter<ProductViewHolder>() {

14
app/src/main/java/me/gilo/wc/adapter/ImagePagerAdapter.kt → app/src/main/java/me/gilo/woodroid/app/adapter/ImagePagerAdapter.kt
View File

@ -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<Image>) :
val ivImage = layout.findViewById<ImageView>(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

6
app/src/main/java/me/gilo/wc/adapter/ListAdapter.kt → app/src/main/java/me/gilo/woodroid/app/adapter/ListAdapter.kt
View File

@ -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<Product>) : RecyclerView.Adapter<ProductViewHolder>() {

10
app/src/main/java/me/gilo/wc/adapter/MenuAdapter.kt → app/src/main/java/me/gilo/woodroid/app/adapter/MenuAdapter.kt
View File

@ -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<String>) : RecyclerView.Adapter<MenuViewHolder>() {

8
app/src/main/java/me/gilo/wc/adapter/OrderAdapter.kt → app/src/main/java/me/gilo/woodroid/app/adapter/OrderAdapter.kt
View File

@ -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<Order>) : RecyclerView.Adapter<OrderViewHolder>() {

7
app/src/main/java/me/gilo/wc/adapter/ProductAdapter.kt → app/src/main/java/me/gilo/woodroid/app/adapter/ProductAdapter.kt
View File

@ -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<Product>) : RecyclerView.Adapter<ProductViewHolder>() {

8
app/src/main/java/me/gilo/wc/adapter/ProductReviewAdapter.kt → app/src/main/java/me/gilo/woodroid/app/adapter/ProductReviewAdapter.kt
View File

@ -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<ProductReview>) : RecyclerView.Adapter<ProductReviewViewHolder>() {

20
app/src/main/java/me/gilo/wc/adapter/viewholder/CartViewHolder.kt → app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/CartViewHolder.kt
View File

@ -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

7
app/src/main/java/me/gilo/wc/adapter/viewholder/CategoryViewHolder.kt → app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/CategoryViewHolder.kt
View File

@ -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) :

6
app/src/main/java/me/gilo/wc/adapter/viewholder/CouponViewHolder.kt → app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/CouponViewHolder.kt
View File

@ -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) :

8
app/src/main/java/me/gilo/wc/adapter/viewholder/MenuViewHolder.java → app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/MenuViewHolder.java
View File

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

12
app/src/main/java/me/gilo/wc/adapter/viewholder/OrderViewHolder.kt → app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/OrderViewHolder.kt
View File

@ -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) :

9
app/src/main/java/me/gilo/wc/adapter/viewholder/ProductReviewViewHolder.kt → app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/ProductReviewViewHolder.kt
View File

@ -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) :

11
app/src/main/java/me/gilo/wc/adapter/viewholder/ProductViewHolder.kt → app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/ProductViewHolder.kt
View File

@ -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) :

3
app/src/main/java/me/gilo/wc/common/BaseActivity.java → app/src/main/java/me/gilo/woodroid/app/common/BaseActivity.java
View File

@ -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;

2
app/src/main/java/me/gilo/wc/common/CompletionDocLiveData.java → app/src/main/java/me/gilo/woodroid/app/common/CompletionDocLiveData.java
View File

@ -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;

2
app/src/main/java/me/gilo/wc/common/CompletionGenericLiveData.kt → app/src/main/java/me/gilo/woodroid/app/common/CompletionGenericLiveData.kt
View File

@ -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

2
app/src/main/java/me/gilo/wc/common/CompletionLiveData.java → app/src/main/java/me/gilo/woodroid/app/common/CompletionLiveData.java
View File

@ -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;

2
app/src/main/java/me/gilo/wc/common/DocumentLiveData.java → app/src/main/java/me/gilo/woodroid/app/common/DocumentLiveData.java
View File

@ -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.*;

2
app/src/main/java/me/gilo/wc/common/NetworkException.java → app/src/main/java/me/gilo/woodroid/app/common/NetworkException.java
View File

@ -1,4 +1,4 @@
package me.gilo.wc.common;
package me.gilo.woodroid.app.common;
public class NetworkException extends Exception{

2
app/src/main/java/me/gilo/wc/common/OnItemClickedListener.java → app/src/main/java/me/gilo/woodroid/app/common/OnItemClickedListener.java
View File

@ -1,4 +1,4 @@
package me.gilo.wc.common;
package me.gilo.woodroid.app.common;
import android.support.v7.widget.RecyclerView;

4
app/src/main/java/me/gilo/wc/common/QueryLiveData.java → app/src/main/java/me/gilo/woodroid/app/common/QueryLiveData.java
View File

@ -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;

2
app/src/main/java/me/gilo/wc/common/Resource.java → app/src/main/java/me/gilo/woodroid/app/common/Resource.java
View File

@ -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;

2
app/src/main/java/me/gilo/wc/common/Status.java → app/src/main/java/me/gilo/woodroid/app/common/Status.java
View File

@ -1,4 +1,4 @@
package me.gilo.wc.common;
package me.gilo.woodroid.app.common;
public enum Status {
EMPTY,

2
app/src/main/java/me/gilo/wc/common/WooLiveData.java → app/src/main/java/me/gilo/woodroid/app/common/WooLiveData.java
View File

@ -1,4 +1,4 @@
package me.gilo.wc.common;
package me.gilo.woodroid.app.common;
import android.arch.lifecycle.LiveData;
import retrofit2.Call;

27
app/src/main/java/me/gilo/wc/di/ActivitiesModule.kt → app/src/main/java/me/gilo/woodroid/app/di/ActivitiesModule.kt
View File

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

4
app/src/main/java/me/gilo/wc/di/AppComponent.kt → app/src/main/java/me/gilo/woodroid/app/di/AppComponent.kt
View File

@ -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

6
app/src/main/java/me/gilo/wc/di/AppModule.kt → app/src/main/java/me/gilo/woodroid/app/di/AppModule.kt
View File

@ -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

2
app/src/main/java/me/gilo/wc/di/FirebaseModule.kt → app/src/main/java/me/gilo/woodroid/app/di/FirebaseModule.kt
View File

@ -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

2
app/src/main/java/me/gilo/wc/di/ViewModelKey.java → app/src/main/java/me/gilo/woodroid/app/di/ViewModelKey.java
View File

@ -1,4 +1,4 @@
package me.gilo.wc.di;
package me.gilo.woodroid.app.di;
import android.arch.lifecycle.ViewModel;
import dagger.MapKey;

12
app/src/main/java/me/gilo/wc/di/ViewModelModule.kt → app/src/main/java/me/gilo/woodroid/app/di/ViewModelModule.kt
View File

@ -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

5
app/src/main/java/me/gilo/wc/events/AddQuantityEvent.java → app/src/main/java/me/gilo/woodroid/app/events/AddQuantityEvent.java
View File

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

5
app/src/main/java/me/gilo/wc/events/LessQuantityEvent.java → app/src/main/java/me/gilo/woodroid/app/events/LessQuantityEvent.java
View File

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

2
app/src/main/java/me/gilo/wc/events/ProductEvent.java → app/src/main/java/me/gilo/woodroid/app/events/ProductEvent.java
View File

@ -1,4 +1,4 @@
package me.gilo.wc.events;
package me.gilo.woodroid.app.events;
import me.gilo.woodroid.models.Product;

3
app/src/main/java/me/gilo/wc/events/ReviewEvent.java → app/src/main/java/me/gilo/woodroid/app/events/ReviewEvent.java
View File

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

7
app/src/main/java/me/gilo/wc/models/CartLineItem.java → app/src/main/java/me/gilo/woodroid/app/models/CartLineItem.java
View File

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

2
app/src/main/java/me/gilo/wc/models/Identifiable.java → app/src/main/java/me/gilo/woodroid/app/models/Identifiable.java
View File

@ -1,4 +1,4 @@
package me.gilo.wc.models;
package me.gilo.woodroid.app.models;
import com.google.firebase.firestore.Exclude;

2
app/src/main/java/me/gilo/wc/models/Model.java → app/src/main/java/me/gilo/woodroid/app/models/Model.java
View File

@ -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;

2
app/src/main/java/me/gilo/wc/models/Repository.java → app/src/main/java/me/gilo/woodroid/app/models/Repository.java
View File

@ -1,4 +1,4 @@
package me.gilo.wc.models;
package me.gilo.woodroid.app.models;
import com.google.android.gms.tasks.Task;

2
app/src/main/java/me/gilo/wc/models/User.java → app/src/main/java/me/gilo/woodroid/app/models/User.java
View File

@ -1,4 +1,4 @@
package me.gilo.wc.models;
package me.gilo.woodroid.app.models;
public class User{
String id;

12
app/src/main/java/me/gilo/wc/repo/CartRepository.kt → app/src/main/java/me/gilo/woodroid/app/repo/CartRepository.kt
View File

@ -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<Map<String, LineItem>> {
val callBack = WooLiveData<Map<String, LineItem>>()
woocommerce!!.CartRepository(context).cart().enqueue(callBack)
woocommerce.CartRepository(context).cart().enqueue(callBack)
return callBack
}

4
app/src/main/java/me/gilo/wc/repo/CategoryRepository.kt → app/src/main/java/me/gilo/woodroid/app/repo/CategoryRepository.kt
View File

@ -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

4
app/src/main/java/me/gilo/wc/repo/CustomerRepository.kt → app/src/main/java/me/gilo/woodroid/app/repo/CustomerRepository.kt
View File

@ -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

10
app/src/main/java/me/gilo/wc/repo/FirebaseRepository.kt → app/src/main/java/me/gilo/woodroid/app/repo/FirebaseRepository.kt
View File

@ -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
/**

10
app/src/main/java/me/gilo/wc/repo/FirebaseUserRepository.java → app/src/main/java/me/gilo/woodroid/app/repo/FirebaseUserRepository.java
View File

@ -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;

6
app/src/main/java/me/gilo/wc/repo/OrderRepository.java → app/src/main/java/me/gilo/woodroid/app/repo/OrderRepository.java
View File

@ -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<Order> addToCart(int productId) {
final WooLiveData<Order> callBack = new WooLiveData();
woocommerce.OrderRepository().addToCart(productId).enqueue(callBack);
woocommerce.OrderRepository().addToCart(productId, null).enqueue(callBack);
return callBack;
}

4
app/src/main/java/me/gilo/wc/repo/ProductRepository.java → app/src/main/java/me/gilo/woodroid/app/repo/ProductRepository.java
View File

@ -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;

6
app/src/main/java/me/gilo/wc/repo/ReviewRepository.java → app/src/main/java/me/gilo/woodroid/app/repo/ReviewRepository.java
View File

@ -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;

6
app/src/main/java/me/gilo/wc/ui/BaseActivity.kt → app/src/main/java/me/gilo/woodroid/app/ui/BaseActivity.kt
View File

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

10
app/src/main/java/me/gilo/wc/ui/MenuActivity.kt → app/src/main/java/me/gilo/woodroid/app/ui/MenuActivity.kt
View File

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

21
app/src/main/java/me/gilo/wc/ui/WooDroidActivity.kt → app/src/main/java/me/gilo/woodroid/app/ui/WooDroidActivity.kt
View File

@ -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<T : ViewModel> : BaseActivity() {
@ -40,7 +37,7 @@ abstract class WooDroidActivity<T : ViewModel> : BaseActivity() {
startActivity(Intent(baseContext, SignInActivity::class.java))
finish()
}
cart()
//cart()
}
fun showLoading() {
@ -67,7 +64,7 @@ abstract class WooDroidActivity<T : ViewModel> : 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<TextView>(R.id.tvCart_counter)

5
app/src/main/java/me/gilo/wc/ui/checkout/CheckoutActivity.kt → app/src/main/java/me/gilo/woodroid/app/ui/checkout/CheckoutActivity.kt
View File

@ -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.*

6
app/src/main/java/me/gilo/wc/ui/coupon/AddCouponActivity.kt → app/src/main/java/me/gilo/woodroid/app/ui/coupon/AddCouponActivity.kt
View File

@ -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

6
app/src/main/java/me/gilo/wc/ui/coupon/CouponActivity.kt → app/src/main/java/me/gilo/woodroid/app/ui/coupon/CouponActivity.kt
View File

@ -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

8
app/src/main/java/me/gilo/wc/ui/coupon/CouponsActivity.kt → app/src/main/java/me/gilo/woodroid/app/ui/coupon/CouponsActivity.kt
View File

@ -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

15
app/src/main/java/me/gilo/wc/ui/customer/BasicCustomerDetailsActivity.kt → app/src/main/java/me/gilo/woodroid/app/ui/customer/BasicCustomerDetailsActivity.kt
View File

@ -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

12
app/src/main/java/me/gilo/wc/ui/customer/BillingAddressActivity.kt → app/src/main/java/me/gilo/woodroid/app/ui/customer/BillingAddressActivity.kt
View File

@ -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

10
app/src/main/java/me/gilo/wc/ui/customer/ProfileActivity.kt → app/src/main/java/me/gilo/woodroid/app/ui/customer/ProfileActivity.kt
View File

@ -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<CustomerViewModel>() {

11
app/src/main/java/me/gilo/wc/ui/customer/ShippingAddressActivity.kt → app/src/main/java/me/gilo/woodroid/app/ui/customer/ShippingAddressActivity.kt
View File

@ -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

10
app/src/main/java/me/gilo/wc/ui/home/CategoryFragment.kt → app/src/main/java/me/gilo/woodroid/app/ui/home/CategoryFragment.kt
View File

@ -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.*

13
app/src/main/java/me/gilo/wc/ui/home/HomeActivity.kt → app/src/main/java/me/gilo/woodroid/app/ui/home/HomeActivity.kt
View File

@ -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<CartViewModel>() {
override lateinit var viewModel: CartViewModel

10
app/src/main/java/me/gilo/wc/ui/home/HomeFragment.kt → app/src/main/java/me/gilo/woodroid/app/ui/home/HomeFragment.kt
View File

@ -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.*

11
app/src/main/java/me/gilo/wc/ui/home/ProfileFragment.kt → app/src/main/java/me/gilo/woodroid/app/ui/home/ProfileFragment.kt
View File

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

12
app/src/main/java/me/gilo/wc/ui/onboarding/AnonymousSignInActivity.kt → app/src/main/java/me/gilo/woodroid/app/ui/onboarding/AnonymousSignInActivity.kt
View File

@ -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<UserViewModel>() {

16
app/src/main/java/me/gilo/wc/ui/onboarding/SignInActivity.kt → app/src/main/java/me/gilo/woodroid/app/ui/onboarding/SignInActivity.kt
View File

@ -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

16
app/src/main/java/me/gilo/wc/ui/onboarding/SignUpActivity.kt → app/src/main/java/me/gilo/woodroid/app/ui/onboarding/SignUpActivity.kt
View File

@ -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

4
app/src/main/java/me/gilo/wc/ui/onboarding/UserDetailsActivity.kt → app/src/main/java/me/gilo/woodroid/app/ui/onboarding/UserDetailsActivity.kt
View File

@ -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.*

16
app/src/main/java/me/gilo/wc/ui/order/MyOrdersActivity.kt → app/src/main/java/me/gilo/woodroid/app/ui/order/MyOrdersActivity.kt
View File

@ -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<OrderViewModel>() {

14
app/src/main/java/me/gilo/wc/ui/order/OrderActivity.kt → app/src/main/java/me/gilo/woodroid/app/ui/order/OrderActivity.kt
View File

@ -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

23
app/src/main/java/me/gilo/wc/ui/product/CartActivity.kt → app/src/main/java/me/gilo/woodroid/app/ui/product/CartActivity.kt
View File

@ -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

26
app/src/main/java/me/gilo/wc/ui/product/ProductActivity.kt → app/src/main/java/me/gilo/woodroid/app/ui/product/ProductActivity.kt
View File

@ -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<TextView>(me.gilo.wc.R.id.tvCart_counter)
tvCartCounter = rootView.findViewById<TextView>(R.id.tvCart_counter)
rootView.setOnClickListener{startActivity(Intent(baseContext, CartActivity::class.java))}

20
app/src/main/java/me/gilo/wc/ui/product/ProductSearchActivity.kt → app/src/main/java/me/gilo/woodroid/app/ui/product/ProductSearchActivity.kt
View File

@ -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

16
app/src/main/java/me/gilo/wc/ui/product/ShopActivity.kt → app/src/main/java/me/gilo/woodroid/app/ui/product/ShopActivity.kt
View File

@ -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.*

6
app/src/main/java/me/gilo/wc/ui/product/section/AddAReviewDialogFragment.kt → app/src/main/java/me/gilo/woodroid/app/ui/product/section/AddAReviewDialogFragment.kt
View File

@ -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

20
app/src/main/java/me/gilo/wc/ui/product/section/ProductReviewsFragment.kt → app/src/main/java/me/gilo/woodroid/app/ui/product/section/ProductReviewsFragment.kt
View File

@ -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")
}

14
app/src/main/java/me/gilo/wc/ui/product/section/RelatedProductsFragment.kt → app/src/main/java/me/gilo/woodroid/app/ui/product/section/RelatedProductsFragment.kt
View File

@ -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

4
app/src/main/java/me/gilo/wc/ui/state/ProgressDialogFragment.java → app/src/main/java/me/gilo/woodroid/app/ui/state/ProgressDialogFragment.java
View File

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

2
app/src/main/java/me/gilo/wc/utils/AppUtils.java → app/src/main/java/me/gilo/woodroid/app/utils/AppUtils.java
View File

@ -1,4 +1,4 @@
package me.gilo.wc.utils;
package me.gilo.woodroid.app.utils;
import android.app.Activity;
import android.content.Context;

2
app/src/main/java/me/gilo/wc/utils/DateTextWatcher.java → app/src/main/java/me/gilo/woodroid/app/utils/DateTextWatcher.java
View File

@ -1,4 +1,4 @@
package me.gilo.wc.utils;
package me.gilo.woodroid.app.utils;
import android.text.Editable;
import android.text.TextWatcher;

2
app/src/main/java/me/gilo/wc/utils/DateUtils.java → app/src/main/java/me/gilo/woodroid/app/utils/DateUtils.java
View File

@ -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;

2
app/src/main/java/me/gilo/wc/utils/OnItemClickListener.java → app/src/main/java/me/gilo/woodroid/app/utils/OnItemClickListener.java
View File

@ -1,4 +1,4 @@
package me.gilo.wc.utils;
package me.gilo.woodroid.app.utils;
public interface OnItemClickListener<T> {
void onItemClick(T data);

2
app/src/main/java/me/gilo/wc/utils/RecyclerItemClickListener.java → app/src/main/java/me/gilo/woodroid/app/utils/RecyclerItemClickListener.java
View File

@ -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;

2
app/src/main/java/me/gilo/wc/utils/StringFormatter.java → app/src/main/java/me/gilo/woodroid/app/utils/StringFormatter.java
View File

@ -1,4 +1,4 @@
package me.gilo.wc.utils;
package me.gilo.woodroid.app.utils;
import java.text.DecimalFormat;

2
app/src/main/java/me/gilo/wc/utils/ViewModelFactory.java → app/src/main/java/me/gilo/woodroid/app/utils/ViewModelFactory.java
View File

@ -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;

18
app/src/main/java/me/gilo/wc/viewmodels/CartViewModel.java → app/src/main/java/me/gilo/woodroid/app/viewmodels/CartViewModel.java
View File

@ -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;

6
app/src/main/java/me/gilo/wc/viewmodels/CategoryViewModel.java → app/src/main/java/me/gilo/woodroid/app/viewmodels/CategoryViewModel.java
View File

@ -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;

7
app/src/main/java/me/gilo/wc/viewmodels/CustomerViewModel.java → app/src/main/java/me/gilo/woodroid/app/viewmodels/CustomerViewModel.java
View File

@ -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;

10
app/src/main/java/me/gilo/wc/viewmodels/OrderViewModel.java → app/src/main/java/me/gilo/woodroid/app/viewmodels/OrderViewModel.java
View File

@ -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;

22
app/src/main/java/me/gilo/wc/viewmodels/ProductViewModel.java → app/src/main/java/me/gilo/woodroid/app/viewmodels/ProductViewModel.java
View File

@ -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<Order> addToCart(int productId) {
return orderRepository.addToCart(productId);
}
public QueryLiveData<CartLineItem> cart() {
return cartRepository.cart();
}

Some files were not shown because too many files have changed in this diff Show More