Skip to content

Commit 55305a9

Browse files
committed
Crash Update
Fixes crashes on multiple devices
1 parent 8242126 commit 55305a9

4 files changed

Lines changed: 74 additions & 47 deletions

File tree

.idea/deploymentTargetDropDown.xml

Lines changed: 14 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/src/main/java/com/btn/pronotes/Adapters/NotesListAdapter.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import com.btn.pronotes.Checklist.ChecklistItem;
2323
import com.btn.pronotes.Models.Notes;
2424
import com.btn.pronotes.NotesClickListener;
25+
import com.btn.pronotes.OpenSettings;
2526
import com.btn.pronotes.R;
2627
import com.btn.pronotes.utils.SharedPreferenceHelper;
2728

@@ -37,6 +38,8 @@ public class NotesListAdapter extends RecyclerView.Adapter<NotesViewHolder> {
3738
private int cardBackgroundColor;
3839

3940

41+
42+
4043
public NotesListAdapter(Context context, List<Notes> list, NotesClickListener listener) {
4144
this.context = context;
4245
this.list = list;

app/src/main/java/com/btn/pronotes/NotesTakerActivity.java

Lines changed: 3 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,9 @@ public class NotesTakerActivity extends AppCompatActivity {
8080
protected void onCreate(Bundle savedInstanceState) {
8181
super.onCreate(savedInstanceState);
8282
setContentView(R.layout.activity_notes_taker);
83-
Spinner spinner = findViewById(R.id.color_spinner);
84-
TextView textViewTitle = findViewById(R.id.textView_title);
83+
// In Activity where notes_list is inflated
84+
View notesListView = getLayoutInflater().inflate(R.layout.notes_list, null);
85+
OpenSettings openSettings = new OpenSettings();
8586

8687
imageView_save = findViewById(R.id.imageView_save);
8788
imageView_back = findViewById(R.id.imageView_back);
@@ -110,48 +111,8 @@ protected void onCreate(Bundle savedInstanceState) {
110111
getArguments();
111112

112113
//back button inside of note
113-
spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
114-
@Override
115-
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
116-
String selectedOption = spinner.getSelectedItem().toString();
117-
changeTextViewBackground(selectedOption);
118-
textView_title.setText(selectedOption);
119-
120-
}
121-
122-
@Override
123-
public void onNothingSelected(AdapterView<?> parent) {
124-
// Handle if nothing is selected, if needed
125-
}
126-
});
127-
128-
}
129-
private void changeTextViewBackground(String selectedOption) {
130-
switch (selectedOption) {
131-
case "Default":
132-
// Use default background color (e.g., from your app's theme)
133-
textView_title.setBackgroundResource(android.R.color.transparent); // Example
134-
break;
135-
case "Faded Black":
136-
textView_title.setBackgroundResource(R.drawable.multiblack);
137-
break;
138-
case "Faded Grey":
139-
textView_title.setBackgroundResource(R.drawable.multigrey);
140-
break;
141-
case "Faded Red":
142-
textView_title.setBackgroundResource(R.drawable.multired);
143-
break;
144-
case "Faded Blue":
145-
textView_title.setBackgroundResource(R.drawable.multiblue);
146-
break;
147-
default:
148-
// Handle if an unexpected option is selected
149-
}
150114
}
151115

152-
153-
154-
155116
private void setupMediaRecyclerView() {
156117
mediaListAdapter = new MediaListAdapter(this, new ArrayList<>(), new MediaClickListener() {
157118
@Override

app/src/main/java/com/btn/pronotes/OpenSettings.java

Lines changed: 54 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
package com.btn.pronotes;
22

33

4+
import static com.btn.pronotes.R.*;
5+
46
import androidx.appcompat.app.AppCompatActivity;
57

68

79
import android.content.Intent;
810
import android.graphics.Color;
911
import android.os.Bundle;
1012
import android.view.View;
13+
import android.widget.AdapterView;
1114
import android.widget.CompoundButton;
1215
import android.widget.ImageView;
1316

@@ -22,8 +25,12 @@
2225
import android.view.View;
2326
import android.widget.EditText;
2427
import android.widget.ImageView;
28+
import android.widget.Spinner;
29+
import android.widget.TextView;
2530
import android.widget.Toast;
2631

32+
import com.btn.pronotes.Adapters.NotesListAdapter;
33+
import com.btn.pronotes.R;
2734
import com.btn.pronotes.Models.Notes;
2835
import com.btn.pronotes.utils.SharedPreferenceHelper;
2936
import com.github.dhaval2404.colorpicker.ColorPickerDialog;
@@ -43,17 +50,38 @@ public class OpenSettings extends AppCompatActivity {
4350
private SwitchCompat colorTilesSwitch;
4451
private ShapeableImageView ivSelectColor;
4552
private String selectedColor;
53+
TextView textView_title;
54+
4655

4756

4857
@Override
4958
protected void onCreate(Bundle savedInstanceState) {
5059
super.onCreate(savedInstanceState);
51-
setContentView(R.layout.settings);
60+
setContentView(layout.settings);
5261
selectedColor = new SharedPreferenceHelper(this).getSelectedColor();
5362

54-
findViewById(R.id.imageView_back1).setOnClickListener(view -> finish());
55-
colorTilesSwitch = findViewById(R.id.color_tile_switch);
56-
ivSelectColor = findViewById(R.id.iv_select_color);
63+
Spinner spinner = findViewById(id.color_spinner);
64+
TextView textViewTitle = findViewById(id.textView_title);
65+
66+
67+
68+
spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
69+
@Override
70+
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
71+
String selectedOption = spinner.getSelectedItem().toString();
72+
changeTextViewBackground(selectedOption);
73+
textView_title.setText(selectedOption);
74+
}
75+
76+
@Override
77+
public void onNothingSelected(AdapterView<?> parent) {
78+
// Handle if nothing is selected, if needed
79+
}
80+
});
81+
82+
findViewById(id.imageView_back1).setOnClickListener(view -> finish());
83+
colorTilesSwitch = findViewById(id.color_tile_switch);
84+
ivSelectColor = findViewById(id.iv_select_color);
5785
if (!selectedColor.isEmpty()) {
5886
ivSelectColor.setBackgroundColor(Color.parseColor(selectedColor));
5987
}
@@ -74,6 +102,28 @@ protected void onCreate(Bundle savedInstanceState) {
74102
.show();
75103
});
76104
}
105+
private void changeTextViewBackground(String selectedOption) {
106+
switch (selectedOption) {
107+
case "Default":
108+
// Use default background color (e.g., from your app's theme)
109+
textView_title.setBackgroundResource(android.R.color.transparent); // Example
110+
break;
111+
case "Faded Black":
112+
textView_title.setBackgroundResource(drawable.multiblack);
113+
break;
114+
case "Faded Grey":
115+
textView_title.setBackgroundResource(drawable.multigrey);
116+
break;
117+
case "Faded Red":
118+
textView_title.setBackgroundResource(drawable.multired);
119+
break;
120+
case "Faded Blue":
121+
textView_title.setBackgroundResource(drawable.multiblue);
122+
break;
123+
default:
124+
// Handle if an unexpected option is selected
125+
}
126+
}
77127
}
78128

79129

0 commit comments

Comments
 (0)