Merge pull request #181 from iHub/bugfixes

Merging in bugfixes

app/src/main/java/com/mozilla/hackathon/kiboko/App.java

@@ -42,11 +42,14 @@ public class App extends Application {
         // Actions are just fake
         Notification notification = new NotificationCompat.Builder(getContext())
                 .setContentTitle(getContext().getString(R.string.app_name))
+                .setContentText("Tap for more information.")
                 .setStyle(new NotificationCompat.BigTextStyle().bigText(msg))
-                .setSmallIcon(R.drawable.ic_launcher)
+                .setColor(getContext().getResources().getColor(R.color.colorPrimary))
+                .setSmallIcon(R.drawable.ic_stat_notification)
                 .setContentIntent(pIntent)
                 .setAutoCancel(true)
-                .addAction(0, getContext().getString(R.string.btn_more), pIntent).build();
+                .addAction(0, getContext().getString(R.string.btn_more), pIntent)
+                .build();
         NotificationManager notificationManager = (NotificationManager) getContext().getSystemService(NOTIFICATION_SERVICE);
         // hide the notification after its selected
         notification.flags |= Notification.FLAG_AUTO_CANCEL;

app/src/main/java/com/mozilla/hackathon/kiboko/recievers/DSONetworkStateReceiver.java

@@ -20,7 +20,7 @@ import com.mozilla.hackathon.kiboko.utilities.NetworkUtils;
         NetworkInfo ni=(NetworkInfo) intent.getExtras().get(ConnectivityManager.EXTRA_NETWORK_INFO);
         if(ni!=null && ni.getState()==NetworkInfo.State.CONNECTED)
         {
-            App.createNotification("Your device is now connected to wifi.", "wifi");
+            App.createNotification("Your device is now connected to Wi-Fi.", "wifi");
         }
     }
 }

app/src/main/res/values/strings.xml

@@ -50,6 +50,6 @@
     <string name="welcome_surtitle">Welcome to</string>
     <string name="welcome_title">Jisort!</string>
     <string name="welcome_description">Explore the topics in this app to learn more about your phone.</string>
-    <string name="welcome_button">Ok\! Let\'s go\!</string>
+    <string name="welcome_button">Ok! Let\'s go!</string>
     <string name="title_dashboard">Jisort - What would you like to do?</string>
 </resources>

gradle.properties

@@ -14,7 +14,7 @@
 # If versions end in odd numbers they are development builds, even versions are release candidates.
 # The AndroidManifest.xml must also be updated currently.
 org.gradle.jvmargs=-Xmx2048M
-version=0.2.5-SNAPSHOT
+version=0.2.6-SNAPSHOT
 
 # Using these variables to sync dependency version numbers across sub-projects.
 android_support_lib_version = 23.4.0