Skip to content

Commit 6f935c1

Browse files
TomTascheTomTasche
authored
Merge pull request #44 from TomTasche/development
1.12
2 parents e150ac6 + 57190a7 commit 6f935c1

33 files changed

Lines changed: 713 additions & 63 deletions

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,3 +66,5 @@ fastlane/report.xml
6666
fastlane/Preview.html
6767
fastlane/screenshots/**/*.png
6868
fastlane/test_output
69+
70+
.DS_Store

‎OpenDocument.core‎

‎OpenDocumentReader.xcodeproj/project.pbxproj‎

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88

99
/* Begin PBXBuildFile section */
1010
21E6C5303C9ED8A9A9317BEC /* Pods_OpenDocumentReader.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EF00F649A86477A6C27F07C0 /* Pods_OpenDocumentReader.framework */; };
11+
AC384BCD23B4FFA700C7BF47 /* ContentViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AC384BC923B4FFA700C7BF47 /* ContentViewController.swift */; };
12+
AC384BCE23B4FFA700C7BF47 /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = AC384BCA23B4FFA700C7BF47 /* Constants.swift */; };
13+
AC384BCF23B4FFA700C7BF47 /* PageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AC384BCB23B4FFA700C7BF47 /* PageViewController.swift */; };
1114
E2064DFE22CFA1BA006441F8 /* iAd.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E2064DDF22CFA1BA006441F8 /* iAd.framework */; };
1215
E22EB716226B621200053B86 /* DocumentBrowserTransitioningDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E22EB6F7226B621200053B86 /* DocumentBrowserTransitioningDelegate.swift */; };
1316
E22EB718226B633500053B86 /* Document.swift in Sources */ = {isa = PBXBuildFile; fileRef = E22EB717226B633500053B86 /* Document.swift */; };
@@ -160,28 +163,28 @@
160163
isa = PBXContainerItemProxy;
161164
containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */;
162165
proxyType = 1;
163-
remoteGlobalIDString = 68722AEF2DC64BF8AB2DF7D5;
166+
remoteGlobalIDString = 6EF4E076CF60433092E37E67;
164167
remoteInfo = glog;
165168
};
166169
E26C39322250D976009C484A /* PBXContainerItemProxy */ = {
167170
isa = PBXContainerItemProxy;
168171
containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */;
169172
proxyType = 1;
170-
remoteGlobalIDString = DBADB6840206443A97F2A76D;
173+
remoteGlobalIDString = 527B291C96804BA39CF2D5CC;
171174
remoteInfo = miniz;
172175
};
173176
E26C39342250D976009C484A /* PBXContainerItemProxy */ = {
174177
isa = PBXContainerItemProxy;
175178
containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */;
176179
proxyType = 1;
177-
remoteGlobalIDString = CD40E84D34284EF7A80FB402;
180+
remoteGlobalIDString = 753F6F499E954CF09FDDDB35;
178181
remoteInfo = odrlib;
179182
};
180183
E26C39362250D976009C484A /* PBXContainerItemProxy */ = {
181184
isa = PBXContainerItemProxy;
182185
containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */;
183186
proxyType = 1;
184-
remoteGlobalIDString = B382587C51824ECE8AB80585;
187+
remoteGlobalIDString = 0485BB4A08784DE785195780;
185188
remoteInfo = tinyxml2;
186189
};
187190
E29A02212365EF7800BD6A96 /* PBXContainerItemProxy */ = {
@@ -251,13 +254,16 @@
251254
isa = PBXContainerItemProxy;
252255
containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */;
253256
proxyType = 1;
254-
remoteGlobalIDString = E08901684B824F61ACF4B07B;
257+
remoteGlobalIDString = 0D80F2CF350D404897887FB1;
255258
remoteInfo = "cryptopp-object";
256259
};
257260
/* End PBXContainerItemProxy section */
258261

