diff --git a/.gitignore b/.gitignore index 25c49f0..a63f74d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -Carthage/ +design/generated/ diff --git a/AutoCat/AppDelegate.swift b/AutoCat/AppDelegate.swift index 4dd6c85..6f1df69 100644 --- a/AutoCat/AppDelegate.swift +++ b/AutoCat/AppDelegate.swift @@ -11,6 +11,7 @@ extension OSLog { enum QuickAction { case none case check + case checkNumber(String) case addVoiceRecord } @@ -22,7 +23,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { let config = Realm.Configuration( - schemaVersion: 8, + schemaVersion: 9, migrationBlock: { migration, oldSchemaVersion in if oldSchemaVersion <= 3 { var numbers: [String] = [] @@ -39,7 +40,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate { }) Realm.Configuration.defaultConfiguration = config - print(Realm.Configuration.defaultConfiguration.fileURL!) IHProgressHUD.set(defaultStyle: .dark) IHProgressHUD.set(defaultMaskType: .black) diff --git a/AutoCat/Assets.xcassets/TabBar/Contents.json b/AutoCat/Assets.xcassets/TabBar/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/AutoCat/Assets.xcassets/TabBar/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AutoCat/Assets.xcassets/TabBar/check-compact.imageset/Contents.json b/AutoCat/Assets.xcassets/TabBar/check-compact.imageset/Contents.json new file mode 100644 index 0000000..2343e1d --- /dev/null +++ b/AutoCat/Assets.xcassets/TabBar/check-compact.imageset/Contents.json @@ -0,0 +1,25 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "check-37.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "check-54.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/AutoCat/Assets.xcassets/TabBar/check-compact.imageset/check-37.png b/AutoCat/Assets.xcassets/TabBar/check-compact.imageset/check-37.png new file mode 100644 index 0000000..70741a2 Binary files /dev/null and b/AutoCat/Assets.xcassets/TabBar/check-compact.imageset/check-37.png differ diff --git a/AutoCat/Assets.xcassets/TabBar/check-compact.imageset/check-54.png b/AutoCat/Assets.xcassets/TabBar/check-compact.imageset/check-54.png new file mode 100644 index 0000000..84ba5f9 Binary files /dev/null and b/AutoCat/Assets.xcassets/TabBar/check-compact.imageset/check-54.png differ diff --git a/AutoCat/Assets.xcassets/TabBar/check.imageset/Contents.json b/AutoCat/Assets.xcassets/TabBar/check.imageset/Contents.json new file mode 100644 index 0000000..c1899ab --- /dev/null +++ b/AutoCat/Assets.xcassets/TabBar/check.imageset/Contents.json @@ -0,0 +1,25 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "check-51.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "check-75.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/AutoCat/Assets.xcassets/TabBar/check.imageset/check-51.png b/AutoCat/Assets.xcassets/TabBar/check.imageset/check-51.png new file mode 100644 index 0000000..68f43ee Binary files /dev/null and b/AutoCat/Assets.xcassets/TabBar/check.imageset/check-51.png differ diff --git a/AutoCat/Assets.xcassets/TabBar/check.imageset/check-75.png b/AutoCat/Assets.xcassets/TabBar/check.imageset/check-75.png new file mode 100644 index 0000000..b7f1ce8 Binary files /dev/null and b/AutoCat/Assets.xcassets/TabBar/check.imageset/check-75.png differ diff --git a/AutoCat/Assets.xcassets/TabBar/record-compact.imageset/Contents.json b/AutoCat/Assets.xcassets/TabBar/record-compact.imageset/Contents.json new file mode 100644 index 0000000..9edc098 --- /dev/null +++ b/AutoCat/Assets.xcassets/TabBar/record-compact.imageset/Contents.json @@ -0,0 +1,25 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "record-47.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "record-69.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/AutoCat/Assets.xcassets/TabBar/record-compact.imageset/record-47.png b/AutoCat/Assets.xcassets/TabBar/record-compact.imageset/record-47.png new file mode 100644 index 0000000..0d9e4c0 Binary files /dev/null and b/AutoCat/Assets.xcassets/TabBar/record-compact.imageset/record-47.png differ diff --git a/AutoCat/Assets.xcassets/TabBar/record-compact.imageset/record-69.png b/AutoCat/Assets.xcassets/TabBar/record-compact.imageset/record-69.png new file mode 100644 index 0000000..f40868c Binary files /dev/null and b/AutoCat/Assets.xcassets/TabBar/record-compact.imageset/record-69.png differ diff --git a/AutoCat/Assets.xcassets/TabBar/record.imageset/Contents.json b/AutoCat/Assets.xcassets/TabBar/record.imageset/Contents.json new file mode 100644 index 0000000..4bb17cf --- /dev/null +++ b/AutoCat/Assets.xcassets/TabBar/record.imageset/Contents.json @@ -0,0 +1,25 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "record-63.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "record-93.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/AutoCat/Assets.xcassets/TabBar/record.imageset/record-63.png b/AutoCat/Assets.xcassets/TabBar/record.imageset/record-63.png new file mode 100644 index 0000000..bd038ea Binary files /dev/null and b/AutoCat/Assets.xcassets/TabBar/record.imageset/record-63.png differ diff --git a/AutoCat/Assets.xcassets/TabBar/record.imageset/record-93.png b/AutoCat/Assets.xcassets/TabBar/record.imageset/record-93.png new file mode 100644 index 0000000..805f663 Binary files /dev/null and b/AutoCat/Assets.xcassets/TabBar/record.imageset/record-93.png differ diff --git a/AutoCat/Assets.xcassets/TabBar/search-compact.imageset/Contents.json b/AutoCat/Assets.xcassets/TabBar/search-compact.imageset/Contents.json new file mode 100644 index 0000000..d26fb9c --- /dev/null +++ b/AutoCat/Assets.xcassets/TabBar/search-compact.imageset/Contents.json @@ -0,0 +1,25 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "search-35.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "search-51.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/AutoCat/Assets.xcassets/TabBar/search-compact.imageset/search-35.png b/AutoCat/Assets.xcassets/TabBar/search-compact.imageset/search-35.png new file mode 100644 index 0000000..56e0a50 Binary files /dev/null and b/AutoCat/Assets.xcassets/TabBar/search-compact.imageset/search-35.png differ diff --git a/AutoCat/Assets.xcassets/TabBar/search-compact.imageset/search-51.png b/AutoCat/Assets.xcassets/TabBar/search-compact.imageset/search-51.png new file mode 100644 index 0000000..65cf137 Binary files /dev/null and b/AutoCat/Assets.xcassets/TabBar/search-compact.imageset/search-51.png differ diff --git a/AutoCat/Assets.xcassets/TabBar/search.imageset/Contents.json b/AutoCat/Assets.xcassets/TabBar/search.imageset/Contents.json new file mode 100644 index 0000000..ef7dde8 --- /dev/null +++ b/AutoCat/Assets.xcassets/TabBar/search.imageset/Contents.json @@ -0,0 +1,25 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "search-47.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "search-69.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/AutoCat/Assets.xcassets/TabBar/search.imageset/search-47.png b/AutoCat/Assets.xcassets/TabBar/search.imageset/search-47.png new file mode 100644 index 0000000..95889f9 Binary files /dev/null and b/AutoCat/Assets.xcassets/TabBar/search.imageset/search-47.png differ diff --git a/AutoCat/Assets.xcassets/TabBar/search.imageset/search-69.png b/AutoCat/Assets.xcassets/TabBar/search.imageset/search-69.png new file mode 100644 index 0000000..5093cf5 Binary files /dev/null and b/AutoCat/Assets.xcassets/TabBar/search.imageset/search-69.png differ diff --git a/AutoCat/Assets.xcassets/TabBar/settings-compact.imageset/Contents.json b/AutoCat/Assets.xcassets/TabBar/settings-compact.imageset/Contents.json new file mode 100644 index 0000000..5eee694 --- /dev/null +++ b/AutoCat/Assets.xcassets/TabBar/settings-compact.imageset/Contents.json @@ -0,0 +1,25 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "settings-37.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "settings-54.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/AutoCat/Assets.xcassets/TabBar/settings-compact.imageset/settings-37.png b/AutoCat/Assets.xcassets/TabBar/settings-compact.imageset/settings-37.png new file mode 100644 index 0000000..309bbdf Binary files /dev/null and b/AutoCat/Assets.xcassets/TabBar/settings-compact.imageset/settings-37.png differ diff --git a/AutoCat/Assets.xcassets/TabBar/settings-compact.imageset/settings-54.png b/AutoCat/Assets.xcassets/TabBar/settings-compact.imageset/settings-54.png new file mode 100644 index 0000000..51f27d3 Binary files /dev/null and b/AutoCat/Assets.xcassets/TabBar/settings-compact.imageset/settings-54.png differ diff --git a/AutoCat/Assets.xcassets/TabBar/settings.imageset/Contents.json b/AutoCat/Assets.xcassets/TabBar/settings.imageset/Contents.json new file mode 100644 index 0000000..55204ff --- /dev/null +++ b/AutoCat/Assets.xcassets/TabBar/settings.imageset/Contents.json @@ -0,0 +1,25 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "settings-51.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "settings-75.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/AutoCat/Assets.xcassets/TabBar/settings.imageset/settings-51.png b/AutoCat/Assets.xcassets/TabBar/settings.imageset/settings-51.png new file mode 100644 index 0000000..b860908 Binary files /dev/null and b/AutoCat/Assets.xcassets/TabBar/settings.imageset/settings-51.png differ diff --git a/AutoCat/Assets.xcassets/TabBar/settings.imageset/settings-75.png b/AutoCat/Assets.xcassets/TabBar/settings.imageset/settings-75.png new file mode 100644 index 0000000..e9477c6 Binary files /dev/null and b/AutoCat/Assets.xcassets/TabBar/settings.imageset/settings-75.png differ diff --git a/AutoCat/Base.lproj/Main.storyboard b/AutoCat/Base.lproj/Main.storyboard index 8887d2a..33e1ec4 100644 --- a/AutoCat/Base.lproj/Main.storyboard +++ b/AutoCat/Base.lproj/Main.storyboard @@ -223,14 +223,14 @@ - + - + - + @@ -376,7 +376,7 @@ - + @@ -419,14 +419,14 @@ -