Skip to content

Commit d108852

Browse files
committed
Crash Fix
Removed new features in settings that caused some crashing when accessing settings and sometimes creating notes Updated the UI of shown notes to now have a header color (changeable coming soon) and removed backup & restore notes due to crashing on outdated code
1 parent 55305a9 commit d108852

10 files changed

Lines changed: 40 additions & 31 deletions

File tree

.idea/cody_history.xml

Lines changed: 20 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/deploymentTargetDropDown.xml

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

app/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ android {
1010
applicationId "com.btn.pronotes"
1111
minSdk 21
1212
targetSdk 34
13-
versionCode 10
14-
versionName "10.0"
13+
versionCode 11
14+
versionName "11.0"
1515

1616
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1717
}
@@ -44,8 +44,8 @@ dependencies {
4444
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
4545
//Androidx room
4646
implementation "androidx.room:room-runtime:2.6.1"
47-
implementation 'androidx.navigation:navigation-fragment:2.7.6'
48-
implementation 'androidx.navigation:navigation-ui:2.7.6'
47+
implementation 'androidx.navigation:navigation-fragment:2.7.7'
48+
implementation 'androidx.navigation:navigation-ui:2.7.7'
4949
annotationProcessor "androidx.room:room-compiler:2.6.1"
5050
testImplementation 'junit:junit:4.13.2'
5151
androidTestImplementation 'androidx.test.ext:junit:1.1.5'

app/debug/app-debug.aab

244 KB
Binary file not shown.

app/release/app-release.aab

234 KB
Binary file not shown.

app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@
6969
android:resource="@xml/note_widget_info" />
7070
</receiver>
7171

72-
<service
72+
<!--<service
7373
android:name=".services.BackupService"
74-
android:foregroundServiceType="dataSync" />
74+
android:foregroundServiceType="dataSync" />-->
7575

7676
<provider
7777
android:name="androidx.core.content.FileProvider"

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,12 @@ protected void onCreate(Bundle savedInstanceState) {
6060
setContentView(layout.settings);
6161
selectedColor = new SharedPreferenceHelper(this).getSelectedColor();
6262

63-
Spinner spinner = findViewById(id.color_spinner);
63+
/* Spinner spinner = findViewById(id.color_spinner);
6464
TextView textViewTitle = findViewById(id.textView_title);
65+
*/
6566

6667

67-
68-
spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
68+
/*spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
6969
@Override
7070
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
7171
String selectedOption = spinner.getSelectedItem().toString();
@@ -77,7 +77,7 @@ public void onItemSelected(AdapterView<?> parent, View view, int position, long
7777
public void onNothingSelected(AdapterView<?> parent) {
7878
// Handle if nothing is selected, if needed
7979
}
80-
});
80+
});*/
8181

8282
findViewById(id.imageView_back1).setOnClickListener(view -> finish());
8383
colorTilesSwitch = findViewById(id.color_tile_switch);
@@ -102,11 +102,11 @@ public void onNothingSelected(AdapterView<?> parent) {
102102
.show();
103103
});
104104
}
105-
private void changeTextViewBackground(String selectedOption) {
105+
/* private void changeTextViewBackground(String selectedOption) {
106106
switch (selectedOption) {
107107
case "Default":
108108
// Use default background color (e.g., from your app's theme)
109-
textView_title.setBackgroundResource(android.R.color.transparent); // Example
109+
textView_title.setBackgroundResource(drawable.multiblack_round); // Example
110110
break;
111111
case "Faded Black":
112112
textView_title.setBackgroundResource(drawable.multiblack);
@@ -123,7 +123,7 @@ private void changeTextViewBackground(String selectedOption) {
123123
default:
124124
// Handle if an unexpected option is selected
125125
}
126-
}
126+
}*/
127127
}
128128

129129

app/src/main/res/layout/settings.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
android:layout_weight="1"
8080
/>
8181
</LinearLayout>
82-
<TextView
82+
<!--<TextView
8383
android:id="@+id/textView_title1"
8484
android:layout_width="wrap_content"
8585
android:layout_height="wrap_content"
@@ -89,7 +89,7 @@
8989
android:textSize="16sp"
9090
android:layout_marginTop="16dp" />
9191
92-
<!-- Add Spinner for color selection -->
92+
&lt;!&ndash; Add Spinner for color selection &ndash;&gt;
9393
<Spinner
9494
android:id="@+id/color_spinner"
9595
android:layout_width="match_parent"
@@ -99,6 +99,6 @@
9999
android:textStyle="bold"
100100
android:background="@drawable/border"
101101
android:textAlignment="center"
102-
android:entries="@array/color_options" /> <!-- Define color_options array in your resources -->
102+
android:entries="@array/color_options" />--> <!-- Define color_options array in your resources -->
103103

104104
</LinearLayout>

app/src/main/res/menu-v26/info_menu.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,12 @@
1818
<item android:id="@+id/backup"
1919
android:icon="@drawable/baseline_backup_24"
2020
app:showAsAction="ifRoom"
21+
android:visible="false"
2122
android:title="Backup Notes"/>
2223
<item android:id="@+id/restore"
2324
android:icon="@drawable/baseline_restore_24"
2425
app:showAsAction="ifRoom"
26+
android:visible="false"
2527
android:title="Restore Notes"/>
2628

2729
<item android:id="@+id/help"

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
buildscript {
44

55
dependencies {
6-
classpath 'com.google.gms:google-services:4.4.0'
6+
classpath 'com.google.gms:google-services:4.4.1'
77
}
88
}
99
plugins {

0 commit comments

Comments
 (0)