cobaltians/Cobalt#92: Remove default bars from cobalt.conf, fix an ac…

…tivity controller and native bars title. Display on 5 toasts in a row, it was so annoying to test with 20...
Cobaltians-Samples · Oct 6, 2016 · 84e56e1 · 84e56e1
1 parent e9e164d
commit 84e56e1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 27 deletions.
diff --git a/cobalt.conf b/cobalt.conf
@@ -2,8 +2,7 @@
 	"controllers": {
         "default": {
             "ios": "SimpleController",
-            "android": ".activities.SimpleHybridActivity",
-            "bars" : { "color": "#3498DB", "backgroundColor": "#FFF"}
+            "android": ".activities.SimpleHybridActivity"
         },
         "dark": {
             "ios": "SimpleController",
@@ -13,30 +12,25 @@
         },
         "callbacks": {
             "ios": "CallbacksController",
-            "android": ".activities.CallbacksActivity",
-            "bars" : { "color": "#3498DB", "backgroundColor": "#FFF"}
+            "android": ".activities.CallbacksActivity"
         },
         "events": {
             "ios": "EventsController",
-            "android": ".activities.EventsActivity",
-            "bars" : { "color": "#3498DB", "backgroundColor": "#FFF"}
+            "android": ".activities.EventsActivity"
         },
         "infiniteScroll": {
             "ios": "SimpleController",
             "android": ".activities.PullToRefreshActivity",
             "infiniteScroll": true,
-            "iosScrollToTop": true,
-            "bars" : { "color": "#3498DB", "backgroundColor": "#FFF"}
+            "iosScrollToTop": true
         } ,
         "infiniteScrollNonActive": {
             "ios": "SimpleController",
-            "android": ".activities.PullToRefreshActivity",
-            "bars" : { "color": "#3498DB", "backgroundColor": "#FFF"}
+            "android": ".activities.PullToRefreshActivity"
         },
         "modalTest": {
             "ios": "SimpleController",
-            "android": ".activities.ModalActivity",
-            "bars" : { "color": "#3498DB", "backgroundColor": "#FFF"}
+            "android": ".activities.ModalActivity"
         },
         "nativeBars": {
             "ios": "SimpleController",
@@ -48,7 +42,7 @@
                 },
                 "backgroundColor": "#FF4444",
                 "color": "FFF",
-                "title": "native bars",
+                "title": "Native Bars",
                 "actions": [{
                         "name": "moon",
                         "title": "Moon !",
@@ -94,38 +88,32 @@
             "ios": "SimpleController",
             "android": ".activities.PullToRefreshActivity",
             "pullToRefresh": true,
-            "infiniteScroll": true,
-            "bars" : { "color": "#3498DB", "backgroundColor": "#FFF"}
+            "infiniteScroll": true
         },
         "pullToRefresh":{
             "ios": "SimpleController",
             "android": ".activities.PullToRefreshActivity",
-            "pullToRefresh": true,
-            "bars" : { "color": "#3498DB", "backgroundColor": "#FFF"}
+            "pullToRefresh": true
         },
         "coloredPullToRefresh":{
             "ios": "SimpleController",
             "android": ".activities.PullToRefreshActivity",
             "pullToRefresh": true,
-            "backgroundColor":"#4a81a5",
-            "bars" : { "color": "#3498DB", "backgroundColor": "#FFF"}
+            "backgroundColor":"#3498DB"
         },
         "pullToRefreshCustom": {
             "ios": "CustomizedPulltoRefreshViewController",
             "android": ".activities.PullToRefreshCustomActivity",
-            "pullToRefresh": true,
-            "bars" : { "color": "#3498DB", "backgroundColor": "#FFF"}
+            "pullToRefresh": true
         },
         "pullToRefreshNonActive": {
             "ios": "SimpleController",
-            "android": "PullToRefreshActivity",
-            "bars" : { "color": "#3498DB", "backgroundColor": "#FFF"}
+            "android": ".activities.PullToRefreshActivity"
         },
         "appEvents": {
             "ios": "SimpleController",
             "android": ".activities.PullToRefreshActivity",
-            "pullToRefresh": true,
-            "bars" : { "color": "#3498DB", "backgroundColor": "#FFF"}
+            "pullToRefresh": true
         },
         "plugins": {
             "ios": "PluginsController",

diff --git a/toasts_&_alerts.html b/toasts_&_alerts.html
@@ -17,7 +17,7 @@ <h2>Toasts</h2>
             <a href="javascript:;" id="toastB">basic toast</a>
             <a href="javascript:;" id="toastC">loooonnnnng toast</a>
             <a href="javascript:;" id="toastD">A toast with multiple lines using \n</a>
-            <a href="javascript:;" id="toastE">20 toasts in a row! boom!</a>
+            <a href="javascript:;" id="toastE">5 toasts in a row! boom!</a>
         </div>
         <div class="block">
             <h2>Alerts</h2>
@@ -74,7 +74,7 @@ <h2>Alerts</h2>
                     return false;
                 });
                 app.touch('#toastE',function(){
-                    for (var i=1; i<=20; i++){
+                    for (var i=1; i<=5; i++){
                         cobalt.toast("toast #"+ i)
                     }
                     return false;