Merge pull request #31 from blanyal/Release

Ready for release
blanyal · May 3, 2015 · 9dc2a45 · 9dc2a45
2 parents ed0fd6d + 32cfb53
commit 9dc2a45
Show file tree

Hide file tree

Showing 17 changed files with 2 additions and 7 deletions.
diff --git a/app/src/main/java/com/blanyal/remindme/AlarmReceiver.java b/app/src/main/java/com/blanyal/remindme/AlarmReceiver.java
@@ -54,8 +54,8 @@ public void onReceive(Context context, Intent intent) {
 
         // Create Notification
         NotificationCompat.Builder mBuilder = new NotificationCompat.Builder(context)
-                .setLargeIcon(BitmapFactory.decodeResource(context.getResources(), R.drawable.ic_launcher))
-                .setSmallIcon(R.drawable.ic_remindly_notification_icons)
+                .setLargeIcon(BitmapFactory.decodeResource(context.getResources(), R.mipmap.ic_launcher))
+                .setSmallIcon(R.drawable.ic_alarm_on_white_24dp)
                 .setContentTitle(context.getResources().getString(R.string.app_name))
                 .setTicker(mTitle)
                 .setContentText(mTitle)

diff --git a/app/src/main/java/com/blanyal/remindme/BootReceiver.java b/app/src/main/java/com/blanyal/remindme/BootReceiver.java
@@ -20,7 +20,6 @@
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.util.Log;
 
 import java.util.Calendar;
 import java.util.List;

diff --git a/app/src/main/java/com/blanyal/remindme/MainActivity.java b/app/src/main/java/com/blanyal/remindme/MainActivity.java
@@ -23,7 +23,6 @@
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.Toolbar;
-import android.util.Log;
 import android.view.ContextMenu;
 import android.view.LayoutInflater;
 import android.view.Menu;

diff --git a/app/src/main/java/com/blanyal/remindme/ReminderAddActivity.java b/app/src/main/java/com/blanyal/remindme/ReminderAddActivity.java
@@ -25,7 +25,6 @@
 import android.text.Editable;
 import android.text.InputType;
 import android.text.TextWatcher;
-import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -40,7 +39,6 @@
 import com.wdullaer.materialdatetimepicker.time.TimePickerDialog;
 
 import java.util.Calendar;
-import java.util.List;
 
 
 public class ReminderAddActivity extends AppCompatActivity implements

diff --git a/app/src/main/java/com/blanyal/remindme/ReminderEditActivity.java b/app/src/main/java/com/blanyal/remindme/ReminderEditActivity.java
@@ -26,7 +26,6 @@
 import android.text.Editable;
 import android.text.InputType;
 import android.text.TextWatcher;
-import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;

diff --git a/app/src/main/res/drawable-hdpi/ic_alarm_on_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_alarm_on_white_24dp.png
diff --git a/app/src/main/res/drawable-hdpi/ic_remindly_notification_icons.png b/app/src/main/res/drawable-hdpi/ic_remindly_notification_icons.png
diff --git a/app/src/main/res/drawable-mdpi/ic_alarm_on_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_alarm_on_white_24dp.png
diff --git a/app/src/main/res/drawable-mdpi/ic_remindly_notification_icons.png b/app/src/main/res/drawable-mdpi/ic_remindly_notification_icons.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_alarm_on_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_alarm_on_white_24dp.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_remindly_notification_icons.png b/app/src/main/res/drawable-xhdpi/ic_remindly_notification_icons.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_alarm_on_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_alarm_on_white_24dp.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_remindly_notification_icons.png b/app/src/main/res/drawable-xxhdpi/ic_remindly_notification_icons.png
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png