Skip to content

Commit 0f983cd

Browse files
authored
chore(android): Remove fixOldArchJavaForRN77Compat (#3424)
Closes software-mansion/react-native-screens-labs#581 ## Description This PR removes `fixOldArchJavaForRN77Compat` function that would fix old react navigation versions <= 77 when changes in 78 were breaking the build. We no longer support either of these, so the workoround is unnecessary. ## Changes Removed `fixOldArchJavaForRN77Compat` & rerun codegen. ## Test code and steps to reproduce Build the app on Paper & Fabric. Nothing should change. No SoftExceptions about 'getDelegate()' should be thrown (https://github.com/facebook/react-native/blob/716303362aead08310e2101f15a319b64a602026/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManager.java#L120)
1 parent 91b17d5 commit 0f983cd

12 files changed

+22
-57
lines changed

android/src/paper/java/com/facebook/react/viewmanagers/RNSBottomTabsManagerInterface.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111

1212
import android.view.View;
1313
import androidx.annotation.Nullable;
14+
import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
1415

15-
16-
public interface RNSBottomTabsManagerInterface<T extends View> {
16+
public interface RNSBottomTabsManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
1717
void setTabBarBackgroundColor(T view, @Nullable Integer value);
1818
void setTabBarItemTitleFontFamily(T view, @Nullable String value);
1919
void setTabBarItemTitleFontSize(T view, float value);

android/src/paper/java/com/facebook/react/viewmanagers/RNSBottomTabsScreenManagerInterface.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
import androidx.annotation.Nullable;
1414
import com.facebook.react.bridge.Dynamic;
1515
import com.facebook.react.bridge.ReadableMap;
16+
import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
1617

17-
18-
public interface RNSBottomTabsScreenManagerInterface<T extends View> {
18+
public interface RNSBottomTabsScreenManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
1919
void setIsFocused(T view, boolean value);
2020
void setTabKey(T view, @Nullable String value);
2121
void setTitle(T view, @Nullable String value);

android/src/paper/java/com/facebook/react/viewmanagers/RNSSafeAreaViewManagerInterface.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
import android.view.View;
1313
import androidx.annotation.Nullable;
1414
import com.facebook.react.bridge.ReadableMap;
15+
import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
1516

16-
17-
public interface RNSSafeAreaViewManagerInterface<T extends View> {
17+
public interface RNSSafeAreaViewManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
1818
void setEdges(T view, @Nullable ReadableMap value);
1919
void setInsetType(T view, @Nullable String value);
2020
}

android/src/paper/java/com/facebook/react/viewmanagers/RNSScreenContainerManagerInterface.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
package com.facebook.react.viewmanagers;
1111

1212
import android.view.View;
13+
import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
1314

14-
15-
public interface RNSScreenContainerManagerInterface<T extends View> {
15+
public interface RNSScreenContainerManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
1616
// No props
1717
}

android/src/paper/java/com/facebook/react/viewmanagers/RNSScreenContentWrapperManagerInterface.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
package com.facebook.react.viewmanagers;
1111

1212
import android.view.View;
13+
import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
1314

14-
15-
public interface RNSScreenContentWrapperManagerInterface<T extends View> {
15+
public interface RNSScreenContentWrapperManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
1616
// No props
1717
}

android/src/paper/java/com/facebook/react/viewmanagers/RNSScreenFooterManagerInterface.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
package com.facebook.react.viewmanagers;
1111

1212
import android.view.View;
13+
import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
1314

14-
15-
public interface RNSScreenFooterManagerInterface<T extends View> {
15+
public interface RNSScreenFooterManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
1616
// No props
1717
}

android/src/paper/java/com/facebook/react/viewmanagers/RNSScreenManagerInterface.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
import androidx.annotation.Nullable;
1414
import com.facebook.react.bridge.ReadableArray;
1515
import com.facebook.react.bridge.ReadableMap;
16+
import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
1617

17-
18-
public interface RNSScreenManagerInterface<T extends View> {
18+
public interface RNSScreenManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
1919
void setScreenId(T view, @Nullable String value);
2020
void setSheetAllowedDetents(T view, @Nullable ReadableArray value);
2121
void setSheetLargestUndimmedDetent(T view, int value);

android/src/paper/java/com/facebook/react/viewmanagers/RNSScreenStackHeaderConfigManagerInterface.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
import android.view.View;
1313
import androidx.annotation.Nullable;
1414
import com.facebook.react.bridge.ReadableArray;
15+
import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
1516

16-
17-
public interface RNSScreenStackHeaderConfigManagerInterface<T extends View> {
17+
public interface RNSScreenStackHeaderConfigManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
1818
void setBackgroundColor(T view, @Nullable Integer value);
1919
void setBackTitle(T view, @Nullable String value);
2020
void setBackTitleFontFamily(T view, @Nullable String value);

android/src/paper/java/com/facebook/react/viewmanagers/RNSScreenStackHeaderSubviewManagerInterface.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111

1212
import android.view.View;
1313
import androidx.annotation.Nullable;
14+
import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
1415

15-
16-
public interface RNSScreenStackHeaderSubviewManagerInterface<T extends View> {
16+
public interface RNSScreenStackHeaderSubviewManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
1717
void setType(T view, @Nullable String value);
1818
void setHidesSharedBackground(T view, boolean value);
1919
void setSynchronousShadowStateUpdatesEnabled(T view, boolean value);

android/src/paper/java/com/facebook/react/viewmanagers/RNSScreenStackManagerInterface.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
package com.facebook.react.viewmanagers;
1111

1212
import android.view.View;
13+
import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
1314

14-
15-
public interface RNSScreenStackManagerInterface<T extends View> {
15+
public interface RNSScreenStackManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
1616
// No props
1717
}

0 commit comments

Comments
 (0)