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

update to androidx

Browse Source
This commit is contained in:
Gilbert Kimutai 2019-11-30 12:15:29 +03:00
parent bf39bba675
commit b7b8d020b7
142 changed files with 625 additions and 474 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/misc.xml generated
View File

@ -5,7 +5,7 @@
<configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
</configurations>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">

177
app/build.gradle
View File

@ -4,15 +4,15 @@ apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-kapt'
android {
compileSdkVersion 28
compileSdkVersion 29
defaultConfig {
applicationId "me.gilo.woodroid.app"
minSdkVersion 16
targetSdkVersion 28
targetSdkVersion 29
versionCode 1
versionName "1.0"
multiDexEnabled true
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
release {
@ -33,17 +33,52 @@ android {
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility = '1.8'
targetCompatibility = '1.8'
}
dataBinding {
enabled = true
}
packagingOptions {
exclude 'META-INF/DEPENDENCIES'
}
defaultConfig {
vectorDrawables.useSupportLibrary = true
}
// To inline the bytecode built with JVM target 1.8 into
// bytecode that is being built with JVM target 1.6. (e.g. navArgs)
}
configurations.all {
resolutionStrategy.eachDependency { DependencyResolveDetails details ->
def requested = details.requested
if (requested.group == "com.android.support") {
if (!requested.name.startsWith("multidex")) {
details.useVersion "26.+"
}
}
}
all*.exclude group: 'com.google.guava', module: 'listenablefuture'
}
ext {
arch_version = '1.1.1'
firebase_version = '11.8.0'
support_lib_version = '28.0.0'
dagger_version = '2.15'
dagger_version = '2.14.1'
play_services = '15.0.1'
roomVersion = '1.1.1'
coroutinesVersion = "1.1.1"
}
kapt {
generateStubs = true
}
@ -51,63 +86,121 @@ kapt {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
implementation 'androidx.paging:paging-runtime-ktx:2.1.0'
implementation 'com.google.android.gms:play-services-auth:17.0.0'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
implementation 'com.android.support:design:28.0.0'
implementation 'com.google.firebase:firebase-database:16.0.4'
implementation 'com.google.firebase:firebase-auth:16.0.4'
implementation 'com.google.firebase:firebase-core:16.0.4'
implementation 'com.google.firebase:firebase-firestore:17.1.1'
implementation 'com.google.firebase:firebase-storage:16.0.4'
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'com.google.android.material:material:1.0.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
// Support Libs
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'androidx.browser:browser:1.0.0'
implementation 'com.google.android.material:material:1.0.0'
implementation 'androidx.recyclerview:recyclerview:1.0.0'
implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.viewpager2:viewpager2:1.0.0-rc01'
//firebase stuff
implementation 'com.google.firebase:firebase-database:19.2.0'
implementation 'com.google.firebase:firebase-auth:19.1.0'
implementation 'com.google.firebase:firebase-core:17.2.1'
implementation 'com.google.firebase:firebase-firestore:21.3.0'
implementation 'com.google.firebase:firebase-storage:19.1.0'
implementation 'com.firebaseui:firebase-ui-database:4.2.0'
implementation 'com.firebaseui:firebase-ui-firestore:4.2.0'
implementation 'com.firebaseui:firebase-ui-storage:4.2.0'
implementation 'com.google.firebase:firebase-messaging:17.1.0'
implementation 'com.google.firebase:firebase-messaging:20.0.1'
implementation 'com.google.android.gms:play-services-maps:17.0.0'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
implementation 'io.github.inflationx:calligraphy3:3.0.0'
implementation 'io.github.inflationx:viewpump:1.0.0'
implementation 'io.github.inflationx:viewpump:2.0.3'
implementation 'org.greenrobot:eventbus:3.1.1'
implementation 'com.squareup.picasso:picasso:2.5.2'
implementation 'com.android.support:support-v4:28.0.0'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
implementation project(path: ':woodroid')
// implementation 'com.github.gilokimu:woodroid:0.2.0'
implementation 'de.hdodenhof:circleimageview:2.1.0'
implementation 'com.romandanylyk:pageindicatorview:0.2.0@aar'
// Android architecture components
implementation "android.arch.lifecycle:extensions:$arch_version"
annotationProcessor "android.arch.lifecycle:compiler:$arch_version"
implementation "android.arch.paging:runtime:1.0.1"
implementation "androidx.lifecycle:lifecycle-extensions:2.2.0-rc02"
kapt "androidx.lifecycle:lifecycle-compiler:2.2.0-rc02"
implementation 'androidx.core:core-ktx:1.1.0'
implementation "androidx.lifecycle:lifecycle-extensions:2.2.0-rc02"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0-rc02"
// Room components
implementation "androidx.room:room-runtime:2.2.1"
kapt "androidx.room:room-compiler:2.2.1"
androidTestImplementation "androidx.room:room-testing:2.2.1"
// Dagger.
implementation "com.google.dagger:dagger:$dagger_version"
implementation "com.google.dagger:dagger-android:$dagger_version"
implementation "com.google.dagger:dagger-android-support:$dagger_version"
kapt "com.google.dagger:dagger-android-processor:$dagger_version"
kapt "com.google.dagger:dagger-compiler:$dagger_version"
implementation "com.google.dagger:dagger:2.15"
implementation "com.google.dagger:dagger-android:2.15"
implementation "com.google.dagger:dagger-android-support:2.15"
kapt "com.google.dagger:dagger-android-processor:2.15"
kapt "com.google.dagger:dagger-compiler:2.15"
implementation 'com.squareup.retrofit2:retrofit:2.3.0'
implementation 'com.miguelcatalan:materialsearchview:1.4.0'
implementation 'me.relex:circleindicator:1.2.2@aar'
// Third-party libraries
implementation 'net.danlew:android.joda:2.9.9.4'
implementation 'org.greenrobot:eventbus:3.1.1'
implementation 'android.arch.lifecycle:livedata:1.1.1'
implementation 'com.readystatesoftware.systembartint:systembartint:1.0.3'
implementation 'com.akexorcist:googledirectionlibrary:1.0.5'
//noinspection GradleDynamicVersion
implementation 'com.google.maps.android:android-maps-utils:0.5+'
implementation 'com.github.aarsy.googlemapsanimations:googlemapsanimations:1.0.5'
implementation 'com.squareup.retrofit2:retrofit:2.5.0'
implementation 'com.squareup.retrofit2:converter-gson:2.5.0'
implementation 'com.google.code.gson:gson:2.8.5'
implementation 'com.jakewharton.retrofit:retrofit1-okhttp3-client:1.1.0'
implementation 'io.reactivex:rxandroid:1.2.1'
implementation 'io.reactivex:rxjava:1.3.0'
implementation 'androidx.multidex:multidex:2.0.1'
implementation 'androidx.room:room-runtime:2.2.2'
kapt 'androidx.room:room-compiler:2.2.2'
implementation 'org.greenrobot:eventbus:3.1.1'
implementation "com.hootsuite.android:nachos:1.1.1"
implementation 'me.relex:circleindicator:1.2.2@aar'
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion"
implementation project(path: ':woodroid')
implementation project(path: ':firebasecart')
implementation project(path: ':core')
implementation 'org.fabiomsr:moneytextview:1.1.0'
}

2
app/src/main/java/me/gilo/woodroid/app/MainActivity.kt
View File

@ -2,7 +2,7 @@ package me.gilo.woodroid.app
import android.content.Intent
import android.os.Bundle
import android.support.v7.app.AppCompatActivity
import androidx.appcompat.app.AppCompatActivity
import android.util.Log
import com.google.firebase.auth.FirebaseAuth
import me.gilo.raison.ui.user.onboarding.SignInActivity

2
app/src/main/java/me/gilo/woodroid/app/adapter/CartAdapter.kt
View File

@ -1,6 +1,6 @@
package me.gilo.woodroid.app.adapter
import android.support.v7.widget.RecyclerView
import androidx.recyclerview.widget.RecyclerView
import android.view.LayoutInflater
import android.view.ViewGroup
import me.gilo.woodroid.app.R

2
app/src/main/java/me/gilo/woodroid/app/adapter/CategoryAdapter.kt
View File

@ -1,6 +1,6 @@
package me.gilo.woodroid.app.adapter
import android.support.v7.widget.RecyclerView
import androidx.recyclerview.widget.RecyclerView
import android.view.LayoutInflater
import android.view.ViewGroup
import me.gilo.woodroid.app.R

2
app/src/main/java/me/gilo/woodroid/app/adapter/CouponAdapter.kt
View File

@ -1,6 +1,6 @@
package me.gilo.woodroid.app.adapter
import android.support.v7.widget.RecyclerView
import androidx.recyclerview.widget.RecyclerView
import android.view.LayoutInflater
import android.view.ViewGroup
import me.gilo.woodroid.app.R

2
app/src/main/java/me/gilo/woodroid/app/adapter/HomeProductAdapter.kt
View File

@ -1,6 +1,6 @@
package me.gilo.woodroid.app.adapter
import android.support.v7.widget.RecyclerView
import androidx.recyclerview.widget.RecyclerView
import android.view.LayoutInflater
import android.view.ViewGroup
import me.gilo.woodroid.app.R

2
app/src/main/java/me/gilo/woodroid/app/adapter/ImagePagerAdapter.kt
View File

@ -2,7 +2,7 @@ package me.gilo.woodroid.app.adapter
import android.content.Context
import android.support.v4.view.PagerAdapter
import androidx.viewpager.widget.PagerAdapter
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup

2
app/src/main/java/me/gilo/woodroid/app/adapter/ListAdapter.kt
View File

@ -1,6 +1,6 @@
package me.gilo.woodroid.app.adapter
import android.support.v7.widget.RecyclerView
import androidx.recyclerview.widget.RecyclerView
import android.view.LayoutInflater
import android.view.ViewGroup
import me.gilo.woodroid.app.R

2
app/src/main/java/me/gilo/woodroid/app/adapter/MenuAdapter.kt
View File

@ -1,6 +1,6 @@
package me.gilo.woodroid.app.adapter
import android.support.v7.widget.RecyclerView
import androidx.recyclerview.widget.RecyclerView
import android.view.LayoutInflater
import android.view.ViewGroup
import me.gilo.woodroid.app.R

2
app/src/main/java/me/gilo/woodroid/app/adapter/OrderAdapter.kt
View File

@ -1,6 +1,6 @@
package me.gilo.woodroid.app.adapter
import android.support.v7.widget.RecyclerView
import androidx.recyclerview.widget.RecyclerView
import android.view.LayoutInflater
import android.view.ViewGroup
import me.gilo.woodroid.app.R

2
app/src/main/java/me/gilo/woodroid/app/adapter/ProductAdapter.kt
View File

@ -1,6 +1,6 @@
package me.gilo.woodroid.app.adapter
import android.support.v7.widget.RecyclerView
import androidx.recyclerview.widget.RecyclerView
import android.view.LayoutInflater
import android.view.ViewGroup
import me.gilo.woodroid.app.R

2
app/src/main/java/me/gilo/woodroid/app/adapter/ProductReviewAdapter.kt
View File

@ -1,6 +1,6 @@
package me.gilo.woodroid.app.adapter
import android.support.v7.widget.RecyclerView
import androidx.recyclerview.widget.RecyclerView
import android.view.LayoutInflater
import android.view.ViewGroup
import me.gilo.woodroid.app.R

2
app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/CartViewHolder.kt
View File

@ -2,7 +2,7 @@ package me.gilo.woodroid.app.adapter.viewholder
import android.content.Context
import android.content.Intent
import android.support.v7.widget.RecyclerView
import androidx.recyclerview.widget.RecyclerView
import android.text.Html
import android.view.View
import android.widget.ImageView

2
app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/CategoryViewHolder.kt
View File

@ -2,7 +2,7 @@ package me.gilo.woodroid.app.adapter.viewholder
import android.content.Context
import android.content.Intent
import android.support.v7.widget.RecyclerView
import androidx.recyclerview.widget.RecyclerView
import android.view.View
import android.widget.TextView
import me.gilo.woodroid.app.R

2
app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/CouponViewHolder.kt
View File

@ -2,7 +2,7 @@ package me.gilo.woodroid.app.adapter.viewholder
import android.content.Context
import android.content.Intent
import android.support.v7.widget.RecyclerView
import androidx.recyclerview.widget.RecyclerView
import android.text.Html
import android.view.View
import android.widget.TextView

2
app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/MenuViewHolder.java
View File

@ -2,7 +2,7 @@ package me.gilo.woodroid.app.adapter.viewholder;
import android.content.Context;
import android.content.Intent;
import android.support.v7.widget.RecyclerView;
import androidx.recyclerview.widget.RecyclerView;
import android.view.View;
import android.widget.TextView;
import me.gilo.woodroid.app.R;

2
app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/OrderViewHolder.kt
View File

@ -2,7 +2,7 @@ package me.gilo.woodroid.app.adapter.viewholder
import android.content.Context
import android.content.Intent
import android.support.v7.widget.RecyclerView
import androidx.recyclerview.widget.RecyclerView
import android.text.SpannableString
import android.view.View
import android.widget.TextView

2
app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/ProductReviewViewHolder.kt
View File

@ -1,7 +1,7 @@
package me.gilo.woodroid.app.adapter.viewholder
import android.content.Context
import android.support.v7.widget.RecyclerView
import androidx.recyclerview.widget.RecyclerView
import android.text.Html
import android.view.View
import android.widget.ImageView

4
app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/ProductViewHolder.kt
View File

@ -2,16 +2,16 @@ package me.gilo.woodroid.app.adapter.viewholder
import android.content.Context
import android.content.Intent
import android.support.v7.widget.RecyclerView
import androidx.recyclerview.widget.RecyclerView
import android.text.Html
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.SpannableString
import me.gilo.woodroid.app.R
import me.gilo.woodroid.app.ui.product.ProductActivity
import me.gilo.woodroid.models.Product
class ProductViewHolder(val context: Context, itemView: View) :

6
app/src/main/java/me/gilo/woodroid/app/common/BaseActivity.java
View File

@ -1,9 +1,9 @@
package me.gilo.woodroid.app.common;
import android.annotation.SuppressLint;
import android.arch.lifecycle.ViewModel;
import android.arch.lifecycle.ViewModelProvider;
import android.arch.lifecycle.ViewModelProviders;
import androidx.lifecycle.ViewModel;
import androidx.lifecycle.ViewModelProvider;
import androidx.lifecycle.ViewModelProviders;
import android.content.Context;
import dagger.android.support.DaggerAppCompatActivity;
import io.github.inflationx.viewpump.ViewPumpContextWrapper;

4
app/src/main/java/me/gilo/woodroid/app/common/CompletionDocLiveData.java
View File

@ -1,7 +1,7 @@
package me.gilo.woodroid.app.common;
import android.arch.lifecycle.LiveData;
import android.support.annotation.NonNull;
import androidx.lifecycle.LiveData;
import androidx.annotation.NonNull;
import com.google.android.gms.tasks.OnCompleteListener;
import com.google.android.gms.tasks.Task;
import com.google.firebase.firestore.DocumentReference;

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

@ -1,6 +1,6 @@
package me.gilo.woodroid.app.common
import android.arch.lifecycle.LiveData
import androidx.lifecycle.LiveData
import com.google.android.gms.tasks.OnCompleteListener
import com.google.android.gms.tasks.Task

4
app/src/main/java/me/gilo/woodroid/app/common/CompletionLiveData.java
View File

@ -1,7 +1,7 @@
package me.gilo.woodroid.app.common;
import android.arch.lifecycle.LiveData;
import android.support.annotation.NonNull;
import androidx.lifecycle.LiveData;
import androidx.annotation.NonNull;
import com.google.android.gms.tasks.OnCompleteListener;
import com.google.android.gms.tasks.Task;

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

@ -1,6 +1,6 @@
package me.gilo.woodroid.app.common;
import android.arch.lifecycle.LiveData;
import androidx.lifecycle.LiveData;
import com.google.firebase.firestore.*;

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

@ -1,6 +1,6 @@
package me.gilo.woodroid.app.common;
import android.support.v7.widget.RecyclerView;
import androidx.recyclerview.widget.RecyclerView;
/**
* Created by amrro <amr.elghobary@gmail.com> on 9/15/17.

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

@ -1,7 +1,7 @@
package me.gilo.woodroid.app.common;
import android.arch.lifecycle.LiveData;
import android.support.annotation.NonNull;
import androidx.lifecycle.LiveData;
import androidx.annotation.NonNull;
import com.google.firebase.firestore.*;
import me.gilo.woodroid.app.models.Model;

4
app/src/main/java/me/gilo/woodroid/app/common/Resource.java
View File

@ -1,7 +1,7 @@
package me.gilo.woodroid.app.common;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import java.util.List;

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

@ -1,6 +1,6 @@
package me.gilo.woodroid.app.common;
import android.arch.lifecycle.LiveData;
import androidx.lifecycle.LiveData;
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;

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

@ -1,6 +1,6 @@
package me.gilo.woodroid.app.di;
import android.arch.lifecycle.ViewModel;
import androidx.lifecycle.ViewModel;
import dagger.MapKey;
import java.lang.annotation.*;

4
app/src/main/java/me/gilo/woodroid/app/di/ViewModelModule.kt
View File

@ -1,7 +1,7 @@
package me.gilo.woodroid.app.di
import android.arch.lifecycle.ViewModel
import android.arch.lifecycle.ViewModelProvider
import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
import dagger.Binds
import dagger.Module
import dagger.multibindings.IntoMap

1
app/src/main/java/me/gilo/woodroid/app/models/CartLineItem.java
View File

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

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

@ -1,6 +1,6 @@
package me.gilo.woodroid.app.models;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import com.google.firebase.firestore.IgnoreExtraProperties;
import com.google.firebase.firestore.ServerTimestamp;

1
app/src/main/java/me/gilo/woodroid/app/repo/CartRepository.kt
View File

@ -13,6 +13,7 @@ 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
import javax.inject.Inject

2
app/src/main/java/me/gilo/woodroid/app/ui/BaseActivity.kt
View File

@ -1,7 +1,7 @@
package me.gilo.woodroid.app.ui
import android.content.Context
import android.support.v7.app.AppCompatActivity
import androidx.appcompat.app.AppCompatActivity
import io.github.inflationx.viewpump.ViewPumpContextWrapper
import me.gilo.woodroid.app.Config
import me.gilo.woodroid.app.ui.state.ProgressDialogFragment

8
app/src/main/java/me/gilo/woodroid/app/ui/MenuActivity.kt
View File

@ -1,7 +1,7 @@
package me.gilo.woodroid.app.ui
import android.os.Bundle
import android.support.v7.widget.LinearLayoutManager
import androidx.recyclerview.widget.LinearLayoutManager
import me.gilo.woodroid.app.R
import kotlinx.android.synthetic.main.activity_menu.*
@ -18,7 +18,11 @@ class MenuActivity : BaseActivity() {
title = "Menu"
val layoutManager = LinearLayoutManager(baseContext, LinearLayoutManager.VERTICAL, false)
val layoutManager = LinearLayoutManager(
baseContext,
LinearLayoutManager.VERTICAL,
false
)
rvMenu.layoutManager = layoutManager
rvMenu.isNestedScrollingEnabled = false

4
app/src/main/java/me/gilo/woodroid/app/ui/WooDroidActivity.kt
View File

@ -1,6 +1,6 @@
package me.gilo.woodroid.app.ui
import android.arch.lifecycle.ViewModel
import androidx.lifecycle.ViewModel
import android.content.Context
import android.content.Intent
import android.view.Menu
@ -87,7 +87,7 @@ abstract class WooDroidActivity<T : ViewModel> : BaseActivity() {
open fun cart() {
var viewModel = getViewModel(CartViewModel::class.java)
viewModel.cart().observe(this, android.arch.lifecycle.Observer { response ->
viewModel.cart().observe(this, androidx.lifecycle.Observer { response ->
when (response!!.status()) {
Status.LOADING -> {

2
app/src/main/java/me/gilo/woodroid/app/ui/checkout/CheckoutActivity.kt
View File

@ -1,7 +1,7 @@
package me.gilo.woodroid.app.ui.checkout
import android.os.Bundle
import android.support.v7.app.AppCompatActivity
import androidx.appcompat.app.AppCompatActivity
import me.gilo.woodroid.app.R
import kotlinx.android.synthetic.main.activity_checkout.*

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

@ -2,7 +2,7 @@ package me.gilo.woodroid.app.ui.coupon
import android.content.Intent
import android.os.Bundle
import android.support.v7.widget.LinearLayoutManager
import androidx.recyclerview.widget.LinearLayoutManager
import kotlinx.android.synthetic.main.activity_coupons.*
import kotlinx.android.synthetic.main.content_coupons.*
import me.gilo.woodroid.app.R
@ -28,7 +28,11 @@ class CouponsActivity : BaseActivity() {
title = "Coupons"
val layoutManager = LinearLayoutManager(baseContext, LinearLayoutManager.VERTICAL, false)
val layoutManager = LinearLayoutManager(
baseContext,
LinearLayoutManager.VERTICAL,
false
)
rvCoupons.layoutManager = layoutManager
rvCoupons.isNestedScrollingEnabled = false

2
app/src/main/java/me/gilo/woodroid/app/ui/customer/BasicCustomerDetailsActivity.kt
View File

@ -1,6 +1,6 @@
package me.gilo.woodroid.app.ui.customer
import android.arch.lifecycle.Observer
import androidx.lifecycle.Observer
import android.content.Context
import android.os.Bundle
import android.widget.Toast

2
app/src/main/java/me/gilo/woodroid/app/ui/customer/BillingAddressActivity.kt
View File

@ -1,6 +1,6 @@
package me.gilo.woodroid.app.ui.customer
import android.arch.lifecycle.Observer
import androidx.lifecycle.Observer
import android.content.Context
import android.os.Bundle
import android.widget.Toast

2
app/src/main/java/me/gilo/woodroid/app/ui/customer/ProfileActivity.kt
View File

@ -1,6 +1,6 @@
package me.gilo.woodroid.app.ui.customer
import android.arch.lifecycle.Observer
import androidx.lifecycle.Observer
import android.content.Context
import android.content.Intent
import android.os.Bundle

2
app/src/main/java/me/gilo/woodroid/app/ui/customer/ShippingAddressActivity.kt
View File

@ -1,6 +1,6 @@
package me.gilo.woodroid.app.ui.customer
import android.arch.lifecycle.Observer
import androidx.lifecycle.Observer
import android.content.Context
import android.os.Bundle
import android.widget.Toast

12
app/src/main/java/me/gilo/woodroid/app/ui/home/CategoryFragment.kt
View File

@ -1,8 +1,8 @@
package me.gilo.woodroid.app.ui.home
import android.os.Bundle
import android.support.v4.app.Fragment
import android.support.v7.widget.LinearLayoutManager
import androidx.fragment.app.Fragment
import androidx.recyclerview.widget.LinearLayoutManager
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
@ -46,7 +46,11 @@ class CategoryFragment : Fragment() {
viewModel = (activity as HomeActivity).getViewModel(CategoryViewModel::class.java)
val layoutManager = LinearLayoutManager(activity, LinearLayoutManager.VERTICAL, false)
val layoutManager = LinearLayoutManager(
activity,
LinearLayoutManager.VERTICAL,
false
)
rvCategory.layoutManager = layoutManager
rvCategory.isNestedScrollingEnabled = false
@ -64,7 +68,7 @@ class CategoryFragment : Fragment() {
val filter = ProductCategoryFilter()
filter.setPer_page(50)
viewModel.categories(filter).observe(this, android.arch.lifecycle.Observer { response ->
viewModel.categories(filter).observe(this, androidx.lifecycle.Observer { response ->
when (response!!.status()) {
Status.LOADING -> {
}

4
app/src/main/java/me/gilo/woodroid/app/ui/home/HomeActivity.kt
View File

@ -1,8 +1,8 @@
package me.gilo.woodroid.app.ui.home
import android.os.Bundle
import android.support.design.widget.BottomNavigationView
import android.support.v4.app.Fragment
import com.google.android.material.bottomnavigation.BottomNavigationView
import androidx.fragment.app.Fragment
import kotlinx.android.synthetic.main.activity_home.*
import me.gilo.woodroid.app.R
import me.gilo.woodroid.app.ui.WooDroidActivity

20
app/src/main/java/me/gilo/woodroid/app/ui/home/HomeFragment.kt
View File

@ -1,8 +1,8 @@
package me.gilo.woodroid.app.ui.home
import android.os.Bundle
import android.support.v4.app.Fragment
import android.support.v7.widget.LinearLayoutManager
import androidx.fragment.app.Fragment
import androidx.recyclerview.widget.LinearLayoutManager
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
@ -60,7 +60,11 @@ class HomeFragment : Fragment() {
}
private fun setUpProducts() {
val layoutManager = LinearLayoutManager(activity, LinearLayoutManager.HORIZONTAL, false)
val layoutManager = LinearLayoutManager(
activity,
LinearLayoutManager.HORIZONTAL,
false
)
rvShop.layoutManager = layoutManager
rvShop.isNestedScrollingEnabled = false
@ -74,7 +78,11 @@ class HomeFragment : Fragment() {
private fun setUpHoodies() {
val layoutManager = LinearLayoutManager(activity, LinearLayoutManager.HORIZONTAL, false)
val layoutManager = LinearLayoutManager(
activity,
LinearLayoutManager.HORIZONTAL,
false
)
rvHoodies.layoutManager = layoutManager
rvHoodies.isNestedScrollingEnabled = false
@ -102,7 +110,7 @@ class HomeFragment : Fragment() {
}
private fun products() {
viewModel.products().observe(this, android.arch.lifecycle.Observer { response ->
viewModel.products().observe(viewLifecycleOwner, androidx.lifecycle.Observer { response ->
when (response!!.status()) {
Status.LOADING -> {
@ -133,7 +141,7 @@ class HomeFragment : Fragment() {
}
private fun products(filter: ProductFilter) {
viewModel.products(filter).observe(this, android.arch.lifecycle.Observer { response ->
viewModel.products(filter).observe(viewLifecycleOwner, androidx.lifecycle.Observer { response ->
when (response!!.status()) {
Status.LOADING -> {
}

2
app/src/main/java/me/gilo/woodroid/app/ui/home/ProfileFragment.kt
View File

@ -2,7 +2,7 @@ package me.gilo.woodroid.app.ui.home
import android.content.Intent
import android.os.Bundle
import android.support.v4.app.Fragment
import androidx.fragment.app.Fragment
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup

2
app/src/main/java/me/gilo/woodroid/app/ui/onboarding/AnonymousSignInActivity.kt
View File

@ -1,6 +1,6 @@
package me.gilo.woodroid.app.ui.onboarding
import android.arch.lifecycle.Observer
import androidx.lifecycle.Observer
import android.content.Context
import android.content.Intent
import android.os.Bundle

2
app/src/main/java/me/gilo/woodroid/app/ui/onboarding/SignInActivity.kt
View File

@ -1,6 +1,6 @@
package me.gilo.raison.ui.user.onboarding
import android.arch.lifecycle.Observer
import androidx.lifecycle.Observer
import android.content.Context
import android.content.Intent
import android.os.Bundle

2
app/src/main/java/me/gilo/woodroid/app/ui/onboarding/SignUpActivity.kt
View File

@ -1,6 +1,6 @@
package me.gilo.raison.ui.user.onboarding
import android.arch.lifecycle.Observer
import androidx.lifecycle.Observer
import android.content.Context
import android.content.Intent
import android.os.Bundle

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

@ -1,8 +1,8 @@
package me.gilo.woodroid.app.ui.onboarding
import android.os.Bundle
import android.support.design.widget.Snackbar
import android.support.v7.app.AppCompatActivity
import androidx.appcompat.app.AppCompatActivity
import com.google.android.material.snackbar.Snackbar
import me.gilo.woodroid.app.R
import kotlinx.android.synthetic.main.activity_user_details.*

10
app/src/main/java/me/gilo/woodroid/app/ui/order/MyOrdersActivity.kt
View File

@ -2,7 +2,7 @@ package me.gilo.woodroid.app.ui.order
import android.content.Intent
import android.os.Bundle
import android.support.v7.widget.LinearLayoutManager
import androidx.recyclerview.widget.LinearLayoutManager
import android.view.View
import kotlinx.android.synthetic.main.activity_my_orders.*
import kotlinx.android.synthetic.main.content_my_orders.*
@ -31,7 +31,11 @@ class MyOrdersActivity : WooDroidActivity<OrderViewModel>() {
viewModel = getViewModel(OrderViewModel::class.java)
title = "My Orders"
val layoutManager = LinearLayoutManager(baseContext, LinearLayoutManager.VERTICAL, false)
val layoutManager = LinearLayoutManager(
baseContext,
LinearLayoutManager.VERTICAL,
false
)
rvOrders.layoutManager = layoutManager
rvOrders.isNestedScrollingEnabled = false
@ -58,7 +62,7 @@ class MyOrdersActivity : WooDroidActivity<OrderViewModel>() {
}
private fun orders() {
viewModel.orders().observe(this, android.arch.lifecycle.Observer { response ->
viewModel.orders().observe(this, androidx.lifecycle.Observer { response ->
when (response!!.status()) {
Status.LOADING -> {
showLoading()

12
app/src/main/java/me/gilo/woodroid/app/ui/order/OrderActivity.kt
View File

@ -1,7 +1,7 @@
package me.gilo.woodroid.app.ui.order
import android.os.Bundle
import android.support.v7.widget.LinearLayoutManager
import androidx.recyclerview.widget.LinearLayoutManager
import kotlinx.android.synthetic.main.activity_order.*
import kotlinx.android.synthetic.main.content_order.*
import me.gilo.woodroid.app.R
@ -35,7 +35,11 @@ class OrderActivity : WooDroidActivity<OrderViewModel>() {
orderId = intent.getIntExtra("orderId", 0)
val layoutManager = LinearLayoutManager(baseContext, LinearLayoutManager.VERTICAL, false)
val layoutManager = LinearLayoutManager(
baseContext,
LinearLayoutManager.VERTICAL,
false
)
rvCart.layoutManager = layoutManager
rvCart.isNestedScrollingEnabled = false
@ -50,7 +54,7 @@ class OrderActivity : WooDroidActivity<OrderViewModel>() {
}
private fun order(orderId : Int) {
viewModel.order(orderId).observe(this, android.arch.lifecycle.Observer { response ->
viewModel.order(orderId).observe(this, androidx.lifecycle.Observer { response ->
when (response!!.status()) {
Status.LOADING -> {
showLoading()
@ -97,7 +101,7 @@ class OrderActivity : WooDroidActivity<OrderViewModel>() {
var filter = ProductFilter()
filter.setInclude(productIds)
viewModel.products(filter).observe(this, android.arch.lifecycle.Observer { response ->
viewModel.products(filter).observe(this, androidx.lifecycle.Observer { response ->
when (response!!.status()) {
Status.LOADING -> {
showLoading()

18
app/src/main/java/me/gilo/woodroid/app/ui/product/CartActivity.kt
View File

@ -1,10 +1,10 @@
package me.gilo.woodroid.app.ui.product
import android.arch.lifecycle.Observer
import androidx.lifecycle.Observer
import android.content.Context
import android.content.Intent
import android.os.Bundle
import android.support.v7.widget.LinearLayoutManager
import androidx.recyclerview.widget.LinearLayoutManager
import android.view.View
import android.widget.Toast
import io.github.inflationx.viewpump.ViewPumpContextWrapper
@ -49,7 +49,11 @@ class CartActivity : WooDroidActivity<CartViewModel>() {
viewModel = getViewModel(CartViewModel::class.java)
title = "Cart"
val layoutManager = LinearLayoutManager(baseContext, LinearLayoutManager.VERTICAL, false)
val layoutManager = LinearLayoutManager(
baseContext,
LinearLayoutManager.VERTICAL,
false
)
rvCart.layoutManager = layoutManager
rvCart.isNestedScrollingEnabled = false
@ -69,7 +73,7 @@ class CartActivity : WooDroidActivity<CartViewModel>() {
}
override fun cart() {
viewModel.cart().observe(this, android.arch.lifecycle.Observer { response ->
viewModel.cart().observe(this, androidx.lifecycle.Observer { response ->
when (response!!.status()) {
Status.LOADING -> {
showLoading()
@ -106,7 +110,7 @@ class CartActivity : WooDroidActivity<CartViewModel>() {
private fun createOrder(order : Order) {
viewModel.createOrder(order).observe(this, android.arch.lifecycle.Observer { response ->
viewModel.createOrder(order).observe(this, androidx.lifecycle.Observer { response ->
when (response!!.status()) {
Status.LOADING -> {
showLoading()
@ -217,7 +221,7 @@ class CartActivity : WooDroidActivity<CartViewModel>() {
}
private fun updateCart(cartLineItem: CartLineItem, quantity: Int) {
viewModel.setQuantity(cartLineItem, quantity).observe(this, android.arch.lifecycle.Observer { response ->
viewModel.setQuantity(cartLineItem, quantity).observe(this, androidx.lifecycle.Observer { response ->
when (response!!.status()) {
Status.LOADING -> {
@ -242,7 +246,7 @@ class CartActivity : WooDroidActivity<CartViewModel>() {
private fun delete(cartLineItem: CartLineItem) {
viewModel.deleteItem(cartLineItem).observe(this, android.arch.lifecycle.Observer { response ->
viewModel.deleteItem(cartLineItem).observe(this, androidx.lifecycle.Observer { response ->
when (response!!.status()) {
Status.LOADING -> {

10
app/src/main/java/me/gilo/woodroid/app/ui/product/ProductActivity.kt
View File

@ -3,7 +3,6 @@ package me.gilo.woodroid.app.ui.product
import android.content.Intent
import android.content.res.ColorStateList
import android.os.Bundle
import android.support.v4.content.ContextCompat
import android.text.Html
import android.view.Menu
import android.view.MenuItem
@ -11,6 +10,7 @@ import android.view.View
import android.widget.FrameLayout
import android.widget.TextView
import android.widget.Toast
import androidx.core.content.ContextCompat
import kotlinx.android.synthetic.main.activity_product.*
import kotlinx.android.synthetic.main.content_product.*
import me.gilo.woodroid.app.R
@ -61,7 +61,7 @@ class ProductActivity : BaseActivity() {
private fun addToCart(product: Product) {
viewModel.addToCart(product.id).observe(this, android.arch.lifecycle.Observer { response ->
viewModel.addToCart(product.id).observe(this, androidx.lifecycle.Observer { response ->
when (response!!.status()) {
Status.LOADING -> {
@ -86,7 +86,7 @@ class ProductActivity : BaseActivity() {
private fun removeFromCart(cartLineItem: CartLineItem) {
viewModel.deleteItem(cartLineItem).observe(this, android.arch.lifecycle.Observer { response ->
viewModel.deleteItem(cartLineItem).observe(this, androidx.lifecycle.Observer { response ->
when (response!!.status()) {
Status.LOADING -> {
@ -111,7 +111,7 @@ class ProductActivity : BaseActivity() {
private fun product(productId : Int) {
viewModel.product(productId).observe(this, android.arch.lifecycle.Observer { response ->
viewModel.product(productId).observe(this, androidx.lifecycle.Observer { response ->
when (response!!.status()) {
Status.LOADING -> {
flLoading.visibility = View.VISIBLE
@ -142,7 +142,7 @@ class ProductActivity : BaseActivity() {
private fun cart() {
viewModel.cart().observe(this, android.arch.lifecycle.Observer { response ->
viewModel.cart().observe(this, androidx.lifecycle.Observer { response ->
when (response!!.status()) {
Status.LOADING -> {

9
app/src/main/java/me/gilo/woodroid/app/ui/product/ProductSearchActivity.kt
View File

@ -4,8 +4,8 @@ import android.app.SearchManager
import android.content.Context
import android.content.Intent
import android.os.Bundle
import android.support.v7.app.ActionBarDrawerToggle
import android.support.v7.widget.GridLayoutManager
import androidx.appcompat.app.ActionBarDrawerToggle
import androidx.recyclerview.widget.GridLayoutManager
import android.widget.Toast
import io.github.inflationx.viewpump.ViewPumpContextWrapper
import me.gilo.woodroid.app.R
@ -46,7 +46,8 @@ class ProductSearchActivity : BaseActivity() {
title = "Search"
val layoutManager = GridLayoutManager(baseContext, 2)
val layoutManager =
GridLayoutManager(baseContext, 2)
rvShop.layoutManager = layoutManager
rvShop.isNestedScrollingEnabled = false
@ -72,7 +73,7 @@ class ProductSearchActivity : BaseActivity() {
}
private fun search(query : String) {
viewModel.search(query).observe(this, android.arch.lifecycle.Observer { response ->
viewModel.search(query).observe(this, androidx.lifecycle.Observer { response ->
when (response!!.status()) {
Status.LOADING -> {
showLoading("Performing search", "This will only take a short while")

15
app/src/main/java/me/gilo/woodroid/app/ui/product/ShopActivity.kt
View File

@ -2,8 +2,8 @@ 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 androidx.core.view.GravityCompat
import androidx.recyclerview.widget.GridLayoutManager
import android.view.Menu
import android.view.MenuItem
import android.widget.Toast
@ -64,7 +64,8 @@ class ShopActivity : BaseActivity() {
}
private fun setUpPage() {
val layoutManager = GridLayoutManager(baseContext, 2)
val layoutManager =
GridLayoutManager(baseContext, 2)
rvShop.layoutManager = layoutManager
rvShop.isNestedScrollingEnabled = false
@ -103,7 +104,7 @@ class ShopActivity : BaseActivity() {
}
private fun products(filter: ProductFilter) {
viewModel.products(filter).observe(this, android.arch.lifecycle.Observer { response ->
viewModel.products(filter).observe(this, androidx.lifecycle.Observer { response ->
when (response!!.status()) {
Status.LOADING -> {
}
@ -134,7 +135,7 @@ class ShopActivity : BaseActivity() {
}
private fun cart() {
viewModel.cart(baseContext).observe(this, android.arch.lifecycle.Observer { response ->
viewModel.cart(baseContext).observe(this, androidx.lifecycle.Observer { response ->
when (response!!.status()) {
Status.LOADING -> {
}
@ -157,7 +158,7 @@ class ShopActivity : BaseActivity() {
}
private fun search(query : String) {
viewModel.search(query).observe(this, android.arch.lifecycle.Observer { response ->
viewModel.search(query).observe(this, androidx.lifecycle.Observer { response ->
when (response!!.status()) {
Status.LOADING -> {
}
@ -189,7 +190,7 @@ class ShopActivity : BaseActivity() {
}
private fun products() {
viewModel.products().observe(this, android.arch.lifecycle.Observer { response ->
viewModel.products().observe(this, androidx.lifecycle.Observer { response ->
when (response!!.status()) {
Status.LOADING -> {

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

@ -1,7 +1,7 @@
package me.gilo.woodroid.app.ui.product.section
import android.os.Bundle
import android.support.v4.app.DialogFragment
import androidx.fragment.app.DialogFragment
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup

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

@ -1,8 +1,8 @@
package me.gilo.woodroid.app.ui.product.section
import android.os.Bundle
import android.support.v4.app.Fragment
import android.support.v7.widget.LinearLayoutManager
import androidx.fragment.app.Fragment
import androidx.recyclerview.widget.LinearLayoutManager
import android.util.Log
import android.view.LayoutInflater
import android.view.View
@ -59,7 +59,11 @@ class ProductReviewsFragment : Fragment() {
private fun reviews(productId : Int) {
val layoutManager = LinearLayoutManager(activity, LinearLayoutManager.VERTICAL, false)
val layoutManager = LinearLayoutManager(
activity,
LinearLayoutManager.VERTICAL,
false
)
rvReviews.layoutManager = layoutManager
rvReviews.isNestedScrollingEnabled = false
@ -69,7 +73,7 @@ class ProductReviewsFragment : Fragment() {
rvReviews.adapter = productReviewAdapter
viewModel.reviews(productId).observe(this, android.arch.lifecycle.Observer { response ->
viewModel.reviews(productId).observe(this, androidx.lifecycle.Observer { response ->
when (response!!.status()) {
Status.LOADING -> {
@ -136,7 +140,7 @@ class ProductReviewsFragment : Fragment() {
}
private fun save(review: ProductReview) {
viewModel.create(review).observe(this, android.arch.lifecycle.Observer { response ->
viewModel.create(review).observe(this, androidx.lifecycle.Observer { response ->
when (response!!.status()) {
Status.LOADING -> {

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

@ -1,8 +1,8 @@
package me.gilo.woodroid.app.ui.product.section
import android.os.Bundle
import android.support.v4.app.Fragment
import android.support.v7.widget.LinearLayoutManager
import androidx.fragment.app.Fragment
import androidx.recyclerview.widget.LinearLayoutManager
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
@ -57,7 +57,11 @@ class RelatedProductsFragment : Fragment() {
}
private fun similarProducts(product: Product) {
val layoutManager = LinearLayoutManager(activity, LinearLayoutManager.HORIZONTAL, false)
val layoutManager = LinearLayoutManager(
activity,
LinearLayoutManager.HORIZONTAL,
false
)
rvShop.layoutManager = layoutManager
rvShop.isNestedScrollingEnabled = false
@ -69,7 +73,7 @@ class RelatedProductsFragment : Fragment() {
val filter = ProductFilter()
filter.setInclude(product.related_ids.toIntArray())
viewModel.products(filter).observe(this, android.arch.lifecycle.Observer { response ->
viewModel.products(filter).observe(this, androidx.lifecycle.Observer { response ->
when (response!!.status()) {
Status.LOADING -> {

2
app/src/main/java/me/gilo/woodroid/app/ui/state/ProgressDialogFragment.java
View File

@ -1,7 +1,7 @@
package me.gilo.woodroid.app.ui.state;
import android.os.Bundle;
import android.support.v4.app.DialogFragment;
import androidx.fragment.app.DialogFragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;

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

@ -4,7 +4,7 @@ import android.app.Activity;
import android.content.Context;
import android.content.SharedPreferences;
import android.os.Handler;
import android.support.annotation.StringRes;
import androidx.annotation.StringRes;
import android.util.Base64;
import android.view.inputmethod.InputMethodManager;
import android.widget.Toast;

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

@ -1,7 +1,7 @@
package me.gilo.woodroid.app.utils;
import android.content.Context;
import android.support.v7.widget.RecyclerView;
import androidx.recyclerview.widget.RecyclerView;
import android.view.GestureDetector;
import android.view.MotionEvent;
import android.view.View;

6
app/src/main/java/me/gilo/woodroid/app/utils/ViewModelFactory.java
View File

@ -16,9 +16,9 @@
package me.gilo.woodroid.app.utils;
import android.arch.lifecycle.ViewModel;
import android.arch.lifecycle.ViewModelProvider;
import android.support.annotation.NonNull;
import androidx.lifecycle.ViewModel;
import androidx.lifecycle.ViewModelProvider;
import androidx.annotation.NonNull;
import javax.inject.Inject;
import javax.inject.Provider;

3
app/src/main/java/me/gilo/woodroid/app/viewmodels/CartViewModel.java
View File

@ -1,6 +1,6 @@
package me.gilo.woodroid.app.viewmodels;
import android.arch.lifecycle.ViewModel;
import androidx.lifecycle.ViewModel;
import android.content.Context;
import com.google.firebase.firestore.DocumentReference;
import me.gilo.woodroid.app.common.CompletionGenericLiveData;
@ -10,6 +10,7 @@ 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 javax.inject.Inject;

2
app/src/main/java/me/gilo/woodroid/app/viewmodels/CategoryViewModel.java
View File

@ -1,6 +1,6 @@
package me.gilo.woodroid.app.viewmodels;
import android.arch.lifecycle.ViewModel;
import androidx.lifecycle.ViewModel;
import me.gilo.woodroid.app.common.WooLiveData;
import me.gilo.woodroid.app.repo.CategoryRepository;
import me.gilo.woodroid.models.Category;

2
app/src/main/java/me/gilo/woodroid/app/viewmodels/CustomerViewModel.java
View File

@ -1,6 +1,6 @@
package me.gilo.woodroid.app.viewmodels;
import android.arch.lifecycle.ViewModel;
import androidx.lifecycle.ViewModel;
import me.gilo.woodroid.app.common.WooLiveData;
import me.gilo.woodroid.app.repo.CustomerRepository;
import me.gilo.woodroid.models.Customer;

2
app/src/main/java/me/gilo/woodroid/app/viewmodels/OrderViewModel.java
View File

@ -1,6 +1,6 @@
package me.gilo.woodroid.app.viewmodels;
import android.arch.lifecycle.ViewModel;
import androidx.lifecycle.ViewModel;
import me.gilo.woodroid.app.common.WooLiveData;
import me.gilo.woodroid.app.repo.OrderRepository;
import me.gilo.woodroid.app.repo.ProductRepository;

4
app/src/main/java/me/gilo/woodroid/app/viewmodels/ProductViewModel.java
View File

@ -1,7 +1,7 @@
package me.gilo.woodroid.app.viewmodels;
import android.arch.lifecycle.MutableLiveData;
import android.arch.lifecycle.ViewModel;
import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.ViewModel;
import android.content.Context;
import com.google.firebase.firestore.DocumentReference;
import me.gilo.woodroid.app.common.CompletionGenericLiveData;

2
app/src/main/java/me/gilo/woodroid/app/viewmodels/ReviewViewModel.java
View File

@ -1,6 +1,6 @@
package me.gilo.woodroid.app.viewmodels;
import android.arch.lifecycle.ViewModel;
import androidx.lifecycle.ViewModel;
import me.gilo.woodroid.app.common.WooLiveData;
import me.gilo.woodroid.app.repo.ReviewRepository;
import me.gilo.woodroid.models.ProductReview;

4
app/src/main/java/me/gilo/woodroid/app/viewmodels/UserViewModel.java
View File

@ -1,7 +1,7 @@
package me.gilo.woodroid.app.viewmodels;
import android.arch.lifecycle.MutableLiveData;
import android.arch.lifecycle.ViewModel;
import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.ViewModel;
import com.google.android.gms.tasks.OnFailureListener;
import com.google.android.gms.tasks.OnSuccessListener;
import com.google.firebase.auth.AuthResult;

10
app/src/main/res/drawable-xxhdpi/baseline_arrow_back_24.xml Executable file
View File

@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="#ffffff"
android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
</vector>

10
app/src/main/res/layout/activity_add_coupon.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
@ -7,20 +7,20 @@
android:layout_height="match_parent"
tools:context=".app.ui.coupon.AddCouponActivity">
<android.support.design.widget.AppBarLayout
<com.google.android.material.appbar.AppBarLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:theme="@style/AppTheme.AppBarOverlay">
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay"/>
</android.support.design.widget.AppBarLayout>
</com.google.android.material.appbar.AppBarLayout>
<include layout="@layout/content_add_coupon"/>
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

10
app/src/main/res/layout/activity_anonymous_sign_in.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
@ -7,20 +7,20 @@
android:layout_height="match_parent"
tools:context=".app.ui.onboarding.AnonymousSignInActivity">
<android.support.design.widget.AppBarLayout
<com.google.android.material.appbar.AppBarLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:theme="@style/AppTheme.AppBarOverlay">
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay"/>
</android.support.design.widget.AppBarLayout>
</com.google.android.material.appbar.AppBarLayout>
<include layout="@layout/content_anonymous_sign_in"/>
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

4
app/src/main/res/layout/activity_basic_customer_details.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
@ -9,4 +9,4 @@
<include layout="@layout/customer_basic_details"/>
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

4
app/src/main/res/layout/activity_billing_address.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
@ -10,4 +10,4 @@
<include layout="@layout/customer_billing_address"/>
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

14
app/src/main/res/layout/activity_cart.xml
View File

@ -1,25 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".app.ui.product.CartActivity">
>
<android.support.design.widget.AppBarLayout
<com.google.android.material.appbar.AppBarLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:theme="@style/AppTheme.AppBarOverlay">
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay"/>
</android.support.design.widget.AppBarLayout>
</com.google.android.material.appbar.AppBarLayout>
<include layout="@layout/content_cart"/>
@ -58,7 +58,7 @@
<ImageView
android:layout_width="32dp"
android:layout_height="32dp"
android:src="@drawable/ic_action_navigation_arrow_back_inverted"
app:srcCompat="@drawable/baseline_arrow_back_24"
android:tint="#ffffff"
android:layout_gravity="right|center"
android:rotation="180"
@ -67,4 +67,4 @@
</FrameLayout>
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

12
app/src/main/res/layout/activity_checkout.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
@ -7,23 +7,23 @@
android:layout_height="match_parent"
tools:context=".app.ui.checkout.CheckoutActivity">
<android.support.design.widget.AppBarLayout
<com.google.android.material.appbar.AppBarLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:theme="@style/AppTheme.AppBarOverlay">
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay"/>
</android.support.design.widget.AppBarLayout>
</com.google.android.material.appbar.AppBarLayout>
<include layout="@layout/content_checkout"/>
<android.support.design.widget.FloatingActionButton
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -31,4 +31,4 @@
android:layout_margin="@dimen/fab_margin"
app:srcCompat="@android:drawable/ic_dialog_email"/>
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

10
app/src/main/res/layout/activity_coupon.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
@ -7,20 +7,20 @@
android:layout_height="match_parent"
tools:context=".app.ui.coupon.CouponActivity">
<android.support.design.widget.AppBarLayout
<com.google.android.material.appbar.AppBarLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:theme="@style/AppTheme.AppBarOverlay">
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay"/>
</android.support.design.widget.AppBarLayout>
</com.google.android.material.appbar.AppBarLayout>
<include layout="@layout/content_coupon"/>
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

12
app/src/main/res/layout/activity_coupons.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
@ -7,23 +7,23 @@
android:layout_height="match_parent"
tools:context=".app.ui.coupon.CouponsActivity">
<android.support.design.widget.AppBarLayout
<com.google.android.material.appbar.AppBarLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:theme="@style/AppTheme.AppBarOverlay">
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay"/>
</android.support.design.widget.AppBarLayout>
</com.google.android.material.appbar.AppBarLayout>
<include layout="@layout/content_coupons"/>
<android.support.design.widget.FloatingActionButton
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -33,4 +33,4 @@
android:layout_margin="16dp" />
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

8
app/src/main/res/layout/activity_home.xml
View File

@ -7,12 +7,12 @@
android:orientation="vertical"
tools:context=".app.ui.home.HomeActivity">
<android.support.design.widget.AppBarLayout
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay">
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
@ -20,7 +20,7 @@
app:title="WooDroid"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</android.support.design.widget.AppBarLayout>
</com.google.android.material.appbar.AppBarLayout>
<LinearLayout
@ -31,7 +31,7 @@
android:orientation="vertical"
/>
<android.support.design.widget.BottomNavigationView
<com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/navigation"
android:layout_width="match_parent"
android:layout_height="wrap_content"

5
app/src/main/res/layout/activity_main.xml
View File

@ -1,11 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".app.MainActivity"
android:layout_margin="16dp"
>
@ -41,4 +40,4 @@
app:layout_constraintTop_toBottomOf="@+id/imageView2"/>
</android.support.constraint.ConstraintLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

10
app/src/main/res/layout/activity_menu.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
@ -7,21 +7,21 @@
android:layout_height="match_parent"
tools:context=".app.ui.MenuActivity">
<android.support.design.widget.AppBarLayout
<com.google.android.material.appbar.AppBarLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:theme="@style/AppTheme.AppBarOverlay">
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay"/>
</android.support.design.widget.AppBarLayout>
</com.google.android.material.appbar.AppBarLayout>
<include layout="@layout/content_menu"/>
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

12
app/src/main/res/layout/activity_my_orders.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
@ -7,19 +7,19 @@
android:layout_height="match_parent"
tools:context=".app.ui.order.MyOrdersActivity">
<android.support.design.widget.AppBarLayout
<com.google.android.material.appbar.AppBarLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:theme="@style/AppTheme.AppBarOverlay">
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay"/>
</android.support.design.widget.AppBarLayout>
</com.google.android.material.appbar.AppBarLayout>
<include layout="@layout/content_my_orders"/>
@ -58,7 +58,7 @@
<ImageView
android:layout_width="32dp"
android:layout_height="32dp"
android:src="@drawable/ic_action_navigation_arrow_back_inverted"
app:srcCompat="@drawable/baseline_arrow_back_24"
android:tint="#ffffff"
android:layout_gravity="right|center"
android:rotation="180"
@ -67,4 +67,4 @@
</FrameLayout>
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

10
app/src/main/res/layout/activity_order.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
@ -7,22 +7,22 @@
android:layout_height="match_parent"
tools:context=".app.ui.order.OrderActivity">
<android.support.design.widget.AppBarLayout
<com.google.android.material.appbar.AppBarLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:theme="@style/AppTheme.AppBarOverlay">
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay"/>
</android.support.design.widget.AppBarLayout>
</com.google.android.material.appbar.AppBarLayout>
<include layout="@layout/content_order"/>
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

14
app/src/main/res/layout/activity_product.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
@ -7,19 +7,19 @@
android:layout_height="match_parent"
tools:context=".app.ui.product.ProductActivity">
<android.support.design.widget.AppBarLayout
<com.google.android.material.appbar.AppBarLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:theme="@style/AppTheme.AppBarOverlay">
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay"/>
</android.support.design.widget.AppBarLayout>
</com.google.android.material.appbar.AppBarLayout>
<include layout="@layout/content_product"/>
@ -41,17 +41,17 @@
</FrameLayout>
<android.support.design.widget.FloatingActionButton
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin"
android:src="@drawable/baseline_add_shopping_cart_24"
app:srcCompat="@drawable/baseline_add_shopping_cart_24"
android:tint="#ffffff"
/>
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

10
app/src/main/res/layout/activity_product_search.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
@ -7,20 +7,20 @@
android:layout_height="match_parent"
tools:context=".app.ui.product.ProductSearchActivity">
<android.support.design.widget.AppBarLayout
<com.google.android.material.appbar.AppBarLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:theme="@style/AppTheme.AppBarOverlay">
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay"/>
</android.support.design.widget.AppBarLayout>
</com.google.android.material.appbar.AppBarLayout>
<include layout="@layout/content_product_search"/>
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

10
app/src/main/res/layout/activity_profile.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
@ -7,20 +7,20 @@
android:layout_height="match_parent"
tools:context=".app.ui.customer.ProfileActivity">
<android.support.design.widget.AppBarLayout
<com.google.android.material.appbar.AppBarLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:theme="@style/AppTheme.AppBarOverlay">
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay"/>
</android.support.design.widget.AppBarLayout>
</com.google.android.material.appbar.AppBarLayout>
<include layout="@layout/content_profile"/>
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

4
app/src/main/res/layout/activity_shipping_address.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
@ -10,4 +10,4 @@
<include layout="@layout/customer_shipping_address"/>
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

16
app/src/main/res/layout/activity_shop.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.DrawerLayout
<androidx.drawerlayout.widget.DrawerLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
@ -9,17 +9,17 @@
tools:context=".app.ui.product.ShopActivity"
tools:openDrawer="end">
<android.support.design.widget.CoordinatorLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
>
<android.support.design.widget.AppBarLayout
<com.google.android.material.appbar.AppBarLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:theme="@style/AppTheme.AppBarOverlay">
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
@ -27,14 +27,14 @@
app:popupTheme="@style/AppTheme.PopupOverlay">
</android.support.v7.widget.Toolbar>
</androidx.appcompat.widget.Toolbar>
</android.support.design.widget.AppBarLayout>
</com.google.android.material.appbar.AppBarLayout>
<include layout="@layout/content_shop"/>
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
<include
layout="@layout/drawer_filter"
@ -44,4 +44,4 @@
/>
</android.support.v4.widget.DrawerLayout>
</androidx.drawerlayout.widget.DrawerLayout>

4
app/src/main/res/layout/activity_sign_in.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
@ -8,4 +8,4 @@
<include layout="@layout/content_sign_in" />
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

4
app/src/main/res/layout/activity_sign_up.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
@ -8,4 +8,4 @@
<include layout="@layout/content_sign_up" />
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

12
app/src/main/res/layout/activity_user_details.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
@ -7,23 +7,23 @@
android:layout_height="match_parent"
tools:context=".app.ui.onboarding.UserDetailsActivity">
<android.support.design.widget.AppBarLayout
<com.google.android.material.appbar.AppBarLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:theme="@style/AppTheme.AppBarOverlay">
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay"/>
</android.support.design.widget.AppBarLayout>
</com.google.android.material.appbar.AppBarLayout>
<include layout="@layout/content_user_details"/>
<android.support.design.widget.FloatingActionButton
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -31,4 +31,4 @@
android:layout_margin="@dimen/fab_margin"
app:srcCompat="@android:drawable/ic_dialog_email"/>
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

8
app/src/main/res/layout/content_add_coupon.xml
View File

@ -11,7 +11,7 @@
app:layout_behavior="@string/appbar_scrolling_view_behavior"
>
<android.support.v4.widget.NestedScrollView
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
>
@ -24,7 +24,7 @@
android:background="@drawable/rect_white"
android:orientation="vertical">
<android.support.v7.widget.AppCompatEditText
<androidx.appcompat.widget.AppCompatEditText
android:id="@+id/etCode"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -39,7 +39,7 @@
/>
<android.support.v7.widget.AppCompatEditText
<androidx.appcompat.widget.AppCompatEditText
android:id="@+id/etDescription"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -57,7 +57,7 @@
</LinearLayout>
</android.support.v4.widget.NestedScrollView>
</androidx.core.widget.NestedScrollView>
<Button
android:id="@+id/bCreate"

4
app/src/main/res/layout/content_anonymous_sign_in.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
@ -10,4 +10,4 @@
tools:showIn="@layout/activity_anonymous_sign_in"
tools:context=".app.ui.onboarding.AnonymousSignInActivity">
</android.support.constraint.ConstraintLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

4
app/src/main/res/layout/content_basic_customer_details.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
@ -9,4 +9,4 @@
tools:showIn="@layout/activity_basic_customer_details"
tools:context=".app.ui.customer.BasicCustomerDetailsActivity">
</android.support.constraint.ConstraintLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

4
app/src/main/res/layout/content_billing_address.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
@ -9,4 +9,4 @@
tools:showIn="@layout/activity_billing_address"
tools:context=".app.ui.customer.BillingAddressActivity">
</android.support.constraint.ConstraintLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

8
app/src/main/res/layout/content_cart.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.NestedScrollView
<androidx.core.widget.NestedScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
@ -25,7 +25,7 @@
android:layout_weight="1"
>
<android.support.v7.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="16dp"
@ -34,7 +34,7 @@
android:background="@drawable/rect_white"
>
</android.support.v7.widget.RecyclerView>
</androidx.recyclerview.widget.RecyclerView>
</LinearLayout>
@ -246,4 +246,4 @@
</LinearLayout>
</android.support.v4.widget.NestedScrollView>
</androidx.core.widget.NestedScrollView>

4
app/src/main/res/layout/content_checkout.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.NestedScrollView
<androidx.core.widget.NestedScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:attrs="http://schemas.android.com/apk/res-auto"
@ -140,4 +140,4 @@
</LinearLayout>
</android.support.v4.widget.NestedScrollView>
</androidx.core.widget.NestedScrollView>

8
app/src/main/res/layout/content_coupon.xml
View File

@ -11,7 +11,7 @@
app:layout_behavior="@string/appbar_scrolling_view_behavior"
>
<android.support.v4.widget.NestedScrollView
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
>
@ -24,7 +24,7 @@
android:background="@drawable/rect_white"
android:orientation="vertical">
<android.support.v7.widget.AppCompatEditText
<androidx.appcompat.widget.AppCompatEditText
android:id="@+id/etCode"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -39,7 +39,7 @@
/>
<android.support.v7.widget.AppCompatEditText
<androidx.appcompat.widget.AppCompatEditText
android:id="@+id/etDescription"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -57,7 +57,7 @@
</LinearLayout>
</android.support.v4.widget.NestedScrollView>
</androidx.core.widget.NestedScrollView>
<LinearLayout
android:layout_width="match_parent"

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