From 393bac83b7492805ef269a932d03d8c1628eede3 Mon Sep 17 00:00:00 2001 From: Iran Vicente Boligan Date: Fri, 17 Jun 2022 14:10:30 -0400 Subject: [PATCH 01/23] initial push --- build.gradle | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 1a9dfd1..6d6dccd 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,8 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '7.2.1' apply false - id 'com.android.library' version '7.2.1' apply false + id 'com.android.application' version '7.1.3' apply false + id 'com.android.library' version '7.1.3' apply false id 'org.jetbrains.kotlin.android' version '1.6.21' apply false } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 327f345..8012d39 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Mon May 23 10:51:54 CDT 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME From 24002b5a917d1468d0176feb1a8b54cdf341ed63 Mon Sep 17 00:00:00 2001 From: Iran Vicente Boligan Date: Tue, 21 Jun 2022 10:21:32 -0400 Subject: [PATCH 02/23] first commit --- .../com/teavaro/teavarodemoapp/core/Item.kt | 7 ++ .../teavarodemoapp/ui/cart/CartAdapter.kt | 11 ++- .../teavarodemoapp/ui/cart/CartFragment.kt | 13 ++- .../teavarodemoapp/ui/shop/ShopAdapter.kt | 26 +++++ .../teavarodemoapp/ui/shop/ShopFragment.kt | 14 ++- .../teavarodemoapp/ui/wishlist/WishAdapter.kt | 23 +++++ .../ui/wishlist/WishlistFragment.kt | 9 +- app/src/main/res/layout/fragment_shop.xml | 54 +---------- app/src/main/res/layout/fragment_wishlist.xml | 51 +--------- app/src/main/res/layout/item_cart.xml | 94 +++++++++++++++++++ app/src/main/res/layout/item_shop.xml | 5 +- app/src/main/res/layout/item_wish.xml | 53 +++++++++++ 12 files changed, 242 insertions(+), 118 deletions(-) create mode 100644 app/src/main/java/com/teavaro/teavarodemoapp/core/Item.kt create mode 100644 app/src/main/java/com/teavaro/teavarodemoapp/ui/shop/ShopAdapter.kt create mode 100644 app/src/main/java/com/teavaro/teavarodemoapp/ui/wishlist/WishAdapter.kt create mode 100644 app/src/main/res/layout/item_cart.xml create mode 100644 app/src/main/res/layout/item_wish.xml diff --git a/app/src/main/java/com/teavaro/teavarodemoapp/core/Item.kt b/app/src/main/java/com/teavaro/teavarodemoapp/core/Item.kt new file mode 100644 index 0000000..f119404 --- /dev/null +++ b/app/src/main/java/com/teavaro/teavarodemoapp/core/Item.kt @@ -0,0 +1,7 @@ +package com.teavaro.teavarodemoapp.core + +data class Item ( + var picture: Int, + var title: String, + var price: Float +) \ No newline at end of file diff --git a/app/src/main/java/com/teavaro/teavarodemoapp/ui/cart/CartAdapter.kt b/app/src/main/java/com/teavaro/teavarodemoapp/ui/cart/CartAdapter.kt index 7873071..6d792b4 100644 --- a/app/src/main/java/com/teavaro/teavarodemoapp/ui/cart/CartAdapter.kt +++ b/app/src/main/java/com/teavaro/teavarodemoapp/ui/cart/CartAdapter.kt @@ -6,17 +6,20 @@ import android.view.View import android.view.ViewGroup import android.widget.ArrayAdapter import com.teavaro.teavarodemoapp.R +import com.teavaro.teavarodemoapp.core.Item import kotlinx.android.synthetic.main.item_shop.view.* class CartAdapter(context: Context, - private val listItems: List) : - ArrayAdapter(context, 0, listItems) { + private val listItems: List) : + ArrayAdapter(context, 0, listItems) { override fun getView(position: Int, convertView: View?, parent: ViewGroup): View { - val layout = LayoutInflater.from(context).inflate(R.layout.item_shop,parent, false) + val layout = LayoutInflater.from(context).inflate(R.layout.item_cart,parent, false) val item = listItems[position] - layout.txtTitle.text = item + layout.txtTitle.text = item.title +// layout.txtPrice.text = item.price.toString() +// layout.imgPicture.setImageResource(item.picture) return layout } diff --git a/app/src/main/java/com/teavaro/teavarodemoapp/ui/cart/CartFragment.kt b/app/src/main/java/com/teavaro/teavarodemoapp/ui/cart/CartFragment.kt index b6d278b..a6554b8 100644 --- a/app/src/main/java/com/teavaro/teavarodemoapp/ui/cart/CartFragment.kt +++ b/app/src/main/java/com/teavaro/teavarodemoapp/ui/cart/CartFragment.kt @@ -4,9 +4,9 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.TextView import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider +import com.teavaro.teavarodemoapp.core.Item import com.teavaro.teavarodemoapp.databinding.FragmentCartBinding class CartFragment : Fragment() { @@ -28,12 +28,11 @@ class CartFragment : Fragment() { _binding = FragmentCartBinding.inflate(inflater, container, false) val root: View = binding.root -// val textView: TextView = binding.textCart -// cartViewModel.text.observe(viewLifecycleOwner) { -// textView.text = it -// } - - val cartAdapter = CartAdapter(requireContext(), listOf("Puerco", "Pollo", "Picadillo")) + val cartAdapter = CartAdapter(requireContext(), listOf( + Item(1, "puerco", 23.4f), + Item(2, "picadillo", 20.1f), + Item(3, "leche", 15.6f), + )) val lvItems = binding.listItems lvItems.adapter = cartAdapter diff --git a/app/src/main/java/com/teavaro/teavarodemoapp/ui/shop/ShopAdapter.kt b/app/src/main/java/com/teavaro/teavarodemoapp/ui/shop/ShopAdapter.kt new file mode 100644 index 0000000..48df2ec --- /dev/null +++ b/app/src/main/java/com/teavaro/teavarodemoapp/ui/shop/ShopAdapter.kt @@ -0,0 +1,26 @@ +package com.teavaro.teavarodemoapp.ui.shop + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.ArrayAdapter +import com.teavaro.teavarodemoapp.R +import com.teavaro.teavarodemoapp.core.Item +import kotlinx.android.synthetic.main.item_shop.view.* + +class ShopAdapter(context: Context, + private val listItems: List) : + ArrayAdapter(context, 0, listItems) { + + override fun getView(position: Int, convertView: View?, parent: ViewGroup): View { + val layout = LayoutInflater.from(context).inflate(R.layout.item_shop,parent, false) + + val item = listItems[position] + layout.txtTitle.text = item.title +// layout.txtPrice.text = "3434" +// layout.imgPicture.setImageResource(item.picture) + + return layout + } +} \ No newline at end of file diff --git a/app/src/main/java/com/teavaro/teavarodemoapp/ui/shop/ShopFragment.kt b/app/src/main/java/com/teavaro/teavarodemoapp/ui/shop/ShopFragment.kt index e85f320..768e53c 100644 --- a/app/src/main/java/com/teavaro/teavarodemoapp/ui/shop/ShopFragment.kt +++ b/app/src/main/java/com/teavaro/teavarodemoapp/ui/shop/ShopFragment.kt @@ -7,7 +7,9 @@ import android.view.ViewGroup import android.widget.TextView import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider +import com.teavaro.teavarodemoapp.core.Item import com.teavaro.teavarodemoapp.databinding.FragmentShopBinding +import com.teavaro.teavarodemoapp.ui.cart.CartAdapter class ShopFragment : Fragment() { @@ -28,10 +30,14 @@ class ShopFragment : Fragment() { _binding = FragmentShopBinding.inflate(inflater, container, false) val root: View = binding.root -// val textView: TextView = binding.textShop -// shopViewModel.text.observe(viewLifecycleOwner) { -// textView.text = it -// } + val shopAdapter = ShopAdapter(requireContext(), listOf( + Item(1, "puerco", 23.4f), + Item(2, "picadillo", 20.1f), + Item(3, "leche", 15.6f), + )) + val lvItems = binding.listItems + lvItems.adapter = shopAdapter + return root } diff --git a/app/src/main/java/com/teavaro/teavarodemoapp/ui/wishlist/WishAdapter.kt b/app/src/main/java/com/teavaro/teavarodemoapp/ui/wishlist/WishAdapter.kt new file mode 100644 index 0000000..60e64a4 --- /dev/null +++ b/app/src/main/java/com/teavaro/teavarodemoapp/ui/wishlist/WishAdapter.kt @@ -0,0 +1,23 @@ +package com.teavaro.teavarodemoapp.ui.wishlist + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.ArrayAdapter +import com.teavaro.teavarodemoapp.R +import kotlinx.android.synthetic.main.item_shop.view.* + +class WishAdapter(context: Context, + private val listItems: List) : + ArrayAdapter(context, 0, listItems) { + + override fun getView(position: Int, convertView: View?, parent: ViewGroup): View { + val layout = LayoutInflater.from(context).inflate(R.layout.item_wish,parent, false) + + val item = listItems[position] + layout.txtTitle.text = item + + return layout + } +} \ No newline at end of file diff --git a/app/src/main/java/com/teavaro/teavarodemoapp/ui/wishlist/WishlistFragment.kt b/app/src/main/java/com/teavaro/teavarodemoapp/ui/wishlist/WishlistFragment.kt index 09e1f6b..4284b87 100644 --- a/app/src/main/java/com/teavaro/teavarodemoapp/ui/wishlist/WishlistFragment.kt +++ b/app/src/main/java/com/teavaro/teavarodemoapp/ui/wishlist/WishlistFragment.kt @@ -4,7 +4,6 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.TextView import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider import com.teavaro.teavarodemoapp.databinding.FragmentWishlistBinding @@ -28,10 +27,10 @@ class WishlistFragment : Fragment() { _binding = FragmentWishlistBinding.inflate(inflater, container, false) val root: View = binding.root -// val textView: TextView = binding.textWishlist -// wishlistViewModel.text.observe(viewLifecycleOwner) { -// textView.text = it -// } + val wishAdapter = WishAdapter(requireContext(), listOf("Puerco", "Pollo", "Picadillo")) + val lvItems = binding.listItems + lvItems.adapter = wishAdapter + return root } diff --git a/app/src/main/res/layout/fragment_shop.xml b/app/src/main/res/layout/fragment_shop.xml index 9a9a6b4..ae7bcf4 100644 --- a/app/src/main/res/layout/fragment_shop.xml +++ b/app/src/main/res/layout/fragment_shop.xml @@ -6,56 +6,10 @@ android:layout_marginTop="30dp" tools:context=".ui.shop.ShopFragment"> - - - - - - - - - - - - - - - -