Merge branch 'dev'

Author: hauke96

.idea/androidTestResultsUserPreferences.xml

@@ -3,15 +3,16 @@ plugins {
 }
 
 android {
-    compileSdkVersion 32
+    compileSdkVersion 33
     buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "de.hauke_stieler.geonotes"
         minSdkVersion 16
-        targetSdkVersion 32
-        versionCode 1005002
-        versionName "1.5.2"
+        targetSdkVersion 33
+        versionCode 1006000
+        versionName "1.6.0"
+        multiDexEnabled true
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -31,22 +32,28 @@ android {
         unitTests {
             includeAndroidResources = true
         }
+        unitTests.all {
+            jvmArgs '-noverify'
+        }
     }
 }
 
 dependencies {
     implementation 'org.osmdroid:osmdroid-android:6.1.13'
 
-    implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'com.google.android.material:material:1.5.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    // noinspection GradleDependency: Versions 1.7.0+ caused compile problems
+    implementation 'com.google.android.material:material:1.6.0'
+    implementation 'androidx.recyclerview:recyclerview:1.3.0'
     implementation 'androidx.preference:preference:1.2.0'
     implementation 'org.apache.commons:commons-text:1.9'
     implementation 'com.google.code.gson:gson:2.8.8'
     implementation 'me.himanshusoni.gpxparser:gpx-parser:1.13'
+    implementation 'com.android.support:multidex:1.0.3'
 
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.mockito:mockito-inline:3.8.0'
 
-    testImplementation 'androidx.test.ext:junit:1.1.3'
+    testImplementation 'androidx.test.ext:junit:1.1.5'
     testImplementation 'org.robolectric:robolectric:4.5.1'
 }

.idea/misc.xml

@@ -45,21 +45,24 @@
 import de.hauke_stieler.geonotes.map.MarkerFragment;
 import de.hauke_stieler.geonotes.map.TouchDownListener;
 import de.hauke_stieler.geonotes.note_list.NoteListActivity;
+import de.hauke_stieler.geonotes.notes.NoteIconProvider;
 import de.hauke_stieler.geonotes.photo.ThumbnailUtil;
 import de.hauke_stieler.geonotes.settings.SettingsActivity;
 
 public class MainActivity extends AppCompatActivity {
 
-    private static final int REQUEST_NOTE_LIST_REQUEST_CODE = 4;
-    private static final int REQUEST_PERMISSIONS_REQUEST_CODE = 3;
-    private static final int REQUEST_CAMERA_PERMISSIONS_REQUEST_CODE = 2;
-    private static final int REQUEST_IMAGE_CAPTURE = 1;
+    static final int REQUEST_CATEGORIES_REQUEST_CODE = 5;
+    static final int REQUEST_NOTE_LIST_REQUEST_CODE = 4;
+    static final int REQUEST_PERMISSIONS_REQUEST_CODE = 3;
+    static final int REQUEST_CAMERA_PERMISSIONS_REQUEST_CODE = 2;
+    static final int REQUEST_IMAGE_CAPTURE = 1;
 
     private Map map;
     private SharedPreferences preferences;
     private Database database;
     private Exporter exporter;
     private Toolbar toolbar;
+    private NoteIconProvider noteIconProvider;
 
     // These fields exist to remember the photo data when the photo Intent is started. This is
     // because the Intent doesn't return anything and works asynchronously. In the result handler
@@ -79,6 +82,7 @@ protected void onCreate(Bundle savedInstanceState) {
         database = Injector.get(Database.class);
         preferences = Injector.get(SharedPreferences.class);
         exporter = Injector.get(Exporter.class);
+        noteIconProvider = Injector.get(NoteIconProvider.class);
 
         toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
@@ -182,7 +186,7 @@ public boolean onOptionsItemSelected(@NonNull MenuItem item) {
                 startActivity(new Intent(this, SettingsActivity.class));
                 return true;
             case R.id.toolbar_btn_categories:
-                startActivity(new Intent(this, CategoryConfigurationActivity.class));
+                startActivityForResult(new Intent(this, CategoryConfigurationActivity.class), REQUEST_CATEGORIES_REQUEST_CODE);
                 return true;
             case R.id.toolbar_btn_note_list:
                 startActivityForResult(new Intent(this, NoteListActivity.class), REQUEST_NOTE_LIST_REQUEST_CODE);
@@ -327,6 +331,9 @@ protected void onActivityResult(int requestCode, int resultCode, @Nullable Inten
                         map.selectNote(selectedNoteId);
                     }
                     break;
+                case REQUEST_CATEGORIES_REQUEST_CODE:
+                    noteIconProvider.updateIcons();
+                    break;
             }
         }
     }
@@ -352,7 +359,7 @@ private void addPhotoToDatabase(Long noteId, File photoFile) {
         try {
             ThumbnailUtil.writeThumbnail(sizeInPixel, photoFile);
         } catch (IOException e) {
-            Toast.makeText(getApplicationContext(), R.string.create_thumbnail_failed, Toast.LENGTH_SHORT);
+            Toast.makeText(getApplicationContext(), R.string.note_list_create_thumbnail_failed, Toast.LENGTH_SHORT);
         }
     }
 

app/build.gradle

@@ -5,24 +5,38 @@
 import de.hauke_stieler.geonotes.R;
 
 public class Category {
-    public final static int NONE_ID = -1;
+    public final static int NONE_ID = -1;    // ID of a dummy category
+    public final static int UNKNOWN_ID = -2; // ID of a new unsaved category.
 
     private final long id;
+    private final int drawableId;
+
     private String color;
     private String name;
-    private final int drawableId;
+    private long sortKey;
+    private boolean hasNotes;
+
+    public Category(String color, String name, long sortKey) {
+        this.id = UNKNOWN_ID;
+        this.color = color;
+        this.name = name;
+        this.sortKey = sortKey;
+        this.drawableId = R.drawable.shape_item_cetagory_spinner;
+    }
 
-    public Category(long id, String color, String name) {
+    public Category(long id, String color, String name, long sortKey) {
         this.id = id;
         this.color = color;
         this.name = name;
+        this.sortKey = sortKey;
         this.drawableId = R.drawable.shape_item_cetagory_spinner;
     }
 
-    public Category(long id, String color, String name, int drawableId) {
+    public Category(long id, String color, String name, int drawableId, long sortKey) {
         this.id = id;
         this.color = color;
         this.name = name;
+        this.sortKey = sortKey;
         this.drawableId = drawableId;
     }
 
@@ -34,8 +48,8 @@ public String getColorString() {
         return color;
     }
 
-    public void setColorString(String newColor) {
-        this.color = newColor;
+    public void setColor(int newColor) {
+        this.color = String.format("#%06X", (0xFFFFFF & newColor));
     }
 
     public int getColor() {
@@ -54,6 +68,22 @@ public int getDrawableId() {
         return drawableId;
     }
 
+    public long getSortKey() {
+        return sortKey;
+    }
+
+    public void setSortKey(int newKey) {
+        this.sortKey = newKey;
+    }
+
+    public boolean hasNotes() {
+        return hasNotes;
+    }
+
+    public void setHasNotes(boolean hasNotes) {
+        this.hasNotes = hasNotes;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;