Add Notification icon and fix delete record with search

KinJih · May 12, 2018 · ae8e623 · ae8e623
1 parent 2984d0e
commit ae8e623
Show file tree

Hide file tree

Showing 17 changed files with 21 additions and 18 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,4 +6,4 @@
 .DS_Store
 /build
 /captures
-.externalNativeBuild
+.externalNativeBuild
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/app/build.gradle b/app/build.gradle
@@ -29,10 +29,10 @@ dependencies {
     })
     implementation 'com.android.support:appcompat-v7:27.1.1'
     implementation 'com.android.support.constraint:constraint-layout:1.1.0'
-    implementation 'com.google.firebase:firebase-messaging:15.0.0'
-    implementation 'com.google.firebase:firebase-auth:15.0.0'
-    implementation 'com.google.firebase:firebase-core:15.0.0'
-    implementation 'com.google.firebase:firebase-database:15.0.0'
+    implementation 'com.google.firebase:firebase-messaging:15.0.2'
+    implementation 'com.google.firebase:firebase-auth:15.1.0'
+    implementation 'com.google.firebase:firebase-core:15.0.2'
+    implementation 'com.google.firebase:firebase-database:15.0.1'
     implementation 'com.android.support:design:27.1.1'
     implementation 'com.android.support:cardview-v7:27.1.1'
     implementation 'com.android.support:recyclerview-v7:27.1.1'

diff --git a/app/src/main/java/com/cid_notify/cid_notify/Activity/LoginActivity.java b/app/src/main/java/com/cid_notify/cid_notify/Activity/LoginActivity.java
@@ -177,9 +177,9 @@ private void sendResetEmail(String Email) {
                     @Override
                     public void onComplete(@NonNull Task<Void> task) {
                         if (task.isSuccessful()) {
-                            Toast.makeText(LoginActivity.this, "We have sent you instructions to reset your password!", Toast.LENGTH_SHORT).show();
+                            Toast.makeText(LoginActivity.this, R.string.send_reset_email, Toast.LENGTH_SHORT).show();
                         } else {
-                            Toast.makeText(LoginActivity.this, "Failed to send reset email!", Toast.LENGTH_SHORT).show();
+                            Toast.makeText(LoginActivity.this, R.string.reset_email_failed, Toast.LENGTH_SHORT).show();
                         }
                     }
                 });
@@ -239,7 +239,7 @@ public void onComplete(@NonNull Task<AuthResult> task) {
                         if (user != null) {
                             doVerify(user);
                         }else{
-                            Toast.makeText(LoginActivity.this, R.string.auth_failed+'!', Toast.LENGTH_SHORT).show();
+                            Toast.makeText(LoginActivity.this, R.string.auth_failed, Toast.LENGTH_SHORT).show();
                         }
                         showProgress(false);
                     } else {

diff --git a/app/src/main/java/com/cid_notify/cid_notify/Activity/MainActivity.java b/app/src/main/java/com/cid_notify/cid_notify/Activity/MainActivity.java
@@ -170,9 +170,9 @@ public void onLongItemClick(View view, final int position) {
                         .setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
                             @Override
                             public void onClick(DialogInterface dialog, int which) {
-                                Record record = myDataSet.get(position);
+                                Record record = myAdapter.getmFilterData().get(position);
                                 reference_contacts.child("Records").child(record.getDate()+" "+record.getFullTime()).removeValue();
-                                myAdapter.deleteRecord(position);
+                                myAdapter.deleteRecord(record);
                             }
                         }).setNegativeButton(R.string.cancel, null)
                         .show();
