🐱 refactoring 🐱

Author: sungbin5304

app/src/main/kotlin/com/sungbin/gitkakaobot/ui/fragment/BotFragment.kt

@@ -15,11 +15,13 @@ import com.sungbin.gitkakaobot.model.Bot
 import com.sungbin.gitkakaobot.model.BotType
 import com.sungbin.gitkakaobot.ui.activity.DashboardActivity.Companion.botList
 import com.sungbin.gitkakaobot.ui.activity.DashboardActivity.Companion.initBotList
+import com.sungbin.gitkakaobot.ui.activity.DashboardActivity.Companion.onBackPressedAction
 import com.sungbin.gitkakaobot.util.BotUtil
 import com.sungbin.gitkakaobot.util.UiUtil
 
 class BotFragment : Fragment() {
 
+    private var onBackPressedTime = 0L
     private val binding by lazy { FragmentBotBinding.inflate(layoutInflater) }
     private lateinit var adapter: BotAdapter
 
@@ -32,6 +34,7 @@ class BotFragment : Fragment() {
         super.onActivityCreated(savedInstanceState)
 
         initBotList()
+        initOnBackPressedAction()
         statusViewInit()
 
         adapter = BotAdapter(botList.value ?: arrayListOf(), requireActivity())
@@ -45,6 +48,12 @@ class BotFragment : Fragment() {
 
         binding.efabAdd.setOnClickListener {
             binding.tslContainer.startTransform()
+            onBackPressedAction = {
+                binding.mbtgContainer.check(R.id.btn_javascript)
+                binding.tietBotName.clear()
+                binding.tslContainer.finishTransform()
+                binding.tietBotName.hideKeyboard()
+            }
         }
 
         binding.btnAdd.setOnClickListener {
@@ -73,6 +82,7 @@ class BotFragment : Fragment() {
                 binding.tslContainer.finishTransform()
                 UiUtil.snackbar(it, getString(R.string.bot_added_new_bot))
                 binding.tietBotName.hideKeyboard()
+                initOnBackPressedAction()
             }
         }
 
@@ -95,6 +105,17 @@ class BotFragment : Fragment() {
         }
     }
 
+    private fun initOnBackPressedAction() {
+        onBackPressedAction = {
+            if (System.currentTimeMillis() - onBackPressedTime <= 3000) {
+                requireActivity().finish()
+            } else {
+                onBackPressedTime = System.currentTimeMillis()
+                UiUtil.toast(requireContext(), getString(R.string.bot_confim_exit))
+            }
+        }
+    }
+
     private val dragCallback = object : ItemTouchHelper.Callback() {
         var dragFrom = -1
         var dragTo = -1

app/src/main/res/drawable/ic_baseline_adb_24.xml

@@ -6,5 +6,5 @@
     android:tint="?attr/colorControlNormal">
   <path
       android:fillColor="@android:color/white"
-      android:pathData="M19,5v2h-4L15,5h4M9,5v6L5,11L5,5h4m10,8v6h-4v-6h4M9,17v2L5,19v-2h4M21,3h-8v6h8L21,3zM11,3L3,3v10h8L11,3zM21,11h-8v10h8L21,11zM11,15L3,15v6h8v-6z"/>
+      android:pathData="M10,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2z" />
 </vector>

app/src/main/res/drawable/ic_outline_dashboard_24.xml renamed to app/src/main/res/drawable/ic_baseline_folder_24.xml

@@ -38,7 +38,7 @@
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/cl_bot_container"
                 android:layout_width="match_parent"
-                android:layout_height="70dp">
+                android:layout_height="100dp">
 
                 <View
                     android:id="@+id/v_compile_statue"
@@ -51,11 +51,11 @@
 
                 <com.sungbin.androidutils.ui.TagableRoundImageView
                     android:id="@+id/triv_icon"
-                    android:layout_width="30dp"
-                    android:layout_height="30dp"
-                    android:layout_marginStart="@dimen/margin_half"
-                    android:layout_marginTop="@dimen/margin_half"
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
+                    android:layout_marginStart="@dimen/margin_default"
                     android:src="@{Item.type == BotType.JS ? @drawable/ic_baseline_javascript_24 : @drawable/ic_baseline_message_24}"
+                    app:layout_constraintBottom_toTopOf="@+id/ll_menu_container"
                     app:layout_constraintStart_toEndOf="@+id/v_compile_statue"
                     app:layout_constraintTop_toTopOf="parent"
                     app:triv_imageRadius="@dimen/margin_half"
@@ -71,6 +71,8 @@
                     android:maxLines="1"
                     android:singleLine="true"
                     android:text="@{Item.name}"
+                    android:textColor="@color/colorBlack"
+                    android:textSize="18sp"
                     app:layout_constraintBottom_toBottomOf="@+id/triv_icon"
                     app:layout_constraintStart_toEndOf="@+id/triv_icon"
                     app:layout_constraintTop_toTopOf="@+id/triv_icon"
@@ -89,16 +91,15 @@
 
                 <LinearLayout
                     android:id="@+id/ll_menu_container"
-                    android:layout_width="0dp"
-                    android:layout_height="0dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/margin_half"
                     android:layout_marginBottom="@dimen/margin_half"
                     android:orientation="horizontal"
                     android:weightSum="6"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toEndOf="@+id/v_compile_statue"
-                    app:layout_constraintTop_toBottomOf="@+id/triv_icon">
+                    app:layout_constraintStart_toEndOf="@+id/v_compile_statue">
 
                     <ImageView
                         android:id="@+id/iv_reload"
@@ -146,7 +147,7 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:contentDescription="@string/database"
-                        android:src="@drawable/ic_baseline_adb_24" />
+                        android:src="@drawable/ic_baseline_folder_24" />
 
                     <ImageView
                         android:id="@+id/iv_setting"