From 909d6e543337165996ad0638a84f4032fc91e414 Mon Sep 17 00:00:00 2001 From: Husain Albayouk Date: Tue, 20 Apr 2021 13:46:25 +0300 Subject: [PATCH] Updated to the latest libraries version used View binding instead of synthetic as kotlin-android-extensions is deprecated updated the import from kotlinx.android.parcel.Parcelize to kotlinx.parcelize.Parcelize optimized the imports --- .gitignore | 15 +++ app/build.gradle | 58 +++++------ .../tamara/example/ExampleInstrumentedTest.kt | 6 +- .../java/co/tamara/example/model/EAddress.kt | 2 +- .../java/co/tamara/example/model/EAmount.kt | 2 +- .../java/co/tamara/example/model/EConsumer.kt | 2 +- .../java/co/tamara/example/model/EDiscount.kt | 2 +- .../java/co/tamara/example/model/EItem.kt | 4 +- .../co/tamara/example/ui/CheckoutFragment.kt | 49 ++++++---- .../co/tamara/example/ui/ConsumerFragment.kt | 38 +++++--- .../co/tamara/example/ui/ConsumerViewModel.kt | 1 - .../example/ui/ShippingAddressFragment.kt | 95 ++++++++++++------- .../java/co/tamara/example/ui/ShopFragment.kt | 80 ++++++++++------ .../example/viewmodel/ViewModelFactory.kt | 1 - .../res/layout/fragment_shipping_address.xml | 1 - app/src/main/res/values/strings.xml | 10 -- .../java/co/tamara/example/ExampleUnitTest.kt | 3 +- build.gradle | 7 +- gradle/wrapper/gradle-wrapper.properties | 4 +- 19 files changed, 231 insertions(+), 149 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..aa724b7 --- /dev/null +++ b/.gitignore @@ -0,0 +1,15 @@ +*.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 +local.properties diff --git a/app/build.gradle b/app/build.gradle index bce03c7..5f21ab2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,20 +1,26 @@ -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' -apply plugin: 'kotlin-kapt' +plugins { + id 'com.android.application' + id 'kotlin-android' + id 'kotlin-parcelize' + id 'kotlin-kapt' +} + android { - compileSdkVersion 29 - buildToolsVersion "29.0.3" + compileSdkVersion 30 + buildToolsVersion "30.0.2" defaultConfig { applicationId "co.tamara.example" minSdkVersion 16 - targetSdkVersion 29 + targetSdkVersion 30 versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } + buildFeatures { + viewBinding true + } buildTypes { debug { @@ -22,9 +28,6 @@ android { } } - androidExtensions { - experimental = true - } compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 @@ -40,31 +43,30 @@ repositories { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32' implementation 'androidx.appcompat:appcompat:1.2.0' implementation 'androidx.core:core-ktx:1.3.2' - implementation 'androidx.constraintlayout:constraintlayout:2.0.2' + implementation 'androidx.constraintlayout:constraintlayout:2.0.4' implementation 'com.google.code.gson:gson:2.8.6' - implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.0-beta01' - implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.3.0-beta01' - implementation "androidx.room:room-runtime:2.2.5" - implementation "androidx.room:room-ktx:2.2.5" - implementation "androidx.navigation:navigation-fragment-ktx:2.3.1" - implementation "androidx.navigation:navigation-ui-ktx:2.3.1" - implementation 'androidx.legacy:legacy-support-v4:1.0.0' + implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0-alpha01' + implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.4.0-alpha01' + implementation "androidx.room:room-runtime:2.2.6" + implementation "androidx.room:room-ktx:2.2.6" + implementation "androidx.navigation:navigation-fragment-ktx:2.3.5" + implementation "androidx.navigation:navigation-ui-ktx:2.3.5" implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' - kapt "androidx.room:room-compiler:2.2.5" - testImplementation 'junit:junit:4.12' + kapt "androidx.room:room-compiler:2.2.6" + testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.2' androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' //For using sdk - implementation (name:'tamara-sdk', ext:'aar') - implementation 'com.google.dagger:dagger-android-support:2.27' - implementation "com.google.dagger:dagger:2.27" - implementation 'com.squareup.retrofit2:retrofit:2.7.2' - implementation 'com.squareup.retrofit2:converter-gson:2.7.2' + implementation(name: 'tamara-sdk', ext: 'aar') + implementation 'com.google.dagger:dagger-android-support:2.29.1' + implementation "com.google.dagger:dagger:2.29.1" + implementation 'com.squareup.retrofit2:retrofit:2.9.0' + implementation 'com.squareup.retrofit2:converter-gson:2.9.0' implementation "com.squareup.okhttp3:logging-interceptor:4.0.1" - kapt 'com.google.dagger:dagger-compiler:2.27' - kapt 'com.google.dagger:dagger-android-processor:2.27' + kapt 'com.google.dagger:dagger-compiler:2.29.1' + kapt 'com.google.dagger:dagger-android-processor:2.29.1' } diff --git a/app/src/androidTest/java/co/tamara/example/ExampleInstrumentedTest.kt b/app/src/androidTest/java/co/tamara/example/ExampleInstrumentedTest.kt index c486c21..a77c7d0 100644 --- a/app/src/androidTest/java/co/tamara/example/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/java/co/tamara/example/ExampleInstrumentedTest.kt @@ -1,13 +1,11 @@ package co.tamara.example -import androidx.test.platform.app.InstrumentationRegistry import androidx.test.ext.junit.runners.AndroidJUnit4 - +import androidx.test.platform.app.InstrumentationRegistry +import org.junit.Assert.assertEquals import org.junit.Test import org.junit.runner.RunWith -import org.junit.Assert.* - /** * Instrumented test, which will execute on an Android device. * diff --git a/app/src/main/java/co/tamara/example/model/EAddress.kt b/app/src/main/java/co/tamara/example/model/EAddress.kt index 92acfc6..f669eb0 100644 --- a/app/src/main/java/co/tamara/example/model/EAddress.kt +++ b/app/src/main/java/co/tamara/example/model/EAddress.kt @@ -4,7 +4,7 @@ import android.os.Parcelable import androidx.room.Entity import androidx.room.PrimaryKey import com.google.gson.annotations.SerializedName -import kotlinx.android.parcel.Parcelize +import kotlinx.parcelize.Parcelize @Parcelize @Entity( diff --git a/app/src/main/java/co/tamara/example/model/EAmount.kt b/app/src/main/java/co/tamara/example/model/EAmount.kt index daa02e9..2e79ebe 100644 --- a/app/src/main/java/co/tamara/example/model/EAmount.kt +++ b/app/src/main/java/co/tamara/example/model/EAmount.kt @@ -1,7 +1,7 @@ package co.tamara.example.model import android.os.Parcelable -import kotlinx.android.parcel.Parcelize +import kotlinx.parcelize.Parcelize import java.text.NumberFormat import java.util.* diff --git a/app/src/main/java/co/tamara/example/model/EConsumer.kt b/app/src/main/java/co/tamara/example/model/EConsumer.kt index 3f52a15..a94989f 100644 --- a/app/src/main/java/co/tamara/example/model/EConsumer.kt +++ b/app/src/main/java/co/tamara/example/model/EConsumer.kt @@ -2,7 +2,7 @@ package co.tamara.example.model import android.os.Parcelable import com.google.gson.annotations.SerializedName -import kotlinx.android.parcel.Parcelize +import kotlinx.parcelize.Parcelize @Parcelize data class EConsumer( diff --git a/app/src/main/java/co/tamara/example/model/EDiscount.kt b/app/src/main/java/co/tamara/example/model/EDiscount.kt index aab4968..7d671a9 100644 --- a/app/src/main/java/co/tamara/example/model/EDiscount.kt +++ b/app/src/main/java/co/tamara/example/model/EDiscount.kt @@ -1,7 +1,7 @@ package co.tamara.example.model import android.os.Parcelable -import kotlinx.android.parcel.Parcelize +import kotlinx.parcelize.Parcelize @Parcelize data class EDiscount( diff --git a/app/src/main/java/co/tamara/example/model/EItem.kt b/app/src/main/java/co/tamara/example/model/EItem.kt index 81a2b6d..65cfbb4 100644 --- a/app/src/main/java/co/tamara/example/model/EItem.kt +++ b/app/src/main/java/co/tamara/example/model/EItem.kt @@ -2,11 +2,9 @@ package co.tamara.example.model import android.os.Parcelable import androidx.room.Entity -import androidx.room.ForeignKey -import androidx.room.Index import androidx.room.PrimaryKey import com.google.gson.annotations.SerializedName -import kotlinx.android.parcel.Parcelize +import kotlinx.parcelize.Parcelize @Parcelize @Entity( diff --git a/app/src/main/java/co/tamara/example/ui/CheckoutFragment.kt b/app/src/main/java/co/tamara/example/ui/CheckoutFragment.kt index 8d077cb..3d25aa5 100644 --- a/app/src/main/java/co/tamara/example/ui/CheckoutFragment.kt +++ b/app/src/main/java/co/tamara/example/ui/CheckoutFragment.kt @@ -9,16 +9,20 @@ import androidx.lifecycle.Observer import androidx.lifecycle.ViewModelProvider import androidx.navigation.fragment.NavHostFragment.findNavController import co.tamara.example.R +import co.tamara.example.databinding.FragmentCheckoutBinding import co.tamara.example.model.EAmount import co.tamara.example.model.EItem import co.tamara.example.viewmodel.ViewModelFactory import co.tamara.sdk.TamaraPayment -import kotlinx.android.synthetic.main.fragment_checkout.* /** * A simple [Fragment] subclass. */ class CheckoutFragment : Fragment() { + + private var _binding: FragmentCheckoutBinding? = null + private val binding get() = _binding!! + private var items: List? = null private lateinit var itemViewModel: OrderViewModel private val shippingAmount = EAmount(20.0, "SAR") @@ -29,26 +33,32 @@ class CheckoutFragment : Fragment() { savedInstanceState: Bundle? ): View? { // Inflate the layout for this fragment - return inflater.inflate(R.layout.fragment_checkout, container, false) + _binding = FragmentCheckoutBinding.inflate(inflater, container, false) + return binding.root } override fun onActivityCreated(savedInstanceState: Bundle?) { super.onActivityCreated(savedInstanceState) - itemViewModel = ViewModelProvider(requireActivity(), ViewModelFactory()).get(OrderViewModel::class.java) + itemViewModel = + ViewModelProvider(requireActivity(), ViewModelFactory()).get(OrderViewModel::class.java) itemViewModel.items.observe(viewLifecycleOwner, Observer { items -> this.items = items updateUI() }) - shippingFeeTxt.text = shippingAmount.getFormattedAmount() - discountTxt.text = getString(R.string.neg_value,discountAmount.getFormattedAmount()) - addressBtn.setOnClickListener { + binding.shippingFeeTxt.text = shippingAmount.getFormattedAmount() + binding.discountTxt.text = + getString(R.string.neg_value, discountAmount.getFormattedAmount()) + binding.addressBtn.setOnClickListener { TamaraPayment.setShippingAmount(shippingAmount.amount) - if(discountCheck.isChecked){ - TamaraPayment.setDiscount(discountAmount.amount, discountCheck.text.toString()) + if (binding.discountCheck.isChecked) { + TamaraPayment.setDiscount( + discountAmount.amount, + binding.discountCheck.text.toString() + ) } findNavController(this).navigate(R.id.shippingAddressFragment) } - discountCheck.setOnCheckedChangeListener { _, _ -> + binding.discountCheck.setOnCheckedChangeListener { _, _ -> updateUI() } } @@ -57,21 +67,28 @@ class CheckoutFragment : Fragment() { var total = 0.0 var totalPrice = 0.0 val ship = shippingAmount.amount - val discount = if(discountCheck.isChecked) discountAmount.amount else 0.0 + val discount = if (binding.discountCheck.isChecked) discountAmount.amount else 0.0 var tax = 0.0 var count = 0 var currency = "" this.items?.forEach { - totalPrice += (it.unitPrice!!.amount - (it.discountAmount?.amount?:0.0)) * it.quantity - total += (it.unitPrice!!.amount - (it.discountAmount?.amount?:0.0) + it.taxAmount!!.amount) * it.quantity + totalPrice += (it.unitPrice!!.amount - (it.discountAmount?.amount ?: 0.0)) * it.quantity + total += (it.unitPrice!!.amount - (it.discountAmount?.amount + ?: 0.0) + it.taxAmount!!.amount) * it.quantity tax += it.taxAmount!!.amount * it.quantity count += it.quantity currency = it.unitPrice!!.currency } - totalItemPriceTxt.text = EAmount(totalPrice, currency).getFormattedAmount() - taxTxt.text = EAmount(tax, currency).getFormattedAmount() - totalTxt.text = EAmount(total + ship - discount, currency).getFormattedAmount() - discountTxt.visibility = if(discountCheck.isChecked) View.VISIBLE else View.GONE + binding.totalItemPriceTxt.text = EAmount(totalPrice, currency).getFormattedAmount() + binding.taxTxt.text = EAmount(tax, currency).getFormattedAmount() + binding.totalTxt.text = EAmount(total + ship - discount, currency).getFormattedAmount() + binding.discountTxt.visibility = + if (binding.discountCheck.isChecked) View.VISIBLE else View.GONE + } + + override fun onDestroyView() { + super.onDestroyView() + _binding = null } } diff --git a/app/src/main/java/co/tamara/example/ui/ConsumerFragment.kt b/app/src/main/java/co/tamara/example/ui/ConsumerFragment.kt index 06414e8..fbf32b8 100644 --- a/app/src/main/java/co/tamara/example/ui/ConsumerFragment.kt +++ b/app/src/main/java/co/tamara/example/ui/ConsumerFragment.kt @@ -9,9 +9,9 @@ import androidx.lifecycle.Observer import androidx.lifecycle.ViewModelProvider import androidx.navigation.fragment.NavHostFragment.findNavController import co.tamara.example.R +import co.tamara.example.databinding.FragmentConsumerBinding import co.tamara.example.viewmodel.ViewModelFactory import co.tamara.sdk.TamaraPayment -import kotlinx.android.synthetic.main.fragment_consumer.* import java.util.* @@ -20,6 +20,9 @@ import java.util.* */ class ConsumerFragment : Fragment() { + private var _binding: FragmentConsumerBinding? = null + private val binding get() = _binding!! + private lateinit var consumerViewModel: ConsumerViewModel override fun onStart() { @@ -32,7 +35,8 @@ class ConsumerFragment : Fragment() { savedInstanceState: Bundle? ): View? { // Inflate the layout for this fragment - return inflater.inflate(R.layout.fragment_consumer, container, false) + _binding = FragmentConsumerBinding.inflate(inflater, container, false) + return binding.root } override fun onViewCreated(view: View, savedInstanceState: Bundle?) { @@ -47,20 +51,30 @@ class ConsumerFragment : Fragment() { override fun onActivityCreated(savedInstanceState: Bundle?) { super.onActivityCreated(savedInstanceState) - consumerViewModel = ViewModelProvider(this, ViewModelFactory()).get(ConsumerViewModel::class.java) - consumerViewModel.consumer.observe(viewLifecycleOwner, Observer {consumer-> - firstNameTxt.text = consumer.firstName - lastNameTxt.text = consumer.lastName - emailTxt.text = consumer.email - phoneTxt.text = consumer.phoneNumber - firstOrderCheck.isChecked = consumer?.isFirstOrder ?: false + consumerViewModel = + ViewModelProvider(this, ViewModelFactory()).get(ConsumerViewModel::class.java) + consumerViewModel.consumer.observe(viewLifecycleOwner, Observer { consumer -> + binding.firstNameTxt.text = consumer.firstName + binding.lastNameTxt.text = consumer.lastName + binding.emailTxt.text = consumer.email + binding.phoneTxt.text = consumer.phoneNumber + binding.firstOrderCheck.isChecked = consumer?.isFirstOrder ?: false }) - shopBtn.setOnClickListener { - TamaraPayment.setCustomerInfo(firstNameTxt.text.toString(), lastNameTxt.text.toString(),phoneTxt.text.toString(), - emailTxt.text.toString(),firstOrderCheck.isChecked) + binding.shopBtn.setOnClickListener { + TamaraPayment.setCustomerInfo( + binding.firstNameTxt.text.toString(), + binding.lastNameTxt.text.toString(), + binding.phoneTxt.text.toString(), + binding.emailTxt.text.toString(), + binding.firstOrderCheck.isChecked + ) findNavController(this).navigate(R.id.shopFragment) } } + override fun onDestroyView() { + super.onDestroyView() + _binding = null + } } diff --git a/app/src/main/java/co/tamara/example/ui/ConsumerViewModel.kt b/app/src/main/java/co/tamara/example/ui/ConsumerViewModel.kt index a0eeff5..8f53f99 100644 --- a/app/src/main/java/co/tamara/example/ui/ConsumerViewModel.kt +++ b/app/src/main/java/co/tamara/example/ui/ConsumerViewModel.kt @@ -4,7 +4,6 @@ import androidx.lifecycle.LiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.liveData import co.tamara.example.data.DataSource -import co.tamara.example.model.EAddress import co.tamara.example.model.EConsumer class ConsumerViewModel(private val dataSource: DataSource) : ViewModel(){ diff --git a/app/src/main/java/co/tamara/example/ui/ShippingAddressFragment.kt b/app/src/main/java/co/tamara/example/ui/ShippingAddressFragment.kt index c1a5cb9..124d3ee 100644 --- a/app/src/main/java/co/tamara/example/ui/ShippingAddressFragment.kt +++ b/app/src/main/java/co/tamara/example/ui/ShippingAddressFragment.kt @@ -8,16 +8,20 @@ import androidx.fragment.app.Fragment import androidx.lifecycle.Observer import androidx.lifecycle.ViewModelProvider import co.tamara.example.R +import co.tamara.example.databinding.FragmentShippingAddressBinding import co.tamara.example.model.EAddress import co.tamara.example.viewmodel.ViewModelFactory import co.tamara.sdk.TamaraPayment -import kotlinx.android.synthetic.main.fragment_shipping_address.* /** * A simple [Fragment] subclass. */ class ShippingAddressFragment : Fragment() { + + private var _binding: FragmentShippingAddressBinding? = null + private val binding get() = _binding!! + private var addresses: List? = null private lateinit var addressViewModel: AddressViewModel private var step = STEP_SHIPPING_ADDRESS @@ -32,45 +36,68 @@ class ShippingAddressFragment : Fragment() { savedInstanceState: Bundle? ): View? { // Inflate the layout for this fragment - return inflater.inflate(R.layout.fragment_shipping_address, container, false) + _binding = FragmentShippingAddressBinding.inflate(inflater, container, false) + return binding.root } override fun onActivityCreated(savedInstanceState: Bundle?) { super.onActivityCreated(savedInstanceState) - addressViewModel = ViewModelProvider(this, ViewModelFactory()).get(AddressViewModel::class.java) + addressViewModel = + ViewModelProvider(this, ViewModelFactory()).get(AddressViewModel::class.java) addressViewModel.addresses.observe(viewLifecycleOwner, Observer { addresses = it fillAddress() }) - useForBillingCheck.setOnCheckedChangeListener { _, checked -> - if(checked){ - actionBtn.text = getString(R.string.pay_via_tamara) + binding.useForBillingCheck.setOnCheckedChangeListener { _, checked -> + if (checked) { + binding.actionBtn.text = getString(R.string.pay_via_tamara) } else { - actionBtn.text = getString(R.string.select_billing_address) + binding.actionBtn.text = getString(R.string.select_billing_address) } } - actionBtn.setOnClickListener { - if(step == STEP_SHIPPING_ADDRESS){ - TamaraPayment.setShippingAddress(firstNameEdit.text.toString(),lastNameEdit.text.toString(), - phoneEdit.text.toString(), address1Edit.text.toString(), address2Edit.text.toString(), - countryEdit.text.toString(), regionEdit.text.toString(), cityEdit.text.toString()) - if(useForBillingCheck.isChecked){ - TamaraPayment.setBillingAddress(firstNameEdit.text.toString(),lastNameEdit.text.toString(), - phoneEdit.text.toString(), address1Edit.text.toString(), address2Edit.text.toString(), - countryEdit.text.toString(), regionEdit.text.toString(), cityEdit.text.toString()) + binding.actionBtn.setOnClickListener { + if (step == STEP_SHIPPING_ADDRESS) { + TamaraPayment.setShippingAddress( + binding.firstNameEdit.text.toString(), + binding.lastNameEdit.text.toString(), + binding.phoneEdit.text.toString(), + binding.address1Edit.text.toString(), + binding.address2Edit.text.toString(), + binding.countryEdit.text.toString(), + binding.regionEdit.text.toString(), + binding.cityEdit.text.toString() + ) + if (binding.useForBillingCheck.isChecked) { + TamaraPayment.setBillingAddress( + binding.firstNameEdit.text.toString(), + binding.lastNameEdit.text.toString(), + binding.phoneEdit.text.toString(), + binding.address1Edit.text.toString(), + binding.address2Edit.text.toString(), + binding.countryEdit.text.toString(), + binding.regionEdit.text.toString(), + binding.cityEdit.text.toString() + ) processPayment() } else { if (addresses != null && addresses!!.size > 1) { updateUI(addresses!![1]) } - useForBillingCheck.visibility = View.GONE - actionBtn.text = getString(R.string.pay_via_tamara) + binding.useForBillingCheck.visibility = View.GONE + binding.actionBtn.text = getString(R.string.pay_via_tamara) step = STEP_BILLING_ADDRESS } } else { - TamaraPayment.setBillingAddress(firstNameEdit.text.toString(),lastNameEdit.text.toString(), - phoneEdit.text.toString(), address1Edit.text.toString(), address2Edit.text.toString(), - countryEdit.text.toString(), regionEdit.text.toString(), cityEdit.text.toString()) + TamaraPayment.setBillingAddress( + binding.firstNameEdit.text.toString(), + binding.lastNameEdit.text.toString(), + binding.phoneEdit.text.toString(), + binding.address1Edit.text.toString(), + binding.address2Edit.text.toString(), + binding.countryEdit.text.toString(), + binding.regionEdit.text.toString(), + binding.cityEdit.text.toString() + ) processPayment() } } @@ -81,24 +108,28 @@ class ShippingAddressFragment : Fragment() { } private fun fillAddress() { - if(!addresses.isNullOrEmpty()) { - if (useForBillingCheck.visibility == View.VISIBLE) { + if (!addresses.isNullOrEmpty()) { + if (binding.useForBillingCheck.visibility == View.VISIBLE) { updateUI(addresses!![0]) - } else if(addresses!!.size > 1){ + } else if (addresses!!.size > 1) { updateUI(addresses!![1]) } } } private fun updateUI(eAddress: EAddress) { - firstNameEdit.setText(eAddress.firstName) - lastNameEdit.setText(eAddress.lastName) - phoneEdit.setText(eAddress.phoneNumber) - address1Edit.setText(eAddress.line1) - address2Edit.setText(eAddress.line2) - countryEdit.setText(eAddress.countryCode) - regionEdit.setText(eAddress.region) - cityEdit.setText(eAddress.city) + binding.firstNameEdit.setText(eAddress.firstName) + binding.lastNameEdit.setText(eAddress.lastName) + binding.phoneEdit.setText(eAddress.phoneNumber) + binding.address1Edit.setText(eAddress.line1) + binding.address2Edit.setText(eAddress.line2) + binding.countryEdit.setText(eAddress.countryCode) + binding.regionEdit.setText(eAddress.region) + binding.cityEdit.setText(eAddress.city) } + override fun onDestroyView() { + super.onDestroyView() + _binding = null + } } diff --git a/app/src/main/java/co/tamara/example/ui/ShopFragment.kt b/app/src/main/java/co/tamara/example/ui/ShopFragment.kt index e5110ea..38fff6e 100644 --- a/app/src/main/java/co/tamara/example/ui/ShopFragment.kt +++ b/app/src/main/java/co/tamara/example/ui/ShopFragment.kt @@ -18,18 +18,17 @@ import androidx.lifecycle.ViewModelProvider import androidx.navigation.fragment.NavHostFragment.findNavController import androidx.recyclerview.widget.RecyclerView import co.tamara.example.R +import co.tamara.example.databinding.FragmentShopBinding +import co.tamara.example.databinding.ItemToyBinding import co.tamara.example.model.EAmount import co.tamara.example.model.EItem import co.tamara.example.viewmodel.ViewModelFactory import co.tamara.sdk.TamaraPayment -import kotlinx.android.extensions.LayoutContainer -import kotlinx.android.synthetic.main.fragment_shop.* -import kotlinx.android.synthetic.main.item_toy.* -import kotlinx.android.synthetic.main.item_toy.view.* -import java.util.* class ShopFragment : Fragment() { + private var _binding: FragmentShopBinding? = null + private val binding get() = _binding!! private lateinit var orderVieModel: OrderViewModel private var items: List? = null private lateinit var viewModel: ShopViewModel @@ -38,21 +37,23 @@ class ShopFragment : Fragment() { inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View? { - return inflater.inflate(R.layout.fragment_shop, container, false) + _binding = FragmentShopBinding.inflate(inflater, container, false) + return binding.root } override fun onActivityCreated(savedInstanceState: Bundle?) { super.onActivityCreated(savedInstanceState) - viewModel = ViewModelProvider(requireActivity(), ViewModelFactory()).get(ShopViewModel::class.java) + viewModel = + ViewModelProvider(requireActivity(), ViewModelFactory()).get(ShopViewModel::class.java) orderVieModel = ViewModelProvider(requireActivity()).get(OrderViewModel::class.java) viewModel.items.observe(viewLifecycleOwner, Observer { items = it - shopList.adapter?.notifyDataSetChanged() + binding.shopList.adapter?.notifyDataSetChanged() }) - shopList.adapter = ShopAdapter() - checkoutBtn.setOnClickListener { + binding.shopList.adapter = ShopAdapter() + binding.checkoutBtn.setOnClickListener { items?.forEach { - if(it.quantity > 0) { + if (it.quantity > 0) { TamaraPayment.addItem( it.name, it.referenceId, @@ -70,7 +71,7 @@ class ShopFragment : Fragment() { } fun formatPrice(textView: TextView, originalPrice: String, discountedPrice: String) { - if(originalPrice != discountedPrice) { + if (originalPrice != discountedPrice) { val text = "$originalPrice $discountedPrice" textView.setText(text, TextView.BufferType.SPANNABLE) val spannable = textView.text as Spannable @@ -102,40 +103,61 @@ class ShopFragment : Fragment() { } } - inner class ShopAdapter: RecyclerView.Adapter() { + override fun onDestroyView() { + super.onDestroyView() + _binding = null + } + + inner class ShopAdapter : RecyclerView.Adapter() { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ShopAdapter.ViewHolder { - var view = LayoutInflater.from(parent.context).inflate(R.layout.item_toy, parent,false) - view.addBtn.setOnClickListener { - var position = it.tag as Int + val view = ViewHolder( + ItemToyBinding.inflate( + LayoutInflater.from(parent.context), + parent, + false + ) + ) + view.binding.addBtn.setOnClickListener { + val position = it.tag as Int items!![position].quantity = (items!![position].quantity + 1).coerceAtMost(5) notifyDataSetChanged() } - view.removeBtn.setOnClickListener { - var position = it.tag as Int + view.binding.removeBtn.setOnClickListener { + val position = it.tag as Int items!![position].quantity = (items!![position].quantity - 1).coerceAtLeast(0) notifyDataSetChanged() } - return ViewHolder(view) + return view + } + override fun getItemCount(): Int { return items?.size ?: 0 } override fun onBindViewHolder(holder: ViewHolder, position: Int) { var item = items!![position] - holder.itemNameTxt.text = item.name - holder.skuTxt.text = item.sku - val discounted = EAmount((item.unitPrice!!.amount - (item.discountAmount?.amount - ?: 0.0)), item.unitPrice!!.currency) - formatPrice(holder.priceTxt, item.unitPrice!!.getFormattedAmount(), discounted.getFormattedAmount()) - holder.taxTxt.text = getString(R.string.tax_with_amount, item.taxAmount?.getFormattedAmount() ?: "0") - holder.quantityEdit.text = item.quantity.toString() - holder.addBtn.tag = position - holder.removeBtn.tag = position + holder.binding.itemNameTxt.text = item.name + holder.binding.skuTxt.text = item.sku + val discounted = EAmount( + (item.unitPrice!!.amount - (item.discountAmount?.amount + ?: 0.0)), item.unitPrice!!.currency + ) + formatPrice( + holder.binding.priceTxt, + item.unitPrice!!.getFormattedAmount(), + discounted.getFormattedAmount() + ) + holder.binding.taxTxt.text = + getString(R.string.tax_with_amount, item.taxAmount?.getFormattedAmount() ?: "0") + holder.binding.quantityEdit.text = item.quantity.toString() + holder.binding.addBtn.tag = position + holder.binding.removeBtn.tag = position } - inner class ViewHolder(override val containerView: View?) : RecyclerView.ViewHolder(containerView!!), LayoutContainer + inner class ViewHolder(val binding: ItemToyBinding) : RecyclerView.ViewHolder(binding.root) } diff --git a/app/src/main/java/co/tamara/example/viewmodel/ViewModelFactory.kt b/app/src/main/java/co/tamara/example/viewmodel/ViewModelFactory.kt index f6ffd71..8d0104a 100644 --- a/app/src/main/java/co/tamara/example/viewmodel/ViewModelFactory.kt +++ b/app/src/main/java/co/tamara/example/viewmodel/ViewModelFactory.kt @@ -5,7 +5,6 @@ import androidx.lifecycle.ViewModelProvider import co.tamara.example.application.App import co.tamara.example.ui.AddressViewModel import co.tamara.example.ui.ConsumerViewModel -import co.tamara.example.ui.OrderViewModel import co.tamara.example.ui.ShopViewModel @Suppress("UNCHECKED_CAST") diff --git a/app/src/main/res/layout/fragment_shipping_address.xml b/app/src/main/res/layout/fragment_shipping_address.xml index ad75e88..92dda75 100644 --- a/app/src/main/res/layout/fragment_shipping_address.xml +++ b/app/src/main/res/layout/fragment_shipping_address.xml @@ -1,6 +1,5 @@ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d2a2873..f1402fa 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,22 +1,13 @@ Tamara Checkout Example - Name - Item - Item value Pay via Tamara - %1$s %2$s - %1$s %2$s Email Phone Consumer\'s Information This is my first order Select items - SKU - Price Check out - Items Tax - Total First name Last name Address 1 @@ -25,7 +16,6 @@ Region City Use this as billing address - Next Select address Shipping fee Payment success! diff --git a/app/src/test/java/co/tamara/example/ExampleUnitTest.kt b/app/src/test/java/co/tamara/example/ExampleUnitTest.kt index fe2f70d..b26c796 100644 --- a/app/src/test/java/co/tamara/example/ExampleUnitTest.kt +++ b/app/src/test/java/co/tamara/example/ExampleUnitTest.kt @@ -1,9 +1,8 @@ package co.tamara.example +import org.junit.Assert.assertEquals import org.junit.Test -import org.junit.Assert.* - /** * Example local unit test, which will execute on the development machine (host). * diff --git a/build.gradle b/build.gradle index 9f9c9e6..a4a0f3c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,15 +1,14 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.72' repositories { google() jcenter() - + } dependencies { - classpath 'com.android.tools.build:gradle:4.0.2' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath 'com.android.tools.build:gradle:4.1.3' + classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 41d99a7..4deaec7 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Oct 19 14:03:41 ICT 2020 +#Tue Apr 20 11:20:36 EEST 2021 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip