Updates

pencilcheck · Jun 29, 2014 · 8b0d007 · 8b0d007
1 parent 18e43ed
commit 8b0d007
Show file tree

Hide file tree

Showing 31 changed files with 465 additions and 35 deletions.
diff --git a/platforms/android/CordovaLib/ant-build/build.prop b/platforms/android/CordovaLib/ant-build/build.prop
@@ -1,5 +1,5 @@
 #Last build type
-#Wed, 25 Jun 2014 22:10:39 -0700
+#Sat, 28 Jun 2014 05:23:56 -0700
 
 build.last.target=debug
 

diff --git a/platforms/android/ant-build/HelloCordova-debug-unaligned.apk b/platforms/android/ant-build/HelloCordova-debug-unaligned.apk
diff --git a/platforms/android/ant-build/HelloCordova-debug.apk b/platforms/android/ant-build/HelloCordova-debug.apk
diff --git a/platforms/android/ant-build/HelloCordova.ap_ b/platforms/android/ant-build/HelloCordova.ap_
diff --git a/platforms/android/ant-build/HelloCordova.ap_.d b/platforms/android/ant-build/HelloCordova.ap_.d
@@ -36,9 +36,11 @@
 /Users/penn/Projects/Spicewords/platforms/android/assets/www/index.html \
 /Users/penn/Projects/Spicewords/platforms/android/assets/www/js \
 /Users/penn/Projects/Spicewords/platforms/android/assets/www/lib \
+/Users/penn/Projects/Spicewords/platforms/android/assets/www/pennsu.html \
 /Users/penn/Projects/Spicewords/platforms/android/assets/www/plugins \
 /Users/penn/Projects/Spicewords/platforms/android/assets/www/README.md \
 /Users/penn/Projects/Spicewords/platforms/android/assets/www/templates \
+/Users/penn/Projects/Spicewords/platforms/android/assets/www/css/main.css \
 /Users/penn/Projects/Spicewords/platforms/android/assets/www/css/style.css \
 /Users/penn/Projects/Spicewords/platforms/android/assets/www/img/ionic.png \
 /Users/penn/Projects/Spicewords/platforms/android/assets/www/js/app.js \

diff --git a/platforms/android/ant-build/build.prop b/platforms/android/ant-build/build.prop
@@ -1,5 +1,5 @@
 #Last build type
-#Wed, 25 Jun 2014 22:10:45 -0700
+#Sat, 28 Jun 2014 05:24:03 -0700
 
 build.last.target=debug
 

diff --git a/platforms/android/assets/www/css/main.css b/platforms/android/assets/www/css/main.css
@@ -0,0 +1,84 @@
+input.MessageBox {
+	width: 345px;
+	height: 80px;
+	font-size: 30px;
+}
+
+.wide-as-needed {
+  overflow: scroll;
+  white-space: nowrap;
+}
+
+.side-margin {
+  margin-left: 10px !important;
+  margin-right: 10px !important;
+}
+
+.inset-shadow {
+  -webkit-box-shadow: inset 0px 0px 25px 0px rgba(0,0,0,0.75);
+  -moz-box-shadow: inset 0px 0px 25px 0px rgba(0,0,0,0.75);
+  box-shadow: inset 0px 0px 25px 0px rgba(0,0,0,0.75);
+}
+
+.circle {
+  background-color: red;
+  color: white;
+  position: relative;
+  display: inline-block;
+  margin: 0;
+  padding: 0;
+  min-width: 100px;
+  min-height: 100px;
+  border: 2px solid white;
+  border-radius: 50px;
+  vertical-align: top;
+  text-align: center;
+  text-overflow: ellipsis;
+  font-size: 16px;
+  line-height: 100px;
+  cursor: pointer;
+}
+
+.topPeers{
+	width:320px;
+	height:195px;
+	overflow-y: hidden;
+  	overflow-x: scroll;
+  	-webkit-overflow-scrolling: touch;
+}
+.otherPeers{
+	width:320px;
+	height:220px;
+	overflow-y: hidden;
+  	overflow-x: scroll;
+  	-webkit-overflow-scrolling: touch;
+}
+
+.peerNames {
+	padding-top: 40px;
+	margin: 0px auto;
+	text-align: center;
+}
+
+#div_1{
+	height: 125px;
+	width: 320px;
+	overflow-y: hidden;
+	overflow-x: scroll;
+}
+
+#div_3{
+	float: left;
+	height: 350px;
+	width: 500px;
+	margin: auto;
+	overflow-y: hidden;
+	overflow-x: scroll
+}
+
+#div_2 {
+	height: 100px;
+	width: 100px;
+	float: left;
+	padding-left: 5px;
+}
diff --git a/platforms/android/assets/www/css/style.css b/platforms/android/assets/www/css/style.css
@@ -1 +1,4 @@
 /* Empty. Add your own CSS if you like */
