From d075a7522ffe8b627836d3c154b115ea302f3251 Mon Sep 17 00:00:00 2001 From: sneh-saraff Date: Thu, 13 Feb 2025 14:33:30 -0600 Subject: [PATCH] points shop without api logic --- app/src/main/java/org/hackillinois/android/API.kt | 2 +- .../hackillinois/android/database/entity/ShopItem.kt | 4 ---- .../org/hackillinois/android/view/shop/CartFragment.kt | 10 +++------- .../hackillinois/android/view/shop/RedeemFragment.kt | 8 +++----- .../org/hackillinois/android/view/shop/ShopAdapter.kt | 2 -- 5 files changed, 7 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/org/hackillinois/android/API.kt b/app/src/main/java/org/hackillinois/android/API.kt index 270249c37..941772b8d 100644 --- a/app/src/main/java/org/hackillinois/android/API.kt +++ b/app/src/main/java/org/hackillinois/android/API.kt @@ -70,7 +70,7 @@ interface API { suspend fun buyShopItem(@Body body: ItemInstance): ShopItem @POST("shop/cart/{itemId}") - fun addItemCart(@Path("itemId") itemId : String) : Call + fun addItemCart(@Path("itemId") itemId: String) : Call @GET("shop/cart/") suspend fun getCart(): Cart diff --git a/app/src/main/java/org/hackillinois/android/database/entity/ShopItem.kt b/app/src/main/java/org/hackillinois/android/database/entity/ShopItem.kt index cc9780cce..5111d5609 100644 --- a/app/src/main/java/org/hackillinois/android/database/entity/ShopItem.kt +++ b/app/src/main/java/org/hackillinois/android/database/entity/ShopItem.kt @@ -15,7 +15,3 @@ data class ShopItem( var quantity: Int, var imageURL: String, ) - - - - diff --git a/app/src/main/java/org/hackillinois/android/view/shop/CartFragment.kt b/app/src/main/java/org/hackillinois/android/view/shop/CartFragment.kt index b5abb9026..da244090f 100644 --- a/app/src/main/java/org/hackillinois/android/view/shop/CartFragment.kt +++ b/app/src/main/java/org/hackillinois/android/view/shop/CartFragment.kt @@ -17,10 +17,8 @@ class CartFragment : Fragment() { private lateinit var cartAdapter: CartAdapter private var cartItems: List> = listOf() - override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? - ): View? { + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle?): View? { val view = inflater.inflate(R.layout.fragment_point_shop_cart, container, false) recyclerView = view.findViewById(R.id.recyclerview_point_shop) @@ -60,6 +58,4 @@ class CartFragment : Fragment() { ) cartAdapter.updateCart(cartItems) } - - -} \ No newline at end of file +} diff --git a/app/src/main/java/org/hackillinois/android/view/shop/RedeemFragment.kt b/app/src/main/java/org/hackillinois/android/view/shop/RedeemFragment.kt index 53e74a928..dcdfc196e 100644 --- a/app/src/main/java/org/hackillinois/android/view/shop/RedeemFragment.kt +++ b/app/src/main/java/org/hackillinois/android/view/shop/RedeemFragment.kt @@ -9,10 +9,8 @@ import org.hackillinois.android.R class RedeemFragment : Fragment() { - override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? - ): View? { + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle?): View? { val view = inflater.inflate(R.layout.fragment_point_shop_redeem, container, false) // Handle Back Button Click @@ -22,5 +20,5 @@ class RedeemFragment : Fragment() { requireActivity().supportFragmentManager.popBackStack() // Go back to previous fragment } return view - } } +} diff --git a/app/src/main/java/org/hackillinois/android/view/shop/ShopAdapter.kt b/app/src/main/java/org/hackillinois/android/view/shop/ShopAdapter.kt index 17e6b4410..06dcd8dc4 100644 --- a/app/src/main/java/org/hackillinois/android/view/shop/ShopAdapter.kt +++ b/app/src/main/java/org/hackillinois/android/view/shop/ShopAdapter.kt @@ -7,7 +7,6 @@ import android.view.View import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import android.widget.Toast import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide import kotlinx.android.synthetic.main.shop_tile.view.* @@ -71,7 +70,6 @@ class ShopAdapter(private var itemList: List) : } - fun updateShop(shopItem: List) { this.itemList = shopItem notifyDataSetChanged()