259262
/* Begin PBXFileReference section */
260263
97704690541D85438FC2079C /* Pods-OpenDocumentReader.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OpenDocumentReader.release.xcconfig"; path = "Pods/Target Support Files/Pods-OpenDocumentReader/Pods-OpenDocumentReader.release.xcconfig"; sourceTree = "<group>"; };
264+
AC384BC923B4FFA700C7BF47 /* ContentViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContentViewController.swift; sourceTree = "<group>"; };
265+
AC384BCA23B4FFA700C7BF47 /* Constants.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = "<group>"; };
266+
AC384BCB23B4FFA700C7BF47 /* PageViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PageViewController.swift; sourceTree = "<group>"; };
261267
B3FCFC99F5757D71C0A3EB11 /* Pods-OpenDocumentReader.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OpenDocumentReader.debug.xcconfig"; path = "Pods/Target Support Files/Pods-OpenDocumentReader/Pods-OpenDocumentReader.debug.xcconfig"; sourceTree = "<group>"; };
262268
E2064DDF22CFA1BA006441F8 /* iAd.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = iAd.framework; path = System/Library/Frameworks/iAd.framework; sourceTree = SDKROOT; };
263269
E22EB6F7226B621200053B86 /* DocumentBrowserTransitioningDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DocumentBrowserTransitioningDelegate.swift; sourceTree = "<group>"; };
@@ -381,6 +387,9 @@
381387
E2F7ED54220B54D600D63515 /* DocumentBrowserViewController.swift */,
382388
E22EB6F7226B621200053B86 /* DocumentBrowserTransitioningDelegate.swift */,
383389
E22EB719226B65E300053B86 /* DocumentViewController.swift */,
390+
AC384BCA23B4FFA700C7BF47 /* Constants.swift */,
391+
AC384BC923B4FFA700C7BF47 /* ContentViewController.swift */,
392+
AC384BCB23B4FFA700C7BF47 /* PageViewController.swift */,
384393
E22EB717226B633500053B86 /* Document.swift */,
385394
E22EB71B226B66B300053B86 /* Main.storyboard */,
386395
E2F7ED5D220B54D700D63515 /* Assets.xcassets */,
@@ -752,10 +761,13 @@
752761
buildActionMask = 2147483647;
753762
files = (
754763
E22EB71A226B65E300053B86 /* DocumentViewController.swift in Sources */,
764+
AC384BCD23B4FFA700C7BF47 /* ContentViewController.swift in Sources */,
755765
E22EB718226B633500053B86 /* Document.swift in Sources */,
766+
AC384BCF23B4FFA700C7BF47 /* PageViewController.swift in Sources */,
756767
E2C008FA220F1CF80097C594 /* CoreWrapper.mm in Sources */,
757768
E2D0B3D9226D945400534FCC /* StoreReviewHelper.swift in Sources */,
758769
E22EB716226B621200053B86 /* DocumentBrowserTransitioningDelegate.swift in Sources */,
770+
AC384BCE23B4FFA700C7BF47 /* Constants.swift in Sources */,
759771
E2F7ED55220B54D600D63515 /* DocumentBrowserViewController.swift in Sources */,
760772
E2F7ED53220B54D600D63515 /* AppDelegate.swift in Sources */,
761773
);
@@ -930,7 +942,7 @@
930942
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
931943
CLANG_ENABLE_MODULES = YES;
932944
CODE_SIGN_STYLE = Automatic;
933-
CURRENT_PROJECT_VERSION = 14;
945+
CURRENT_PROJECT_VERSION = 16;
934946
DEVELOPMENT_TEAM = 5LS6X97G6J;
935947
HEADER_SEARCH_PATHS = (
936948
"$(inherited)",
@@ -943,7 +955,7 @@
943955
"@executable_path/Frameworks",
944956
);
945957
LIBRARY_SEARCH_PATHS = "$(inherited)";
946-
MARKETING_VERSION = 1.10;
958+
MARKETING_VERSION = 1.12;
947959
PRODUCT_BUNDLE_IDENTIFIER = at.tomtasche.reader;
948960
PRODUCT_NAME = "$(TARGET_NAME)";
949961
SWIFT_OBJC_BRIDGING_HEADER = OpenDocumentReader/BridgingHeader.h;
@@ -960,7 +972,7 @@
960972
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
961973
CLANG_ENABLE_MODULES = YES;
962974
CODE_SIGN_STYLE = Automatic;
963-
CURRENT_PROJECT_VERSION = 14;
975+
CURRENT_PROJECT_VERSION = 16;
964976
DEVELOPMENT_TEAM = 5LS6X97G6J;
965977
HEADER_SEARCH_PATHS = (
966978
"$(inherited)",
@@ -973,7 +985,7 @@
973985
"@executable_path/Frameworks",
974986
);
975987
LIBRARY_SEARCH_PATHS = "$(inherited)";
976-
MARKETING_VERSION = 1.10;
988+
MARKETING_VERSION = 1.12;
977989
PRODUCT_BUNDLE_IDENTIFIER = at.tomtasche.reader;
978990
PRODUCT_NAME = "$(TARGET_NAME)";
979991
SWIFT_OBJC_BRIDGING_HEADER = OpenDocumentReader/BridgingHeader.h;

