Merge V2 Conversation Fragment behind an internal setting.

app/src/main/java/org/thoughtcrime/securesms/components/InsetAwareConstraintLayout.java

@@ -1,10 +1,6 @@
 package org.thoughtcrime.securesms.components;
 
-import android.annotation.TargetApi;
 import android.content.Context;
-import android.graphics.Insets;
-import android.graphics.Rect;
-import android.os.Build;
 import android.util.AttributeSet;
 import android.view.WindowInsets;
 
@@ -12,12 +8,17 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.Guideline;
+import androidx.core.graphics.Insets;
+import androidx.core.view.WindowInsetsCompat;
 
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.util.ViewUtil;
 
 public class InsetAwareConstraintLayout extends ConstraintLayout {
 
+  private WindowInsetsTypeProvider windowInsetsTypeProvider = WindowInsetsTypeProvider.ALL;
+  private Insets                   insets;
+
   public InsetAwareConstraintLayout(@NonNull Context context) {
     super(context);
   }
@@ -30,30 +31,21 @@ public class InsetAwareConstraintLayout extends ConstraintLayout {
     super(context, attrs, defStyleAttr);
   }
 
+  public void setWindowInsetsTypeProvider(@NonNull WindowInsetsTypeProvider windowInsetsTypeProvider) {
+    this.windowInsetsTypeProvider = windowInsetsTypeProvider;
+    requestLayout();
+  }
+
   @Override
   public WindowInsets onApplyWindowInsets(WindowInsets insets) {
-    if (Build.VERSION.SDK_INT < 30) {
-      return super.onApplyWindowInsets(insets);
-    }
-
-    Insets windowInsets = insets.getInsets(WindowInsets.Type.systemBars() | WindowInsets.Type.ime() | WindowInsets.Type.displayCutout());
-    applyInsets(new Rect(windowInsets.left, windowInsets.top, windowInsets.right, windowInsets.bottom));
+    WindowInsetsCompat windowInsetsCompat = WindowInsetsCompat.toWindowInsetsCompat(insets);
+    Insets             newInsets          = windowInsetsCompat.getInsets(windowInsetsTypeProvider.getInsetsType());
 
+    applyInsets(newInsets);
     return super.onApplyWindowInsets(insets);
   }
 
-  @Override
-  protected boolean fitSystemWindows(Rect insets) {
-    if (Build.VERSION.SDK_INT >= 30) {
-      return true;
-    }
-
-    applyInsets(insets);
-
-    return true;
-  }
-
-  private void applyInsets(@NonNull Rect insets) {
+  public void applyInsets(@NonNull Insets insets) {
     Guideline statusBarGuideline     = findViewById(R.id.status_bar_guideline);
     Guideline navigationBarGuideline = findViewById(R.id.navigation_bar_guideline);
     Guideline parentStartGuideline   = findViewById(R.id.parent_start_guideline);
@@ -83,4 +75,15 @@ public class InsetAwareConstraintLayout extends ConstraintLayout {
       }
     }
   }
+
+  public interface WindowInsetsTypeProvider {
+
+    WindowInsetsTypeProvider ALL = () ->
+      WindowInsetsCompat.Type.ime() |
+      WindowInsetsCompat.Type.systemBars() |
+      WindowInsetsCompat.Type.displayCutout();
+
+    @WindowInsetsCompat.Type.InsetsType
+    int getInsetsType();
+  }
 }

app/src/main/java/org/thoughtcrime/securesms/components/KeyboardAwareLinearLayout.java

@@ -219,6 +219,10 @@ public class KeyboardAwareLinearLayout extends LinearLayoutCompat {
   }
 
   private int getDeviceRotation() {
+    if (isInEditMode()) {
+      return Surface.ROTATION_0;
+    }
+
     if (Build.VERSION.SDK_INT >= 30) {
       getContext().getDisplay().getRealMetrics(displayMetrics);
     } else {

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsFragment.kt

@@ -595,6 +595,15 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
           }
         )
       }
+
+      dividerPref()
+      switchPref(
+        title = DSLSettingsText.from("Use V2 ConversationFragment"),
+        isChecked = state.useConversationFragmentV2,
+        onClick = {
+          viewModel.setUseConversationFragmentV2(!state.useConversationFragmentV2)
+        }
+      )
     }
   }
 

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsState.kt

@@ -21,5 +21,6 @@ data class InternalSettingsState(
   val delayResends: Boolean,
   val disableStorageService: Boolean,
   val canClearOnboardingState: Boolean,
-  val pnpInitialized: Boolean
+  val pnpInitialized: Boolean,
+  val useConversationFragmentV2: Boolean
 )

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsViewModel.kt

@@ -104,6 +104,11 @@ class InternalSettingsViewModel(private val repository: InternalSettingsReposito
     refresh()
   }
 
+  fun setUseConversationFragmentV2(enabled: Boolean) {
+    SignalStore.internalValues().setUseConversationFragmentV2(enabled)
+    refresh()
+  }
+
   fun addSampleReleaseNote() {
     repository.addSampleReleaseNote()
   }
@@ -130,7 +135,8 @@ class InternalSettingsViewModel(private val repository: InternalSettingsReposito
     delayResends = SignalStore.internalValues().delayResends(),
     disableStorageService = SignalStore.internalValues().storageServiceDisabled(),
     canClearOnboardingState = SignalStore.storyValues().hasDownloadedOnboardingStory && Stories.isFeatureEnabled(),
-    pnpInitialized = SignalStore.misc().hasPniInitializedDevices()
+    pnpInitialized = SignalStore.misc().hasPniInitializedDevices(),
+    useConversationFragmentV2 = SignalStore.internalValues().useConversationFragmentV2()
   )
 
   fun onClearOnboardingState() {