+.background {
+  background-color: #42b4e6;
+}
diff --git a/platforms/android/assets/www/index.html b/platforms/android/assets/www/index.html
@@ -7,6 +7,8 @@
 
     <link href="lib/ionic/css/ionic.css" rel="stylesheet">
     <link href="css/style.css" rel="stylesheet">
+    <link rel="stylesheet" href="css/main.css" />
+    <link rel="stylesheet" href="http://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.2.0/css/bootstrap.css">
 
     <!-- IF using Sass (run gulp sass first), then uncomment below and remove the CSS includes above
     <link href="css/ionic.app.css" rel="stylesheet">

diff --git a/platforms/android/assets/www/js/app.js b/platforms/android/assets/www/js/app.js
@@ -67,6 +67,6 @@ angular.module('starter', ['ionic', 'starter.controllers'])
       }
     });
   // if none of the above states are matched, use this as the fallback
-  $urlRouterProvider.otherwise('/app/playlists');
+  $urlRouterProvider.otherwise('/app/message');
 });
 
diff --git a/platforms/android/assets/www/js/controllers.js b/platforms/android/assets/www/js/controllers.js
@@ -4,6 +4,14 @@ angular.module('starter.controllers', [])
   // Form data for the login modal
   $scope.loginData = {};
 
+  $scope.favorites = [
+    'Yuri S.',
+    'Penn S.',
+    'Venkytesh B.',
+    'Golly A.',
+    'Jessica V.'
+  ]
+
   // Create the login modal that we will use later
   $ionicModal.fromTemplateUrl('templates/login.html', {
     scope: $scope

diff --git a/platforms/android/assets/www/pennsu.html b/platforms/android/assets/www/pennsu.html
@@ -0,0 +1,76 @@
+<html>
+  <head>
+    <title>Spice Words- Main Screen</title>
+    <link rel="stylesheet" href="css/main.css" />
+    <link rel="stylesheet" href="http://www.netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css">
+    <script type="text/javascript" src="js/main.js"></script>
+  </head>
+    <body>
+    <div class="mainBodyWrapper">
+        <div class="mainMessageBox">
+            <input class="MessageBox" placeholder="Type Something Here"></input>
+        </div>
+
+        <div class="topPeers">
+        <h2>The Crew</h2>
+            <div id="div_1">
+                <div id="div_3">
+                    <div id="div_2">
+                        <div class="circle">
+                            <div class="peerNames">Yuri S.</div>
+                        </div>
+                    </div>
+
+                    <div id="div_2">
+                        <div class="circle">
+                            <div class="peerNames">Penn S.</div>
+                        </div>
+                    </div>
+
+                    <div id="div_2">
+                        <div class="circle">
+                            <div class="peerNames">Johnny S.</div>
+                        </div>
+                    </div>
+
+                    <div id="div_2">
+                        <div class="circle">
+                            <div class="peerNames">MuhahhaaLa S.</div>
+                        </div>
+                    </div>   
+                </div>
+            </div>         
+        </div> 
+        <div class="otherPeers">
+            <h2>The Rest_________[Search]</h2>
+            <div id="div_1">
+                <div id="div_3">
+                    <div id="div_2">
+                        <div class="circle">
+                            <div class="peerNames">Brown S.</div>
+                        </div>
+                    </div>
+
+                    <div id="div_2">
+                        <div class="circle">
+                            <div class="peerNames">Pink S.</div>
+                        </div>
+                    </div>
+
+                    <div id="div_2">
+                        <div class="circle">
+                            <div class="peerNames">Sparkles S.</div>
+                        </div>
+                    </div>
+
+                    <div id="div_2">
+                        <div class="circle">
+                            <div class="peerNames">Christinado S.</div>
+                        </div>
+                    </div>   
+                </div>
+            </div>                     
+        </div>
+    </div>
+</body>
+</html>
diff --git a/platforms/android/assets/www/templates/menu.html b/platforms/android/assets/www/templates/menu.html
@@ -1,6 +1,6 @@
 <ion-side-menus>
 
-  <ion-pane ion-side-menu-content>
+  <ion-pane ion-side-menu-content drag-content="false">
     <ion-nav-bar class="bar-stable nav-title-slide-ios7">
       <ion-nav-back-button class="button-clear"><i class="icon ion-ios7-arrow-back"></i> Back</ion-nav-back-button>
     </ion-nav-bar>

diff --git a/platforms/android/assets/www/templates/message.html b/platforms/android/assets/www/templates/message.html
@@ -2,13 +2,18 @@
   <ion-nav-buttons side="left">
     <button menu-toggle="left" class="button button-icon icon ion-navicon"></button>
   </ion-nav-buttons>
-  <ion-content class="has-header">
-    <h1>Message</h1>
+  <ion-content class="has-header background">
     <div class="list list-inset">
       <label class="item item-input">
         <i class="icon ion-search placeholder-icon"></i>
-        <input type="text" placeholder="Search">
+        <input type="text" placeholder="Type message ...">
       </label>
     </div>
+    <h2>The Crew</h2>
+    <ion-scroll direction="x" scrollbar-y="false" has-bouncing="false" zooming="false" class="wide-as-needed">
+        <a class="circle side-margin inset-shadow" ng-repeat="favorite in favorites" ng-click="message(favorite)">
+            {{favorite}}
+        </a>
+    </ion-scroll>
   </ion-content>
 </ion-view>
diff --git a/platforms/ios/cordova/console.log b/platforms/ios/cordova/console.log
@@ -0,0 +1,24 @@
+2014-06-25 21:45:34.696 HelloCordova[24690:70b] Multi-tasking -> Device: YES, App: YES
+2014-06-25 21:45:34.728 HelloCordova[24690:70b] Unlimited access to network resources
+2014-06-25 21:45:34.888 HelloCordova[24690:70b] [CDVTimer][keyboard] 0.111997ms
+2014-06-25 21:45:34.889 HelloCordova[24690:70b] CDVPlugin class CDVStatusBar (pluginName: statusbar) does not exist.
+2014-06-25 21:45:34.889 HelloCordova[24690:70b] [CDVTimer][statusbar] 0.571012ms
+2014-06-25 21:45:34.890 HelloCordova[24690:70b] [CDVTimer][TotalPluginStartup] 1.834035ms
+2014-06-25 21:45:35.064 HelloCordova[24690:70b] Resetting plugins due to page load.
+2014-06-25 21:45:35.424 HelloCordova[24690:70b] Finished load of: file:///Users/penn/Library/Application%20Support/iPhone%20Simulator/7.1/Applications/B9522309-E74A-4373-AB90-BAB4C6601E81/HelloCordova.app/www/index.html#/app/playlists
+2014-06-28 04:58:07.787 HelloCordova[82959:70b] Multi-tasking -> Device: YES, App: YES
+2014-06-28 04:58:07.844 HelloCordova[82959:70b] Unlimited access to network resources
+2014-06-28 04:58:08.274 HelloCordova[82959:70b] [CDVTimer][keyboard] 0.104010ms
+2014-06-28 04:58:08.274 HelloCordova[82959:70b] CDVPlugin class CDVStatusBar (pluginName: statusbar) does not exist.
+2014-06-28 04:58:08.275 HelloCordova[82959:70b] [CDVTimer][statusbar] 0.491977ms
+2014-06-28 04:58:08.275 HelloCordova[82959:70b] [CDVTimer][TotalPluginStartup] 1.689970ms
+2014-06-28 04:58:08.493 HelloCordova[82959:70b] Resetting plugins due to page load.
+2014-06-28 04:58:08.874 HelloCordova[82959:70b] Finished load of: file:///Users/penn/Library/Application%20Support/iPhone%20Simulator/7.1/Applications/B9522309-E74A-4373-AB90-BAB4C6601E81/HelloCordova.app/www/index.html#/app/message
+2014-06-28 05:13:53.735 HelloCordova[83374:70b] Multi-tasking -> Device: YES, App: YES
+2014-06-28 05:13:53.782 HelloCordova[83374:70b] Unlimited access to network resources
+2014-06-28 05:13:54.477 HelloCordova[83374:70b] [CDVTimer][keyboard] 0.075996ms
+2014-06-28 05:13:54.477 HelloCordova[83374:70b] CDVPlugin class CDVStatusBar (pluginName: statusbar) does not exist.
+2014-06-28 05:13:54.478 HelloCordova[83374:70b] [CDVTimer][statusbar] 0.411034ms
+2014-06-28 05:13:54.478 HelloCordova[83374:70b] [CDVTimer][TotalPluginStartup] 1.338005ms
+2014-06-28 05:13:54.713 HelloCordova[83374:70b] Resetting plugins due to page load.
+2014-06-28 05:13:55.202 HelloCordova[83374:70b] Finished load of: file:///Users/penn/Library/Application%20Support/iPhone%20Simulator/7.1/Applications/B9522309-E74A-4373-AB90-BAB4C6601E81/HelloCordova.app/www/index.html#/app/message
diff --git a/platforms/ios/www/css/main.css b/platforms/ios/www/css/main.css
@@ -0,0 +1,84 @@
+input.MessageBox {
+	width: 345px;
+	height: 80px;
+	font-size: 30px;
+}
+
+.wide-as-needed {
+  overflow: scroll;
+  white-space: nowrap;
+}
+
+.side-margin {
+  margin-left: 10px !important;
+  margin-right: 10px !important;
+}
+
+.inset-shadow {
+  -webkit-box-shadow: inset 0px 0px 25px 0px rgba(0,0,0,0.75);
+  -moz-box-shadow: inset 0px 0px 25px 0px rgba(0,0,0,0.75);
+  box-shadow: inset 0px 0px 25px 0px rgba(0,0,0,0.75);
+}
+
+.circle {
+  background-color: red;
+  color: white;
+  position: relative;
+  display: inline-block;
+  margin: 0;
+  padding: 0;
+  min-width: 100px;
+  min-height: 100px;
+  border: 2px solid white;
+  border-radius: 50px;
+  vertical-align: top;
+  text-align: center;
+  text-overflow: ellipsis;
+  font-size: 16px;
+  line-height: 100px;
+  cursor: pointer;
+}
+
+.topPeers{
+	width:320px;
+	height:195px;
+	overflow-y: hidden;
+  	overflow-x: scroll;
+  	-webkit-overflow-scrolling: touch;
+}
+.otherPeers{
+	width:320px;
+	height:220px;
+	overflow-y: hidden;
+  	overflow-x: scroll;
+  	-webkit-overflow-scrolling: touch;
+}
+
+.peerNames {
+	padding-top: 40px;
+	margin: 0px auto;
+	text-align: center;
+}
+
+#div_1{
+	height: 125px;
+	width: 320px;
+	overflow-y: hidden;
+	overflow-x: scroll;
+}
+
+#div_3{
+	float: left;
+	height: 350px;
+	width: 500px;
+	margin: auto;
+	overflow-y: hidden;
+	overflow-x: scroll
+}
+
+#div_2 {
+	height: 100px;
+	width: 100px;
+	float: left;
+	padding-left: 5px;
+}
diff --git a/platforms/ios/www/css/style.css b/platforms/ios/www/css/style.css
@@ -1 +1,4 @@
 /* Empty. Add your own CSS if you like */
+.background {
+  background-color: #42b4e6;
+}
diff --git a/platforms/ios/www/index.html b/platforms/ios/www/index.html
@@ -7,6 +7,8 @@
 
     <link href="lib/ionic/css/ionic.css" rel="stylesheet">
     <link href="css/style.css" rel="stylesheet">
+    <link rel="stylesheet" href="css/main.css" />
+    <link rel="stylesheet" href="http://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.2.0/css/bootstrap.css">
 
     <!-- IF using Sass (run gulp sass first), then uncomment below and remove the CSS includes above
     <link href="css/ionic.app.css" rel="stylesheet">