added popup notifications and fixed problems

Author: NickCoffin

Android/Layout_Version/.gradle/file-system.probe

@@ -15,6 +15,7 @@
 public class Account_Page extends AppCompatActivity {
     private Account account;
     private VideoViewModel videoViewModel;
+    private boolean s = false;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -26,11 +27,12 @@ protected void onCreate(Bundle savedInstanceState) {
 
         Button loginbtn = findViewById(R.id.login);
         Button signupbtn = findViewById(R.id.signup);
-
+        if(s){
+            Notifications notif = new Notifications(this);
+            NotificationManagerCompat managerCompat = NotificationManagerCompat.from(this);
+            notif.send_Sign_In_Notification(managerCompat);
+        }
         TextView resetPassword = findViewById(R.id.resetPassword);
-        Notifications notif = new Notifications(this);
-        NotificationManagerCompat managerCompat = NotificationManagerCompat.from(this);
-        notif.send_Sign_In_Notification(managerCompat);
         loginbtn.setOnClickListener(v ->
                 account.signin(
                         Account_Page.this,
@@ -40,6 +42,7 @@ protected void onCreate(Bundle savedInstanceState) {
                         () -> {}
                 )
         );
+        s = true;
 //        loginbtn.setOnClickListener(view -> {
 //            startActivity(new Intent (Account_Page.this, Bluetooth_Page.class));
 //        });
@@ -51,7 +54,6 @@ protected void onCreate(Bundle savedInstanceState) {
         resetPassword.setOnClickListener(view -> {
             startActivity(new Intent (Account_Page.this,Account_Page_Forgot_Password.class));
         });
-
     }
 
 

Android/Layout_Version/.idea/workspace.xml

@@ -19,9 +19,6 @@ public class Account_Page_Password_Change extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        Notifications notif = new Notifications(this);
-        NotificationManagerCompat managerCompat = NotificationManagerCompat.from(this);
-        notif.send_Password_Change_Notification(managerCompat);
         setContentView(R.layout.account_password);
         account = Account.getInstance();
 
@@ -37,6 +34,9 @@ protected void onCreate(Bundle savedInstanceState) {
         changeBtn.setOnClickListener(v ->
                 {
                     if (password.getText().toString().equals(re_password.getText().toString())) {
+                        Notifications notif = new Notifications(this);
+                        NotificationManagerCompat managerCompat = NotificationManagerCompat.from(this);
+                        notif.send_Password_Change_Notification(managerCompat);
                         account.changePassword(
                                 Account_Page_Password_Change.this,
                                 password.getText().toString(),

Android/Layout_Version/app/src/main/java/com/example/layout_version/Account/Account_Page.java

@@ -20,9 +20,6 @@ public class Account_Page_Signup extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        Notifications notif = new Notifications(this);
-        NotificationManagerCompat managerCompat = NotificationManagerCompat.from(this);
-        notif.send_New_Account_Notification(managerCompat);
         setContentView(R.layout.account_signup_page);
         account = Account.getInstance();
         ImageView back_im;
@@ -41,6 +38,9 @@ protected void onCreate(Bundle savedInstanceState) {
         signupbtn.setOnClickListener(v -> {
             if(password.getText().toString().equals(re_password.getText().toString()))
             {
+                Notifications notif = new Notifications(this);
+                NotificationManagerCompat managerCompat = NotificationManagerCompat.from(this);
+                notif.send_New_Account_Notification(managerCompat);
                 account.signup(
                         Account_Page_Signup.this,
                         username.getText().toString(),

Android/Layout_Version/app/src/main/java/com/example/layout_version/Account/Account_Page_Password_Change.java

@@ -10,6 +10,9 @@
 import android.widget.Toast;
 
 import androidx.appcompat.app.AlertDialog;
+import androidx.core.app.NotificationManagerCompat;
+
+import com.example.layout_version.Notifications;
 
 import java.io.IOException;
 import java.io.InputStream;

Android/Layout_Version/app/src/main/java/com/example/layout_version/Account/Account_Page_Signup.java

@@ -5,6 +5,7 @@
 import android.widget.Button;
 
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.app.NotificationManagerCompat;
 
 import com.example.layout_version.Account.Account_Page;
 import com.example.layout_version.Bluetooth.BluetoothManager;
@@ -14,6 +15,9 @@ public class Bluetooth_Page extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        Notifications notif = new Notifications(this);
+        NotificationManagerCompat managerCompat = NotificationManagerCompat.from(this);
+        notif.send_Bluetooth_Notification(managerCompat);
         setContentView(R.layout.bluetooth_hardware_page);
 
         Button serialbtn = findViewById(R.id.serialButton);

Android/Layout_Version/app/src/main/java/com/example/layout_version/Bluetooth/BluetoothManager.java

@@ -57,15 +57,15 @@ protected void onCreate(Bundle savedInstanceState) {
         StreamingListFragmentInterface.setUpNetwork(this, this, streamingViewModel, 4);
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            NotificationChannel channel = new NotificationChannel("My_Notification", "My Notification", NotificationManager.IMPORTANCE_DEFAULT);
+            NotificationChannel channel = new NotificationChannel("My_Notification", "My Notification", NotificationManager.IMPORTANCE_HIGH);
             NotificationManager manager = getSystemService(NotificationManager.class);
             manager.createNotificationChannel(channel);
         }
         Notifications notif = new Notifications(this);
         NotificationManagerCompat managerCompat = NotificationManagerCompat.from(this);
-        notif.send_Recording_Notification( managerCompat);
-        notif.send_New_Account_Notification( managerCompat);
-        notif.send_Motion_Detected_Notification( managerCompat);
+        //notif.send_Recording_Notification( managerCompat);
+        //notif.send_New_Account_Notification( managerCompat);
+        //notif.send_Motion_Detected_Notification( managerCompat);
 
         try {
             Thread.sleep(2000);

Android/Layout_Version/app/src/main/java/com/example/layout_version/Bluetooth_Page.java

@@ -55,4 +55,7 @@ public void send_Streaming_Notification( NotificationManagerCompat managerCompat
     public void send_Forgot_Password_Notification( NotificationManagerCompat managerCompat ) {
         send_Notification(managerCompat, "Forgot Password", "Looks like you forgot your password. We got your back!");
     }
+    public void send_Bluetooth_Notification( NotificationManagerCompat managerCompat ) {
+        send_Notification(managerCompat, "Bluetooth Connected", "Bluetooth has been connected and is working properly");
+    }
 }

Android/Layout_Version/app/src/main/java/com/example/layout_version/MainActivity.java

@@ -15,6 +15,7 @@
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.core.app.NotificationManagerCompat;
 
 import java.security.Policy;
 import java.util.ArrayList;