‎OpenDocumentReader/AppDelegate.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,5 +71,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
7171

7272
return true
7373
}
74+
7475
}
7576

‎OpenDocumentReader/Assets.xcassets/AppIcon.appiconset/1024.png‎

100755100644
-41.7 KB
Loading

‎OpenDocumentReader/Assets.xcassets/AppIcon.appiconset/Contents.json‎

Lines changed: 158 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,158 @@
1-
{"images":[{"size":"60x60","expected-size":"180","filename":"180.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"40x40","expected-size":"80","filename":"80.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"40x40","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"60x60","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"57x57","expected-size":"57","filename":"57.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"58","filename":"58.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"29x29","expected-size":"29","filename":"29.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"87","filename":"87.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"57x57","expected-size":"114","filename":"114.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"60","filename":"60.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"1024x1024","filename":"1024.png","expected-size":"1024","idiom":"ios-marketing","folder":"Assets.xcassets/AppIcon.appiconset/","scale":"1x"},{"size":"40x40","expected-size":"80","filename":"80.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"72x72","expected-size":"72","filename":"72.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"76x76","expected-size":"152","filename":"152.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"50x50","expected-size":"100","filename":"100.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"29x29","expected-size":"58","filename":"58.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"76x76","expected-size":"76","filename":"76.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"29x29","expected-size":"29","filename":"29.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"50x50","expected-size":"50","filename":"50.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"72x72","expected-size":"144","filename":"144.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"40x40","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"83.5x83.5","expected-size":"167","filename":"167.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"20x20","expected-size":"20","filename":"20.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"20x20","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"1024x1024","filename":"1024.png","expected-size":"1024","idiom":"ios-marketing","folder":"Assets.xcassets/AppIcon.appiconset/","scale":"1x"}]}
1+
{
2+
"images" : [
3+
{
4+
"size" : "20x20",
5+
"idiom" : "iphone",
6+
"filename" : "40.png",
7+
"scale" : "2x"
8+
},
9+
{
10+
"size" : "20x20",
11+
"idiom" : "iphone",
12+
"filename" : "60.png",
13+
"scale" : "3x"
14+
},
15+
{
16+
"size" : "29x29",
17+
"idiom" : "iphone",
18+
"filename" : "29.png",
19+
"scale" : "1x"
20+
},
21+
{
22+
"size" : "29x29",
23+
"idiom" : "iphone",
24+
"filename" : "58.png",
25+
"scale" : "2x"
26+
},
27+
{
28+
"size" : "29x29",
29+
"idiom" : "iphone",
30+
"filename" : "87.png",
31+
"scale" : "3x"
32+
},
33+
{
34+
"size" : "40x40",
35+
"idiom" : "iphone",
36+
"filename" : "80.png",
37+
"scale" : "2x"
38+
},
39+
{
40+
"size" : "40x40",
41+
"idiom" : "iphone",
42+
"filename" : "120.png",
43+
"scale" : "3x"
44+
},
45+
{
46+
"size" : "57x57",
47+
"idiom" : "iphone",
48+
"filename" : "57.png",
49+
"scale" : "1x"
50+
},
51+
{
52+
"size" : "57x57",
53+
"idiom" : "iphone",
54+
"filename" : "114.png",
55+
"scale" : "2x"
56+
},
57+
{
58+
"size" : "60x60",
59+
"idiom" : "iphone",
60+
"filename" : "120.png",
61+
"scale" : "2x"
62+
},
63+
{
64+
"size" : "60x60",
65+
"idiom" : "iphone",
66+
"filename" : "180.png",
67+
"scale" : "3x"
68+
},
69+
{
70+
"size" : "20x20",
71+
"idiom" : "ipad",
72+
"filename" : "20.png",
73+
"scale" : "1x"
74+
},
75+
{
76+
"size" : "20x20",
77+
"idiom" : "ipad",
78+
"filename" : "40.png",
79+
"scale" : "2x"
80+
},
81+
{
82+
"size" : "29x29",
83+
"idiom" : "ipad",
84+
"filename" : "29.png",
85+
"scale" : "1x"
86+
},
87+
{
88+
"size" : "29x29",
89+
"idiom" : "ipad",
90+
"filename" : "58.png",
91+
"scale" : "2x"
92+
},
93+
{
94+
"size" : "40x40",
95+
"idiom" : "ipad",
96+
"filename" : "40.png",
97+
"scale" : "1x"
98+
},
99+
{
100+
"size" : "40x40",
101+
"idiom" : "ipad",
102+
"filename" : "80.png",
103+
"scale" : "2x"
104+
},
105+
{
106+
"size" : "50x50",
107+
"idiom" : "ipad",
108+
"filename" : "50.png",
109+
"scale" : "1x"
110+
},
111+
{
112+
"size" : "50x50",
113+
"idiom" : "ipad",
114+
"filename" : "100.png",
115+
"scale" : "2x"
116+
},
117+
{
118+
"size" : "72x72",
119+
"idiom" : "ipad",
120+
"filename" : "72.png",
121+
"scale" : "1x"
122+
},
123+
{
124+
"size" : "72x72",
125+
"idiom" : "ipad",
126+
"filename" : "144.png",
127+
"scale" : "2x"
128+
},
129+
{
130+
"size" : "76x76",
131+
"idiom" : "ipad",
132+
"filename" : "76.png",
133+
"scale" : "1x"
134+
},
135+
{
136+
"size" : "76x76",
137+
"idiom" : "ipad",
138+
"filename" : "152.png",
139+
"scale" : "2x"
140+
},
141+
{
142+
"size" : "83.5x83.5",
143+
"idiom" : "ipad",
144+
"filename" : "167.png",
145+
"scale" : "2x"
146+
},
147+
{
148+
"size" : "1024x1024",
149+
"idiom" : "ios-marketing",
150+
"filename" : "1024.png",
151+
"scale" : "1x"
152+
}
153+
],
154+
"info" : {
155+
"version" : 1,
156+
"author" : "xcode"
157+
}
158+
}

‎OpenDocumentReader/Assets.xcassets/Contents.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"info" : {
3+
"version" : 1,
4+
"author" : "xcode"
5+
}
6+
}

‎OpenDocumentReader/Assets.xcassets/launch_image.imageset/Contents.json‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"filename" : "launch_image.png",
6+
"scale" : "1x"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"filename" : "launch_image@2x.png",
11+
"scale" : "2x"
12+
},
13+
{
14+
"idiom" : "universal",
15+
"filename" : "launch_image@3x.png",
16+
"scale" : "3x"
17+
}
18+
],
19+
"info" : {
20+
"version" : 1,
21+
"author" : "xcode"
22+
}
23+
}

‎OpenDocumentReader/Assets.xcassets/launch_image.imageset/launch_image.png‎

23.2 KB
Loading

‎OpenDocumentReader/Assets.xcassets/launch_image.imageset/launch_image@2x.png‎

53.3 KB
Loading

0 commit comments

Comments
 (0)