Merge branch 'master' into release

wix · Sep 7, 2022 · f97fc0b · f97fc0b
2 parents d6a4e78 + 76fa3a5
commit f97fc0b
Show file tree

Hide file tree

Showing 72 changed files with 1,167 additions and 984 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -74,8 +74,8 @@ Fill in your RNUILib and React Native versions below.
 List other libraries if relevant.
 -->
 
-- React Native:
-- React Native UI Lib:
+- React Native version:
+- React Native UI Lib version:
 
 ### Affected platforms
 

diff --git a/demo/src/demoApp.js b/demo/src/demoApp.js
@@ -42,39 +42,40 @@ function getDefaultNavigationStyle() {
     statusBar: {
       visible: true,
       style: 'light',
-      backgroundColor: Colors.primary // for Android
+      backgroundColor: Colors.$backgroundPrimaryHeavy // for Android
     },
     layout: {
-      backgroundColor: Colors.white,
-      orientation: ['portrait', 'landscape']
+      backgroundColor: Colors.$backgroundDefault,
+      orientation: ['portrait', 'landscape'],
+      componentBackgroundColor: Colors.$backgroundDefault
     },
     topBar: {
       visible: true,
       noBorder: true, // for iOS
       elevation: 0, // for Android
       background: {
-        color: Colors.primary
+        color: Colors.$backgroundPrimaryHeavy
       },
       title: {
-        color: Colors.white,
+        color: Colors.$textDefaultLight,
         fontSize: Typography.text60H.fontSize,
         fontFamily: Typography.text65H.fontFamily
       },
       subtitle: {
-        color: Colors.white,
+        color: Colors.$textDefaultLight,
         fontSize: Typography.text80T.fontSize,
         fontFamily: Typography.text80.fontFamily
       },
       backButton: {
         // visible: true,
-        color: Colors.white,
+        color: Colors.$iconDefaultLight,
         showTitle: Constants.isIOS ? false : undefined,
         testID: 'pop'
       },
-      leftButtonColor: Colors.white,
-      leftButtonDisabledColor: Colors.rgba(Colors.white, 0.6),
-      rightButtonColor: Colors.white,
-      rightButtonDisabledColor: Colors.rgba(Colors.white, 0.6)
+      leftButtonColor: Colors.$iconDefaultLight,
+      leftButtonDisabledColor: Colors.$iconDisabled,
+      rightButtonColor: Colors.$iconDefaultLight,
+      rightButtonDisabledColor: Colors.$iconDisabled
     }
   };
 }

diff --git a/demo/src/index.js b/demo/src/index.js
@@ -227,9 +227,6 @@ module.exports = {
       get PanViewScreen() {
         return require('./screens/incubatorScreens/PanViewScreen').default;
       },
-      get TransitionViewScreen() {
-        return require('./screens/incubatorScreens/TransitionViewScreen').default;
-      },
       // realExamples
       get AppleMusic() {
         return require('./screens/realExamples/AppleMusic').default;