MultiCraft
/
MultiCraft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iOS: minor update

master
Maksim 2020-12-18 22:20:12 +01:00
parent 5599aec760
commit 04afd56375
7 changed files with 164 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj
View File

@ -1834,7 +1834,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
CURRENT_PROJECT_VERSION = 112;
CURRENT_PROJECT_VERSION = 113;
DEVELOPMENT_TEAM = R3RLJ9TW52;
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
@ -1866,7 +1866,7 @@
"@executable_path/Frameworks",
);
LIBRARY_SEARCH_PATHS = "$(inherited)";
MARKETING_VERSION = 1.14.2;
MARKETING_VERSION = 1.14.3;
OTHER_CFLAGS = (
"$(inherited)",
"-isystem",
@ -1900,7 +1900,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
CURRENT_PROJECT_VERSION = 112;
CURRENT_PROJECT_VERSION = 113;
DEVELOPMENT_TEAM = R3RLJ9TW52;
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
@ -1933,7 +1933,7 @@
"@executable_path/Frameworks",
);
LIBRARY_SEARCH_PATHS = "$(inherited)";
MARKETING_VERSION = 1.14.2;
MARKETING_VERSION = 1.14.3;
OTHER_CFLAGS = (
"$(inherited)",
"-isystem",
@ -1989,7 +1989,7 @@
repositoryURL = "https://github.com/bugsnag/bugsnag-cocoa";
requirement = {
kind = upToNextMinorVersion;
minimumVersion = 6.2.0;
minimumVersion = 6.4.0;
};
};
84C32A3524AF7A4500445E92 /* XCRemoteSwiftPackageReference "Nantes" */ = {
@ -1997,7 +1997,7 @@
repositoryURL = "https://github.com/instacart/Nantes";
requirement = {
kind = upToNextMinorVersion;
minimumVersion = 0.1.1;
minimumVersion = 0.1.2;
};
};
/* End XCRemoteSwiftPackageReference section */

173
build/iOS/MultiCraft/MultiCraft/Info.plist
View File

