fix crop picker patch
This commit is contained in:
+10
-9
@@ -1,5 +1,5 @@
|
|||||||
diff --git a/node_modules/react-native-image-crop-picker/android/src/main/AndroidManifest.xml b/node_modules/react-native-image-crop-picker/android/src/main/AndroidManifest.xml
|
diff --git a/node_modules/react-native-image-crop-picker/android/src/main/AndroidManifest.xml b/node_modules/react-native-image-crop-picker/android/src/main/AndroidManifest.xml
|
||||||
index 391f303..8e2c3db 100644
|
index a08629b..fab6299 100644
|
||||||
--- a/node_modules/react-native-image-crop-picker/android/src/main/AndroidManifest.xml
|
--- a/node_modules/react-native-image-crop-picker/android/src/main/AndroidManifest.xml
|
||||||
+++ b/node_modules/react-native-image-crop-picker/android/src/main/AndroidManifest.xml
|
+++ b/node_modules/react-native-image-crop-picker/android/src/main/AndroidManifest.xml
|
||||||
@@ -24,7 +24,7 @@
|
@@ -24,7 +24,7 @@
|
||||||
@@ -8,12 +8,12 @@ index 391f303..8e2c3db 100644
|
|||||||
android:name="com.yalantis.ucrop.UCropActivity"
|
android:name="com.yalantis.ucrop.UCropActivity"
|
||||||
- android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
|
- android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
|
||||||
+ android:theme="@style/Theme.UCropNoEdgeToEdge" />
|
+ android:theme="@style/Theme.UCropNoEdgeToEdge" />
|
||||||
</application>
|
|
||||||
|
|
||||||
</manifest>
|
|
||||||
|
<!-- Prompt Google Play services to install the backported photo picker module -->
|
||||||
diff --git a/node_modules/react-native-image-crop-picker/android/src/main/res/values-v35/styles.xml b/node_modules/react-native-image-crop-picker/android/src/main/res/values-v35/styles.xml
|
diff --git a/node_modules/react-native-image-crop-picker/android/src/main/res/values-v35/styles.xml b/node_modules/react-native-image-crop-picker/android/src/main/res/values-v35/styles.xml
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..396d5a8
|
index 0000000..5301f74
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/node_modules/react-native-image-crop-picker/android/src/main/res/values-v35/styles.xml
|
+++ b/node_modules/react-native-image-crop-picker/android/src/main/res/values-v35/styles.xml
|
||||||
@@ -0,0 +1,5 @@
|
@@ -0,0 +1,5 @@
|
||||||
@@ -22,26 +22,27 @@ index 0000000..396d5a8
|
|||||||
+ <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
|
+ <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
|
||||||
+ </style>
|
+ </style>
|
||||||
+</resources>
|
+</resources>
|
||||||
|
\ No newline at end of file
|
||||||
diff --git a/node_modules/react-native-image-crop-picker/android/src/main/res/values/styles.xml b/node_modules/react-native-image-crop-picker/android/src/main/res/values/styles.xml
|
diff --git a/node_modules/react-native-image-crop-picker/android/src/main/res/values/styles.xml b/node_modules/react-native-image-crop-picker/android/src/main/res/values/styles.xml
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..50129b6
|
index 0000000..55569aa
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/node_modules/react-native-image-crop-picker/android/src/main/res/values/styles.xml
|
+++ b/node_modules/react-native-image-crop-picker/android/src/main/res/values/styles.xml
|
||||||
@@ -0,0 +1,3 @@
|
@@ -0,0 +1,3 @@
|
||||||
+<resources>
|
+<resources>
|
||||||
+ <style name="Theme.UCropNoEdgeToEdge" parent="Theme.AppCompat.Light.NoActionBar"/>
|
+ <style name="Theme.UCropNoEdgeToEdge" parent="Theme.AppCompat.Light.NoActionBar"/>
|
||||||
+</resources>
|
+</resources>
|
||||||
|
\ No newline at end of file
|
||||||
diff --git a/node_modules/react-native-image-crop-picker/ios/src/ImageCropPicker.m b/node_modules/react-native-image-crop-picker/ios/src/ImageCropPicker.m
|
diff --git a/node_modules/react-native-image-crop-picker/ios/src/ImageCropPicker.m b/node_modules/react-native-image-crop-picker/ios/src/ImageCropPicker.m
|
||||||
index 9f20973..68d4766 100644
|
index 9f20973..c414a7a 100644
|
||||||
--- a/node_modules/react-native-image-crop-picker/ios/src/ImageCropPicker.m
|
--- a/node_modules/react-native-image-crop-picker/ios/src/ImageCropPicker.m
|
||||||
+++ b/node_modules/react-native-image-crop-picker/ios/src/ImageCropPicker.m
|
+++ b/node_modules/react-native-image-crop-picker/ios/src/ImageCropPicker.m
|
||||||
@@ -126,7 +126,8 @@ - (void) setConfiguration:(NSDictionary *)options
|
@@ -126,7 +126,7 @@ - (void) setConfiguration:(NSDictionary *)options
|
||||||
|
|
||||||
- (UIViewController*) getRootVC {
|
- (UIViewController*) getRootVC {
|
||||||
UIViewController *root = [[[[UIApplication sharedApplication] delegate] window] rootViewController];
|
UIViewController *root = [[[[UIApplication sharedApplication] delegate] window] rootViewController];
|
||||||
- while (root.presentedViewController != nil) {
|
- while (root.presentedViewController != nil) {
|
||||||
+ while (root.presentedViewController != nil &&
|
+ while (root.presentedViewController != nil && !root.presentedViewController.isBeingDismissed) {
|
||||||
+ !root.presentedViewController.isBeingDismissed) {
|
|
||||||
root = root.presentedViewController;
|
root = root.presentedViewController;
|
||||||
}
|
}
|
||||||
|
|
||||||
Reference in New Issue
Block a user