Skip to content

Commit 5ec8e60

Browse files
lunaleapsfacebook-github-bot
authored andcommitted
Refactor VirtualView target structure on Android (#52476)
Summary: Pull Request resolved: #52476 Changelog: [Internal] - Refactor package structure on Android to prepare for experimental VirtualView so that non-view related objects go under `virtual` and the native view goes under `view`. This breaks dependency circles for experimental VirtualView in upcoming change. Reviewed By: yungsters Differential Revision: D77335426 fbshipit-source-id: 3b978e9cc5ad376c71aebc039cfc74d2515d2cfa
1 parent 918f02d commit 5ec8e60

6 files changed

Lines changed: 13 additions & 6 deletions

File tree

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/virtualview/VirtualViewMode.kt renamed to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/virtual/VirtualViewMode.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
package com.facebook.react.views.virtualview
8+
package com.facebook.react.views.virtual
99

1010
internal enum class VirtualViewMode(val value: Int) {
1111
Visible(0),

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/virtualview/VirtualViewModeChangeEvent.kt renamed to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/virtual/VirtualViewModeChangeEvent.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
package com.facebook.react.views.virtualview
8+
package com.facebook.react.views.virtual
99

1010
import android.graphics.Rect
1111
import androidx.annotation.VisibleForTesting

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/virtualview/VirtualViewRenderState.kt renamed to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/virtual/VirtualViewRenderState.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
package com.facebook.react.views.virtualview
8+
package com.facebook.react.views.virtual
99

1010
/**
1111
* Represents the the render state of children in the most recent commit.

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/virtualview/ReactVirtualView.kt renamed to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/virtual/view/ReactVirtualView.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
package com.facebook.react.views.virtualview
8+
package com.facebook.react.views.virtual.view
99

1010
import android.content.Context
1111
import android.graphics.Rect
@@ -24,6 +24,8 @@ import com.facebook.react.views.scroll.ReactScrollView
2424
import com.facebook.react.views.scroll.ReactScrollViewHelper
2525
import com.facebook.react.views.scroll.ScrollEventType
2626
import com.facebook.react.views.view.ReactViewGroup
27+
import com.facebook.react.views.virtual.VirtualViewMode
28+
import com.facebook.react.views.virtual.VirtualViewRenderState
2729
import com.facebook.systrace.Systrace
2830

2931
internal class ReactVirtualView(context: Context) :

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/virtualview/ReactVirtualViewManager.kt renamed to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/virtual/view/ReactVirtualViewManager.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
package com.facebook.react.views.virtualview
8+
package com.facebook.react.views.virtual.view
99

1010
import android.graphics.Rect
1111
import androidx.annotation.VisibleForTesting
@@ -19,6 +19,9 @@ import com.facebook.react.uimanager.annotations.ReactProp
1919
import com.facebook.react.uimanager.events.EventDispatcher
2020
import com.facebook.react.viewmanagers.VirtualViewManagerDelegate
2121
import com.facebook.react.viewmanagers.VirtualViewManagerInterface
22+
import com.facebook.react.views.virtual.VirtualViewMode
23+
import com.facebook.react.views.virtual.VirtualViewModeChangeEvent
24+
import com.facebook.react.views.virtual.VirtualViewRenderState
2225

2326
@ReactModule(name = ReactVirtualViewManager.REACT_CLASS)
2427
internal class ReactVirtualViewManager :

packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/virtualview/ReactVirtualViewTest.kt renamed to packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/virtual/view/ReactVirtualViewTest.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
package com.facebook.react.views.virtualview
8+
package com.facebook.react.views.virtual.view
99

1010
import android.app.Activity
1111
import android.content.Context
@@ -19,6 +19,8 @@ import com.facebook.react.uimanager.DisplayMetricsHolder
1919
import com.facebook.react.uimanager.events.Event
2020
import com.facebook.react.uimanager.events.EventDispatcher
2121
import com.facebook.react.views.scroll.ReactScrollView
22+
import com.facebook.react.views.virtual.VirtualViewMode
23+
import com.facebook.react.views.virtual.VirtualViewModeChangeEvent
2224
import org.assertj.core.api.Assertions.assertThat
2325
import org.junit.Before
2426
import org.junit.Test

0 commit comments

Comments
 (0)