1 files changed, 6 insertions, 22 deletions
diff --git a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/app/CreditCardActivity.kt b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/app/CreditCardActivity.kt
index f2d9a8b4..46fdb72a 100644
--- a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/app/CreditCardActivity.kt
+++ b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/app/CreditCardActivity.kt
@@ -19,49 +19,33 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
-import android.view.View
 import android.widget.ArrayAdapter
-import android.widget.Button
-import android.widget.Spinner
-
 import com.example.android.autofillframework.R
+import kotlinx.android.synthetic.main.credit_card_activity.*
 
 class CreditCardActivity : AppCompatActivity() {
 
-    private var mCcExpirationDaySpinner: Spinner? = null
-    private var mCcExpirationMonthSpinner: Spinner? = null
-    private var mCcExpirationYearSpinner: Spinner? = null
-    private var mSubmitButton: Button? = null
-    private var mClearButton: Button? = null
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        setContentView(R.layout.credit_card_activity)
-
-        mSubmitButton = findViewById(R.id.submit) as Button
-        mClearButton = findViewById(R.id.clear) as Button
-        mCcExpirationDaySpinner = findViewById(R.id.expirationDay) as Spinner
-        mCcExpirationMonthSpinner = findViewById(R.id.expirationMonth) as Spinner
-        mCcExpirationYearSpinner = findViewById(R.id.expirationYear) as Spinner
 
         // Create an ArrayAdapter using the string array and a default spinner layout
         val dayAdapter = ArrayAdapter.createFromResource(this, R.array.day_array, android.R.layout.simple_spinner_item)
         // Specify the layout to use when the list of choices appears
         dayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
         // Apply the adapter to the spinner
-        mCcExpirationDaySpinner!!.adapter = dayAdapter
+        expirationDay.adapter = dayAdapter
 
         val monthAdapter = ArrayAdapter.createFromResource(this, R.array.month_array, android.R.layout.simple_spinner_item)
         monthAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
-        mCcExpirationMonthSpinner!!.adapter = monthAdapter
+        expirationMonth.adapter = monthAdapter
 
         val yearAdapter = ArrayAdapter.createFromResource(this, R.array.year_array, android.R.layout.simple_spinner_item)
         yearAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
-        mCcExpirationYearSpinner!!.adapter = yearAdapter
+        expirationYear.adapter = yearAdapter
 
-        mSubmitButton!!.setOnClickListener { submit() }
-        mClearButton!!.setOnClickListener { resetFields() }
+        submit.setOnClickListener { submit() }
+        clear.setOnClickListener { resetFields() }
     }
 
     private fun resetFields() {