diff --git a/Cart/.gitignore b/Cart/.gitignore new file mode 100644 index 00000000..603b1407 --- /dev/null +++ b/Cart/.gitignore @@ -0,0 +1,14 @@ +*.iml +.gradle +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +/build +/captures +.externalNativeBuild +.cxx diff --git a/Cart/.idea/codeStyles/Project.xml b/Cart/.idea/codeStyles/Project.xml new file mode 100644 index 00000000..88ea3aa1 --- /dev/null +++ b/Cart/.idea/codeStyles/Project.xml @@ -0,0 +1,122 @@ + + + + + + + + + +
+ + + + xmlns:android + + ^$ + + + +
+
+ + + + xmlns:.* + + ^$ + + + BY_NAME + +
+
+ + + + .*:id + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + .*:name + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + name + + ^$ + + + +
+
+ + + + style + + ^$ + + + +
+
+ + + + .* + + ^$ + + + BY_NAME + +
+
+ + + + .* + + http://schemas.android.com/apk/res/android + + + ANDROID_ATTRIBUTE_ORDER + +
+
+ + + + .* + + .* + + + BY_NAME + +
+ + + + + + + \ No newline at end of file diff --git a/Cart/.idea/codeStyles/codeStyleConfig.xml b/Cart/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 00000000..79ee123c --- /dev/null +++ b/Cart/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/Cart/.idea/gradle.xml b/Cart/.idea/gradle.xml new file mode 100644 index 00000000..5cd135a0 --- /dev/null +++ b/Cart/.idea/gradle.xml @@ -0,0 +1,20 @@ + + + + + + + \ No newline at end of file diff --git a/Cart/.idea/misc.xml b/Cart/.idea/misc.xml new file mode 100644 index 00000000..37a75096 --- /dev/null +++ b/Cart/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/Cart/.idea/runConfigurations.xml b/Cart/.idea/runConfigurations.xml new file mode 100644 index 00000000..7f68460d --- /dev/null +++ b/Cart/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/Cart/.idea/vcs.xml b/Cart/.idea/vcs.xml new file mode 100644 index 00000000..6c0b8635 --- /dev/null +++ b/Cart/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Cart/app/.gitignore b/Cart/app/.gitignore new file mode 100644 index 00000000..796b96d1 --- /dev/null +++ b/Cart/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/Cart/app/build.gradle b/Cart/app/build.gradle new file mode 100644 index 00000000..3cf88a17 --- /dev/null +++ b/Cart/app/build.gradle @@ -0,0 +1,64 @@ +apply plugin: 'com.android.application' +apply plugin: 'kotlin-android' +apply plugin: 'kotlin-android-extensions' +apply plugin: "kotlin-kapt" + +android { + compileSdkVersion 29 + buildToolsVersion "29.0.3" + + defaultConfig { + applicationId "br.com.cart" + minSdkVersion 21 + targetSdkVersion 29 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + +} + +dependencies { + def nav_version = "2.3.0-alpha05" + def lifecycle_version = "2.2.0" + def room_version = "2.2.5" + + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.core:core-ktx:1.3.0' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + //Material Components + implementation 'com.google.android.material:material:1.1.0' + //Navigation + implementation "androidx.navigation:navigation-fragment-ktx:$nav_version" + implementation "androidx.navigation:navigation-ui-ktx:$nav_version" + // ViewModel + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" + // LiveData + implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version" + //Room database + implementation "androidx.room:room-runtime:$room_version" + kapt "androidx.room:room-compiler:$room_version" + //Retrofit + implementation 'com.squareup.retrofit2:retrofit:2.6.0' + implementation 'com.squareup.retrofit2:converter-gson:2.6.0' + //Koin + implementation 'org.koin:koin-android-viewmodel:1.0.2' + //Glide + implementation 'com.github.bumptech.glide:glide:4.4.0' + kapt 'com.github.bumptech.glide:compiler:4.4.0' + + testImplementation 'junit:junit:4.12' + androidTestImplementation 'androidx.test.ext:junit:1.1.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' + implementation 'androidx.recyclerview:recyclerview:1.1.0' +} diff --git a/Cart/app/proguard-rules.pro b/Cart/app/proguard-rules.pro new file mode 100644 index 00000000..f1b42451 --- /dev/null +++ b/Cart/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile diff --git a/Cart/app/src/androidTest/java/br/com/cart/ExampleInstrumentedTest.kt b/Cart/app/src/androidTest/java/br/com/cart/ExampleInstrumentedTest.kt new file mode 100644 index 00000000..5d446585 --- /dev/null +++ b/Cart/app/src/androidTest/java/br/com/cart/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package br.com.cart + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("br.com.cart", appContext.packageName) + } +} diff --git a/Cart/app/src/main/AndroidManifest.xml b/Cart/app/src/main/AndroidManifest.xml new file mode 100644 index 00000000..0e3f1527 --- /dev/null +++ b/Cart/app/src/main/AndroidManifest.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Cart/app/src/main/java/br/com/cart/MyApplication.kt b/Cart/app/src/main/java/br/com/cart/MyApplication.kt new file mode 100644 index 00000000..73dc50b7 --- /dev/null +++ b/Cart/app/src/main/java/br/com/cart/MyApplication.kt @@ -0,0 +1,16 @@ +package br.com.cart + +import android.app.Application +import br.com.cart.di.DependencyModules +import org.koin.android.ext.android.startKoin + +class MyApplication: Application() { + + override fun onCreate() { + super.onCreate() + + startKoin(this, listOf(DependencyModules.appModule)) + + } + +} \ No newline at end of file diff --git a/Cart/app/src/main/java/br/com/cart/api/CartService.kt b/Cart/app/src/main/java/br/com/cart/api/CartService.kt new file mode 100644 index 00000000..8d0f2f14 --- /dev/null +++ b/Cart/app/src/main/java/br/com/cart/api/CartService.kt @@ -0,0 +1,12 @@ +package br.com.cart.api + +import br.com.cart.model.Product +import retrofit2.Call +import retrofit2.http.GET + +interface CartService { + + @GET("myfreecomm/desafio-mobile-android/master/api/data.json") + fun getProducts(): Call> + +} \ No newline at end of file diff --git a/Cart/app/src/main/java/br/com/cart/di/DependencyModules.kt b/Cart/app/src/main/java/br/com/cart/di/DependencyModules.kt new file mode 100644 index 00000000..c79ba69a --- /dev/null +++ b/Cart/app/src/main/java/br/com/cart/di/DependencyModules.kt @@ -0,0 +1,21 @@ +package br.com.cart.di + +import br.com.cart.model.ProductManager +import br.com.cart.utils.Network +import br.com.cart.viewmodel.CartViewModel +import org.koin.android.viewmodel.ext.koin.viewModel +import org.koin.dsl.module.module + +object DependencyModules { + + val appModule = module { + + single { Network() } + + single { ProductManager(get()) } + + viewModel { CartViewModel(get()) } + + } + +} \ No newline at end of file diff --git a/Cart/app/src/main/java/br/com/cart/model/Product.kt b/Cart/app/src/main/java/br/com/cart/model/Product.kt new file mode 100644 index 00000000..4aee9a54 --- /dev/null +++ b/Cart/app/src/main/java/br/com/cart/model/Product.kt @@ -0,0 +1,7 @@ +package br.com.cart.model + +import java.io.Serializable + +class Product(val name: String, val quantity: Int, val stock: Int, val image_url: String, val price: Double, val tax: Double, val shipping: Int, val description: String ): Serializable { + +} \ No newline at end of file diff --git a/Cart/app/src/main/java/br/com/cart/model/ProductManager.kt b/Cart/app/src/main/java/br/com/cart/model/ProductManager.kt new file mode 100644 index 00000000..51a8682c --- /dev/null +++ b/Cart/app/src/main/java/br/com/cart/model/ProductManager.kt @@ -0,0 +1,14 @@ +package br.com.cart.model + +import br.com.cart.utils.Network +import retrofit2.Callback + +class ProductManager(private val network: Network) { + + fun getProducts(callback: Callback>){ + val cartService = network.cartService() + val call = cartService.getProducts() + call.enqueue(callback) + } + +} \ No newline at end of file diff --git a/Cart/app/src/main/java/br/com/cart/utils/CartHelper.kt b/Cart/app/src/main/java/br/com/cart/utils/CartHelper.kt new file mode 100644 index 00000000..c7415c17 --- /dev/null +++ b/Cart/app/src/main/java/br/com/cart/utils/CartHelper.kt @@ -0,0 +1,26 @@ +package br.com.cart.utils + +import java.math.RoundingMode +import java.text.DecimalFormat +import kotlin.math.round + +class CartHelper { + + fun formatValue(value: Double): String{ + val df = DecimalFormat("0.00") + return "$" + df.format(value) + } + + fun getStockLabel(quantity: Int): String { + return if (quantity > 0){ + if (quantity == 1){ + "only 1 left in stock" + }else{ + "in stock" + } + }else{ + "out of stock" + } + } + +} \ No newline at end of file diff --git a/Cart/app/src/main/java/br/com/cart/utils/Network.kt b/Cart/app/src/main/java/br/com/cart/utils/Network.kt new file mode 100644 index 00000000..806a73a5 --- /dev/null +++ b/Cart/app/src/main/java/br/com/cart/utils/Network.kt @@ -0,0 +1,17 @@ +package br.com.cart.utils + +import br.com.cart.api.CartService +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory + +class Network { + + companion object { + const val CART_BASE_URL = "https://raw.githubusercontent.com/" + } + + private val cartRetrofit = Retrofit.Builder().baseUrl(CART_BASE_URL).addConverterFactory(GsonConverterFactory.create()).build() + + fun cartService(): CartService = cartRetrofit.create(CartService::class.java) + +} \ No newline at end of file diff --git a/Cart/app/src/main/java/br/com/cart/view/activity/DetailsActivity.kt b/Cart/app/src/main/java/br/com/cart/view/activity/DetailsActivity.kt new file mode 100644 index 00000000..c9bac79f --- /dev/null +++ b/Cart/app/src/main/java/br/com/cart/view/activity/DetailsActivity.kt @@ -0,0 +1,54 @@ +package br.com.cart.view.activity + +import android.os.Bundle +import android.view.MenuItem +import androidx.appcompat.app.AppCompatActivity +import br.com.cart.R +import br.com.cart.model.Product +import br.com.cart.utils.CartHelper +import com.bumptech.glide.Glide +import kotlinx.android.synthetic.main.activity_details.* + +class DetailsActivity : AppCompatActivity() { + + companion object { + private const val PRODUCT_EXTRA = "product" + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_details) + + val actionbar = supportActionBar + //Actionbar title + actionbar!!.title = "Product details" + //Back button + actionbar.setDisplayHomeAsUpEnabled(true) + actionbar.setDisplayHomeAsUpEnabled(true) + + val product: Product = intent.getSerializableExtra(PRODUCT_EXTRA) as Product + + fillInformation(product) + + } + + override fun onOptionsItemSelected(item: MenuItem): Boolean { + when (item.itemId) { + android.R.id.home -> { + supportFinishAfterTransition() + return true + } + } + return super.onOptionsItemSelected(item) + } + + private fun fillInformation(product: Product) { + val cartHelper = CartHelper() + Glide.with(this).load(product.image_url).into(iv_product) + tv_name.text = product.name + tv_quantity_in_stock.text = cartHelper.getStockLabel(product.quantity) + tv_price.text = cartHelper.formatValue(product.price) + tv_description.text = product.description + } + +} diff --git a/Cart/app/src/main/java/br/com/cart/view/activity/MainActivity.kt b/Cart/app/src/main/java/br/com/cart/view/activity/MainActivity.kt new file mode 100644 index 00000000..8cf9ca99 --- /dev/null +++ b/Cart/app/src/main/java/br/com/cart/view/activity/MainActivity.kt @@ -0,0 +1,104 @@ +package br.com.cart.view.activity + +import android.content.Intent +import android.os.Bundle +import android.view.View +import android.widget.AdapterView +import androidx.appcompat.app.AppCompatActivity +import androidx.core.app.ActivityOptionsCompat +import androidx.core.view.ViewCompat +import androidx.recyclerview.widget.DividerItemDecoration +import androidx.recyclerview.widget.LinearLayoutManager +import br.com.cart.R +import br.com.cart.model.Product +import br.com.cart.utils.CartHelper +import br.com.cart.view.adapter.CartAdapter +import br.com.cart.view.adapter.RecyclerItemClickListener +import br.com.cart.viewmodel.CartViewModel +import kotlinx.android.synthetic.main.activity_main.* +import org.koin.android.viewmodel.ext.android.viewModel +import retrofit2.Call +import retrofit2.Callback +import retrofit2.Response + + +class MainActivity : AppCompatActivity() { + + companion object { + private const val PRODUCT_EXTRA = "product" + } + + private val cartViewModel: CartViewModel by viewModel() + + private val cartAdapter: CartAdapter by lazy{ CartAdapter() } + + private var productList = listOf() + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_main) + + recycler_view.adapter = cartAdapter + recycler_view.layoutManager = LinearLayoutManager(this) + + recycler_view.addItemDecoration(DividerItemDecoration(this, LinearLayoutManager.VERTICAL)) + + recycler_view.addOnItemTouchListener(RecyclerItemClickListener(this, recycler_view, object: RecyclerItemClickListener.OnItemClickListener{ + override fun onItemClick(view: View?, position: Int) { + //Call detail activity with transition + val iv = view!!.findViewById(R.id.iv_product) as View + val options: ActivityOptionsCompat = ActivityOptionsCompat.makeSceneTransitionAnimation(this@MainActivity, iv, ViewCompat.getTransitionName(iv).toString()) + startActivity(Intent(applicationContext, DetailsActivity::class.java).putExtra(PRODUCT_EXTRA, productList[position]), options.toBundle()) + } + + override fun onItemClick(p0: AdapterView<*>?, p1: View?, p2: Int, p3: Long) { + + } + + override fun onLongItemClick(view: View?, position: Int) { + + } + + })) + + getProducts() + + } + + private fun getProducts(){ + cartViewModel.getProducts(object: Callback>{ + override fun onFailure(call: Call>, t: Throwable) { + + } + + override fun onResponse(call: Call>, response: Response>) { + response.let { + productList = response.body()!! + cartAdapter.add(productList) + sunValues(productList) + } + } + + }) + } + + fun sunValues(productList: List){ + val total: Double; var subtotal = 0.0; var shipping = 0.0; var tax = 0.0 + for (item in productList){ + subtotal += item.price + shipping += item.shipping + tax += item.tax + } + total = subtotal + shipping + tax + + val cartHelper = CartHelper() + tv_total.text = cartHelper.formatValue(total) + tv_subtotal.text = cartHelper.formatValue(subtotal) + tv_shipping.text = cartHelper.formatValue(shipping) + tv_tax.text = cartHelper.formatValue(tax) + + tv_quantity_in_cart.text = "${cartAdapter.itemCount} items in your cart" + + } + +} diff --git a/Cart/app/src/main/java/br/com/cart/view/adapter/CartAdapter.kt b/Cart/app/src/main/java/br/com/cart/view/adapter/CartAdapter.kt new file mode 100644 index 00000000..d68345ac --- /dev/null +++ b/Cart/app/src/main/java/br/com/cart/view/adapter/CartAdapter.kt @@ -0,0 +1,41 @@ +package br.com.cart.view.adapter + +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.recyclerview.widget.RecyclerView +import br.com.cart.R +import br.com.cart.model.Product +import br.com.cart.utils.CartHelper +import com.bumptech.glide.Glide +import kotlinx.android.synthetic.main.cart_item_layout.view.* + +class CartViewHolder (private val view: View): RecyclerView.ViewHolder(view){ + private val cartHelper = CartHelper() + fun bindView(item: Product){ + with(view){ + Glide.with(context).load(item.image_url).into(iv_product) + tv_name.text = item.name + tv_quantity.text = cartHelper.getStockLabel(item.quantity) + tv_price.text = cartHelper.formatValue(item.price) + } + } +} + +class CartAdapter(private val data: MutableList = mutableListOf()): + RecyclerView.Adapter(){ + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): CartViewHolder { + val view = LayoutInflater.from(parent.context).inflate(R.layout.cart_item_layout, parent, false) + return CartViewHolder(view) + } + + override fun getItemCount(): Int = data.size + + override fun onBindViewHolder(holder: CartViewHolder, position: Int) = holder.bindView(data[position]) + + fun add(items: List){ + data.clear() + data.addAll(items) + notifyDataSetChanged() + } +} \ No newline at end of file diff --git a/Cart/app/src/main/java/br/com/cart/view/adapter/RecyclerItemClickListener.kt b/Cart/app/src/main/java/br/com/cart/view/adapter/RecyclerItemClickListener.kt new file mode 100644 index 00000000..ba1cebed --- /dev/null +++ b/Cart/app/src/main/java/br/com/cart/view/adapter/RecyclerItemClickListener.kt @@ -0,0 +1,46 @@ +package br.com.cart.view.adapter + +import android.content.Context +import android.view.GestureDetector +import android.view.GestureDetector.SimpleOnGestureListener +import android.view.MotionEvent +import android.view.View +import android.widget.AdapterView +import androidx.recyclerview.widget.RecyclerView + + +class RecyclerItemClickListener(context: Context, val recyclerView: RecyclerView, listener: OnItemClickListener) : RecyclerView.OnItemTouchListener { + + private var mListener: OnItemClickListener? = listener + var mGestureDetector: GestureDetector? = GestureDetector(context, object : SimpleOnGestureListener() { + override fun onSingleTapUp(e: MotionEvent): Boolean { + return true + } + + override fun onLongPress(e: MotionEvent) { + val child: View? = recyclerView.findChildViewUnder(e.x, e.y) + if (child != null && mListener != null) { + mListener!!.onLongItemClick(child, recyclerView.getChildAdapterPosition(child)) + } + } + }) + + override fun onTouchEvent(rv: RecyclerView, e: MotionEvent) {} + + override fun onInterceptTouchEvent(rv: RecyclerView, e: MotionEvent): Boolean { + val childView: View? = rv.findChildViewUnder(e.x, e.y) + if (childView != null && mListener != null && mGestureDetector!!.onTouchEvent(e)) { + mListener!!.onItemClick(childView, rv.getChildAdapterPosition(childView)) + return true + } + return false + } + + override fun onRequestDisallowInterceptTouchEvent(disallowIntercept: Boolean) {} + + interface OnItemClickListener : AdapterView.OnItemClickListener { + fun onItemClick(view: View?, position: Int) + fun onLongItemClick(view: View?, position: Int) + } + +} \ No newline at end of file diff --git a/Cart/app/src/main/java/br/com/cart/viewmodel/CartViewModel.kt b/Cart/app/src/main/java/br/com/cart/viewmodel/CartViewModel.kt new file mode 100644 index 00000000..fd0fbec8 --- /dev/null +++ b/Cart/app/src/main/java/br/com/cart/viewmodel/CartViewModel.kt @@ -0,0 +1,14 @@ +package br.com.cart.viewmodel + +import androidx.lifecycle.ViewModel +import br.com.cart.model.Product +import br.com.cart.model.ProductManager +import retrofit2.Callback +import java.math.RoundingMode +import java.text.DecimalFormat + +class CartViewModel(private val productManager: ProductManager): ViewModel() { + + fun getProducts(callback: Callback>) = productManager.getProducts(callback) + +} \ No newline at end of file diff --git a/Cart/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/Cart/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 00000000..2b068d11 --- /dev/null +++ b/Cart/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/Cart/app/src/main/res/drawable/ic_close_black_24dp.xml b/Cart/app/src/main/res/drawable/ic_close_black_24dp.xml new file mode 100644 index 00000000..0c8775c4 --- /dev/null +++ b/Cart/app/src/main/res/drawable/ic_close_black_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/Cart/app/src/main/res/drawable/ic_launcher_background.xml b/Cart/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 00000000..07d5da9c --- /dev/null +++ b/Cart/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Cart/app/src/main/res/layout/activity_details.xml b/Cart/app/src/main/res/layout/activity_details.xml new file mode 100644 index 00000000..a5cecc6b --- /dev/null +++ b/Cart/app/src/main/res/layout/activity_details.xml @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + +