diff --git a/app/src/main/java/org/hackillinois/android/API.kt b/app/src/main/java/org/hackillinois/android/API.kt index 941772b8..ec29ec8d 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/view/shop/CartFragment.kt b/app/src/main/java/org/hackillinois/android/view/shop/CartFragment.kt index da244090..6a6a1e4b 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 @@ -10,15 +10,17 @@ import androidx.recyclerview.widget.RecyclerView import org.hackillinois.android.R import org.hackillinois.android.database.entity.ShopItem - class CartFragment : Fragment() { private lateinit var recyclerView: RecyclerView 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) @@ -45,9 +47,7 @@ class CartFragment : Fragment() { .commit() } - return view - } private fun fetchCartData() { 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 dcdfc196..211a8318 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,8 +9,11 @@ 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 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 495efd64..d98960d3 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 @@ -37,8 +37,6 @@ class ShopAdapter(private var itemList: List) : // populating views within ViewHolder with data from 'item' // position is zero-indexed but we want the leaderboard to start at 1 bind(item, holder.itemView, position + 1) - - } private fun bind(item: ShopItem, itemView: View, position: Int) { @@ -65,9 +63,7 @@ class ShopAdapter(private var itemList: List) : Log.d("CartDebug", "Plus button clicked!") App.getAPI().addItemCart(item.itemId) } - } - } fun updateShop(shopItem: List) { diff --git a/app/src/main/java/org/hackillinois/android/view/shop/ShopFragment.kt b/app/src/main/java/org/hackillinois/android/view/shop/ShopFragment.kt index a54d0192..42f1c99f 100644 --- a/app/src/main/java/org/hackillinois/android/view/shop/ShopFragment.kt +++ b/app/src/main/java/org/hackillinois/android/view/shop/ShopFragment.kt @@ -2,6 +2,7 @@ package org.hackillinois.android.view.shop import android.content.Context import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -15,7 +16,6 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import kotlinx.android.synthetic.main.fragment_point_shop.number_of_coins_textview import kotlinx.android.synthetic.main.fragment_point_shop.view.recyclerview_point_shop -import android.util.Log import org.hackillinois.android.R import org.hackillinois.android.common.JWTUtilities import org.hackillinois.android.database.entity.Profile