Browse Source

TopBar testId

Guy Carmeli 7 years ago
parent
commit
2668c8b3eb

+ 6
- 0
lib/android/app/src/main/java/com/reactnativenavigation/parse/TopBarOptions.java View File

59
     public ArrayList<Button> rightButtons;
59
     public ArrayList<Button> rightButtons;
60
 
60
 
61
     void mergeWith(final TopBarOptions other) {
61
     void mergeWith(final TopBarOptions other) {
62
+        if (other.testId.hasValue()) {
63
+            testId = other.testId;
64
+        }
62
         if (other.title.hasValue())
65
         if (other.title.hasValue())
63
             title = other.title;
66
             title = other.title;
64
         if (other.backgroundColor.hasValue())
67
         if (other.backgroundColor.hasValue())
110
             leftButtons = defaultOptions.leftButtons;
113
             leftButtons = defaultOptions.leftButtons;
111
         if (rightButtons == null)
114
         if (rightButtons == null)
112
             rightButtons = defaultOptions.rightButtons;
115
             rightButtons = defaultOptions.rightButtons;
116
+        if (!testId.hasValue()) {
117
+            testId = defaultOptions.testId;
118
+        }
113
     }
119
     }
114
 }
120
 }

+ 3
- 1
lib/android/app/src/main/java/com/reactnativenavigation/views/TopBar.java View File

17
 import com.reactnativenavigation.anim.TopBarAnimator;
17
 import com.reactnativenavigation.anim.TopBarAnimator;
18
 import com.reactnativenavigation.anim.TopBarCollapseBehavior;
18
 import com.reactnativenavigation.anim.TopBarCollapseBehavior;
19
 import com.reactnativenavigation.interfaces.ScrollEventListener;
19
 import com.reactnativenavigation.interfaces.ScrollEventListener;
20
+import com.reactnativenavigation.parse.params.Bool;
20
 import com.reactnativenavigation.parse.params.Button;
21
 import com.reactnativenavigation.parse.params.Button;
21
 import com.reactnativenavigation.parse.params.Color;
22
 import com.reactnativenavigation.parse.params.Color;
22
 import com.reactnativenavigation.parse.params.Fraction;
23
 import com.reactnativenavigation.parse.params.Fraction;
23
 import com.reactnativenavigation.parse.params.Number;
24
 import com.reactnativenavigation.parse.params.Number;
24
-import com.reactnativenavigation.parse.params.Bool;
25
 
25
 
26
 import java.util.ArrayList;
26
 import java.util.ArrayList;
27
 
27
 
47
         this.animator = new TopBarAnimator(this);
47
         this.animator = new TopBarAnimator(this);
48
         this.parentView = parentView;
48
         this.parentView = parentView;
49
         addView(titleBar);
49
         addView(titleBar);
50
+        titleBar.setContentDescription("titleBar");
51
+        setContentDescription("TopBar");
50
     }
52
     }
51
 
53
 
52
     public void setTitle(String title) {
54
     public void setTitle(String title) {