From c07e9b64945d7320ca5c9d4cfe481308a3e6967c Mon Sep 17 00:00:00 2001
From: Kacper Kafara <kacper.kafara@swmansion.com>
Date: Thu, 16 Jan 2025 15:34:51 +0100
Subject: [PATCH] refactor(Android): rename `FabricEnabledHeaderSubviewGroup`
 -> `FabricEnabledHeaderSubviewViewGroup` + fix arch-consistency check (#2622)

- **Add FabricEnabledHeaderSubviewViewGroup to arch-check balcklist**
- **Fix naming**

## Description

<!--
Description and motivation for this PR.

Include Fixes #<number> if this is fixing some issue.

Fixes # .
-->

## Changes

<!--
Please describe things you've changed here, make a **high level**
overview, if change is simple you can omit this section.

For example:

- Updated `about.md` docs

-->

<!--

## Screenshots / GIFs

Here you can add screenshots / GIFs documenting your change.

You can add before / after section if you're changing some behavior.

### Before

### After

-->

## Test code and steps to reproduce

<!--
Please include code that can be used to test this change and short
description how this example should work.
This snippet should be as minimal as possible and ready to be pasted
into editor (don't exclude exports or remove "not important" parts of
reproduction example)
-->

## Checklist

- [ ] Included code example that can be used to test this change
- [ ] Updated TS types
- [ ] Updated documentation: <!-- For adding new props to native-stack
-->
- [ ]
https://github.com/software-mansion/react-native-screens/blob/main/guides/GUIDE_FOR_LIBRARY_AUTHORS.md
- [ ]
https://github.com/software-mansion/react-native-screens/blob/main/native-stack/README.md
- [ ]
https://github.com/software-mansion/react-native-screens/blob/main/src/types.tsx
- [ ]
https://github.com/software-mansion/react-native-screens/blob/main/src/native-stack/types.tsx
- [ ] Ensured that CI passes
---
 ...up.kt => FabricEnabledHeaderSubviewViewGroup.kt} |  2 +-
 .../swmansion/rnscreens/ScreenStackHeaderSubview.kt | 13 ++++++-------
 ...up.kt => FabricEnabledHeaderSubviewViewGroup.kt} |  2 +-
 scripts/codegen-utils.js                            |  1 +
 4 files changed, 9 insertions(+), 9 deletions(-)
 rename android/src/fabric/java/com/swmansion/rnscreens/{FabricEnabledHeaderSubviewGroup.kt => FabricEnabledHeaderSubviewViewGroup.kt} (96%)
 rename android/src/paper/java/com/swmansion/rnscreens/{FabricEnabledHeaderSubviewGroup.kt => FabricEnabledHeaderSubviewViewGroup.kt} (79%)

diff --git a/android/src/fabric/java/com/swmansion/rnscreens/FabricEnabledHeaderSubviewGroup.kt b/android/src/fabric/java/com/swmansion/rnscreens/FabricEnabledHeaderSubviewViewGroup.kt
similarity index 96%
rename from android/src/fabric/java/com/swmansion/rnscreens/FabricEnabledHeaderSubviewGroup.kt
rename to android/src/fabric/java/com/swmansion/rnscreens/FabricEnabledHeaderSubviewViewGroup.kt
index 9e8be5110f..329677ec58 100644
--- a/android/src/fabric/java/com/swmansion/rnscreens/FabricEnabledHeaderSubviewGroup.kt
+++ b/android/src/fabric/java/com/swmansion/rnscreens/FabricEnabledHeaderSubviewViewGroup.kt
@@ -8,7 +8,7 @@ import com.facebook.react.bridge.WritableNativeMap
 import com.facebook.react.uimanager.PixelUtil
 import com.facebook.react.uimanager.StateWrapper
 
-abstract class FabricEnabledHeaderSubviewGroup(
+abstract class FabricEnabledHeaderSubviewViewGroup(
     context: Context?,
 ) : ViewGroup(context) {
     private var mStateWrapper: StateWrapper? = null
diff --git a/android/src/main/java/com/swmansion/rnscreens/ScreenStackHeaderSubview.kt b/android/src/main/java/com/swmansion/rnscreens/ScreenStackHeaderSubview.kt
index add6eea5aa..4a3f24ba50 100644
--- a/android/src/main/java/com/swmansion/rnscreens/ScreenStackHeaderSubview.kt
+++ b/android/src/main/java/com/swmansion/rnscreens/ScreenStackHeaderSubview.kt
@@ -3,12 +3,11 @@ package com.swmansion.rnscreens
 import android.annotation.SuppressLint
 import android.view.View
 import com.facebook.react.bridge.ReactContext
-import com.facebook.react.views.view.ReactViewGroup
 
 @SuppressLint("ViewConstructor")
 class ScreenStackHeaderSubview(
     context: ReactContext?,
-) : FabricEnabledHeaderSubviewGroup(context) {
+) : FabricEnabledHeaderSubviewViewGroup(context) {
     private var reactWidth = 0
     private var reactHeight = 0
     var type = Type.RIGHT
@@ -42,11 +41,11 @@ class ScreenStackHeaderSubview(
         r: Int,
         b: Int,
     ) {
-       if (changed && BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-           val width = r - l;
-           val height = b - t;
-           updateSubviewFrameState(width, height, l, t)
-       }
+        if (changed && BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
+            val width = r - l
+            val height = b - t
+            updateSubviewFrameState(width, height, l, t)
+        }
     }
 
     enum class Type {
diff --git a/android/src/paper/java/com/swmansion/rnscreens/FabricEnabledHeaderSubviewGroup.kt b/android/src/paper/java/com/swmansion/rnscreens/FabricEnabledHeaderSubviewViewGroup.kt
similarity index 79%
rename from android/src/paper/java/com/swmansion/rnscreens/FabricEnabledHeaderSubviewGroup.kt
rename to android/src/paper/java/com/swmansion/rnscreens/FabricEnabledHeaderSubviewViewGroup.kt
index 84e20aea1f..936eaa94b3 100644
--- a/android/src/paper/java/com/swmansion/rnscreens/FabricEnabledHeaderSubviewGroup.kt
+++ b/android/src/paper/java/com/swmansion/rnscreens/FabricEnabledHeaderSubviewViewGroup.kt
@@ -4,7 +4,7 @@ import android.content.Context
 import android.view.ViewGroup
 import com.facebook.react.uimanager.StateWrapper
 
-abstract class FabricEnabledHeaderSubviewGroup(context: Context?): ViewGroup(context) {
+abstract class FabricEnabledHeaderSubviewViewGroup(context: Context?): ViewGroup(context) {
 
     fun setStateWrapper(wrapper: StateWrapper?) = Unit
 
diff --git a/scripts/codegen-utils.js b/scripts/codegen-utils.js
index a542f3198e..9633aa7e84 100644
--- a/scripts/codegen-utils.js
+++ b/scripts/codegen-utils.js
@@ -28,6 +28,7 @@ const BLACKLISTED_FILES = new Set([
   'FabricEnabledViewGroup.kt',
   'NativeProxy.kt',
   'FabricEnabledHeaderConfigViewGroup.kt',
+  'FabricEnabledHeaderSubviewViewGroup.kt',
 ]);