Skip to content

Commit 8077c22

Browse files
TomTascheTomTasche
authored
Merge pull request #55 from opendocument-app/fix/plists-for-lite
Use different commits for Full and Lite.
2 parents 3547c66 + 14495e0 commit 8077c22

4 files changed

Lines changed: 153 additions & 16 deletions

File tree

‎OpenDocumentReader.xcodeproj/project.pbxproj‎

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
AC384BCF23B4FFA700C7BF47 /* PageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AC384BCB23B4FFA700C7BF47 /* PageViewController.swift */; };
1515
ACA46529244E403900A5DA7A /* AppType.swift in Sources */ = {isa = PBXBuildFile; fileRef = ACA46528244E403900A5DA7A /* AppType.swift */; };
1616
ACD9BE3C2444A371009014E6 /* ConfigurationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = ACD9BE2D2444A371009014E6 /* ConfigurationManager.swift */; };
17+
ACF1A3E32469EFB5000BA420 /* GoogleService-Info-Lite.plist in Resources */ = {isa = PBXBuildFile; fileRef = ACF1A3E22469EFB5000BA420 /* GoogleService-Info-Lite.plist */; };
18+
ACF1A3E52469F8DE000BA420 /* Info-Lite.plist in Resources */ = {isa = PBXBuildFile; fileRef = ACF1A3E42469F8DE000BA420 /* Info-Lite.plist */; };
1719
E2064DFE22CFA1BA006441F8 /* iAd.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E2064DDF22CFA1BA006441F8 /* iAd.framework */; };
1820
E22EB716226B621200053B86 /* DocumentBrowserTransitioningDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E22EB6F7226B621200053B86 /* DocumentBrowserTransitioningDelegate.swift */; };
1921
E22EB718226B633500053B86 /* Document.swift in Sources */ = {isa = PBXBuildFile; fileRef = E22EB717226B633500053B86 /* Document.swift */; };
@@ -159,70 +161,70 @@
159161
isa = PBXContainerItemProxy;
160162
containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */;
161163
proxyType = 1;
162-
remoteGlobalIDString = 6257F11D56B545C591A10309;
164+
remoteGlobalIDString = DA4C6B6E1E0148C9975C2962;
163165
remoteInfo = "cryptopp-object";
164166
};
165167
E21C59B124308C720076C37C /* PBXContainerItemProxy */ = {
166168
isa = PBXContainerItemProxy;
167169
containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */;
168170
proxyType = 1;
169-
remoteGlobalIDString = DCB9174656A748CE884EFAEE;
171+
remoteGlobalIDString = 781A907BDD00495588A29602;
170172
remoteInfo = glog;
171173
};
172174
E21C59B324308C720076C37C /* PBXContainerItemProxy */ = {
173175
isa = PBXContainerItemProxy;
174176
containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */;
175177
proxyType = 1;
176-
remoteGlobalIDString = 23086A8F2CA2443796C49FB0;
178+
remoteGlobalIDString = A530886A38B3457E880C0C88;
177179
remoteInfo = miniz;
178180
};
179181
E21C59B724308C720076C37C /* PBXContainerItemProxy */ = {
180182
isa = PBXContainerItemProxy;
181183
containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */;
182184
proxyType = 1;
183-
remoteGlobalIDString = EE39F72B8F3A4DE997E903DF;
185+
remoteGlobalIDString = FF3A381B435E447D84523A12;
184186
remoteInfo = odr_access;
185187
};
186188
E21C59B924308C720076C37C /* PBXContainerItemProxy */ = {
187189
isa = PBXContainerItemProxy;
188190
containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */;
189191
proxyType = 1;
190-
remoteGlobalIDString = 20074ABE230D4AD4BF2207AE;
192+
remoteGlobalIDString = 2B08811DFBF3412B917D57A1;
191193
remoteInfo = odr_common;
192194
};
193195
E21C59BB24308C720076C37C /* PBXContainerItemProxy */ = {
194196
isa = PBXContainerItemProxy;
195197
containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */;
196198
proxyType = 1;
197-
remoteGlobalIDString = 17512C8D1E4A4606A9884927;
199+
remoteGlobalIDString = 2785D541DC8646F9829CAF77;
198200
remoteInfo = odr_crypto;
199201
};
200202
E21C59BD24308C720076C37C /* PBXContainerItemProxy */ = {
201203
isa = PBXContainerItemProxy;
202204
containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */;
203205
proxyType = 1;
204-
remoteGlobalIDString = 839D31ED15844CAAAE94B867;
206+
remoteGlobalIDString = 12116874D1F94F88A5307748;
205207
remoteInfo = odr_odf;
206208
};
207209
E21C59BF24308C720076C37C /* PBXContainerItemProxy */ = {
208210
isa = PBXContainerItemProxy;
209211
containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */;
210212
proxyType = 1;
211-
remoteGlobalIDString = 1D30FF03E4BE4FAD90C20D1D;
213+
remoteGlobalIDString = 049FD5E204234022BB80F0E1;
212214
remoteInfo = odr_ooxml;
213215
};
214216
E21C59C124308C720076C37C /* PBXContainerItemProxy */ = {
215217
isa = PBXContainerItemProxy;
216218
containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */;
217219
proxyType = 1;
218-
remoteGlobalIDString = 1DCBB0EA8B1A4D448EF60FB0;
220+
remoteGlobalIDString = 2F49B27FD60D460DA219D33E;
219221
remoteInfo = odr_svm;
220222
};
221223
E21C59C324308C720076C37C /* PBXContainerItemProxy */ = {
222224
isa = PBXContainerItemProxy;
223225
containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */;
224226
proxyType = 1;
225-
remoteGlobalIDString = 079B134111D74946B4726B9A;
227+
remoteGlobalIDString = 38505C699823488499C370C5;
226228
remoteInfo = tinyxml2;
227229
};
228230
E22E08E62441B187001A374C /* PBXContainerItemProxy */ = {
@@ -257,14 +259,14 @@
257259
isa = PBXContainerItemProxy;
258260
containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */;
259261
proxyType = 1;
260-
remoteGlobalIDString = 1D6B29B7CBFC4E25B45C2B51;
262+
remoteGlobalIDString = 5FB248442B1C4F4C9925C505;
261263
remoteInfo = odr_oldms;
262264
};
263265
E2C8C15D2441B28900B46ABE /* PBXContainerItemProxy */ = {
264266
isa = PBXContainerItemProxy;
265267
containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */;
266268
proxyType = 1;
267-
remoteGlobalIDString = B900947EBD68402D938FEEC6;
269+
remoteGlobalIDString = FA3982A90F2140DB876A508B;
268270
remoteInfo = "odr-static";
269271
};
270272
/* End PBXContainerItemProxy section */
@@ -294,6 +296,8 @@
294296
AC73790F2438E52B00F9F3B5 /* sl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sl; path = sl.lproj/Localizable.strings; sourceTree = "<group>"; };
295297
ACA46528244E403900A5DA7A /* AppType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppType.swift; sourceTree = "<group>"; };
296298
ACD9BE2D2444A371009014E6 /* ConfigurationManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConfigurationManager.swift; sourceTree = "<group>"; };
299+
ACF1A3E22469EFB5000BA420 /* GoogleService-Info-Lite.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "GoogleService-Info-Lite.plist"; sourceTree = "<group>"; };
300+
ACF1A3E42469F8DE000BA420 /* Info-Lite.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-Lite.plist"; sourceTree = "<group>"; };
297301
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>"; };
298302
C39C76F36758805489D19A8D /* Pods-OpenDocumentReader.debug lite.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OpenDocumentReader.debug lite.xcconfig"; path = "Pods/Target Support Files/Pods-OpenDocumentReader/Pods-OpenDocumentReader.debug lite.xcconfig"; sourceTree = "<group>"; };
299303
E2064DDF22CFA1BA006441F8 /* iAd.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = iAd.framework; path = System/Library/Frameworks/iAd.framework; sourceTree = SDKROOT; };
@@ -433,10 +437,12 @@
433437
E2F7ED5D220B54D700D63515 /* Assets.xcassets */,
434438
E2F7ED5F220B54D700D63515 /* LaunchScreen.storyboard */,
435439
E2F7ED62220B54D700D63515 /* Info.plist */,
440+
ACF1A3E42469F8DE000BA420 /* Info-Lite.plist */,
441+
ACF1A3E22469EFB5000BA420 /* GoogleService-Info-Lite.plist */,
442+
E29E4076225A4672002C06E6 /* GoogleService-Info.plist */,
436443
E2BB4B60220EF3A10056176B /* BridgingHeader.h */,
437444
E2C008F9220F1CF80097C594 /* CoreWrapper.mm */,
438445
E2C008FC220F1D570097C594 /* CoreWrapper.h */,
439-
E29E4076225A4672002C06E6 /* GoogleService-Info.plist */,
440446
E2D0B3D8226D945400534FCC /* StoreReviewHelper.swift */,
441447
AC125F182435311A008AD515 /* Localizable.strings */,
442448
);
@@ -686,7 +692,9 @@
686692
buildActionMask = 2147483647;
687693
files = (
688694
AC125F162435311A008AD515 /* Localizable.strings in Resources */,
695+
ACF1A3E32469EFB5000BA420 /* GoogleService-Info-Lite.plist in Resources */,
689696
E2F7ED61220B54D700D63515 /* LaunchScreen.storyboard in Resources */,
697+
ACF1A3E52469F8DE000BA420 /* Info-Lite.plist in Resources */,
690698
E22EB71C226B66B300053B86 /* Main.storyboard in Resources */,
691699
E29E4077225A4672002C06E6 /* GoogleService-Info.plist in Resources */,
692700
E2F7ED5E220B54D700D63515 /* Assets.xcassets in Resources */,
@@ -955,7 +963,7 @@
955963
"$(inherited)",
956964
"$(PROJECT_DIR)/OpenDocument.core/odr/include/**",
957965
);
958-
INFOPLIST_FILE = OpenDocumentReader/Info.plist;
966+
INFOPLIST_FILE = "OpenDocumentReader/Info-Lite.plist";
959967
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
960968
LD_RUNPATH_SEARCH_PATHS = (
961969
"$(inherited)",
@@ -1045,7 +1053,7 @@
10451053
"$(inherited)",
10461054
"$(PROJECT_DIR)/OpenDocument.core/odr/include/**",
10471055
);
1048-
INFOPLIST_FILE = OpenDocumentReader/Info.plist;
1056+
INFOPLIST_FILE = "OpenDocumentReader/Info-Lite.plist";
10491057
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
10501058
LD_RUNPATH_SEARCH_PATHS = (
10511059
"$(inherited)",

‎OpenDocumentReader/AppDelegate.swift‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,14 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
1515
var window: UIWindow?
1616

1717
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
18-
FirebaseApp.configure()
18+
19+
if ConfigurationManager.manager.configuration == .lite {
20+
let filePath = Bundle.main.path(forResource: "GoogleService-Info-Lite", ofType: "plist")!
21+
let options = FirebaseOptions(contentsOfFile: filePath)
22+
FirebaseApp.configure(options: options!)
23+
} else {
24+
FirebaseApp.configure()
25+
}
1926

2027
StoreReviewHelper.incrementAppOpenedCount()
2128

‎OpenDocumentReader/GoogleService-Info-Lite.plist‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CLIENT_ID</key>
6+
<string>1093041624247-3mpspg70slchbpn1vut1h5g884mkt778.apps.googleusercontent.com</string>
7+
<key>REVERSED_CLIENT_ID</key>
8+
<string>com.googleusercontent.apps.1093041624247-3mpspg70slchbpn1vut1h5g884mkt778</string>
9+
<key>ANDROID_CLIENT_ID</key>
10+
<string>1093041624247-jl8grfrvqrjf5d7hg9b9gvhq3tkcg936.apps.googleusercontent.com</string>
11+
<key>API_KEY</key>
12+
<string>AIzaSyCNIHbJXAB0p9afrBrQuzGRPUYwTvVubLc</string>
13+
<key>GCM_SENDER_ID</key>
14+
<string>1093041624247</string>
15+
<key>PLIST_VERSION</key>
16+
<string>1</string>
17+
<key>BUNDLE_ID</key>
18+
<string>at.tomtasche.reader.lite1</string>
19+
<key>PROJECT_ID</key>
20+
<string>admob-app-id-9025061963</string>
21+
<key>STORAGE_BUCKET</key>
22+
<string>admob-app-id-9025061963.appspot.com</string>
23+
<key>IS_ADS_ENABLED</key>
24+
<false></false>
25+
<key>IS_ANALYTICS_ENABLED</key>
26+
<false></false>
27+
<key>IS_APPINVITE_ENABLED</key>
28+
<true></true>
29+
<key>IS_GCM_ENABLED</key>
30+
<true></true>
31+
<key>IS_SIGNIN_ENABLED</key>
32+
<true></true>
33+
<key>GOOGLE_APP_ID</key>
34+
<string>1:1093041624247:ios:1b8ee952c9b98e4b136932</string>
35+
<key>DATABASE_URL</key>
36+
<string>https://admob-app-id-9025061963.firebaseio.com</string>
37+
</dict>
38+
</plist>

‎OpenDocumentReader/Info-Lite.plist‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CFBundleDevelopmentRegion</key>
6+
<string>$(DEVELOPMENT_LANGUAGE)</string>
7+
<key>CFBundleDocumentTypes</key>
8+
<array>
9+
<dict>
10+
<key>CFBundleTypeIconFiles</key>
11+
<array/>
12+
<key>CFBundleTypeName</key>
13+
<string>ODT</string>
14+
<key>CFBundleTypeRole</key>
15+
<string>Viewer</string>
16+
<key>LSHandlerRank</key>
17+
<string>Alternate</string>
18+
<key>LSItemContentTypes</key>
19+
<array>
20+
<string>public.zip-archive</string>
21+
</array>
22+
</dict>
23+
<dict>
24+
<key>CFBundleTypeIconFiles</key>
25+
<array/>
26+
<key>CFBundleTypeName</key>
27+
<string>Others</string>
28+
<key>CFBundleTypeRole</key>
29+
<string>Viewer</string>
30+
<key>LSHandlerRank</key>
31+
<string>Alternate</string>
32+
<key>LSItemContentTypes</key>
33+
<array>
34+
<string>public.text</string>
35+
<string>public.image</string>
36+
<string>public.audiovisual-content</string>
37+
<string>public.composite-content</string>
38+
</array>
39+
</dict>
40+
</array>
41+
<key>CFBundleExecutable</key>
42+
<string>$(EXECUTABLE_NAME)</string>
43+
<key>CFBundleIdentifier</key>
44+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
45+
<key>CFBundleInfoDictionaryVersion</key>
46+
<string>6.0</string>
47+
<key>CFBundleName</key>
48+
<string>$(PRODUCT_NAME)</string>
49+
<key>CFBundlePackageType</key>
50+
<string>APPL</string>
51+
<key>CFBundleShortVersionString</key>
52+
<string>$(MARKETING_VERSION)</string>
53+
<key>CFBundleVersion</key>
54+
<string>$(CURRENT_PROJECT_VERSION)</string>
55+
<key>GADApplicationIdentifier</key>
56+
<string>ca-app-pub-8161473686436957~5688952247</string>
57+
<key>LSRequiresIPhoneOS</key>
58+
<true/>
59+
<key>UILaunchStoryboardName</key>
60+
<string>LaunchScreen</string>
61+
<key>UIMainStoryboardFile</key>
62+
<string>Main</string>
63+
<key>UIRequiredDeviceCapabilities</key>
64+
<array>
65+
<string>armv7</string>
66+
</array>
67+
<key>UISupportedInterfaceOrientations</key>
68+
<array>
69+
<string>UIInterfaceOrientationPortrait</string>
70+
<string>UIInterfaceOrientationLandscapeLeft</string>
71+
<string>UIInterfaceOrientationLandscapeRight</string>
72+
<string>UIInterfaceOrientationPortraitUpsideDown</string>
73+
</array>
74+
<key>UISupportedInterfaceOrientations~ipad</key>
75+
<array>
76+
<string>UIInterfaceOrientationPortrait</string>
77+
<string>UIInterfaceOrientationPortraitUpsideDown</string>
78+
<string>UIInterfaceOrientationLandscapeLeft</string>
79+
<string>UIInterfaceOrientationLandscapeRight</string>
80+
</array>
81+
<key>UISupportsDocumentBrowser</key>
82+
<true/>
83+
</dict>
84+
</plist>

0 commit comments

Comments
 (0)