Notifications redesign

WordPress/src/main/AndroidManifest.xml

@@ -83,7 +83,12 @@
 
         <!-- Comments activities -->
         <activity
-            android:name=".ui.comments.CommentsActivity" />
+            android:name=".ui.comments.CommentsActivity"
+            android:theme="@style/CalypsoTheme" />
+        <activity
+            android:name=".ui.comments.CommentDetailActivity"
+            android:theme="@style/CalypsoTheme"
+            android:windowSoftInputMode="stateHidden" />
         <activity
             android:name=".ui.comments.EditCommentActivity" />
 
@@ -238,7 +243,8 @@
 
         <!-- Notifications activities -->
         <activity
-            android:name=".ui.notifications.NotificationsActivity"/>
+            android:name=".ui.notifications.NotificationsActivity"
+            android:theme="@style/CalypsoTheme" />
 
         <activity
             android:name=".ui.notifications.NotificationsWebViewActivity"

WordPress/src/main/java/org/wordpress/android/GCMIntentService.java

@@ -22,8 +22,8 @@
 import org.wordpress.android.analytics.AnalyticsTracker.Stat;
 import org.wordpress.android.analytics.AnalyticsTrackerMixpanel;
 import org.wordpress.android.ui.notifications.NotificationDismissBroadcastReceiver;
-import org.wordpress.android.ui.notifications.NotificationUtils;
 import org.wordpress.android.ui.notifications.NotificationsActivity;
+import org.wordpress.android.ui.notifications.utils.NotificationsUtils;
 import org.wordpress.android.ui.posts.PostsActivity;
 import org.wordpress.android.ui.prefs.AppPrefs;
 import org.wordpress.android.util.AppLog;
@@ -285,15 +285,15 @@ protected void onRegistered(Context context, String regId) {
         SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(context);
         if (!TextUtils.isEmpty(regId)) {
             // Get or create UUID for WP.com notes api
-            String uuid = settings.getString(NotificationUtils.WPCOM_PUSH_DEVICE_UUID, null);
+            String uuid = settings.getString(NotificationsUtils.WPCOM_PUSH_DEVICE_UUID, null);
             if (uuid == null) {
                 uuid = UUID.randomUUID().toString();
                 SharedPreferences.Editor editor = settings.edit();
-                editor.putString(NotificationUtils.WPCOM_PUSH_DEVICE_UUID, uuid);
+                editor.putString(NotificationsUtils.WPCOM_PUSH_DEVICE_UUID, uuid);
                 editor.commit();
             }
 
-            NotificationUtils.registerDeviceForPushNotifications(context, regId);
+            NotificationsUtils.registerDeviceForPushNotifications(context, regId);
 
             AnalyticsTracker.registerPushNotificationToken(regId);
         }

WordPress/src/main/java/org/wordpress/android/WordPress.java

@@ -40,8 +40,8 @@
 import org.wordpress.android.networking.SelfSignedSSLCertsManager;
 import org.wordpress.android.ui.ActivityId;
 import org.wordpress.android.ui.accounts.SetupBlogTask.GenericSetupBlogTask;
-import org.wordpress.android.ui.notifications.NotificationUtils;
-import org.wordpress.android.ui.notifications.SimperiumUtils;
+import org.wordpress.android.ui.notifications.utils.NotificationsUtils;
+import org.wordpress.android.ui.notifications.utils.SimperiumUtils;
 import org.wordpress.android.ui.prefs.AppPrefs;
 import org.wordpress.android.ui.stats.service.StatsService;
 import org.wordpress.android.util.AppLog;
@@ -318,7 +318,7 @@ public static void registerForCloudMessaging(Context context) {
         if (WordPress.hasValidWPComCredentials(context)) {
             if (!TextUtils.isEmpty(regId)) {
                 // Send the token to WP.com in case it was invalidated
-                NotificationUtils.registerDeviceForPushNotifications(context, regId);
+                NotificationsUtils.registerDeviceForPushNotifications(context, regId);
                 AppLog.v(T.NOTIFS, "Already registered for GCM");
             }
         }
@@ -500,7 +500,7 @@ public static void removeWpComUserRelatedData(Context context) {
         // a Volley request
         VolleyUtils.cancelAllRequests(requestQueue);
 
-        NotificationUtils.unregisterDevicePushNotifications(context);
+        NotificationsUtils.unregisterDevicePushNotifications(context);
         try {
             GCMRegistrar.checkDevice(context);
             GCMRegistrar.unregister(context);
@@ -690,7 +690,7 @@ private void updatePushNotificationTokenIfNotLimited() {
                         AppLog.e(T.NOTIFS, "Could not ping the PNs backend, Token or gmcID not found");
                     } else {
                         // Send the token to WP.com
-                        NotificationUtils.registerDeviceForPushNotifications(mContext, token);
+                        NotificationsUtils.registerDeviceForPushNotifications(mContext, token);
                     }
                 } catch (Exception e) {
                     AppLog.e(T.NOTIFS, "Could not ping the PNs backend: " + e.getMessage());