Merge changes to default branch

Hg: changed android/app/src/main/java/com/dinect/checker/AbstractScannerActivity.java
This commit is contained in:
Ivan Murashov
2018-02-12 08:06:50 +03:00
83 changed files with 1035 additions and 1573 deletions

View File

@@ -1,14 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SuppressBuildableAutocreation</key>
<dict>
<key>ACE861271F9F745B006FEF38</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict>
</dict>
</plist>

View File

@@ -1,72 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SchemeUserState</key>
<dict>
<key>Autobonus copy.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>4</integer>
</dict>
<key>Dinect copy.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>5</integer>
</dict>
<key>Runner copy.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>13</integer>
</dict>
<key>Runner.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>4</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
<dict>
<key>97C146ED1CF9000F007C117D</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>AC45BF1B1F9E386C009713E2</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>AC45BF691F9E408E009713E2</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>AC45BF921F9E574C009713E2</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>AC73A3CE1F9F79760026EBA4</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>AC73A3F61F9F7F910026EBA4</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>ACE860F91F9F716A006FEF38</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>ACE861271F9F745B006FEF38</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict>
</dict>
</plist>

View File

@@ -1,14 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SchemeUserState</key>
<dict>
<key>Runner.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
</dict>
</dict>
</dict>
</plist>