Merge pull request 'MiNote_Rewrite2.1' (#2) from feature1 into main

MiNote/app/build.gradle.kts

@@ -50,9 +50,11 @@ dependencies {
 //        "include" to listOf("*.aar", "*.jar"),
 //        "exclude" to listOf()
 //    )))
-    implementation(files("E:/AndroidProjects/MiNote_Rewrite/MiNote/httpcomponents-client-4.5.14-bin/lib/httpclient-osgi-4.5.14.jar"))
+    //noinspection GradlePath
-    implementation(files("E:/AndroidProjects/MiNote_Rewrite/MiNote/httpcomponents-client-4.5.14-bin/lib/httpclient-win-4.5.14.jar"))
+    implementation(files("D:/MiNotes-Rewrite/MiNote_Rewrite/MiNote/httpcomponents-client-4.5.14-bin/lib/httpclient-osgi-4.5.14.jar"))
-    implementation(files("E:/AndroidProjects/MiNote_Rewrite/MiNote/httpcomponents-client-4.5.14-bin/lib/httpcore-4.4.16.jar"))
+    implementation(files("D:/MiNotes-Rewrite/MiNote_Rewrite/MiNote/httpcomponents-client-4.5.14-bin/lib/httpclient-win-4.5.14.jar"))
+    implementation(files("D:/MiNotes-Rewrite/MiNote_Rewrite/MiNote/httpcomponents-client-4.5.14-bin/lib/httpcore-4.4.16.jar"))
+
     testImplementation(libs.junit)
     androidTestImplementation(libs.ext.junit)
     androidTestImplementation(libs.espresso.core)

MiNote/app/src/main/AndroidManifest.xml

@@ -29,7 +29,7 @@
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:label="@string/app_name"
             android:launchMode="singleTop"
-            android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
+            android:theme="@style/NoteTheme"
             android:uiOptions="splitActionBarWhenNarrow"
             android:windowSoftInputMode="adjustPan"
             android:exported="true">
@@ -44,7 +44,7 @@
             android:name=".ui.NoteEditActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:launchMode="singleTop"
-            android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
+            android:theme="@style/NoteTheme"
             android:exported="true">
 
             <intent-filter tools:ignore="AppLinkUrlError">

MiNote/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java

@@ -52,8 +52,6 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import androidx.appcompat.app.AppCompatActivity;
-
 import net.micode.notes.R;
 import net.micode.notes.data.Notes;
 import net.micode.notes.data.Notes.TextNote;
@@ -74,7 +72,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 
-public class NoteEditActivity extends AppCompatActivity implements OnClickListener,
+public class NoteEditActivity extends Activity implements OnClickListener,
         NoteSettingChangedListener, OnTextViewChangeListener {
     private class HeadViewHolder {
         public TextView tvModified;
@@ -432,7 +430,7 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen
         if (id == R.id.btn_set_bg_color) {
             mNoteBgColorSelector.setVisibility(View.VISIBLE);
             findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
-                    View.VISIBLE);
+                    -                    View.VISIBLE);
         } else if (sBgSelectorBtnsMap.containsKey(id)) {
             findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
                     View.GONE);
@@ -625,7 +623,7 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen
         if (mWorkingNote.getNoteId() > 0) {
             Intent intent = new Intent(this, AlarmReceiver.class);
             intent.setData(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, mWorkingNote.getNoteId()));
-            PendingIntent pendingIntent = PendingIntent.getBroadcast(this, 0, intent, PendingIntent.FLAG_IMMUTABLE);
+            PendingIntent pendingIntent = PendingIntent.getBroadcast(this, 0, intent, 0);
             AlarmManager alarmManager = ((AlarmManager) getSystemService(ALARM_SERVICE));
             showAlertHeader();
             if(!set) {

MiNote/app/src/main/java/net/micode/notes/ui/NotesListActivity.java

@@ -60,8 +60,6 @@ import android.widget.PopupMenu;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import androidx.appcompat.app.AppCompatActivity;
-
 import net.micode.notes.R;
 import net.micode.notes.data.Notes;
 import net.micode.notes.data.Notes.NoteColumns;
@@ -80,7 +78,7 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.HashSet;
 
-public class NotesListActivity extends AppCompatActivity implements OnClickListener, OnItemLongClickListener {
+public class NotesListActivity extends Activity implements OnClickListener, OnItemLongClickListener {
     private static final int FOLDER_NOTE_LIST_QUERY_TOKEN = 0;
 
     private static final int FOLDER_LIST_QUERY_TOKEN      = 1;

MiNote/app/src/main/res/values/styles.xml

@@ -63,7 +63,7 @@
     </style>
 
     <style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
-        <item name="android:displayOptions" />
+<!--        <item name="android:displayOptions" />-->
-        <item name="android:visibility">gone</item>
+        <item name="android:visibility">visible</item>
     </style>
 </resources>