@ -45,195 +45,267 @@
<array>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>4PFYVQ9L8R.skadnetwork</string>
<string>4pfyvq9l8r.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>YCLNXRL5PM.skadnetwork</string>
<string>yclnxrl5pm.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>V72QYCH5UU.skadnetwork</string>
<string>v72qych5uu.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>TL55SBB4FM.skadnetwork</string>
<string>tl55sbb4fm.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>T38B2KH725.skadnetwork</string>
<string>t38b2kh725.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>PRCB7NJMU6.skadnetwork</string>
<string>prcb7njmu6.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>PPXM28T8AP.skadnetwork</string>
<string>ppxm28t8ap.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>MLMMFZH3R3.skadnetwork</string>
<string>mlmmfzh3r3.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>KLF5C3L5U5.skadnetwork</string>
<string>klf5c3l5u5.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>HS6BDUKANM.skadnetwork</string>
<string>hs6bdukanm.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>C6K4G5QG8M.skadnetwork</string>
<string>c6k4g5qg8m.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>9T245VHMPL.skadnetwork</string>
<string>9t245vhmpl.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>9RD848Q2BZ.skadnetwork</string>
<string>9rd848q2bz.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>8S468MFL3Y.skadnetwork</string>
<string>8s468mfl3y.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>7UG5ZH24HU.skadnetwork</string>
<string>7ug5zh24hu.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>4FZDC2EVR5.skadnetwork</string>
<string>4fzdc2evr5.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>4468KM3ULZ.skadnetwork</string>
<string>4468km3ulz.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>3RD42EKR43.skadnetwork</string>
<string>3rd42ekr43.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>2U9PT9HC89.skadnetwork</string>
<string>2u9pt9hc89.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>LUDVB6Z3BS.skadnetwork</string>
<string>m8dbw4sv7c.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>WG4VFF78ZM.skadnetwork</string>
<string>7rz58n8ntl.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>737Z793B9F.skadnetwork</string>
<string>ejvt5qm6ak.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>YDX93A7ASS.skadnetwork</string>
<string>5lm9lj6jb7.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>44JX6755AQ.skadnetwork</string>
<string>44jx6755aq.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>W9Q455WK68.skadnetwork</string>
<string>mtkv5xtk9e.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>GLQZH8VGBY.skadnetwork</string>
<string>ludvb6z3bs.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>AV6W8KGT66.skadnetwork</string>
<string>wg4vff78zm.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>CJ5566H2GA.skadnetwork</string>
<string>737z793b9f.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>F38H382JLK.skadnetwork</string>
<string>ydx93a7ass.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>CSTR6SUWN9.skadnetwork</string>
<string>w9q455wk68.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>SU67R6K2V3.skadnetwork</string>
<string>glqzh8vgby.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>KBD757YWX3.skadnetwork</string>
<string>av6w8kgt66.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>22MMUN2RN5.skadnetwork</string>
<string>cj5566h2ga.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>V79KVWWJ4G.skadnetwork</string>
<string>f38h382jlk.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>BVPN9UFA9B.skadnetwork</string>
<string>s39g8k73mm.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>238DA6JT44.skadnetwork</string>
<string>v9wttpbfk9.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>3SH42Y64Q3.skadnetwork</string>
<string>n38lu8286q.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>4DZT52R2T5.skadnetwork</string>
<string>cstr6suwn9.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>WZMMZ9FP6W.skadnetwork</string>
<string>su67r6k2v3.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>F73KDQ92P3.skadnetwork</string>
<string>kbd757ywx3.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>424M5254LK.skadnetwork</string>
<string>n9x2a789qt.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>44N7HLLDY6.skadnetwork</string>
<string>uw77j35x4d.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>5A6FLPKH64.skadnetwork</string>
<string>3sh42y64q3.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>488R3Q3DTQ.skadnetwork</string>
<string>5l3tpt7t6e.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>ZMVFPC5AQ8.skadnetwork</string>
<string>mls7yz5dvl.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>M8DBW4SV7C.skadnetwork</string>
<string>5a6flpkh64.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>LR83YXWKA7.skadnetwork</string>
<string>578prtvx9j.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>5LM9LJ6JB7.skadnetwork</string>
<string>f73kdq92p3.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>8m87ys6875.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>488r3q3dtq.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>zmvfpc5aq8.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>97r2b46745.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>6xzpu9s2p8.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>cg4yq2srnc.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>ecpz2srf59.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>22mmun2rn5.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>wzmmz9fp6w.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>lr83yxwka7.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>238da6jt44.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>424m5254lk.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>bvpn9ufa9b.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>v79kvwwj4g.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>24t9a8vw3c.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>44n7hlldy6.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>4dzt52r2t5.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>gta9lk7p23.skadnetwork</string>
</dict>
</array>
<key>UIBackgroundModes</key>
@ -262,5 +334,10 @@
</array>
<key>UIViewControllerBasedStatusBarAppearance</key>
<false/>
<key>bugsnag</key>
<dict>
<key>apiKey</key>
<string>1</string>
</dict>
</dict>
</plist>

30
build/iOS/MultiCraft/MultiCraft/UI/UITextViewPlaceholder.swift
View File

