Kindness Mode UX Update

app/src/main/java/org/torproject/android/service/OrbotService.java

@@ -754,10 +754,6 @@ public void onReceive(Context context, Intent intent) {
                     // hack for https://github.com/guardianproject/tor-android/issues/73 remove when fixed
                     var newStatus = intent.getStringExtra(EXTRA_STATUS);
 
-                    if (STATUS_ON.equals(newStatus) && Prefs.getTransport() == Transport.NONE && !Prefs.getHasDirectConnected()) {
-                        Prefs.setHasDirectConnected(true);
-                    }
-
                     if (STATUS_OFF.equals(mCurrentStatus) && STATUS_STOPPING.equals(newStatus))
                         break;
                     mCurrentStatus = newStatus;

app/src/main/java/org/torproject/android/ui/OrbotBottomSheetDialogFragment.kt

@@ -6,6 +6,7 @@ import android.graphics.Color
 import android.os.Bundle
 import android.view.MotionEvent
 import android.view.View
+import android.view.ViewGroup
 import android.widget.EditText
 import android.widget.FrameLayout
 
@@ -21,7 +22,9 @@ import org.torproject.android.R
 Class to set up default bottom sheet behavior for Config Connection, MOAT and any other
 bottom sheets to come
  */
-open class OrbotBottomSheetDialogFragment : BottomSheetDialogFragment() {
+open class OrbotBottomSheetDialogFragment(
+    val minMode: Boolean = false
+) : BottomSheetDialogFragment() {
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         val dialog = BottomSheetDialog(requireActivity(), theme)
         dialog.setOnShowListener {
@@ -30,25 +33,33 @@ open class OrbotBottomSheetDialogFragment : BottomSheetDialogFragment() {
             bottomSheetView?.let {
                 it.setBackgroundResource(R.drawable.bottom_sheet_rounded)
                 it.setBackgroundColor(Color.TRANSPARENT)
-                setHeightResponsive(it)
                 val behavior = BottomSheetBehavior.from(it)
+                setHeightResponsive(it, behavior)
                 behavior.state = BottomSheetBehavior.STATE_EXPANDED
             }
         }
 
         return dialog
     }
 
-    private fun setHeightResponsive(bottomSheet: View) {
+    private fun setHeightResponsive(bottomSheet: View, behavior: BottomSheetBehavior<*>) {
         val windowMetrics = WindowMetricsCalculator
             .getOrCreate()
             .computeCurrentWindowMetrics(requireActivity())
 
         val windowHeight = windowMetrics.bounds.height()
         val height = (windowHeight * getHeightRatio()).toInt()
-
         val layoutParams = bottomSheet.layoutParams
-        layoutParams.height = height
+
+        if (minMode) {
+            behavior.maxHeight = height
+
+            layoutParams.height = ViewGroup.LayoutParams.WRAP_CONTENT
+        }
+        else {
+            layoutParams.height = height
+        }
+
         bottomSheet.layoutParams = layoutParams
     }
 

app/src/main/java/org/torproject/android/ui/kindness/KindnessConfigBottomSheet.kt

@@ -4,45 +4,45 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Button
-import androidx.appcompat.widget.SwitchCompat
-import androidx.fragment.app.FragmentActivity
-import org.torproject.android.R
-import org.torproject.android.util.Prefs
+import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.setFragmentResult
+import org.torproject.android.databinding.KindnessConfigBottomSheetBinding
 import org.torproject.android.ui.OrbotBottomSheetDialogFragment
+import org.torproject.android.util.Prefs
 
-class KindnessConfigBottomSheet : OrbotBottomSheetDialogFragment() {
+class KindnessConfigBottomSheet : OrbotBottomSheetDialogFragment(true) {
 
-    private lateinit var btnAction: Button
+    private lateinit var mBinding: KindnessConfigBottomSheetBinding
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
-    ): View? {
-        val v = inflater.inflate(R.layout.kindess_config_bottom_sheet, container, false)
-        v.findViewById<View>(R.id.tvCancel).setOnClickListener { dismiss() }
-        btnAction = v.findViewById(R.id.btnAction)
+    ): View {
+        mBinding = KindnessConfigBottomSheetBinding.inflate(inflater, container, false)
+
+        mBinding.tvCancel.setOnClickListener { dismiss() }
 
-        val configWifi = v.findViewById<SwitchCompat>(R.id.swKindnessConfigWifi)
-        val configCharging = v.findViewById<SwitchCompat>(R.id.swKindnessConfigCharging)
+        mBinding.btnAction.setOnClickListener {
+            Prefs.setBeSnowflakeProxyLimitWifi(mBinding.swKindnessConfigWifi.isChecked)
+            Prefs.setBeSnowflakeProxyLimitCharging(mBinding.swKindnessConfigCharging.isChecked)
 
-        btnAction.setOnClickListener {
-            Prefs.setBeSnowflakeProxyLimitWifi(configWifi.isChecked)
-            Prefs.setBeSnowflakeProxyLimitCharging(configCharging.isChecked)
+            setFragmentResult(KEY_CONFIG_CHANGED, Bundle())
             dismiss()
         }
 
-        configWifi.isChecked = Prefs.limitSnowflakeProxyingWifi()
-        configCharging.isChecked = Prefs.limitSnowflakeProxyingCharging()
-        return v
+        mBinding.swKindnessConfigWifi.isChecked = Prefs.limitSnowflakeProxyingWifi()
+        mBinding.swKindnessConfigCharging.isChecked = Prefs.limitSnowflakeProxyingCharging()
+
+        return mBinding.root
     }
 
     companion object {
-        fun openKindnessSettings(fragmentActivity: FragmentActivity) {
+        const val KEY_CONFIG_CHANGED = "kindness_config_changed"
+
+        fun show(fragmentManager: FragmentManager) {
             KindnessConfigBottomSheet().show(
-                fragmentActivity.supportFragmentManager,
+                fragmentManager,
                 "KindnessConfig"
             )
         }
     }
-
-}
+}