Skip to content

Commit b31d18c

Browse files
authored
Merge pull request #45 from Capstone-Projects-2023-Spring/MPC-134-Deleting-item-in-library-and-streaming
Mpc 134 deleting item in library and streaming
2 parents dea444c + dc7e1c5 commit b31d18c

10 files changed

+46
-10
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,12 @@ public class Account_Page_Forgot_Password extends AppCompatActivity {
1919
@Override
2020
protected void onCreate(Bundle savedInstanceState) {
2121
super.onCreate(savedInstanceState);
22+
setContentView(R.layout.account_reset);
23+
account = Account.getInstance();
24+
2225
Notifications notif = new Notifications(this);
2326
NotificationManagerCompat managerCompat = NotificationManagerCompat.from(this);
2427
notif.send_Forgot_Password_Notification(managerCompat);
25-
setContentView(R.layout.account_reset);
26-
account = Account.getInstance();
2728

2829
TextView username = findViewById(R.id.username);
2930

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ public class Account_Page_Password_Change extends AppCompatActivity {
1919
@Override
2020
protected void onCreate(Bundle savedInstanceState) {
2121
super.onCreate(savedInstanceState);
22-
Notifications notif = new Notifications(this);
23-
NotificationManagerCompat managerCompat = NotificationManagerCompat.from(this);
24-
notif.send_Password_Change_Notification(managerCompat);
2522
setContentView(R.layout.account_password);
2623
account = Account.getInstance();
2724

@@ -37,6 +34,9 @@ protected void onCreate(Bundle savedInstanceState) {
3734
changeBtn.setOnClickListener(v ->
3835
{
3936
if (password.getText().toString().equals(re_password.getText().toString())) {
37+
Notifications notif = new Notifications(this);
38+
NotificationManagerCompat managerCompat = NotificationManagerCompat.from(this);
39+
notif.send_Password_Change_Notification(managerCompat);
4040
account.changePassword(
4141
Account_Page_Password_Change.this,
4242
password.getText().toString(),

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@
1111

1212
import androidx.appcompat.app.AlertDialog;
1313
import androidx.appcompat.app.AppCompatActivity;
14+
import androidx.core.app.NotificationManagerCompat;
1415

16+
import com.example.layout_version.Notifications;
1517
import com.example.layout_version.R;
1618

1719
public class Account_Page_Profile extends AppCompatActivity {
@@ -22,7 +24,6 @@ protected void onCreate(Bundle savedInstanceState) {
2224
super.onCreate(savedInstanceState);
2325
setContentView(R.layout.account_profile);
2426
account = Account.getInstance();
25-
2627
TextView username = findViewById(R.id.username);
2728
TextView resetPassword = findViewById(R.id.resetPassword);
2829

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ public class Account_Page_Signup extends AppCompatActivity {
2020
@Override
2121
protected void onCreate(Bundle savedInstanceState) {
2222
super.onCreate(savedInstanceState);
23-
Notifications notif = new Notifications(this);
24-
NotificationManagerCompat managerCompat = NotificationManagerCompat.from(this);
25-
notif.send_New_Account_Notification(managerCompat);
2623
setContentView(R.layout.account_signup_page);
2724
account = Account.getInstance();
2825
ImageView back_im;
@@ -41,6 +38,9 @@ protected void onCreate(Bundle savedInstanceState) {
4138
signupbtn.setOnClickListener(v -> {
4239
if(password.getText().toString().equals(re_password.getText().toString()))
4340
{
41+
Notifications notif = new Notifications(this);
42+
NotificationManagerCompat managerCompat = NotificationManagerCompat.from(this);
43+
notif.send_New_Account_Notification(managerCompat);
4444
account.signup(
4545
Account_Page_Signup.this,
4646
username.getText().toString(),

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
import android.widget.Toast;
1414

1515
import androidx.appcompat.app.AlertDialog;
16+
import androidx.core.app.NotificationManagerCompat;
17+
18+
import com.example.layout_version.Notifications;
1619

1720
import com.example.layout_version.R;
1821

@@ -33,8 +36,12 @@ public class BluetoothManager {
3336
private InputStream inputStream;
3437
private OutputStream outputStream;
3538

39+
public boolean connected;
40+
3641
public BluetoothManager() {
42+
3743
bluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
44+
connected = false;
3845
}
3946

4047
@SuppressLint("MissingPermission")
@@ -47,6 +54,7 @@ public boolean connectToDevice(String deviceAddress) {
4754
outputStream = socket.getOutputStream();
4855
read();
4956
write("Change name\nnew_device");
57+
connected = true;
5058
return true;
5159
} catch (IOException e) {
5260
Log.e(TAG, "Error connecting to device", e);
@@ -149,4 +157,7 @@ private void showWifiInputDialog(Context context) {
149157

150158
builder.create().show();
151159
}
160+
public boolean getConnected(){
161+
return connected;
162+
}
152163
}

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import android.widget.Button;
66

77
import androidx.appcompat.app.AppCompatActivity;
8+
import androidx.core.app.NotificationManagerCompat;
89

910
import com.example.layout_version.Account.Account_Page;
1011
import com.example.layout_version.Bluetooth.BluetoothManager;
@@ -21,6 +22,11 @@ protected void onCreate(Bundle savedInstanceState) {
2122
serialbtn.setOnClickListener(view -> {
2223
BluetoothManager bluetoothManager = new BluetoothManager();
2324
bluetoothManager.show_bluetooth_devices(this);
25+
if(bluetoothManager.getConnected()){
26+
Notifications notif = new Notifications(this);
27+
NotificationManagerCompat managerCompat = NotificationManagerCompat.from(this);
28+
notif.send_Bluetooth_Notification(managerCompat);
29+
}
2430
});
2531
}
2632
}

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
import android.util.Log;
1111
import android.widget.Button;
1212
import android.widget.ImageView;
13+
import android.Manifest;
14+
import android.widget.Toast;
1315

1416
import androidx.appcompat.app.AppCompatActivity;
1517
import androidx.core.app.NotificationManagerCompat;
@@ -29,6 +31,11 @@
2931
import com.example.layout_version.MainTab.Streaming.StreamingListFragment;
3032
import com.example.layout_version.MainTab.Streaming.StreamingListFragmentInterface;
3133
import com.example.layout_version.MainTab.Streaming.StreamingViewModel;
34+
import com.example.layout_version.Network.NetworkInterface;
35+
import com.example.layout_version.Network.NetworkRequestManager;
36+
37+
import org.json.JSONException;
38+
import org.json.JSONObject;
3239

3340

3441
public class MainActivity extends AppCompatActivity implements LibraryFragmentInterface, StreamingListFragmentInterface {
@@ -57,7 +64,7 @@ protected void onCreate(Bundle savedInstanceState) {
5764

5865

5966
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
60-
NotificationChannel channel = new NotificationChannel("My_Notification", "My Notification", NotificationManager.IMPORTANCE_DEFAULT);
67+
NotificationChannel channel = new NotificationChannel("My_Notification", "My Notification", NotificationManager.IMPORTANCE_HIGH);
6168
NotificationManager manager = getSystemService(NotificationManager.class);
6269
manager.createNotificationChannel(channel);
6370
}
@@ -253,4 +260,6 @@ protected void onRestoreInstanceState(Bundle savedInstanceState) {
253260
Log.d("Restore", value);
254261
}
255262

263+
264+
256265
}

Android/Layout_Version/app/src/main/java/com/example/layout_version/Network/NetworkRequestManager.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
public class NetworkRequestManager {
4040
private final RequestQueue mRequestQueue;
4141
private final Context context;
42+
4243
private final ProgressBar progressBar;
4344

4445
private final ImageView resultView;

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,10 @@ public void send_Streaming_Notification( NotificationManagerCompat managerCompat
5757
public void send_Forgot_Password_Notification( NotificationManagerCompat managerCompat ) {
5858
send_Notification(managerCompat, "Forgot Password", "Looks like you forgot your password. We got your back!");
5959
}
60+
public void send_Bluetooth_Notification( NotificationManagerCompat managerCompat ) {
61+
send_Notification(managerCompat, "Bluetooth Connected", "Bluetooth has been connected and is working properly");
62+
}
63+
public void send_Network_Not_Connected_Notification( NotificationManagerCompat managerCompat ) {
64+
send_Notification(managerCompat, "Network Connection Failed", "Your device was unable to connect");
65+
}
6066
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import androidx.appcompat.app.AlertDialog;
1616
import androidx.appcompat.app.AppCompatActivity;
1717
import androidx.constraintlayout.widget.ConstraintLayout;
18+
import androidx.core.app.NotificationManagerCompat;
1819

1920
import java.security.Policy;
2021
import java.util.ArrayList;

0 commit comments

Comments
 (0)