Browse Source

some more styles

Guy Carmeli 8 years ago
parent
commit
ff436f0a03

+ 4
- 15
android/app/src/main/java/com/reactnativenavigation/layouts/ScreenLayout.java View File

16
 import com.reactnativenavigation.utils.SdkSupports;
16
 import com.reactnativenavigation.utils.SdkSupports;
17
 import com.reactnativenavigation.views.ContentView;
17
 import com.reactnativenavigation.views.ContentView;
18
 import com.reactnativenavigation.views.ScrollDirectionListener;
18
 import com.reactnativenavigation.views.ScrollDirectionListener;
19
-import com.reactnativenavigation.views.TitleBar;
20
 import com.reactnativenavigation.views.TitleBarButton;
19
 import com.reactnativenavigation.views.TitleBarButton;
21
 
20
 
22
 import java.util.List;
21
 import java.util.List;
47
 
46
 
48
     private void createViews() {
47
     private void createViews() {
49
         addTopBar();
48
         addTopBar();
50
-        addTitleBarAndSetButtons();
49
+        topBar.addTitleBarAndSetButtons(buttons);
51
         addContentView();
50
         addContentView();
52
     }
51
     }
53
 
52
 
54
-    private void addTitleBarAndSetButtons() {
55
-        TitleBar titleBar = new TitleBar(getContext());
56
-        titleBar.setButtons(buttons);
57
-        topBar.addView(titleBar);
58
-    }
59
-
60
     private void addTopBar() {
53
     private void addTopBar() {
61
         topBar = new TopBar(getContext());
54
         topBar = new TopBar(getContext());
62
         addView(topBar, new LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT));
55
         addView(topBar, new LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT));
71
         setStatusBarColor(styleParams.statusBarColor);
64
         setStatusBarColor(styleParams.statusBarColor);
72
         setTopBarColor(styleParams.topBarColor);
65
         setTopBarColor(styleParams.topBarColor);
73
         setNavigationBarColor(styleParams.navigationBarColor);
66
         setNavigationBarColor(styleParams.navigationBarColor);
74
-        setTitleBarHidden(styleParams.titleBarHidden);
67
+        topBar.setTitleBarVisibility(styleParams.titleBarHidden);
68
+        topBar.setVisibility(styleParams.topBarHidden ? GONE : VISIBLE);
69
+
75
     }
70
     }
76
 
71
 
77
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
72
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
110
         }
105
         }
111
     }
106
     }
112
 
107
 
113
-    private void setTitleBarHidden(boolean titleBarHidden) {
114
-        if (titleBarHidden) {
115
-            
116
-        }
117
-    }
118
-
119
     @Override
108
     @Override
120
     public void onScrollChanged(ScrollDirectionListener.Direction direction) {
109
     public void onScrollChanged(ScrollDirectionListener.Direction direction) {
121
 
110
 

+ 16
- 0
android/app/src/main/java/com/reactnativenavigation/layouts/TopBar.java View File

3
 import android.content.Context;
3
 import android.content.Context;
4
 import android.support.design.widget.AppBarLayout;
4
 import android.support.design.widget.AppBarLayout;
5
 
5
 
6
+import com.reactnativenavigation.views.TitleBar;
7
+import com.reactnativenavigation.views.TitleBarButton;
8
+
9
+import java.util.List;
10
+
6
 public class TopBar extends AppBarLayout {
11
 public class TopBar extends AppBarLayout {
7
 
12
 
13
+    private TitleBar titleBar;
14
+
8
     public TopBar(Context context) {
15
     public TopBar(Context context) {
9
         super(context);
16
         super(context);
10
         setFitsSystemWindows(true);
17
         setFitsSystemWindows(true);
11
     }
18
     }
19
+
20
+    public void addTitleBarAndSetButtons(List<TitleBarButton.Params> buttons) {
21
+        titleBar = new TitleBar(getContext());
22
+        titleBar.setButtons(buttons);
23
+    }
24
+
25
+    public void setTitleBarVisibility(boolean isHidden) {
26
+        titleBar.setVisibility(isHidden ? GONE : VISIBLE);
27
+    }
12
 }
28
 }