diff --git a/.idea/misc.xml b/.idea/misc.xml index 8a8f75b..703e5d4 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -5,7 +5,7 @@ - + diff --git a/app/build.gradle b/app/build.gradle index 115c573..dbec713 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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' } diff --git a/app/src/main/java/me/gilo/woodroid/app/MainActivity.kt b/app/src/main/java/me/gilo/woodroid/app/MainActivity.kt index 884cc13..bb21c46 100644 --- a/app/src/main/java/me/gilo/woodroid/app/MainActivity.kt +++ b/app/src/main/java/me/gilo/woodroid/app/MainActivity.kt @@ -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 diff --git a/app/src/main/java/me/gilo/woodroid/app/adapter/CartAdapter.kt b/app/src/main/java/me/gilo/woodroid/app/adapter/CartAdapter.kt index 750d354..1370bbb 100644 --- a/app/src/main/java/me/gilo/woodroid/app/adapter/CartAdapter.kt +++ b/app/src/main/java/me/gilo/woodroid/app/adapter/CartAdapter.kt @@ -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 diff --git a/app/src/main/java/me/gilo/woodroid/app/adapter/CategoryAdapter.kt b/app/src/main/java/me/gilo/woodroid/app/adapter/CategoryAdapter.kt index 61e22d0..d0ad056 100644 --- a/app/src/main/java/me/gilo/woodroid/app/adapter/CategoryAdapter.kt +++ b/app/src/main/java/me/gilo/woodroid/app/adapter/CategoryAdapter.kt @@ -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 diff --git a/app/src/main/java/me/gilo/woodroid/app/adapter/CouponAdapter.kt b/app/src/main/java/me/gilo/woodroid/app/adapter/CouponAdapter.kt index 9ac85f2..681d093 100644 --- a/app/src/main/java/me/gilo/woodroid/app/adapter/CouponAdapter.kt +++ b/app/src/main/java/me/gilo/woodroid/app/adapter/CouponAdapter.kt @@ -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 diff --git a/app/src/main/java/me/gilo/woodroid/app/adapter/HomeProductAdapter.kt b/app/src/main/java/me/gilo/woodroid/app/adapter/HomeProductAdapter.kt index caaf7b1..b5567c2 100644 --- a/app/src/main/java/me/gilo/woodroid/app/adapter/HomeProductAdapter.kt +++ b/app/src/main/java/me/gilo/woodroid/app/adapter/HomeProductAdapter.kt @@ -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 diff --git a/app/src/main/java/me/gilo/woodroid/app/adapter/ImagePagerAdapter.kt b/app/src/main/java/me/gilo/woodroid/app/adapter/ImagePagerAdapter.kt index c3dca86..735a49e 100644 --- a/app/src/main/java/me/gilo/woodroid/app/adapter/ImagePagerAdapter.kt +++ b/app/src/main/java/me/gilo/woodroid/app/adapter/ImagePagerAdapter.kt @@ -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 diff --git a/app/src/main/java/me/gilo/woodroid/app/adapter/ListAdapter.kt b/app/src/main/java/me/gilo/woodroid/app/adapter/ListAdapter.kt index a349f44..a7a1743 100644 --- a/app/src/main/java/me/gilo/woodroid/app/adapter/ListAdapter.kt +++ b/app/src/main/java/me/gilo/woodroid/app/adapter/ListAdapter.kt @@ -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 diff --git a/app/src/main/java/me/gilo/woodroid/app/adapter/MenuAdapter.kt b/app/src/main/java/me/gilo/woodroid/app/adapter/MenuAdapter.kt index f3d7547..4a1f692 100644 --- a/app/src/main/java/me/gilo/woodroid/app/adapter/MenuAdapter.kt +++ b/app/src/main/java/me/gilo/woodroid/app/adapter/MenuAdapter.kt @@ -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 diff --git a/app/src/main/java/me/gilo/woodroid/app/adapter/OrderAdapter.kt b/app/src/main/java/me/gilo/woodroid/app/adapter/OrderAdapter.kt index a366a7f..5248779 100644 --- a/app/src/main/java/me/gilo/woodroid/app/adapter/OrderAdapter.kt +++ b/app/src/main/java/me/gilo/woodroid/app/adapter/OrderAdapter.kt @@ -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 diff --git a/app/src/main/java/me/gilo/woodroid/app/adapter/ProductAdapter.kt b/app/src/main/java/me/gilo/woodroid/app/adapter/ProductAdapter.kt index 527e809..e8b5162 100644 --- a/app/src/main/java/me/gilo/woodroid/app/adapter/ProductAdapter.kt +++ b/app/src/main/java/me/gilo/woodroid/app/adapter/ProductAdapter.kt @@ -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 diff --git a/app/src/main/java/me/gilo/woodroid/app/adapter/ProductReviewAdapter.kt b/app/src/main/java/me/gilo/woodroid/app/adapter/ProductReviewAdapter.kt index e8dfde3..9d4c97f 100644 --- a/app/src/main/java/me/gilo/woodroid/app/adapter/ProductReviewAdapter.kt +++ b/app/src/main/java/me/gilo/woodroid/app/adapter/ProductReviewAdapter.kt @@ -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 diff --git a/app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/CartViewHolder.kt b/app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/CartViewHolder.kt index 0e1277a..03b680b 100644 --- a/app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/CartViewHolder.kt +++ b/app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/CartViewHolder.kt @@ -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 diff --git a/app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/CategoryViewHolder.kt b/app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/CategoryViewHolder.kt index 89309ee..4a9c4a4 100644 --- a/app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/CategoryViewHolder.kt +++ b/app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/CategoryViewHolder.kt @@ -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 diff --git a/app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/CouponViewHolder.kt b/app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/CouponViewHolder.kt index d9c6cf7..c57f9db 100644 --- a/app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/CouponViewHolder.kt +++ b/app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/CouponViewHolder.kt @@ -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 diff --git a/app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/MenuViewHolder.java b/app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/MenuViewHolder.java index 9e0c85e..506b520 100644 --- a/app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/MenuViewHolder.java +++ b/app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/MenuViewHolder.java @@ -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; diff --git a/app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/OrderViewHolder.kt b/app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/OrderViewHolder.kt index aaa21bb..246fdd0 100644 --- a/app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/OrderViewHolder.kt +++ b/app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/OrderViewHolder.kt @@ -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 diff --git a/app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/ProductReviewViewHolder.kt b/app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/ProductReviewViewHolder.kt index f91cb0a..3697fe4 100644 --- a/app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/ProductReviewViewHolder.kt +++ b/app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/ProductReviewViewHolder.kt @@ -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 diff --git a/app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/ProductViewHolder.kt b/app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/ProductViewHolder.kt index ab4dabf..a07a5dc 100644 --- a/app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/ProductViewHolder.kt +++ b/app/src/main/java/me/gilo/woodroid/app/adapter/viewholder/ProductViewHolder.kt @@ -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) : diff --git a/app/src/main/java/me/gilo/woodroid/app/common/BaseActivity.java b/app/src/main/java/me/gilo/woodroid/app/common/BaseActivity.java index aeb81c2..ffc96e3 100644 --- a/app/src/main/java/me/gilo/woodroid/app/common/BaseActivity.java +++ b/app/src/main/java/me/gilo/woodroid/app/common/BaseActivity.java @@ -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; diff --git a/app/src/main/java/me/gilo/woodroid/app/common/CompletionDocLiveData.java b/app/src/main/java/me/gilo/woodroid/app/common/CompletionDocLiveData.java index 2e9beea..a4c1156 100644 --- a/app/src/main/java/me/gilo/woodroid/app/common/CompletionDocLiveData.java +++ b/app/src/main/java/me/gilo/woodroid/app/common/CompletionDocLiveData.java @@ -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; diff --git a/app/src/main/java/me/gilo/woodroid/app/common/CompletionGenericLiveData.kt b/app/src/main/java/me/gilo/woodroid/app/common/CompletionGenericLiveData.kt index 6d0ce65..3e55794 100644 --- a/app/src/main/java/me/gilo/woodroid/app/common/CompletionGenericLiveData.kt +++ b/app/src/main/java/me/gilo/woodroid/app/common/CompletionGenericLiveData.kt @@ -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 diff --git a/app/src/main/java/me/gilo/woodroid/app/common/CompletionLiveData.java b/app/src/main/java/me/gilo/woodroid/app/common/CompletionLiveData.java index eb4d446..551e6b2 100644 --- a/app/src/main/java/me/gilo/woodroid/app/common/CompletionLiveData.java +++ b/app/src/main/java/me/gilo/woodroid/app/common/CompletionLiveData.java @@ -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; diff --git a/app/src/main/java/me/gilo/woodroid/app/common/DocumentLiveData.java b/app/src/main/java/me/gilo/woodroid/app/common/DocumentLiveData.java index e900d43..3d7660a 100644 --- a/app/src/main/java/me/gilo/woodroid/app/common/DocumentLiveData.java +++ b/app/src/main/java/me/gilo/woodroid/app/common/DocumentLiveData.java @@ -1,6 +1,6 @@ package me.gilo.woodroid.app.common; -import android.arch.lifecycle.LiveData; +import androidx.lifecycle.LiveData; import com.google.firebase.firestore.*; diff --git a/app/src/main/java/me/gilo/woodroid/app/common/OnItemClickedListener.java b/app/src/main/java/me/gilo/woodroid/app/common/OnItemClickedListener.java index 4480191..a7b2a05 100644 --- a/app/src/main/java/me/gilo/woodroid/app/common/OnItemClickedListener.java +++ b/app/src/main/java/me/gilo/woodroid/app/common/OnItemClickedListener.java @@ -1,6 +1,6 @@ package me.gilo.woodroid.app.common; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; /** * Created by amrro on 9/15/17. diff --git a/app/src/main/java/me/gilo/woodroid/app/common/QueryLiveData.java b/app/src/main/java/me/gilo/woodroid/app/common/QueryLiveData.java index 48c486e..83fcd1f 100644 --- a/app/src/main/java/me/gilo/woodroid/app/common/QueryLiveData.java +++ b/app/src/main/java/me/gilo/woodroid/app/common/QueryLiveData.java @@ -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; diff --git a/app/src/main/java/me/gilo/woodroid/app/common/Resource.java b/app/src/main/java/me/gilo/woodroid/app/common/Resource.java index d847e24..f2c5c81 100644 --- a/app/src/main/java/me/gilo/woodroid/app/common/Resource.java +++ b/app/src/main/java/me/gilo/woodroid/app/common/Resource.java @@ -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; diff --git a/app/src/main/java/me/gilo/woodroid/app/common/WooLiveData.java b/app/src/main/java/me/gilo/woodroid/app/common/WooLiveData.java index c34a89f..98b77fc 100644 --- a/app/src/main/java/me/gilo/woodroid/app/common/WooLiveData.java +++ b/app/src/main/java/me/gilo/woodroid/app/common/WooLiveData.java @@ -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; diff --git a/app/src/main/java/me/gilo/woodroid/app/di/ViewModelKey.java b/app/src/main/java/me/gilo/woodroid/app/di/ViewModelKey.java index ce8c0e1..0d4bc28 100644 --- a/app/src/main/java/me/gilo/woodroid/app/di/ViewModelKey.java +++ b/app/src/main/java/me/gilo/woodroid/app/di/ViewModelKey.java @@ -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.*; diff --git a/app/src/main/java/me/gilo/woodroid/app/di/ViewModelModule.kt b/app/src/main/java/me/gilo/woodroid/app/di/ViewModelModule.kt index 5a7abef..9c11d3d 100644 --- a/app/src/main/java/me/gilo/woodroid/app/di/ViewModelModule.kt +++ b/app/src/main/java/me/gilo/woodroid/app/di/ViewModelModule.kt @@ -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 diff --git a/app/src/main/java/me/gilo/woodroid/app/models/CartLineItem.java b/app/src/main/java/me/gilo/woodroid/app/models/CartLineItem.java index e347730..26b9b3a 100644 --- a/app/src/main/java/me/gilo/woodroid/app/models/CartLineItem.java +++ b/app/src/main/java/me/gilo/woodroid/app/models/CartLineItem.java @@ -1,5 +1,4 @@ package me.gilo.woodroid.app.models; - import me.gilo.woodroid.models.Product; diff --git a/app/src/main/java/me/gilo/woodroid/app/models/Model.java b/app/src/main/java/me/gilo/woodroid/app/models/Model.java index 96eeff1..9905e7c 100644 --- a/app/src/main/java/me/gilo/woodroid/app/models/Model.java +++ b/app/src/main/java/me/gilo/woodroid/app/models/Model.java @@ -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; diff --git a/app/src/main/java/me/gilo/woodroid/app/repo/CartRepository.kt b/app/src/main/java/me/gilo/woodroid/app/repo/CartRepository.kt index c693946..37df858 100644 --- a/app/src/main/java/me/gilo/woodroid/app/repo/CartRepository.kt +++ b/app/src/main/java/me/gilo/woodroid/app/repo/CartRepository.kt @@ -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 diff --git a/app/src/main/java/me/gilo/woodroid/app/ui/BaseActivity.kt b/app/src/main/java/me/gilo/woodroid/app/ui/BaseActivity.kt index 32fc067..f390c1b 100644 --- a/app/src/main/java/me/gilo/woodroid/app/ui/BaseActivity.kt +++ b/app/src/main/java/me/gilo/woodroid/app/ui/BaseActivity.kt @@ -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 diff --git a/app/src/main/java/me/gilo/woodroid/app/ui/MenuActivity.kt b/app/src/main/java/me/gilo/woodroid/app/ui/MenuActivity.kt index 95c73c9..e54fa72 100644 --- a/app/src/main/java/me/gilo/woodroid/app/ui/MenuActivity.kt +++ b/app/src/main/java/me/gilo/woodroid/app/ui/MenuActivity.kt @@ -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 diff --git a/app/src/main/java/me/gilo/woodroid/app/ui/WooDroidActivity.kt b/app/src/main/java/me/gilo/woodroid/app/ui/WooDroidActivity.kt index 894ff96..1d3346f 100644 --- a/app/src/main/java/me/gilo/woodroid/app/ui/WooDroidActivity.kt +++ b/app/src/main/java/me/gilo/woodroid/app/ui/WooDroidActivity.kt @@ -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 : 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 -> { diff --git a/app/src/main/java/me/gilo/woodroid/app/ui/checkout/CheckoutActivity.kt b/app/src/main/java/me/gilo/woodroid/app/ui/checkout/CheckoutActivity.kt index d8823e0..0c8bf9c 100644 --- a/app/src/main/java/me/gilo/woodroid/app/ui/checkout/CheckoutActivity.kt +++ b/app/src/main/java/me/gilo/woodroid/app/ui/checkout/CheckoutActivity.kt @@ -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.* diff --git a/app/src/main/java/me/gilo/woodroid/app/ui/coupon/CouponsActivity.kt b/app/src/main/java/me/gilo/woodroid/app/ui/coupon/CouponsActivity.kt index b47a989..04e3cea 100644 --- a/app/src/main/java/me/gilo/woodroid/app/ui/coupon/CouponsActivity.kt +++ b/app/src/main/java/me/gilo/woodroid/app/ui/coupon/CouponsActivity.kt @@ -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 diff --git a/app/src/main/java/me/gilo/woodroid/app/ui/customer/BasicCustomerDetailsActivity.kt b/app/src/main/java/me/gilo/woodroid/app/ui/customer/BasicCustomerDetailsActivity.kt index 073eea6..00b63a8 100644 --- a/app/src/main/java/me/gilo/woodroid/app/ui/customer/BasicCustomerDetailsActivity.kt +++ b/app/src/main/java/me/gilo/woodroid/app/ui/customer/BasicCustomerDetailsActivity.kt @@ -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 diff --git a/app/src/main/java/me/gilo/woodroid/app/ui/customer/BillingAddressActivity.kt b/app/src/main/java/me/gilo/woodroid/app/ui/customer/BillingAddressActivity.kt index 5340f02..e8d714d 100644 --- a/app/src/main/java/me/gilo/woodroid/app/ui/customer/BillingAddressActivity.kt +++ b/app/src/main/java/me/gilo/woodroid/app/ui/customer/BillingAddressActivity.kt @@ -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 diff --git a/app/src/main/java/me/gilo/woodroid/app/ui/customer/ProfileActivity.kt b/app/src/main/java/me/gilo/woodroid/app/ui/customer/ProfileActivity.kt index 21b1e53..793750f 100644 --- a/app/src/main/java/me/gilo/woodroid/app/ui/customer/ProfileActivity.kt +++ b/app/src/main/java/me/gilo/woodroid/app/ui/customer/ProfileActivity.kt @@ -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 diff --git a/app/src/main/java/me/gilo/woodroid/app/ui/customer/ShippingAddressActivity.kt b/app/src/main/java/me/gilo/woodroid/app/ui/customer/ShippingAddressActivity.kt index b8c1596..b18ad89 100644 --- a/app/src/main/java/me/gilo/woodroid/app/ui/customer/ShippingAddressActivity.kt +++ b/app/src/main/java/me/gilo/woodroid/app/ui/customer/ShippingAddressActivity.kt @@ -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 diff --git a/app/src/main/java/me/gilo/woodroid/app/ui/home/CategoryFragment.kt b/app/src/main/java/me/gilo/woodroid/app/ui/home/CategoryFragment.kt index c6c9b93..66c1ffc 100644 --- a/app/src/main/java/me/gilo/woodroid/app/ui/home/CategoryFragment.kt +++ b/app/src/main/java/me/gilo/woodroid/app/ui/home/CategoryFragment.kt @@ -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 -> { } diff --git a/app/src/main/java/me/gilo/woodroid/app/ui/home/HomeActivity.kt b/app/src/main/java/me/gilo/woodroid/app/ui/home/HomeActivity.kt index 314b688..1a52b00 100644 --- a/app/src/main/java/me/gilo/woodroid/app/ui/home/HomeActivity.kt +++ b/app/src/main/java/me/gilo/woodroid/app/ui/home/HomeActivity.kt @@ -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 diff --git a/app/src/main/java/me/gilo/woodroid/app/ui/home/HomeFragment.kt b/app/src/main/java/me/gilo/woodroid/app/ui/home/HomeFragment.kt index 91f83e2..c2ea6c5 100644 --- a/app/src/main/java/me/gilo/woodroid/app/ui/home/HomeFragment.kt +++ b/app/src/main/java/me/gilo/woodroid/app/ui/home/HomeFragment.kt @@ -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 -> { } diff --git a/app/src/main/java/me/gilo/woodroid/app/ui/home/ProfileFragment.kt b/app/src/main/java/me/gilo/woodroid/app/ui/home/ProfileFragment.kt index cf48c45..619bccb 100644 --- a/app/src/main/java/me/gilo/woodroid/app/ui/home/ProfileFragment.kt +++ b/app/src/main/java/me/gilo/woodroid/app/ui/home/ProfileFragment.kt @@ -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 diff --git a/app/src/main/java/me/gilo/woodroid/app/ui/onboarding/AnonymousSignInActivity.kt b/app/src/main/java/me/gilo/woodroid/app/ui/onboarding/AnonymousSignInActivity.kt index e6d6cc5..8802cb0 100644 --- a/app/src/main/java/me/gilo/woodroid/app/ui/onboarding/AnonymousSignInActivity.kt +++ b/app/src/main/java/me/gilo/woodroid/app/ui/onboarding/AnonymousSignInActivity.kt @@ -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 diff --git a/app/src/main/java/me/gilo/woodroid/app/ui/onboarding/SignInActivity.kt b/app/src/main/java/me/gilo/woodroid/app/ui/onboarding/SignInActivity.kt index a653206..67ea8e3 100644 --- a/app/src/main/java/me/gilo/woodroid/app/ui/onboarding/SignInActivity.kt +++ b/app/src/main/java/me/gilo/woodroid/app/ui/onboarding/SignInActivity.kt @@ -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 diff --git a/app/src/main/java/me/gilo/woodroid/app/ui/onboarding/SignUpActivity.kt b/app/src/main/java/me/gilo/woodroid/app/ui/onboarding/SignUpActivity.kt index ad4b093..a0e3c1d 100644 --- a/app/src/main/java/me/gilo/woodroid/app/ui/onboarding/SignUpActivity.kt +++ b/app/src/main/java/me/gilo/woodroid/app/ui/onboarding/SignUpActivity.kt @@ -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 diff --git a/app/src/main/java/me/gilo/woodroid/app/ui/onboarding/UserDetailsActivity.kt b/app/src/main/java/me/gilo/woodroid/app/ui/onboarding/UserDetailsActivity.kt index 94a20f0..8fd17c6 100644 --- a/app/src/main/java/me/gilo/woodroid/app/ui/onboarding/UserDetailsActivity.kt +++ b/app/src/main/java/me/gilo/woodroid/app/ui/onboarding/UserDetailsActivity.kt @@ -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.* diff --git a/app/src/main/java/me/gilo/woodroid/app/ui/order/MyOrdersActivity.kt b/app/src/main/java/me/gilo/woodroid/app/ui/order/MyOrdersActivity.kt index a0938a2..7d96808 100644 --- a/app/src/main/java/me/gilo/woodroid/app/ui/order/MyOrdersActivity.kt +++ b/app/src/main/java/me/gilo/woodroid/app/ui/order/MyOrdersActivity.kt @@ -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() { 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() { } 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() diff --git a/app/src/main/java/me/gilo/woodroid/app/ui/order/OrderActivity.kt b/app/src/main/java/me/gilo/woodroid/app/ui/order/OrderActivity.kt index c61300d..bb29a97 100644 --- a/app/src/main/java/me/gilo/woodroid/app/ui/order/OrderActivity.kt +++ b/app/src/main/java/me/gilo/woodroid/app/ui/order/OrderActivity.kt @@ -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() { 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() { } 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() { 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() diff --git a/app/src/main/java/me/gilo/woodroid/app/ui/product/CartActivity.kt b/app/src/main/java/me/gilo/woodroid/app/ui/product/CartActivity.kt index b0249ff..c8c3f32 100644 --- a/app/src/main/java/me/gilo/woodroid/app/ui/product/CartActivity.kt +++ b/app/src/main/java/me/gilo/woodroid/app/ui/product/CartActivity.kt @@ -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() { 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() { } 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() { 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() { } 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() { 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 -> { diff --git a/app/src/main/java/me/gilo/woodroid/app/ui/product/ProductActivity.kt b/app/src/main/java/me/gilo/woodroid/app/ui/product/ProductActivity.kt index ac6d990..fc86a2f 100644 --- a/app/src/main/java/me/gilo/woodroid/app/ui/product/ProductActivity.kt +++ b/app/src/main/java/me/gilo/woodroid/app/ui/product/ProductActivity.kt @@ -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 -> { diff --git a/app/src/main/java/me/gilo/woodroid/app/ui/product/ProductSearchActivity.kt b/app/src/main/java/me/gilo/woodroid/app/ui/product/ProductSearchActivity.kt index d499d6f..6f79c6d 100644 --- a/app/src/main/java/me/gilo/woodroid/app/ui/product/ProductSearchActivity.kt +++ b/app/src/main/java/me/gilo/woodroid/app/ui/product/ProductSearchActivity.kt @@ -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") diff --git a/app/src/main/java/me/gilo/woodroid/app/ui/product/ShopActivity.kt b/app/src/main/java/me/gilo/woodroid/app/ui/product/ShopActivity.kt index 2784b9a..1bfb2ea 100644 --- a/app/src/main/java/me/gilo/woodroid/app/ui/product/ShopActivity.kt +++ b/app/src/main/java/me/gilo/woodroid/app/ui/product/ShopActivity.kt @@ -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 -> { diff --git a/app/src/main/java/me/gilo/woodroid/app/ui/product/section/AddAReviewDialogFragment.kt b/app/src/main/java/me/gilo/woodroid/app/ui/product/section/AddAReviewDialogFragment.kt index e295252..113afee 100644 --- a/app/src/main/java/me/gilo/woodroid/app/ui/product/section/AddAReviewDialogFragment.kt +++ b/app/src/main/java/me/gilo/woodroid/app/ui/product/section/AddAReviewDialogFragment.kt @@ -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 diff --git a/app/src/main/java/me/gilo/woodroid/app/ui/product/section/ProductReviewsFragment.kt b/app/src/main/java/me/gilo/woodroid/app/ui/product/section/ProductReviewsFragment.kt index f99b5ee..50fcf66 100644 --- a/app/src/main/java/me/gilo/woodroid/app/ui/product/section/ProductReviewsFragment.kt +++ b/app/src/main/java/me/gilo/woodroid/app/ui/product/section/ProductReviewsFragment.kt @@ -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 -> { diff --git a/app/src/main/java/me/gilo/woodroid/app/ui/product/section/RelatedProductsFragment.kt b/app/src/main/java/me/gilo/woodroid/app/ui/product/section/RelatedProductsFragment.kt index 251b32f..c42640a 100644 --- a/app/src/main/java/me/gilo/woodroid/app/ui/product/section/RelatedProductsFragment.kt +++ b/app/src/main/java/me/gilo/woodroid/app/ui/product/section/RelatedProductsFragment.kt @@ -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 -> { diff --git a/app/src/main/java/me/gilo/woodroid/app/ui/state/ProgressDialogFragment.java b/app/src/main/java/me/gilo/woodroid/app/ui/state/ProgressDialogFragment.java index a7963ca..1438d3d 100644 --- a/app/src/main/java/me/gilo/woodroid/app/ui/state/ProgressDialogFragment.java +++ b/app/src/main/java/me/gilo/woodroid/app/ui/state/ProgressDialogFragment.java @@ -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; diff --git a/app/src/main/java/me/gilo/woodroid/app/utils/AppUtils.java b/app/src/main/java/me/gilo/woodroid/app/utils/AppUtils.java index e668774..4414225 100644 --- a/app/src/main/java/me/gilo/woodroid/app/utils/AppUtils.java +++ b/app/src/main/java/me/gilo/woodroid/app/utils/AppUtils.java @@ -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; diff --git a/app/src/main/java/me/gilo/woodroid/app/utils/RecyclerItemClickListener.java b/app/src/main/java/me/gilo/woodroid/app/utils/RecyclerItemClickListener.java index 2ae6ceb..f55c725 100644 --- a/app/src/main/java/me/gilo/woodroid/app/utils/RecyclerItemClickListener.java +++ b/app/src/main/java/me/gilo/woodroid/app/utils/RecyclerItemClickListener.java @@ -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; diff --git a/app/src/main/java/me/gilo/woodroid/app/utils/ViewModelFactory.java b/app/src/main/java/me/gilo/woodroid/app/utils/ViewModelFactory.java index 6a26949..2a2136e 100644 --- a/app/src/main/java/me/gilo/woodroid/app/utils/ViewModelFactory.java +++ b/app/src/main/java/me/gilo/woodroid/app/utils/ViewModelFactory.java @@ -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; diff --git a/app/src/main/java/me/gilo/woodroid/app/viewmodels/CartViewModel.java b/app/src/main/java/me/gilo/woodroid/app/viewmodels/CartViewModel.java index 02e7a5e..ff93ab6 100644 --- a/app/src/main/java/me/gilo/woodroid/app/viewmodels/CartViewModel.java +++ b/app/src/main/java/me/gilo/woodroid/app/viewmodels/CartViewModel.java @@ -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; diff --git a/app/src/main/java/me/gilo/woodroid/app/viewmodels/CategoryViewModel.java b/app/src/main/java/me/gilo/woodroid/app/viewmodels/CategoryViewModel.java index 3655530..1325eeb 100644 --- a/app/src/main/java/me/gilo/woodroid/app/viewmodels/CategoryViewModel.java +++ b/app/src/main/java/me/gilo/woodroid/app/viewmodels/CategoryViewModel.java @@ -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; diff --git a/app/src/main/java/me/gilo/woodroid/app/viewmodels/CustomerViewModel.java b/app/src/main/java/me/gilo/woodroid/app/viewmodels/CustomerViewModel.java index 39d0699..4eded15 100644 --- a/app/src/main/java/me/gilo/woodroid/app/viewmodels/CustomerViewModel.java +++ b/app/src/main/java/me/gilo/woodroid/app/viewmodels/CustomerViewModel.java @@ -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; diff --git a/app/src/main/java/me/gilo/woodroid/app/viewmodels/OrderViewModel.java b/app/src/main/java/me/gilo/woodroid/app/viewmodels/OrderViewModel.java index 930c824..707d445 100644 --- a/app/src/main/java/me/gilo/woodroid/app/viewmodels/OrderViewModel.java +++ b/app/src/main/java/me/gilo/woodroid/app/viewmodels/OrderViewModel.java @@ -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; diff --git a/app/src/main/java/me/gilo/woodroid/app/viewmodels/ProductViewModel.java b/app/src/main/java/me/gilo/woodroid/app/viewmodels/ProductViewModel.java index 85367ff..a18c9f1 100644 --- a/app/src/main/java/me/gilo/woodroid/app/viewmodels/ProductViewModel.java +++ b/app/src/main/java/me/gilo/woodroid/app/viewmodels/ProductViewModel.java @@ -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; diff --git a/app/src/main/java/me/gilo/woodroid/app/viewmodels/ReviewViewModel.java b/app/src/main/java/me/gilo/woodroid/app/viewmodels/ReviewViewModel.java index bfb8283..f0f58bb 100644 --- a/app/src/main/java/me/gilo/woodroid/app/viewmodels/ReviewViewModel.java +++ b/app/src/main/java/me/gilo/woodroid/app/viewmodels/ReviewViewModel.java @@ -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; diff --git a/app/src/main/java/me/gilo/woodroid/app/viewmodels/UserViewModel.java b/app/src/main/java/me/gilo/woodroid/app/viewmodels/UserViewModel.java index 751295c..c97a6f4 100644 --- a/app/src/main/java/me/gilo/woodroid/app/viewmodels/UserViewModel.java +++ b/app/src/main/java/me/gilo/woodroid/app/viewmodels/UserViewModel.java @@ -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; diff --git a/app/src/main/res/drawable-xxhdpi/baseline_arrow_back_24.xml b/app/src/main/res/drawable-xxhdpi/baseline_arrow_back_24.xml new file mode 100755 index 0000000..b3037c4 --- /dev/null +++ b/app/src/main/res/drawable-xxhdpi/baseline_arrow_back_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/layout/activity_add_coupon.xml b/app/src/main/res/layout/activity_add_coupon.xml index df65874..04be244 100644 --- a/app/src/main/res/layout/activity_add_coupon.xml +++ b/app/src/main/res/layout/activity_add_coupon.xml @@ -1,5 +1,5 @@ - - - - + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_anonymous_sign_in.xml b/app/src/main/res/layout/activity_anonymous_sign_in.xml index 5e42fea..54b30fd 100644 --- a/app/src/main/res/layout/activity_anonymous_sign_in.xml +++ b/app/src/main/res/layout/activity_anonymous_sign_in.xml @@ -1,5 +1,5 @@ - - - - + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_basic_customer_details.xml b/app/src/main/res/layout/activity_basic_customer_details.xml index 3e6d153..e98346d 100644 --- a/app/src/main/res/layout/activity_basic_customer_details.xml +++ b/app/src/main/res/layout/activity_basic_customer_details.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_billing_address.xml b/app/src/main/res/layout/activity_billing_address.xml index 621940b..2d2030e 100644 --- a/app/src/main/res/layout/activity_billing_address.xml +++ b/app/src/main/res/layout/activity_billing_address.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_cart.xml b/app/src/main/res/layout/activity_cart.xml index 6dc6b29..e50433a 100644 --- a/app/src/main/res/layout/activity_cart.xml +++ b/app/src/main/res/layout/activity_cart.xml @@ -1,25 +1,25 @@ - + > - - - + @@ -58,7 +58,7 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_checkout.xml b/app/src/main/res/layout/activity_checkout.xml index fa6b1a4..daee98c 100644 --- a/app/src/main/res/layout/activity_checkout.xml +++ b/app/src/main/res/layout/activity_checkout.xml @@ -1,5 +1,5 @@ - - - - + - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_coupon.xml b/app/src/main/res/layout/activity_coupon.xml index e7e1232..905a403 100644 --- a/app/src/main/res/layout/activity_coupon.xml +++ b/app/src/main/res/layout/activity_coupon.xml @@ -1,5 +1,5 @@ - - - - + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_coupons.xml b/app/src/main/res/layout/activity_coupons.xml index 5f2b3ea..e899c36 100644 --- a/app/src/main/res/layout/activity_coupons.xml +++ b/app/src/main/res/layout/activity_coupons.xml @@ -1,5 +1,5 @@ - - - - + - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml index ccfba34..b8a0590 100644 --- a/app/src/main/res/layout/activity_home.xml +++ b/app/src/main/res/layout/activity_home.xml @@ -7,12 +7,12 @@ android:orientation="vertical" tools:context=".app.ui.home.HomeActivity"> - - - + - - @@ -41,4 +40,4 @@ app:layout_constraintTop_toBottomOf="@+id/imageView2"/> - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_menu.xml b/app/src/main/res/layout/activity_menu.xml index 261f3dd..abe397b 100644 --- a/app/src/main/res/layout/activity_menu.xml +++ b/app/src/main/res/layout/activity_menu.xml @@ -1,5 +1,5 @@ - - - - + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_my_orders.xml b/app/src/main/res/layout/activity_my_orders.xml index aa678b3..e222583 100644 --- a/app/src/main/res/layout/activity_my_orders.xml +++ b/app/src/main/res/layout/activity_my_orders.xml @@ -1,5 +1,5 @@ - - - - + @@ -58,7 +58,7 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_order.xml b/app/src/main/res/layout/activity_order.xml index 9d38be6..a1fa1a2 100644 --- a/app/src/main/res/layout/activity_order.xml +++ b/app/src/main/res/layout/activity_order.xml @@ -1,5 +1,5 @@ - - - - + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_product.xml b/app/src/main/res/layout/activity_product.xml index 23e725d..94c9506 100644 --- a/app/src/main/res/layout/activity_product.xml +++ b/app/src/main/res/layout/activity_product.xml @@ -1,5 +1,5 @@ - - - - + @@ -41,17 +41,17 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_product_search.xml b/app/src/main/res/layout/activity_product_search.xml index 737c1b4..150994b 100644 --- a/app/src/main/res/layout/activity_product_search.xml +++ b/app/src/main/res/layout/activity_product_search.xml @@ -1,5 +1,5 @@ - - - - + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_profile.xml b/app/src/main/res/layout/activity_profile.xml index c6f8f72..e447924 100644 --- a/app/src/main/res/layout/activity_profile.xml +++ b/app/src/main/res/layout/activity_profile.xml @@ -1,5 +1,5 @@ - - - - + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_shipping_address.xml b/app/src/main/res/layout/activity_shipping_address.xml index c54380a..f059dc8 100644 --- a/app/src/main/res/layout/activity_shipping_address.xml +++ b/app/src/main/res/layout/activity_shipping_address.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_shop.xml b/app/src/main/res/layout/activity_shop.xml index bc390f4..1233c0a 100644 --- a/app/src/main/res/layout/activity_shop.xml +++ b/app/src/main/res/layout/activity_shop.xml @@ -1,5 +1,5 @@ - - - - - + - + - + - + diff --git a/app/src/main/res/layout/activity_sign_in.xml b/app/src/main/res/layout/activity_sign_in.xml index 3b7e70c..f557df2 100644 --- a/app/src/main/res/layout/activity_sign_in.xml +++ b/app/src/main/res/layout/activity_sign_in.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_sign_up.xml b/app/src/main/res/layout/activity_sign_up.xml index 41ae094..79b7ef5 100644 --- a/app/src/main/res/layout/activity_sign_up.xml +++ b/app/src/main/res/layout/activity_sign_up.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_user_details.xml b/app/src/main/res/layout/activity_user_details.xml index 07c92bb..e423dfe 100644 --- a/app/src/main/res/layout/activity_user_details.xml +++ b/app/src/main/res/layout/activity_user_details.xml @@ -1,5 +1,5 @@ - - - - + - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/content_add_coupon.xml b/app/src/main/res/layout/content_add_coupon.xml index 60b8717..f67d003 100644 --- a/app/src/main/res/layout/content_add_coupon.xml +++ b/app/src/main/res/layout/content_add_coupon.xml @@ -11,7 +11,7 @@ app:layout_behavior="@string/appbar_scrolling_view_behavior" > - @@ -24,7 +24,7 @@ android:background="@drawable/rect_white" android:orientation="vertical"> - - - +