Skip to content

Commit f2cba90

Browse files
kligarskikligarski
committed
native cleanup for Android
1 parent 4ec16ec commit f2cba90

8 files changed

Lines changed: 21 additions & 21 deletions

File tree

‎android/src/main/java/com/swmansion/rnscreens/RNScreensPackage.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import com.facebook.react.module.model.ReactModuleInfoProvider
99
import com.facebook.react.uimanager.ViewManager
1010
import com.swmansion.rnscreens.gamma.stack.host.StackHostViewManager
1111
import com.swmansion.rnscreens.gamma.stack.screen.StackScreenViewManager
12-
import com.swmansion.rnscreens.gamma.tabs.TabScreenViewManager
1312
import com.swmansion.rnscreens.gamma.tabs.TabsHostViewManager
13+
import com.swmansion.rnscreens.gamma.tabs.TabsScreenViewManager
1414
import com.swmansion.rnscreens.safearea.SafeAreaViewManager
1515
import com.swmansion.rnscreens.utils.ScreenDummyLayoutHelper
1616

@@ -51,7 +51,7 @@ class RNScreensPackage : BaseReactPackage() {
5151
ScreenFooterManager(),
5252
ScreenContentWrapperManager(),
5353
TabsHostViewManager(),
54-
TabScreenViewManager(),
54+
TabsScreenViewManager(),
5555
SafeAreaViewManager(),
5656
StackHostViewManager(),
5757
StackScreenViewManager(),

‎android/src/main/java/com/swmansion/rnscreens/gamma/tabs/TabsHostViewManager.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ import com.facebook.react.uimanager.ThemedReactContext
66
import com.facebook.react.uimanager.ViewGroupManager
77
import com.facebook.react.uimanager.ViewManagerDelegate
88
import com.facebook.react.uimanager.annotations.ReactProp
9-
import com.facebook.react.viewmanagers.RNSBottomTabsManagerDelegate
10-
import com.facebook.react.viewmanagers.RNSBottomTabsManagerInterface
9+
import com.facebook.react.viewmanagers.RNSTabsHostManagerDelegate
10+
import com.facebook.react.viewmanagers.RNSTabsHostManagerInterface
1111
import com.swmansion.rnscreens.gamma.helpers.makeEventRegistrationInfo
1212
import com.swmansion.rnscreens.gamma.tabs.event.TabsHostNativeFocusChangeEvent
1313

1414
@ReactModule(name = TabsHostViewManager.REACT_CLASS)
1515
class TabsHostViewManager :
1616
ViewGroupManager<TabsHost>(),
17-
RNSBottomTabsManagerInterface<TabsHost> {
18-
private val delegate: ViewManagerDelegate<TabsHost> = RNSBottomTabsManagerDelegate<TabsHost, TabsHostViewManager>(this)
17+
RNSTabsHostManagerInterface<TabsHost> {
18+
private val delegate: ViewManagerDelegate<TabsHost> = RNSTabsHostManagerDelegate<TabsHost, TabsHostViewManager>(this)
1919

2020
override fun getName() = REACT_CLASS
2121

@@ -217,6 +217,6 @@ class TabsHostViewManager :
217217
}
218218

219219
companion object {
220-
const val REACT_CLASS = "RNSBottomTabs"
220+
const val REACT_CLASS = "RNSTabsHost"
221221
}
222222
}

android/src/main/java/com/swmansion/rnscreens/gamma/tabs/TabScreenViewManager.kt renamed to android/src/main/java/com/swmansion/rnscreens/gamma/tabs/TabsScreenViewManager.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import com.facebook.react.uimanager.ThemedReactContext
77
import com.facebook.react.uimanager.ViewGroupManager
88
import com.facebook.react.uimanager.ViewManagerDelegate
99
import com.facebook.react.uimanager.annotations.ReactProp
10-
import com.facebook.react.viewmanagers.RNSBottomTabsScreenManagerDelegate
11-
import com.facebook.react.viewmanagers.RNSBottomTabsScreenManagerInterface
10+
import com.facebook.react.viewmanagers.RNSTabsScreenManagerDelegate
11+
import com.facebook.react.viewmanagers.RNSTabsScreenManagerInterface
1212
import com.swmansion.rnscreens.gamma.helpers.makeEventRegistrationInfo
1313
import com.swmansion.rnscreens.gamma.tabs.event.TabScreenDidAppearEvent
1414
import com.swmansion.rnscreens.gamma.tabs.event.TabScreenDidDisappearEvent
@@ -17,11 +17,11 @@ import com.swmansion.rnscreens.gamma.tabs.event.TabScreenWillDisappearEvent
1717
import com.swmansion.rnscreens.gamma.tabs.image.loadTabImage
1818
import com.swmansion.rnscreens.utils.RNSLog
1919

20-
@ReactModule(name = TabScreenViewManager.REACT_CLASS)
21-
class TabScreenViewManager :
20+
@ReactModule(name = TabsScreenViewManager.REACT_CLASS)
21+
class TabsScreenViewManager :
2222
ViewGroupManager<TabScreen>(),
23-
RNSBottomTabsScreenManagerInterface<TabScreen> {
24-
private val delegate: ViewManagerDelegate<TabScreen> = RNSBottomTabsScreenManagerDelegate<TabScreen, TabScreenViewManager>(this)
23+
RNSTabsScreenManagerInterface<TabScreen> {
24+
private val delegate: ViewManagerDelegate<TabScreen> = RNSTabsScreenManagerDelegate<TabScreen, TabsScreenViewManager>(this)
2525

2626
override fun getName() = REACT_CLASS
2727

@@ -241,6 +241,6 @@ class TabScreenViewManager :
241241
}
242242

243243
companion object {
244-
const val REACT_CLASS = "RNSBottomTabsScreen"
244+
const val REACT_CLASS = "RNSTabsScreen"
245245
}
246246
}

android/src/paper/java/com/facebook/react/viewmanagers/RNSBottomTabsManagerDelegate.java renamed to android/src/paper/java/com/facebook/react/viewmanagers/RNSTabsHostManagerDelegate.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
import com.facebook.react.uimanager.LayoutShadowNode;
1818

1919
@SuppressWarnings("deprecation")
20-
public class RNSBottomTabsManagerDelegate<T extends View, U extends BaseViewManager<T, ? extends LayoutShadowNode> & RNSBottomTabsManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
21-
public RNSBottomTabsManagerDelegate(U viewManager) {
20+
public class RNSTabsHostManagerDelegate<T extends View, U extends BaseViewManager<T, ? extends LayoutShadowNode> & RNSTabsHostManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
21+
public RNSTabsHostManagerDelegate(U viewManager) {
2222
super(viewManager);
2323
}
2424
@Override

android/src/paper/java/com/facebook/react/viewmanagers/RNSBottomTabsManagerInterface.java renamed to android/src/paper/java/com/facebook/react/viewmanagers/RNSTabsHostManagerInterface.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import androidx.annotation.Nullable;
1414
import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
1515

16-
public interface RNSBottomTabsManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
16+
public interface RNSTabsHostManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
1717
void setTabBarHidden(T view, boolean value);
1818
void setNativeContainerBackgroundColor(T view, @Nullable Integer value);
1919
void setTabBarBackgroundColor(T view, @Nullable Integer value);

android/src/paper/java/com/facebook/react/viewmanagers/RNSBottomTabsScreenManagerDelegate.java renamed to android/src/paper/java/com/facebook/react/viewmanagers/RNSTabsScreenManagerDelegate.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
import com.facebook.react.uimanager.LayoutShadowNode;
2020

2121
@SuppressWarnings("deprecation")
22-
public class RNSBottomTabsScreenManagerDelegate<T extends View, U extends BaseViewManager<T, ? extends LayoutShadowNode> & RNSBottomTabsScreenManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
23-
public RNSBottomTabsScreenManagerDelegate(U viewManager) {
22+
public class RNSTabsScreenManagerDelegate<T extends View, U extends BaseViewManager<T, ? extends LayoutShadowNode> & RNSTabsScreenManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
23+
public RNSTabsScreenManagerDelegate(U viewManager) {
2424
super(viewManager);
2525
}
2626
@Override

android/src/paper/java/com/facebook/react/viewmanagers/RNSBottomTabsScreenManagerInterface.java renamed to android/src/paper/java/com/facebook/react/viewmanagers/RNSTabsScreenManagerInterface.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import com.facebook.react.bridge.ReadableMap;
1616
import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
1717

18-
public interface RNSBottomTabsScreenManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
18+
public interface RNSTabsScreenManagerInterface<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);

‎react-native.config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ module.exports = {
1414
"RNSScreenFooterComponentDescriptor",
1515
"RNSScreenContentWrapperComponentDescriptor",
1616
'RNSModalScreenComponentDescriptor',
17-
'RNSBottomTabsComponentDescriptor',
17+
'RNSTabsHostComponentDescriptor',
1818
'RNSSafeAreaViewComponentDescriptor'
1919
],
2020
cmakeListsPath: "../android/src/main/jni/CMakeLists.txt"

0 commit comments

Comments
 (0)