diff --git a/AppIcon.icon/Assets/eraser.svg b/AppIcon.icon/Assets/eraser.svg
new file mode 100644
index 00000000..694fc49a
--- /dev/null
+++ b/AppIcon.icon/Assets/eraser.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/AppIcon.icon/Assets/pencil.svg b/AppIcon.icon/Assets/pencil.svg
new file mode 100644
index 00000000..2afed830
--- /dev/null
+++ b/AppIcon.icon/Assets/pencil.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/AppIcon.icon/icon.json b/AppIcon.icon/icon.json
new file mode 100644
index 00000000..88a15848
--- /dev/null
+++ b/AppIcon.icon/icon.json
@@ -0,0 +1,60 @@
+{
+ "fill" : {
+ "solid" : "display-p3:0.10980,0.68627,1.00000,1.00000"
+ },
+ "groups" : [
+ {
+ "layers" : [
+ {
+ "image-name" : "eraser.svg",
+ "name" : "eraser",
+ "position" : {
+ "scale" : 35,
+ "translation-in-points" : [
+ 0,
+ 0
+ ]
+ }
+ }
+ ],
+ "shadow" : {
+ "kind" : "neutral",
+ "opacity" : 0.5
+ },
+ "translucency" : {
+ "enabled" : true,
+ "value" : 0.5
+ }
+ },
+ {
+ "layers" : [
+ {
+ "image-name" : "pencil.svg",
+ "name" : "pencil",
+ "position" : {
+ "scale" : 35,
+ "translation-in-points" : [
+ 0,
+ 0
+ ]
+ }
+ }
+ ],
+ "lighting" : "individual",
+ "shadow" : {
+ "kind" : "neutral",
+ "opacity" : 0.5
+ },
+ "translucency" : {
+ "enabled" : true,
+ "value" : 0.5
+ }
+ }
+ ],
+ "supported-platforms" : {
+ "circles" : [
+ "watchOS"
+ ],
+ "squares" : "shared"
+ }
+}
\ No newline at end of file
diff --git a/Brand/Custom.xcassets/AppIcon.appiconset/100.png b/Brand/Custom.xcassets/AppIcon.appiconset/100.png
deleted file mode 100644
index d57350bd..00000000
Binary files a/Brand/Custom.xcassets/AppIcon.appiconset/100.png and /dev/null differ
diff --git a/Brand/Custom.xcassets/AppIcon.appiconset/1024.png b/Brand/Custom.xcassets/AppIcon.appiconset/1024.png
deleted file mode 100644
index af855b89..00000000
Binary files a/Brand/Custom.xcassets/AppIcon.appiconset/1024.png and /dev/null differ
diff --git a/Brand/Custom.xcassets/AppIcon.appiconset/114.png b/Brand/Custom.xcassets/AppIcon.appiconset/114.png
deleted file mode 100644
index 3c0b21e0..00000000
Binary files a/Brand/Custom.xcassets/AppIcon.appiconset/114.png and /dev/null differ
diff --git a/Brand/Custom.xcassets/AppIcon.appiconset/120.png b/Brand/Custom.xcassets/AppIcon.appiconset/120.png
deleted file mode 100644
index 26249f10..00000000
Binary files a/Brand/Custom.xcassets/AppIcon.appiconset/120.png and /dev/null differ
diff --git a/Brand/Custom.xcassets/AppIcon.appiconset/144.png b/Brand/Custom.xcassets/AppIcon.appiconset/144.png
deleted file mode 100644
index afb9b379..00000000
Binary files a/Brand/Custom.xcassets/AppIcon.appiconset/144.png and /dev/null differ
diff --git a/Brand/Custom.xcassets/AppIcon.appiconset/152.png b/Brand/Custom.xcassets/AppIcon.appiconset/152.png
deleted file mode 100644
index 7b630fd9..00000000
Binary files a/Brand/Custom.xcassets/AppIcon.appiconset/152.png and /dev/null differ
diff --git a/Brand/Custom.xcassets/AppIcon.appiconset/167.png b/Brand/Custom.xcassets/AppIcon.appiconset/167.png
deleted file mode 100644
index 66a7a95f..00000000
Binary files a/Brand/Custom.xcassets/AppIcon.appiconset/167.png and /dev/null differ
diff --git a/Brand/Custom.xcassets/AppIcon.appiconset/172.png b/Brand/Custom.xcassets/AppIcon.appiconset/172.png
deleted file mode 100644
index b36c1577..00000000
Binary files a/Brand/Custom.xcassets/AppIcon.appiconset/172.png and /dev/null differ
diff --git a/Brand/Custom.xcassets/AppIcon.appiconset/180.png b/Brand/Custom.xcassets/AppIcon.appiconset/180.png
deleted file mode 100644
index 3a21275e..00000000
Binary files a/Brand/Custom.xcassets/AppIcon.appiconset/180.png and /dev/null differ
diff --git a/Brand/Custom.xcassets/AppIcon.appiconset/196.png b/Brand/Custom.xcassets/AppIcon.appiconset/196.png
deleted file mode 100644
index c247333e..00000000
Binary files a/Brand/Custom.xcassets/AppIcon.appiconset/196.png and /dev/null differ
diff --git a/Brand/Custom.xcassets/AppIcon.appiconset/20.png b/Brand/Custom.xcassets/AppIcon.appiconset/20.png
deleted file mode 100644
index 60285dee..00000000
Binary files a/Brand/Custom.xcassets/AppIcon.appiconset/20.png and /dev/null differ
diff --git a/Brand/Custom.xcassets/AppIcon.appiconset/216.png b/Brand/Custom.xcassets/AppIcon.appiconset/216.png
deleted file mode 100644
index e2ca452f..00000000
Binary files a/Brand/Custom.xcassets/AppIcon.appiconset/216.png and /dev/null differ
diff --git a/Brand/Custom.xcassets/AppIcon.appiconset/29.png b/Brand/Custom.xcassets/AppIcon.appiconset/29.png
deleted file mode 100644
index 51c2698f..00000000
Binary files a/Brand/Custom.xcassets/AppIcon.appiconset/29.png and /dev/null differ
diff --git a/Brand/Custom.xcassets/AppIcon.appiconset/40.png b/Brand/Custom.xcassets/AppIcon.appiconset/40.png
deleted file mode 100644
index da3196a0..00000000
Binary files a/Brand/Custom.xcassets/AppIcon.appiconset/40.png and /dev/null differ
diff --git a/Brand/Custom.xcassets/AppIcon.appiconset/48.png b/Brand/Custom.xcassets/AppIcon.appiconset/48.png
deleted file mode 100644
index 22ffa764..00000000
Binary files a/Brand/Custom.xcassets/AppIcon.appiconset/48.png and /dev/null differ
diff --git a/Brand/Custom.xcassets/AppIcon.appiconset/50.png b/Brand/Custom.xcassets/AppIcon.appiconset/50.png
deleted file mode 100644
index e890d6a5..00000000
Binary files a/Brand/Custom.xcassets/AppIcon.appiconset/50.png and /dev/null differ
diff --git a/Brand/Custom.xcassets/AppIcon.appiconset/55.png b/Brand/Custom.xcassets/AppIcon.appiconset/55.png
deleted file mode 100644
index 766620ea..00000000
Binary files a/Brand/Custom.xcassets/AppIcon.appiconset/55.png and /dev/null differ
diff --git a/Brand/Custom.xcassets/AppIcon.appiconset/57.png b/Brand/Custom.xcassets/AppIcon.appiconset/57.png
deleted file mode 100644
index f7f1a022..00000000
Binary files a/Brand/Custom.xcassets/AppIcon.appiconset/57.png and /dev/null differ
diff --git a/Brand/Custom.xcassets/AppIcon.appiconset/58.png b/Brand/Custom.xcassets/AppIcon.appiconset/58.png
deleted file mode 100644
index 55918cce..00000000
Binary files a/Brand/Custom.xcassets/AppIcon.appiconset/58.png and /dev/null differ
diff --git a/Brand/Custom.xcassets/AppIcon.appiconset/60.png b/Brand/Custom.xcassets/AppIcon.appiconset/60.png
deleted file mode 100644
index 80e3f6ca..00000000
Binary files a/Brand/Custom.xcassets/AppIcon.appiconset/60.png and /dev/null differ
diff --git a/Brand/Custom.xcassets/AppIcon.appiconset/66.png b/Brand/Custom.xcassets/AppIcon.appiconset/66.png
deleted file mode 100644
index eab87b8f..00000000
Binary files a/Brand/Custom.xcassets/AppIcon.appiconset/66.png and /dev/null differ
diff --git a/Brand/Custom.xcassets/AppIcon.appiconset/72.png b/Brand/Custom.xcassets/AppIcon.appiconset/72.png
deleted file mode 100644
index 1bc5e143..00000000
Binary files a/Brand/Custom.xcassets/AppIcon.appiconset/72.png and /dev/null differ
diff --git a/Brand/Custom.xcassets/AppIcon.appiconset/76.png b/Brand/Custom.xcassets/AppIcon.appiconset/76.png
deleted file mode 100644
index b3a41e50..00000000
Binary files a/Brand/Custom.xcassets/AppIcon.appiconset/76.png and /dev/null differ
diff --git a/Brand/Custom.xcassets/AppIcon.appiconset/80.png b/Brand/Custom.xcassets/AppIcon.appiconset/80.png
deleted file mode 100644
index 17b11b15..00000000
Binary files a/Brand/Custom.xcassets/AppIcon.appiconset/80.png and /dev/null differ
diff --git a/Brand/Custom.xcassets/AppIcon.appiconset/87.png b/Brand/Custom.xcassets/AppIcon.appiconset/87.png
deleted file mode 100644
index de3ace6d..00000000
Binary files a/Brand/Custom.xcassets/AppIcon.appiconset/87.png and /dev/null differ
diff --git a/Brand/Custom.xcassets/AppIcon.appiconset/88.png b/Brand/Custom.xcassets/AppIcon.appiconset/88.png
deleted file mode 100644
index 574a5aec..00000000
Binary files a/Brand/Custom.xcassets/AppIcon.appiconset/88.png and /dev/null differ
diff --git a/Brand/Custom.xcassets/AppIcon.appiconset/92.png b/Brand/Custom.xcassets/AppIcon.appiconset/92.png
deleted file mode 100644
index bac4155a..00000000
Binary files a/Brand/Custom.xcassets/AppIcon.appiconset/92.png and /dev/null differ
diff --git a/Brand/Custom.xcassets/AppIcon.appiconset/Contents.json b/Brand/Custom.xcassets/AppIcon.appiconset/Contents.json
deleted file mode 100644
index 47d11075..00000000
--- a/Brand/Custom.xcassets/AppIcon.appiconset/Contents.json
+++ /dev/null
@@ -1,286 +0,0 @@
-{
- "images" : [
- {
- "filename" : "40.png",
- "idiom" : "iphone",
- "scale" : "2x",
- "size" : "20x20"
- },
- {
- "filename" : "60.png",
- "idiom" : "iphone",
- "scale" : "3x",
- "size" : "20x20"
- },
- {
- "filename" : "29.png",
- "idiom" : "iphone",
- "scale" : "1x",
- "size" : "29x29"
- },
- {
- "filename" : "58.png",
- "idiom" : "iphone",
- "scale" : "2x",
- "size" : "29x29"
- },
- {
- "filename" : "87.png",
- "idiom" : "iphone",
- "scale" : "3x",
- "size" : "29x29"
- },
- {
- "filename" : "80.png",
- "idiom" : "iphone",
- "scale" : "2x",
- "size" : "40x40"
- },
- {
- "filename" : "120.png",
- "idiom" : "iphone",
- "scale" : "3x",
- "size" : "40x40"
- },
- {
- "filename" : "57.png",
- "idiom" : "iphone",
- "scale" : "1x",
- "size" : "57x57"
- },
- {
- "filename" : "114.png",
- "idiom" : "iphone",
- "scale" : "2x",
- "size" : "57x57"
- },
- {
- "filename" : "120.png",
- "idiom" : "iphone",
- "scale" : "2x",
- "size" : "60x60"
- },
- {
- "filename" : "180.png",
- "idiom" : "iphone",
- "scale" : "3x",
- "size" : "60x60"
- },
- {
- "filename" : "20.png",
- "idiom" : "ipad",
- "scale" : "1x",
- "size" : "20x20"
- },
- {
- "filename" : "40.png",
- "idiom" : "ipad",
- "scale" : "2x",
- "size" : "20x20"
- },
- {
- "filename" : "29.png",
- "idiom" : "ipad",
- "scale" : "1x",
- "size" : "29x29"
- },
- {
- "filename" : "58.png",
- "idiom" : "ipad",
- "scale" : "2x",
- "size" : "29x29"
- },
- {
- "filename" : "40.png",
- "idiom" : "ipad",
- "scale" : "1x",
- "size" : "40x40"
- },
- {
- "filename" : "80.png",
- "idiom" : "ipad",
- "scale" : "2x",
- "size" : "40x40"
- },
- {
- "filename" : "50.png",
- "idiom" : "ipad",
- "scale" : "1x",
- "size" : "50x50"
- },
- {
- "filename" : "100.png",
- "idiom" : "ipad",
- "scale" : "2x",
- "size" : "50x50"
- },
- {
- "filename" : "72.png",
- "idiom" : "ipad",
- "scale" : "1x",
- "size" : "72x72"
- },
- {
- "filename" : "144.png",
- "idiom" : "ipad",
- "scale" : "2x",
- "size" : "72x72"
- },
- {
- "filename" : "76.png",
- "idiom" : "ipad",
- "scale" : "1x",
- "size" : "76x76"
- },
- {
- "filename" : "152.png",
- "idiom" : "ipad",
- "scale" : "2x",
- "size" : "76x76"
- },
- {
- "filename" : "167.png",
- "idiom" : "ipad",
- "scale" : "2x",
- "size" : "83.5x83.5"
- },
- {
- "filename" : "1024.png",
- "idiom" : "ios-marketing",
- "scale" : "1x",
- "size" : "1024x1024"
- },
- {
- "filename" : "48.png",
- "idiom" : "watch",
- "role" : "notificationCenter",
- "scale" : "2x",
- "size" : "24x24",
- "subtype" : "38mm"
- },
- {
- "filename" : "55.png",
- "idiom" : "watch",
- "role" : "notificationCenter",
- "scale" : "2x",
- "size" : "27.5x27.5",
- "subtype" : "42mm"
- },
- {
- "filename" : "58.png",
- "idiom" : "watch",
- "role" : "companionSettings",
- "scale" : "2x",
- "size" : "29x29"
- },
- {
- "filename" : "87.png",
- "idiom" : "watch",
- "role" : "companionSettings",
- "scale" : "3x",
- "size" : "29x29"
- },
- {
- "filename" : "66.png",
- "idiom" : "watch",
- "role" : "notificationCenter",
- "scale" : "2x",
- "size" : "33x33",
- "subtype" : "45mm"
- },
- {
- "filename" : "80.png",
- "idiom" : "watch",
- "role" : "appLauncher",
- "scale" : "2x",
- "size" : "40x40",
- "subtype" : "38mm"
- },
- {
- "filename" : "88.png",
- "idiom" : "watch",
- "role" : "appLauncher",
- "scale" : "2x",
- "size" : "44x44",
- "subtype" : "40mm"
- },
- {
- "filename" : "92.png",
- "idiom" : "watch",
- "role" : "appLauncher",
- "scale" : "2x",
- "size" : "46x46",
- "subtype" : "41mm"
- },
- {
- "filename" : "100.png",
- "idiom" : "watch",
- "role" : "appLauncher",
- "scale" : "2x",
- "size" : "50x50",
- "subtype" : "44mm"
- },
- {
- "idiom" : "watch",
- "role" : "appLauncher",
- "scale" : "2x",
- "size" : "51x51",
- "subtype" : "45mm"
- },
- {
- "idiom" : "watch",
- "role" : "appLauncher",
- "scale" : "2x",
- "size" : "54x54",
- "subtype" : "49mm"
- },
- {
- "filename" : "172.png",
- "idiom" : "watch",
- "role" : "quickLook",
- "scale" : "2x",
- "size" : "86x86",
- "subtype" : "38mm"
- },
- {
- "filename" : "196.png",
- "idiom" : "watch",
- "role" : "quickLook",
- "scale" : "2x",
- "size" : "98x98",
- "subtype" : "42mm"
- },
- {
- "filename" : "216.png",
- "idiom" : "watch",
- "role" : "quickLook",
- "scale" : "2x",
- "size" : "108x108",
- "subtype" : "44mm"
- },
- {
- "idiom" : "watch",
- "role" : "quickLook",
- "scale" : "2x",
- "size" : "117x117",
- "subtype" : "45mm"
- },
- {
- "idiom" : "watch",
- "role" : "quickLook",
- "scale" : "2x",
- "size" : "129x129",
- "subtype" : "49mm"
- },
- {
- "filename" : "1024.png",
- "idiom" : "watch-marketing",
- "scale" : "1x",
- "size" : "1024x1024"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/Source/Screens/Notes/NotesTableViewController.swift b/Source/Screens/Notes/NotesTableViewController.swift
index 8e01a86e..1781f92a 100644
--- a/Source/Screens/Notes/NotesTableViewController.swift
+++ b/Source/Screens/Notes/NotesTableViewController.swift
@@ -24,7 +24,6 @@ class NotesTableViewController: BaseUITableViewController, Logging, NSFetchedRes
@IBOutlet var addBarButton: UIBarButtonItem!
@IBOutlet weak var refreshBarButton: UIBarButtonItem!
- var notes: [Note]?
var editorViewController: EditorViewController?
let appDelegate = UIApplication.shared.delegate as! AppDelegate
diff --git a/iOCNotes.xcodeproj/project.pbxproj b/iOCNotes.xcodeproj/project.pbxproj
index 9f55a80c..3207dca4 100644
--- a/iOCNotes.xcodeproj/project.pbxproj
+++ b/iOCNotes.xcodeproj/project.pbxproj
@@ -70,6 +70,8 @@
D0E60F71277FADD6009CF78F /* CheckBoxTapHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0E60F52277FADD5009CF78F /* CheckBoxTapHandler.swift */; };
D0E60F74277FADD6009CF78F /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0E60F55277FADD5009CF78F /* Extensions.swift */; };
D0E60F76277FB0A5009CF78F /* Themes.bundle in Resources */ = {isa = PBXBuildFile; fileRef = D0E60F75277FB0A5009CF78F /* Themes.bundle */; };
+ F32D782A2FA350BD0067EBE9 /* AppIcon.icon in Resources */ = {isa = PBXBuildFile; fileRef = F32D78292FA350BD0067EBE9 /* AppIcon.icon */; };
+ F32D782B2FA350BD0067EBE9 /* AppIcon.icon in Resources */ = {isa = PBXBuildFile; fileRef = F32D78292FA350BD0067EBE9 /* AppIcon.icon */; };
F389ABFF2C9C40210056C059 /* Custom.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F389ABFE2C9C40210056C059 /* Custom.xcassets */; };
F3E3C8D92C6B7C2200A80504 /* NCBrand.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3E3C8D82C6B7C2200A80504 /* NCBrand.swift */; };
F3E3C8DC2C6B7DA600A80504 /* UIColor+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3E3C8DB2C6B7DA600A80504 /* UIColor+Extension.swift */; };
@@ -206,6 +208,7 @@
F30037402E6ED2DC00A49C0D /* IOCNotesUnitTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = IOCNotesUnitTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
F32A39442C99A40D008EE8DC /* iOCNotes.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = iOCNotes.entitlements; sourceTree = ""; };
F32A39452C99A40D008EE8DC /* iOCNotes.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = iOCNotes.plist; sourceTree = ""; };
+ F32D78292FA350BD0067EBE9 /* AppIcon.icon */ = {isa = PBXFileReference; lastKnownFileType = folder.iconcomposer.icon; path = AppIcon.icon; sourceTree = ""; };
F389ABFE2C9C40210056C059 /* Custom.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Custom.xcassets; sourceTree = ""; };
F3E3C8D82C6B7C2200A80504 /* NCBrand.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCBrand.swift; sourceTree = ""; };
F3E3C8DB2C6B7DA600A80504 /* UIColor+Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIColor+Extension.swift"; sourceTree = ""; };
@@ -301,23 +304,24 @@
D0CFE52A1888A7BD00165839 = {
isa = PBXGroup;
children = (
- AA360F442D71E6EF00BDC831 /* iOCNotes.xcconfig */,
AA592A6F2DBBBB04003A3057 /* .github */,
AA592A6E2DBBBA3B003A3057 /* .swiftlint.yml */,
AA62DF642D5DFC48009E8894 /* .tx */,
- AABD0BF82D5E08B500F009E6 /* README.md */,
+ F32D78292FA350BD0067EBE9 /* AppIcon.icon */,
F3E3C8D72C6B7BF800A80504 /* Brand */,
- AA4C16BF2D8332C1006AFE8C /* iOCNotes */,
- F77B57002993E32100A23E76 /* Nextcloud */,
- D0CFE53C1888A7BD00165839 /* Source */,
- D084FB6C245A5FDC003EB6FB /* Shared */,
- D01067DC220BCAD60047E090 /* Models */,
- D07F5E8C2207B6D700528E90 /* Networking */,
D0E60F35277FADA0009CF78F /* Editor */,
F3E3C8DA2C6B7D3B00A80504 /* Extensions */,
- F30037412E6ED2DC00A49C0D /* IOCNotesUnitTests */,
D0CFE5351888A7BD00165839 /* Frameworks */,
+ AA4C16BF2D8332C1006AFE8C /* iOCNotes */,
+ AA360F442D71E6EF00BDC831 /* iOCNotes.xcconfig */,
+ F30037412E6ED2DC00A49C0D /* IOCNotesUnitTests */,
+ D01067DC220BCAD60047E090 /* Models */,
+ D07F5E8C2207B6D700528E90 /* Networking */,
+ F77B57002993E32100A23E76 /* Nextcloud */,
D0CFE5341888A7BD00165839 /* Products */,
+ AABD0BF82D5E08B500F009E6 /* README.md */,
+ D084FB6C245A5FDC003EB6FB /* Shared */,
+ D0CFE53C1888A7BD00165839 /* Source */,
);
sourceTree = "";
};
@@ -644,6 +648,7 @@
D0E60F76277FB0A5009CF78F /* Themes.bundle in Resources */,
D0BCFE6A2454BF40007C4CA3 /* Categories.storyboard in Resources */,
D0CFE5411888A7BD00165839 /* InfoPlist.strings in Resources */,
+ F32D782B2FA350BD0067EBE9 /* AppIcon.icon in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -651,6 +656,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
+ F32D782A2FA350BD0067EBE9 /* AppIcon.icon in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};