@@ -360,7 +360,7 @@ public void onDataChange(DataSnapshot dataSnapshot) {
                                         AdminData adminData = dataSnapshot.getValue(AdminData.class);
                                         String pwdSha= EncryptUtil.pwd2sha(secPwd,adminData.getcellphone(),adminData.getbirthday());
                                         if (pwdSha.equals(adminData.getsecondPassword())){
-
+                                            startActivity(new Intent(MainActivity.this,UpdatePasswordActivity.class));
                                         }else{
                                             Toast.makeText(MainActivity.this, R.string.error_incorrect_password, Toast.LENGTH_SHORT).show();
                                         }

diff --git a/app/src/main/java/com/cid_notify/cid_notify/Activity/MyAboutPage.java b/app/src/main/java/com/cid_notify/cid_notify/Activity/MyAboutPage.java
@@ -35,7 +35,7 @@ public void onClick(View v) {
         View aboutPage = new AboutPage(this)
                 .isRTL(false)
                 .setDescription("Hi, we are CID_Notify team.")
-                .addItem(new Element().setTitle("Version 1.0-Release"))
+                .addItem(new Element().setTitle("Version 1.0B-Release"))
                 .addGroup("Connect with us")
                 .addEmail("u0424035@nkfust.edu.tw")
                 .addWebsite("https://github.com/KinJih/CID_Notify")

diff --git a/app/src/main/java/com/cid_notify/cid_notify/Model/AdminData.java b/app/src/main/java/com/cid_notify/cid_notify/Model/AdminData.java
@@ -1,7 +1,5 @@
 package com.cid_notify.cid_notify.Model;
 
-import android.support.annotation.NonNull;
-
 import com.cid_notify.cid_notify.Util.EncryptUtil;
 
 public class AdminData {

diff --git a/app/src/main/java/com/cid_notify/cid_notify/Util/MyAdapter.java b/app/src/main/java/com/cid_notify/cid_notify/Util/MyAdapter.java
@@ -53,8 +53,9 @@ public void onCancelled(DatabaseError databaseError) {
     }
     public ArrayList<Record> getmFilterData(){ return mFilterData;/*let stickyDecoration can change with Filter*/ }
 
-    public void deleteRecord(int position){
-        mData.remove(position);
+    public void deleteRecord(Record record){
+        mData.remove(mData.indexOf(record));
+        if(mData.size()!=mFilterData.size())mFilterData.remove(mFilterData.indexOf(record));
         notifyDataSetChanged();
     }
     @NonNull

diff --git a/app/src/main/java/com/cid_notify/cid_notify/Util/MyFirebaseMessagingService.java b/app/src/main/java/com/cid_notify/cid_notify/Util/MyFirebaseMessagingService.java
@@ -54,7 +54,7 @@ private void sendNotification(String body,String title) {
         PendingIntent pendingIntent = PendingIntent.getActivity(this, 0/*Request ID*/, intent, PendingIntent.FLAG_ONE_SHOT);
 
         NotificationCompat.Builder builder = new NotificationCompat.Builder(this,"CID")
-                .setSmallIcon(R.mipmap.ic_launcher)
+                .setSmallIcon(R.mipmap.ic_notifictaion)
                 .setContentTitle(title)
                 .setContentText(body)
                 .setAutoCancel(true)

diff --git a/app/src/main/res/mipmap-hdpi/ic_notifictaion.png b/app/src/main/res/mipmap-hdpi/ic_notifictaion.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_notifictaion.png b/app/src/main/res/mipmap-mdpi/ic_notifictaion.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_notifictaion.png b/app/src/main/res/mipmap-xhdpi/ic_notifictaion.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_notifictaion.png b/app/src/main/res/mipmap-xxhdpi/ic_notifictaion.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_notifictaion.png b/app/src/main/res/mipmap-xxxhdpi/ic_notifictaion.png
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
@@ -61,4 +61,6 @@
     <string name="im_ready">我準備好了!</string>
     <string name="important">*重要通知*</string>
     <string name="second_password_description">當您需要更改密碼或設定某些敏感功能時，您必須使用第二道密碼。 \n\n如果您不小心忘記了第二道密碼，您可以使用手機號碼和生日進行重置。</string>
+    <string name="reset_email_failed">密碼重設信寄送失敗</string>
+    <string name="send_reset_email">將會寄出密碼重設信至您的信箱</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -64,5 +64,7 @@
     <string name="birthday">Birthday e.g.19701001</string>
     <string name="im_ready">I\'m ready!</string>
     <string name="important">*IMPORTANT*</string>
+    <string name="reset_email_failed">Failed to send reset email</string>
+    <string name="send_reset_email">We have sent you instructions to reset your password</string>
     <string name="second_password_description">You must use a second password when you need to change your password or set some sensitive feature of an appliance. \\n\\nIf you accidentally forget the second password, you cna reset it through your cellphone number and birthday.</string>
 </resources>
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.1.2'
-        classpath 'com.google.gms:google-services:3.1.0'
+        classpath 'com.google.gms:google-services:3.3.1'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }