Minor code changes

Author: MarkNjunge

app/src/main/java/com/marknkamau/justjava/data/local/CartDatabase.kt

@@ -4,7 +4,7 @@ import android.arch.persistence.room.Database
 import android.arch.persistence.room.RoomDatabase
 import com.marknkamau.justjava.data.models.OrderItem
 
-@Database(entities = arrayOf(OrderItem::class), version = 1)
+@Database(entities = [(OrderItem::class)], version = 1)
 abstract class CartDatabase : RoomDatabase(){
     abstract fun cartDao(): CartDao
 }

app/src/main/java/com/marknkamau/justjava/ui/cart/CartActivity.kt

@@ -42,12 +42,12 @@ class CartActivity : BaseActivity(), CartView {
             }
         }
 
-        adapter = CartAdapter(this, { cartItem ->
+        adapter = CartAdapter(this) { cartItem ->
             val args = Bundle()
             args.putParcelable(EditCartDialog.CART_ITEM, cartItem)
             editCartDialog.arguments = args
             editCartDialog.show(supportFragmentManager, "edit_cart_dialog")
-        })
+        }
         rvCart.layoutManager = LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)
         rvCart .addItemDecoration(DividerItemDecoration(this, LinearLayout.VERTICAL))
         rvCart.adapter = adapter

app/src/main/java/com/marknkamau/justjava/ui/cart/EditCartDialog.kt

@@ -17,17 +17,16 @@ import com.marknkamau.justjava.data.local.DrinksProvider
 import com.marknkamau.justjava.data.models.OrderItem
 
 class EditCartDialog : DialogFragment(), View.OnClickListener {
-    lateinit var tvDrinkName: TextView
-    lateinit var tvQuantity: TextView
-    lateinit var tvChocolate: TextView
-    lateinit var tvMarshmallows: TextView
-    lateinit var tvTotal: TextView
-    lateinit var tvCinnamon: TextView
-    lateinit var imgMinusQty: ImageView
-    lateinit var imgDelete: ImageView
-    lateinit var imgAddQty: ImageView
-    lateinit var imgSave: ImageView
-
+    private lateinit var tvDrinkName: TextView
+    private lateinit var tvQuantity: TextView
+    private lateinit var tvChocolate: TextView
+    private lateinit var tvMarshmallows: TextView
+    private lateinit var tvTotal: TextView
+    private lateinit var tvCinnamon: TextView
+    private lateinit var imgMinusQty: ImageView
+    private lateinit var imgDelete: ImageView
+    private lateinit var imgAddQty: ImageView
+    private lateinit var imgSave: ImageView
 
     private var quantity: Int = 0
     private lateinit var item: OrderItem
@@ -221,7 +220,7 @@ class EditCartDialog : DialogFragment(), View.OnClickListener {
     }
 
     companion object {
-        val CART_ITEM = "item_cart"
-        private val PADDING = 24
+        const val CART_ITEM = "item_cart"
+        private const val PADDING = 24
     }
 }

app/src/main/java/com/marknkamau/justjava/ui/drinkdetails/DrinkDetailsActivity.kt

@@ -18,7 +18,7 @@ import kotlinx.android.synthetic.main.content_drink_details.*
 class DrinkDetailsActivity : BaseActivity(), DrinkDetailsView, View.OnClickListener {
 
     companion object {
-        val DRINK_KEY = "drink_key"
+        const val DRINK_KEY = "drink_key"
     }
 
     private lateinit var drink: CoffeeDrink

app/src/main/java/com/marknkamau/justjava/ui/main/MainActivity.kt

@@ -23,11 +23,11 @@ class MainActivity : BaseActivity(), MainView {
 
         supportActionBar?.setDisplayShowTitleEnabled(false)
 
-        catalogAdapter = CatalogAdapter(this, { coffeeDrink ->
+        catalogAdapter = CatalogAdapter(this) { coffeeDrink ->
             val i = Intent(this, DrinkDetailsActivity::class.java)
             i.putExtra(DrinkDetailsActivity.DRINK_KEY, coffeeDrink)
             startActivity(i)
-        })
+        }
 
         rvCatalog.layoutManager = LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)
         rvCatalog.adapter = catalogAdapter

app/src/main/java/com/marknkamau/justjava/utils/mpesa/Mpesa.kt

@@ -18,11 +18,11 @@ import io.reactivex.Single
 class Mpesa(private val consumerKey: String, private val consumerSecret: String, private val mpesaService: MpesaService) {
 
     object Config {
-        val BUSINESS_SHORT_CODE = "174379"
-        val PARTY_B = "174379"
-        val TRANSACTION_TYPE = "CustomerPayBillOnline"
-        val PASSKEY = "bfb279f9aa9bdbcf158e97dd71a467cd2e0c893059b10f78e6b72ada1ed2c919"
-        val CALLBACK_URL = "https://us-central1-justjava-android.cloudfunctions.net/callback_url/"
+        const val BUSINESS_SHORT_CODE = "174379"
+        const val PARTY_B = "174379"
+        const val TRANSACTION_TYPE = "CustomerPayBillOnline"
+        const val PASSKEY = "bfb279f9aa9bdbcf158e97dd71a467cd2e0c893059b10f78e6b72ada1ed2c919"
+        const val CALLBACK_URL = "https://us-central1-justjava-android.cloudfunctions.net/callback_url/"
     }
 
     private fun getAccessToken(): Single<OAuthAccess> {