Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix getViewProp on Android, RN.74 #6441

Merged
merged 12 commits into from
Sep 23, 2024
Merged

Fix getViewProp on Android, RN.74 #6441

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ff57ff6
First commit
Latropos Aug 22, 2024
ebfce5d
Add semicolon
Latropos Aug 22, 2024
5d0c383
Update packages/react-native-reanimated/android/src/main/java/com/swm…
Latropos Sep 17, 2024
230fbd6
Manual merge
Latropos Sep 17, 2024
9b58775
Remove unnecessary files
Latropos Sep 17, 2024
5be60de
Remove unnecessary files
Latropos Sep 17, 2024
5b031c0
Merge
Latropos Sep 18, 2024
29cfe3c
format
Latropos Sep 18, 2024
ef70e03
Restore eslint
Latropos Sep 23, 2024
7638aa7
Manual merge
Latropos Sep 23, 2024
1d9fa80
Error message
Latropos Sep 23, 2024
44e258c
Fix braces
Latropos Sep 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 8 additions & 18 deletions .../react-native-reanimated/android/src/main/java/com/swmansion/reanimated/NodesManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,12 @@
import com.facebook.react.uimanager.UIManagerModule;
import com.facebook.react.uimanager.UIManagerReanimatedHelper;
import com.facebook.react.uimanager.common.UIManagerType;
import com.facebook.react.uimanager.drawable.CSSBackgroundDrawable;
import com.facebook.react.uimanager.events.Event;
import com.facebook.react.uimanager.events.EventDispatcherListener;
import com.facebook.react.uimanager.events.RCTEventEmitter;
import com.facebook.react.views.view.ReactViewBackgroundDrawable;
import com.swmansion.reanimated.layoutReanimation.AnimationsManager;
import com.swmansion.reanimated.nativeProxy.NoopEventHandler;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedList;
Expand Down Expand Up @@ -458,26 +457,17 @@ public String obtainProp(int viewTag, String propName) {
}
case "backgroundColor" -> {
Drawable background = view.getBackground();
int actualColor = -1;
try {
Method getColor = background.getClass().getMethod("getColor");
int actualColor = (int) getColor.invoke(background);

// ReactViewBackgroundDrawable got deprecated in react-native 0.75.
//noinspection deprecation
if (background instanceof ReactViewBackgroundDrawable) {
//noinspection deprecation
actualColor = ((ReactViewBackgroundDrawable) background).getColor();
}
String invertedColor = String.format("%08x", (0xFFFFFFFF & actualColor));
// By default transparency is first, color second
return "#" + invertedColor.substring(2, 8) + invertedColor.substring(0, 2);

if (background instanceof CSSBackgroundDrawable) {
actualColor = ((CSSBackgroundDrawable) background).getColor();
}

if (actualColor == -1) {
} catch (Exception e) {
return "Unable to resolve background color";
}

String invertedColor = String.format("%08x", actualColor);
// By default transparency is first, color second
return "#" + invertedColor.substring(2, 8) + invertedColor.substring(0, 2);
}
default -> {
throw new IllegalArgumentException(
Expand Down
Loading