@ -29,7 +29,7 @@ extension UITextView: UITextViewDelegate {
/// Resize the placeholder when the UITextView bounds change
override open var bounds: CGRect {
didSet {
self.resizePlaceholder()
resizePlaceholder()
}
}
@ -38,18 +38,18 @@ extension UITextView: UITextViewDelegate {
get {
var placeholderText: String?
if let placeholderLabel = self.viewWithTag(100) as? UILabel {
if let placeholderLabel = viewWithTag(100) as? UILabel {
placeholderText = placeholderLabel.text
}
return placeholderText
}
set {
if let placeholderLabel = self.viewWithTag(100) as! UILabel? {
if let placeholderLabel = viewWithTag(100) as! UILabel? {
placeholderLabel.text = newValue
placeholderLabel.sizeToFit()
} else {
self.addPlaceholder(newValue!)
addPlaceholder(newValue!)
}
}
}
@ -58,17 +58,17 @@ extension UITextView: UITextViewDelegate {
///
/// - Parameter textView: The UITextView that got updated
public func textViewDidChange(_ textView: UITextView) {
if let placeholderLabel = self.viewWithTag(100) as? UILabel {
placeholderLabel.isHidden = !self.text.isEmpty
if let placeholderLabel = viewWithTag(100) as? UILabel {
placeholderLabel.isHidden = !text.isEmpty
}
}
/// Resize the placeholder UILabel to make sure it's in the same position as the UITextView text
private func resizePlaceholder() {
if let placeholderLabel = self.viewWithTag(100) as! UILabel? {
let labelX = self.textContainer.lineFragmentPadding
let labelY = self.textContainerInset.top
let labelWidth = self.frame.width - (labelX * 2)
if let placeholderLabel = viewWithTag(100) as! UILabel? {
let labelX = textContainer.lineFragmentPadding
let labelY = textContainerInset.top
let labelWidth = frame.width - (labelX * 2)
let labelHeight = placeholderLabel.frame.height
placeholderLabel.frame = CGRect(x: labelX, y: labelY, width: labelWidth, height: labelHeight)
@ -82,14 +82,14 @@ extension UITextView: UITextViewDelegate {
placeholderLabel.text = placeholderText
placeholderLabel.sizeToFit()
placeholderLabel.font = self.font
placeholderLabel.font = font
placeholderLabel.textColor = UIColor.lightGray
placeholderLabel.tag = 100
placeholderLabel.isHidden = !self.text.isEmpty
placeholderLabel.isHidden = !text.isEmpty
self.addSubview(placeholderLabel)
self.resizePlaceholder()
self.delegate = self
addSubview(placeholderLabel)
resizePlaceholder()
delegate = self
}
}

1
build/iOS/MultiCraft/MultiCraft/ioswrap.h
View File

@ -5,7 +5,6 @@
#import "ads.h"
#else
#define ZIPPWD @"1" // zip password
#define CrashliticsApiKey @"1" // crashlitics key
#endif
#ifdef __cplusplus

1
build/iOS/MultiCraft/MultiCraft/ioswrap.m
View File

@ -10,7 +10,6 @@ void init_IOS_Settings()
{
BugsnagConfiguration *config = [BugsnagConfiguration loadConfig];
config.enabledErrorTypes.ooms = NO;
config.apiKey = CrashliticsApiKey;
[Bugsnag startWithConfiguration:config]; // crash analytics
[[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategoryAmbient error:nil]; // don't stop background music

23
build/iOS/Podfile
View File

@ -1,20 +1,25 @@
project 'MultiCraft/MultiCraft.xcodeproj'
platform :ios, '9.3'
platform :ios, '10.3'
use_frameworks!
install! 'cocoapods', :warn_for_multiple_pod_sources => false, :warn_for_unused_master_specs_repo => false
def appodeal
source 'https://github.com/appodeal/CocoaPods.git'
# source 'https://github.com/appodeal/CocoaPods.git'
ver = '2.8.1.1' # '2.7.5.1'
pod 'APDAdColonyAdapter', '2.7.5.1'
pod 'APDAppLovinAdapter', '2.7.5.1'
pod 'APDAppodealAdExchangeAdapter', '2.7.5.1'
pod 'APDIronSourceAdapter', '2.7.5.1'
pod 'APDTapjoyAdapter', '2.7.5.1'
pod 'APDUnityAdapter', '2.7.5.1'
pod 'APDAdColonyAdapter', ver
pod 'APDAppLovinAdapter', ver
# We don't use all of these networks, but they are part of BidMachine and we can't exclude only FB otherwise
pod 'APDBidMachineAdapter', ver, :subspecs => ['Tapjoy', 'AdColony', 'Amazon', 'Criteo', 'MyTarget', 'Smaato', 'Vungle', 'AppRoll']
# pod 'APDAppodealAdExchangeAdapter', ver
pod 'APDIronSourceAdapter', ver
pod 'APDTapjoyAdapter', ver
pod 'APDUnityAdapter', ver
end
target 'MultiCraft' do
source 'https://cdn.cocoapods.org/'
# source 'https://cdn.cocoapods.org/'
pod 'leveldb-library'
pod 'libvorbis'

8
build/macOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj
View File

@ -1926,7 +1926,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = R3RLJ9TW52;
ENABLE_HARDENED_RUNTIME = YES;
GCC_PREPROCESSOR_DEFINITIONS = (
@ -1956,7 +1956,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.10;
MARKETING_VERSION = 1.13.1;
MARKETING_VERSION = 1.14;
OTHER_LDFLAGS = (
"$(inherited)",
"-L${SRCROOT}/../deps/freetype/lib",
@ -1978,7 +1978,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = R3RLJ9TW52;
ENABLE_HARDENED_RUNTIME = YES;
GCC_PREPROCESSOR_DEFINITIONS = (
@ -2010,7 +2010,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.10;
MARKETING_VERSION = 1.13.1;
MARKETING_VERSION = 1.14;
OTHER_LDFLAGS = (
"$(inherited)",
"-L${SRCROOT}/../deps/freetype/lib",