Android - #15

- Continuing to remove all SuperBottomSheets - Added new BottomSheet (based off of BottomSheetDialog)
MattS8 · Aug 11, 2019 · b797fca · b797fca
1 parent 31c1de1
commit b797fca
Show file tree

Hide file tree

Showing 16 changed files with 407 additions and 562 deletions.
diff --git a/android/SmartIRHub/.idea/misc.xml b/android/SmartIRHub/.idea/misc.xml
diff --git a/android/SmartIRHub/app/build.gradle b/android/SmartIRHub/app/build.gradle
@@ -77,7 +77,7 @@ dependencies {
     implementation 'com.google.android.material:material:1.1.0-alpha09'
 
     //Bottom Sheet Dialog
-    implementation 'com.github.andrefrsousa:SuperBottomSheet:1.3.0'
+//    implementation 'com.github.andrefrsousa:SuperBottomSheet:1.3.0'
 
     //Potential Remote Buttons
     implementation 'com.github.armcha:ElasticView:0.2.0'

diff --git a/...IRHub/app/src/main/java/com/ms8/smartirhub/android/create_button/CBWalkthroughActivity.kt b/...IRHub/app/src/main/java/com/ms8/smartirhub/android/create_button/CBWalkthroughActivity.kt
@@ -15,7 +15,7 @@ import com.ms8.smartirhub.android.R
 import com.ms8.smartirhub.android.create_button._old.CBStyleActivity
 import com.ms8.smartirhub.android.create_command.ActionSequenceAdapter
 import com.ms8.smartirhub.android.create_command.CC_ChooseIrSignalActivity
-import com.ms8.smartirhub.android.custom_views.bottom_sheets.BackWarningSheet
+import com.ms8.smartirhub.android.custom_views.bottom_sheets.BottomSheet
 import com.ms8.smartirhub.android.custom_views.bottom_sheets.SimpleListDescSheet
 import com.ms8.smartirhub.android.custom_views.bottom_sheets.SimpleListDescSheet.Companion.REQ_EDIT_ACTION
 import com.ms8.smartirhub.android.custom_views.bottom_sheets.SimpleListDescSheet.Companion.REQ_NEW_ACTION
@@ -33,8 +33,8 @@ import com.ms8.smartirhub.android.utils.MyValidators.ButtonNameValidator
 class CBWalkThroughActivity : AppCompatActivity() {
     lateinit var binding: ACreateButtonWalkthroughBinding
 
-    private val warningSheet: BackWarningSheet = BackWarningSheet()
-    private val pickNameSheet = PickNameSheet()
+    private lateinit var warningSheet : BottomSheet
+    private val pickNameSheet = PickNameSheet(this)
 
 /*
     ----------------------------------------------
@@ -57,7 +57,8 @@ class CBWalkThroughActivity : AppCompatActivity() {
             )
         }
     })
-    private val pickActionsSheet = SimpleListDescSheet()
+
+    private val pickActionsSheet = SimpleListDescSheet(this)
 
     private val commandListener = object : ObservableList.OnListChangedCallback<ObservableArrayList<Command.Action>>() {
         override fun onChanged(sender: ObservableArrayList<Command.Action>) {
@@ -104,7 +105,7 @@ class CBWalkThroughActivity : AppCompatActivity() {
 
     override fun onBackPressed() {
         when {
-            pickNameSheet.isVisible -> {
+            pickNameSheet.isShowing -> {
                 pickNameSheet.dismiss()
             }
             binding.prog3.bOnThisStep -> {
@@ -120,7 +121,7 @@ class CBWalkThroughActivity : AppCompatActivity() {
                 super.onBackPressed()
             }
             !warningSheet.bIsShowing -> {
-                warningSheet.show(supportFragmentManager, "WarningBottomSheet")
+                warningSheet.show()
             }
         }
     }
@@ -164,8 +165,18 @@ class CBWalkThroughActivity : AppCompatActivity() {
         if (AppState.tempData.tempButton == null)
             AppState.tempData.tempButton = RemoteProfile.Button()
 
+        // set up warning sheet
+        warningSheet = BottomSheet(this,
+            getString(R.string.exit_app_title),
+            getString(R.string.exit_app_desc),
+            getString(R.string.leave),
+            getString(android.R.string.cancel),
+            { finishAndRemoveTask() })
+        warningSheet.setup()
+
         //Set up PickNameSheet
         pickNameSheet.nameDesc = getString(R.string.remember_button_name_desc)
+        pickNameSheet.setup()
 
         //Set up pickActionsSheet
         pickActionsSheet.sheetTitle = this@CBWalkThroughActivity.getString(R.string.command_title)
@@ -289,7 +300,7 @@ class CBWalkThroughActivity : AppCompatActivity() {
                 binding.prog3.bOnThisStep = true
                 binding.btnNextStep.text = getString(R.string.select_style)
                 binding.btnNextStep.setOnClickListener { getButtonStyle() }
-                binding.prog1.setOnClickListener { getButtonStyle() }
+                binding.prog1.  setOnClickListener { getButtonStyle() }
             }
         }
     }
@@ -301,14 +312,14 @@ class CBWalkThroughActivity : AppCompatActivity() {
 */
 
     private fun showPickNameSheet() {
-        if (!pickNameSheet.isVisible) {
-            pickNameSheet.show(supportFragmentManager, "PickButtonNameSheet")
+        if (!pickNameSheet.isShowing) {
+            pickNameSheet.show()
         }
     }
 
     private fun getSignalOrAction() {
-        if (!pickActionsSheet.isVisible) {
-            pickActionsSheet.show(supportFragmentManager, "PickActionsSheet")
+        if (!pickActionsSheet.isShowing) {
+            pickActionsSheet.show()
         }
     }
 

diff --git a/...rtIRHub/app/src/main/java/com/ms8/smartirhub/android/create_button/_old/CBNameActivity.kt b/...rtIRHub/app/src/main/java/com/ms8/smartirhub/android/create_button/_old/CBNameActivity.kt
@@ -4,22 +4,31 @@ import android.app.Activity
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import androidx.databinding.DataBindingUtil
+import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.ms8.smartirhub.android.R
-import com.ms8.smartirhub.android.custom_views.bottom_sheets.BottomErrorSheet
 import com.ms8.smartirhub.android.database.AppState
 import com.ms8.smartirhub.android.databinding.ACreateButtonNameBinding
+import com.ms8.smartirhub.android.databinding.VBottomSheetBinding
 import com.ms8.smartirhub.android.utils.MyValidators.ButtonNameValidator
 
 class CBNameActivity : AppCompatActivity() {
     lateinit var binding: ACreateButtonNameBinding
-    val errorNameSheet = BottomErrorSheet()
+    private lateinit var errorNameSheet : BottomSheetDialog
+    private var errorNameSheetBinding: VBottomSheetBinding? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = DataBindingUtil.setContentView(this, R.layout.a_create_button_name)
 
-        errorNameSheet.sheetTitle = getString(R.string.err_invalid_button_name_title)
-        errorNameSheet.description = getString(R.string.err_invalid_button_name_desc)
+        // set up error BottomSheet
+        errorNameSheet = BottomSheetDialog(this)
+        val errorNameSheetView = layoutInflater.inflate(R.layout.v_bottom_sheet, null)
+        errorNameSheet.setContentView(errorNameSheetView)
+        errorNameSheetBinding = DataBindingUtil.bind(errorNameSheetView)
+        errorNameSheetBinding?.let { b ->
+            b.tvTitle.text =  getString(R.string.err_invalid_button_name_title)
+            b.tvDescription.text = getString(R.string.err_invalid_button_name_desc)
+        }
 
         binding.btnPickName.setOnClickListener { checkName() }
 
@@ -36,7 +45,7 @@ class CBNameActivity : AppCompatActivity() {
  */
     private fun checkName() {
         val isValidName = binding.txtButtonName.editText!!.text.toString().ButtonNameValidator()
-            .addErrorCallback { errorNameSheet.show(supportFragmentManager, "bottom_sheet_error_invalid_name") }
+            .addErrorCallback { errorNameSheet.show() }
             .check()
         if (isValidName) {
             AppState.tempData.tempButton?.name = binding.txtButtonName.editText!!.text.toString()

diff --git a/...p/src/main/java/com/ms8/smartirhub/android/custom_views/bottom_sheets/BackWarningSheet.kt b/...p/src/main/java/com/ms8/smartirhub/android/custom_views/bottom_sheets/BackWarningSheet.kt
diff --git a/...p/src/main/java/com/ms8/smartirhub/android/custom_views/bottom_sheets/BottomErrorSheet.kt b/...p/src/main/java/com/ms8/smartirhub/android/custom_views/bottom_sheets/BottomErrorSheet.kt