diff --git a/rudict/rudict-all/rudict/adjective.cpp b/rudict/rudict-all/rudict/adjective.cpp index b5709c6..017d458 100644 --- a/rudict/rudict-all/rudict/adjective.cpp +++ b/rudict/rudict-all/rudict/adjective.cpp @@ -6,8 +6,10 @@ #include "utf8utf16.h" #include "boost/regex.hpp" + #include "boost/algorithm/string/regex.hpp" + namespace AJ { @@ -391,7 +393,7 @@ namespace AJ return{ base + L"ый", base + L"ой" }; } - return{}; + return std::set(); } diff --git a/rudict/rudict-all/rudict/grammarCase.cpp b/rudict/rudict-all/rudict/grammarCase.cpp index c4ee610..5cb666a 100644 --- a/rudict/rudict-all/rudict/grammarCase.cpp +++ b/rudict/rudict-all/rudict/grammarCase.cpp @@ -206,9 +206,10 @@ std::wstring NounGrammaticalCaseToWString(NounGrammaticalCase nounGrammaticalCas case NGC_P4_ACCUSATIVE: return L"NGC_P4_ACCUSATIVE"; case NGC_P5_INSTRUMENTAL: return L"NGC_P5_INSTRUMENTAL"; case NGC_P6_PREPOSITIONAL: return L"NGC_P6_PREPOSITIONAL"; + default: return L""; } - return L""; + } NounGrammaticalCase WStringToNounGrammaticalCase(std::wstring str) diff --git a/rudict/rudict-all/rudict/http/request_handler.cpp b/rudict/rudict-all/rudict/http/request_handler.cpp index 5d13ca5..cad7ce7 100644 --- a/rudict/rudict-all/rudict/http/request_handler.cpp +++ b/rudict/rudict-all/rudict/http/request_handler.cpp @@ -136,82 +136,6 @@ namespace http { return true; } - - void RemoveDuplicates(std::vector>& wordPairSet) - { - size_t i = 0; - - while (i < wordPairSet.size()) - { - size_t j = i + 1; - - while (j < wordPairSet.size()) - { - if (*wordPairSet[i] == *wordPairSet[j]) - { - wordPairSet.erase(wordPairSet.begin() + j); - j--; - } - - j++; - } - - i++; - } - } - - - boost::property_tree::wptree PrepareReport(std::wstring request) - { - boost::property_tree::wptree result; - - std::cout <<"PrepareReport" << std::endl; - - if (request.size() < 2) - { - result.put(L"error", L"String is too short"); - } - - int id = 0; - - std::vector> wordPairSet; - - NN::RecognizeNoun(request, wordPairSet); - AJ::RecognizeAdjective(request, wordPairSet); - VB::RecognizeVerb(request, wordPairSet); - OT::RecognizeWord(request, wordPairSet); - PP::RecognizeWord(request, wordPairSet); - - RemoveDuplicates(wordPairSet); - - boost::property_tree::wptree wordArr; - - for (auto& wordPair : wordPairSet) - { - boost::property_tree::wptree nounTree; - - nounTree.put(L"id", id); - nounTree.put(L"type", wordPair->getType()); - nounTree.put(L"word", wordPair->word().GetWord()); - - nounTree.put_child(L"properties", wordPair->word().GetProperties()); - - nounTree.put_child(L"modificators", wordPair->wordModificator().GetModificators()); - - nounTree.put_child(L"translations", wordPair->word().CreateTranslationPropertyTree()); - - wordArr.push_back(std::make_pair(L"", nounTree)); - - id++; - } - - result.put_child(L"words", wordArr); - - - - return result; - - } } // namespace server } // namespace http diff --git a/rudict/rudict-all/rudict/http/request_handler.hpp b/rudict/rudict-all/rudict/http/request_handler.hpp index d52ed2a..5e01041 100644 --- a/rudict/rudict-all/rudict/http/request_handler.hpp +++ b/rudict/rudict-all/rudict/http/request_handler.hpp @@ -14,6 +14,8 @@ #include #include "boost/property_tree/ptree.hpp" +#include "../reporter.h" + namespace http { namespace server { @@ -40,7 +42,6 @@ private: static bool url_decode(const std::string& in, std::string& out); }; -boost::property_tree::wptree PrepareReport(std::wstring request); } // namespace server } // namespace http diff --git a/rudict/rudict-ios.xcodeproj/project.pbxproj b/rudict/rudict-ios.xcodeproj/project.pbxproj new file mode 100644 index 0000000..a9026f2 --- /dev/null +++ b/rudict/rudict-ios.xcodeproj/project.pbxproj @@ -0,0 +1,571 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXBuildFile section */ + 843BF91E1A3CFE20005FC6F3 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 843BF91D1A3CFE20005FC6F3 /* Foundation.framework */; }; + 843BF9201A3CFE20005FC6F3 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 843BF91F1A3CFE20005FC6F3 /* CoreGraphics.framework */; }; + 843BF9221A3CFE20005FC6F3 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 843BF9211A3CFE20005FC6F3 /* UIKit.framework */; }; + 843BF9281A3CFE20005FC6F3 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 843BF9261A3CFE20005FC6F3 /* InfoPlist.strings */; }; + 843BF92A1A3CFE20005FC6F3 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 843BF9291A3CFE20005FC6F3 /* main.m */; }; + 843BF92E1A3CFE20005FC6F3 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 843BF92D1A3CFE20005FC6F3 /* AppDelegate.m */; }; + 843BF9311A3CFE20005FC6F3 /* Main_iPhone.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 843BF92F1A3CFE20005FC6F3 /* Main_iPhone.storyboard */; }; + 843BF9341A3CFE20005FC6F3 /* Main_iPad.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 843BF9321A3CFE20005FC6F3 /* Main_iPad.storyboard */; }; + 843BF9371A3CFE20005FC6F3 /* FirstViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 843BF9361A3CFE20005FC6F3 /* FirstViewController.m */; }; + 843BF93A1A3CFE20005FC6F3 /* SecondViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 843BF9391A3CFE20005FC6F3 /* SecondViewController.m */; }; + 843BF93C1A3CFE21005FC6F3 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 843BF93B1A3CFE21005FC6F3 /* Images.xcassets */; }; + 843BF9431A3CFE21005FC6F3 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 843BF9421A3CFE21005FC6F3 /* XCTest.framework */; }; + 843BF9441A3CFE21005FC6F3 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 843BF91D1A3CFE20005FC6F3 /* Foundation.framework */; }; + 843BF9451A3CFE21005FC6F3 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 843BF9211A3CFE20005FC6F3 /* UIKit.framework */; }; + 843BF94D1A3CFE21005FC6F3 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 843BF94B1A3CFE21005FC6F3 /* InfoPlist.strings */; }; + 843BF94F1A3CFE21005FC6F3 /* rudict_iosTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 843BF94E1A3CFE21005FC6F3 /* rudict_iosTests.m */; }; + 843BF9681A3CFFE6005FC6F3 /* adjective.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 843BF9591A3CFFE6005FC6F3 /* adjective.cpp */; }; + 843BF9691A3CFFE6005FC6F3 /* grammarCase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 843BF95B1A3CFFE6005FC6F3 /* grammarCase.cpp */; }; + 843BF96B1A3CFFE6005FC6F3 /* noun.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 843BF95E1A3CFFE6005FC6F3 /* noun.cpp */; }; + 843BF96C1A3CFFE6005FC6F3 /* other.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 843BF9601A3CFFE6005FC6F3 /* other.cpp */; }; + 843BF96D1A3CFFE6005FC6F3 /* preposition.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 843BF9621A3CFFE6005FC6F3 /* preposition.cpp */; }; + 843BF96E1A3CFFE6005FC6F3 /* utf8utf16.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 843BF9641A3CFFE6005FC6F3 /* utf8utf16.cpp */; }; + 843BF96F1A3CFFE6005FC6F3 /* verb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 843BF9661A3CFFE6005FC6F3 /* verb.cpp */; }; + 843BF9711A3D063D005FC6F3 /* libboost.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 843BF9701A3D063D005FC6F3 /* libboost.a */; }; + 843BF9741A3D0829005FC6F3 /* reporter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 843BF9721A3D0829005FC6F3 /* reporter.cpp */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 843BF9461A3CFE21005FC6F3 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 843BF9121A3CFE20005FC6F3 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 843BF9191A3CFE20005FC6F3; + remoteInfo = "rudict-ios"; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXFileReference section */ + 843BF91A1A3CFE20005FC6F3 /* rudict-ios.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "rudict-ios.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 843BF91D1A3CFE20005FC6F3 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; + 843BF91F1A3CFE20005FC6F3 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; + 843BF9211A3CFE20005FC6F3 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; + 843BF9251A3CFE20005FC6F3 /* rudict-ios-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "rudict-ios-Info.plist"; sourceTree = ""; }; + 843BF9271A3CFE20005FC6F3 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; + 843BF9291A3CFE20005FC6F3 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; + 843BF92B1A3CFE20005FC6F3 /* rudict-ios-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "rudict-ios-Prefix.pch"; sourceTree = ""; }; + 843BF92C1A3CFE20005FC6F3 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; + 843BF92D1A3CFE20005FC6F3 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; + 843BF9301A3CFE20005FC6F3 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main_iPhone.storyboard; sourceTree = ""; }; + 843BF9331A3CFE20005FC6F3 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main_iPad.storyboard; sourceTree = ""; }; + 843BF9351A3CFE20005FC6F3 /* FirstViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FirstViewController.h; sourceTree = ""; }; + 843BF9361A3CFE20005FC6F3 /* FirstViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FirstViewController.m; sourceTree = ""; }; + 843BF9381A3CFE20005FC6F3 /* SecondViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecondViewController.h; sourceTree = ""; }; + 843BF9391A3CFE20005FC6F3 /* SecondViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SecondViewController.m; sourceTree = ""; }; + 843BF93B1A3CFE21005FC6F3 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; + 843BF9411A3CFE21005FC6F3 /* rudict-iosTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "rudict-iosTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; + 843BF9421A3CFE21005FC6F3 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; }; + 843BF94A1A3CFE21005FC6F3 /* rudict-iosTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "rudict-iosTests-Info.plist"; sourceTree = ""; }; + 843BF94C1A3CFE21005FC6F3 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; + 843BF94E1A3CFE21005FC6F3 /* rudict_iosTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = rudict_iosTests.m; sourceTree = ""; }; + 843BF9591A3CFFE6005FC6F3 /* adjective.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = adjective.cpp; path = "rudict-all/rudict/adjective.cpp"; sourceTree = SOURCE_ROOT; }; + 843BF95A1A3CFFE6005FC6F3 /* adjective.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = adjective.h; path = "rudict-all/rudict/adjective.h"; sourceTree = SOURCE_ROOT; }; + 843BF95B1A3CFFE6005FC6F3 /* grammarCase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = grammarCase.cpp; path = "rudict-all/rudict/grammarCase.cpp"; sourceTree = SOURCE_ROOT; }; + 843BF95C1A3CFFE6005FC6F3 /* grammarCase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = grammarCase.h; path = "rudict-all/rudict/grammarCase.h"; sourceTree = SOURCE_ROOT; }; + 843BF95E1A3CFFE6005FC6F3 /* noun.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = noun.cpp; path = "rudict-all/rudict/noun.cpp"; sourceTree = SOURCE_ROOT; }; + 843BF95F1A3CFFE6005FC6F3 /* noun.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = noun.h; path = "rudict-all/rudict/noun.h"; sourceTree = SOURCE_ROOT; }; + 843BF9601A3CFFE6005FC6F3 /* other.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = other.cpp; path = "rudict-all/rudict/other.cpp"; sourceTree = SOURCE_ROOT; }; + 843BF9611A3CFFE6005FC6F3 /* other.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = other.h; path = "rudict-all/rudict/other.h"; sourceTree = SOURCE_ROOT; }; + 843BF9621A3CFFE6005FC6F3 /* preposition.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = preposition.cpp; path = "rudict-all/rudict/preposition.cpp"; sourceTree = SOURCE_ROOT; }; + 843BF9631A3CFFE6005FC6F3 /* preposition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = preposition.h; path = "rudict-all/rudict/preposition.h"; sourceTree = SOURCE_ROOT; }; + 843BF9641A3CFFE6005FC6F3 /* utf8utf16.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = utf8utf16.cpp; path = "rudict-all/rudict/utf8utf16.cpp"; sourceTree = SOURCE_ROOT; }; + 843BF9651A3CFFE6005FC6F3 /* utf8utf16.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = utf8utf16.h; path = "rudict-all/rudict/utf8utf16.h"; sourceTree = SOURCE_ROOT; }; + 843BF9661A3CFFE6005FC6F3 /* verb.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = verb.cpp; path = "rudict-all/rudict/verb.cpp"; sourceTree = SOURCE_ROOT; }; + 843BF9671A3CFFE6005FC6F3 /* verb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = verb.h; path = "rudict-all/rudict/verb.h"; sourceTree = SOURCE_ROOT; }; + 843BF9701A3D063D005FC6F3 /* libboost.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libboost.a; path = "../../libs/boost_1_57_0/build-ios/ios-simulator/libboost.a"; sourceTree = ""; }; + 843BF9721A3D0829005FC6F3 /* reporter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = reporter.cpp; path = "rudict-all/rudict/reporter.cpp"; sourceTree = SOURCE_ROOT; }; + 843BF9731A3D0829005FC6F3 /* reporter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = reporter.h; path = "rudict-all/rudict/reporter.h"; sourceTree = SOURCE_ROOT; }; + 843BF9751A3D0A61005FC6F3 /* cpp-ios-stuff.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "cpp-ios-stuff.h"; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 843BF9171A3CFE20005FC6F3 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 843BF9711A3D063D005FC6F3 /* libboost.a in Frameworks */, + 843BF9201A3CFE20005FC6F3 /* CoreGraphics.framework in Frameworks */, + 843BF9221A3CFE20005FC6F3 /* UIKit.framework in Frameworks */, + 843BF91E1A3CFE20005FC6F3 /* Foundation.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 843BF93E1A3CFE21005FC6F3 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 843BF9431A3CFE21005FC6F3 /* XCTest.framework in Frameworks */, + 843BF9451A3CFE21005FC6F3 /* UIKit.framework in Frameworks */, + 843BF9441A3CFE21005FC6F3 /* Foundation.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 843BF9111A3CFE20005FC6F3 = { + isa = PBXGroup; + children = ( + 843BF9231A3CFE20005FC6F3 /* rudict-ios */, + 843BF9481A3CFE21005FC6F3 /* rudict-iosTests */, + 843BF91C1A3CFE20005FC6F3 /* Frameworks */, + 843BF91B1A3CFE20005FC6F3 /* Products */, + ); + sourceTree = ""; + }; + 843BF91B1A3CFE20005FC6F3 /* Products */ = { + isa = PBXGroup; + children = ( + 843BF91A1A3CFE20005FC6F3 /* rudict-ios.app */, + 843BF9411A3CFE21005FC6F3 /* rudict-iosTests.xctest */, + ); + name = Products; + sourceTree = ""; + }; + 843BF91C1A3CFE20005FC6F3 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 843BF9701A3D063D005FC6F3 /* libboost.a */, + 843BF91D1A3CFE20005FC6F3 /* Foundation.framework */, + 843BF91F1A3CFE20005FC6F3 /* CoreGraphics.framework */, + 843BF9211A3CFE20005FC6F3 /* UIKit.framework */, + 843BF9421A3CFE21005FC6F3 /* XCTest.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; + 843BF9231A3CFE20005FC6F3 /* rudict-ios */ = { + isa = PBXGroup; + children = ( + 843BF9581A3CFFBF005FC6F3 /* cpp */, + 843BF92C1A3CFE20005FC6F3 /* AppDelegate.h */, + 843BF92D1A3CFE20005FC6F3 /* AppDelegate.m */, + 843BF92F1A3CFE20005FC6F3 /* Main_iPhone.storyboard */, + 843BF9321A3CFE20005FC6F3 /* Main_iPad.storyboard */, + 843BF9351A3CFE20005FC6F3 /* FirstViewController.h */, + 843BF9361A3CFE20005FC6F3 /* FirstViewController.m */, + 843BF9381A3CFE20005FC6F3 /* SecondViewController.h */, + 843BF9391A3CFE20005FC6F3 /* SecondViewController.m */, + 843BF93B1A3CFE21005FC6F3 /* Images.xcassets */, + 843BF9241A3CFE20005FC6F3 /* Supporting Files */, + 843BF9751A3D0A61005FC6F3 /* cpp-ios-stuff.h */, + ); + path = "rudict-ios"; + sourceTree = ""; + }; + 843BF9241A3CFE20005FC6F3 /* Supporting Files */ = { + isa = PBXGroup; + children = ( + 843BF9251A3CFE20005FC6F3 /* rudict-ios-Info.plist */, + 843BF9261A3CFE20005FC6F3 /* InfoPlist.strings */, + 843BF9291A3CFE20005FC6F3 /* main.m */, + 843BF92B1A3CFE20005FC6F3 /* rudict-ios-Prefix.pch */, + ); + name = "Supporting Files"; + sourceTree = ""; + }; + 843BF9481A3CFE21005FC6F3 /* rudict-iosTests */ = { + isa = PBXGroup; + children = ( + 843BF94E1A3CFE21005FC6F3 /* rudict_iosTests.m */, + 843BF9491A3CFE21005FC6F3 /* Supporting Files */, + ); + path = "rudict-iosTests"; + sourceTree = ""; + }; + 843BF9491A3CFE21005FC6F3 /* Supporting Files */ = { + isa = PBXGroup; + children = ( + 843BF94A1A3CFE21005FC6F3 /* rudict-iosTests-Info.plist */, + 843BF94B1A3CFE21005FC6F3 /* InfoPlist.strings */, + ); + name = "Supporting Files"; + sourceTree = ""; + }; + 843BF9581A3CFFBF005FC6F3 /* cpp */ = { + isa = PBXGroup; + children = ( + 843BF9721A3D0829005FC6F3 /* reporter.cpp */, + 843BF9731A3D0829005FC6F3 /* reporter.h */, + 843BF9591A3CFFE6005FC6F3 /* adjective.cpp */, + 843BF95A1A3CFFE6005FC6F3 /* adjective.h */, + 843BF95B1A3CFFE6005FC6F3 /* grammarCase.cpp */, + 843BF95C1A3CFFE6005FC6F3 /* grammarCase.h */, + 843BF95E1A3CFFE6005FC6F3 /* noun.cpp */, + 843BF95F1A3CFFE6005FC6F3 /* noun.h */, + 843BF9601A3CFFE6005FC6F3 /* other.cpp */, + 843BF9611A3CFFE6005FC6F3 /* other.h */, + 843BF9621A3CFFE6005FC6F3 /* preposition.cpp */, + 843BF9631A3CFFE6005FC6F3 /* preposition.h */, + 843BF9641A3CFFE6005FC6F3 /* utf8utf16.cpp */, + 843BF9651A3CFFE6005FC6F3 /* utf8utf16.h */, + 843BF9661A3CFFE6005FC6F3 /* verb.cpp */, + 843BF9671A3CFFE6005FC6F3 /* verb.h */, + ); + name = cpp; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 843BF9191A3CFE20005FC6F3 /* rudict-ios */ = { + isa = PBXNativeTarget; + buildConfigurationList = 843BF9521A3CFE21005FC6F3 /* Build configuration list for PBXNativeTarget "rudict-ios" */; + buildPhases = ( + 843BF9161A3CFE20005FC6F3 /* Sources */, + 843BF9171A3CFE20005FC6F3 /* Frameworks */, + 843BF9181A3CFE20005FC6F3 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "rudict-ios"; + productName = "rudict-ios"; + productReference = 843BF91A1A3CFE20005FC6F3 /* rudict-ios.app */; + productType = "com.apple.product-type.application"; + }; + 843BF9401A3CFE21005FC6F3 /* rudict-iosTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 843BF9551A3CFE21005FC6F3 /* Build configuration list for PBXNativeTarget "rudict-iosTests" */; + buildPhases = ( + 843BF93D1A3CFE21005FC6F3 /* Sources */, + 843BF93E1A3CFE21005FC6F3 /* Frameworks */, + 843BF93F1A3CFE21005FC6F3 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 843BF9471A3CFE21005FC6F3 /* PBXTargetDependency */, + ); + name = "rudict-iosTests"; + productName = "rudict-iosTests"; + productReference = 843BF9411A3CFE21005FC6F3 /* rudict-iosTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 843BF9121A3CFE20005FC6F3 /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 0510; + ORGANIZATIONNAME = Vladislav; + TargetAttributes = { + 843BF9401A3CFE21005FC6F3 = { + TestTargetID = 843BF9191A3CFE20005FC6F3; + }; + }; + }; + buildConfigurationList = 843BF9151A3CFE20005FC6F3 /* Build configuration list for PBXProject "rudict-ios" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 843BF9111A3CFE20005FC6F3; + productRefGroup = 843BF91B1A3CFE20005FC6F3 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 843BF9191A3CFE20005FC6F3 /* rudict-ios */, + 843BF9401A3CFE21005FC6F3 /* rudict-iosTests */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 843BF9181A3CFE20005FC6F3 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 843BF9341A3CFE20005FC6F3 /* Main_iPad.storyboard in Resources */, + 843BF93C1A3CFE21005FC6F3 /* Images.xcassets in Resources */, + 843BF9311A3CFE20005FC6F3 /* Main_iPhone.storyboard in Resources */, + 843BF9281A3CFE20005FC6F3 /* InfoPlist.strings in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 843BF93F1A3CFE21005FC6F3 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 843BF94D1A3CFE21005FC6F3 /* InfoPlist.strings in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 843BF9161A3CFE20005FC6F3 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 843BF9681A3CFFE6005FC6F3 /* adjective.cpp in Sources */, + 843BF96B1A3CFFE6005FC6F3 /* noun.cpp in Sources */, + 843BF9691A3CFFE6005FC6F3 /* grammarCase.cpp in Sources */, + 843BF93A1A3CFE20005FC6F3 /* SecondViewController.m in Sources */, + 843BF9741A3D0829005FC6F3 /* reporter.cpp in Sources */, + 843BF92E1A3CFE20005FC6F3 /* AppDelegate.m in Sources */, + 843BF9371A3CFE20005FC6F3 /* FirstViewController.m in Sources */, + 843BF96C1A3CFFE6005FC6F3 /* other.cpp in Sources */, + 843BF96F1A3CFFE6005FC6F3 /* verb.cpp in Sources */, + 843BF96E1A3CFFE6005FC6F3 /* utf8utf16.cpp in Sources */, + 843BF96D1A3CFFE6005FC6F3 /* preposition.cpp in Sources */, + 843BF92A1A3CFE20005FC6F3 /* main.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 843BF93D1A3CFE21005FC6F3 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 843BF94F1A3CFE21005FC6F3 /* rudict_iosTests.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + 843BF9471A3CFE21005FC6F3 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 843BF9191A3CFE20005FC6F3 /* rudict-ios */; + targetProxy = 843BF9461A3CFE21005FC6F3 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin PBXVariantGroup section */ + 843BF9261A3CFE20005FC6F3 /* InfoPlist.strings */ = { + isa = PBXVariantGroup; + children = ( + 843BF9271A3CFE20005FC6F3 /* en */, + ); + name = InfoPlist.strings; + sourceTree = ""; + }; + 843BF92F1A3CFE20005FC6F3 /* Main_iPhone.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 843BF9301A3CFE20005FC6F3 /* Base */, + ); + name = Main_iPhone.storyboard; + sourceTree = ""; + }; + 843BF9321A3CFE20005FC6F3 /* Main_iPad.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 843BF9331A3CFE20005FC6F3 /* Base */, + ); + name = Main_iPad.storyboard; + sourceTree = ""; + }; + 843BF94B1A3CFE21005FC6F3 /* InfoPlist.strings */ = { + isa = PBXVariantGroup; + children = ( + 843BF94C1A3CFE21005FC6F3 /* en */, + ); + name = InfoPlist.strings; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 843BF9501A3CFE21005FC6F3 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 7.1; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + 843BF9511A3CFE21005FC6F3 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = YES; + ENABLE_NS_ASSERTIONS = NO; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 7.1; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + 843BF9531A3CFE21005FC6F3 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "rudict-ios/rudict-ios-Prefix.pch"; + HEADER_SEARCH_PATHS = ( + "$(inherited)", + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, + /Users/admin/Work/libs/boost_1_57_0, + ); + INFOPLIST_FILE = "rudict-ios/rudict-ios-Info.plist"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "/Users/admin/Work/libs/boost_1_57_0/build-ios/ios-simulator", + ); + PRODUCT_NAME = "$(TARGET_NAME)"; + WRAPPER_EXTENSION = app; + }; + name = Debug; + }; + 843BF9541A3CFE21005FC6F3 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "rudict-ios/rudict-ios-Prefix.pch"; + HEADER_SEARCH_PATHS = ( + "$(inherited)", + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, + /Users/admin/Work/libs/boost_1_57_0, + ); + INFOPLIST_FILE = "rudict-ios/rudict-ios-Info.plist"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "/Users/admin/Work/libs/boost_1_57_0/build-ios/ios-simulator", + ); + PRODUCT_NAME = "$(TARGET_NAME)"; + WRAPPER_EXTENSION = app; + }; + name = Release; + }; + 843BF9561A3CFE21005FC6F3 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/rudict-ios.app/rudict-ios"; + FRAMEWORK_SEARCH_PATHS = ( + "$(SDKROOT)/Developer/Library/Frameworks", + "$(inherited)", + "$(DEVELOPER_FRAMEWORKS_DIR)", + ); + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "rudict-ios/rudict-ios-Prefix.pch"; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + INFOPLIST_FILE = "rudict-iosTests/rudict-iosTests-Info.plist"; + PRODUCT_NAME = "$(TARGET_NAME)"; + TEST_HOST = "$(BUNDLE_LOADER)"; + WRAPPER_EXTENSION = xctest; + }; + name = Debug; + }; + 843BF9571A3CFE21005FC6F3 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/rudict-ios.app/rudict-ios"; + FRAMEWORK_SEARCH_PATHS = ( + "$(SDKROOT)/Developer/Library/Frameworks", + "$(inherited)", + "$(DEVELOPER_FRAMEWORKS_DIR)", + ); + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "rudict-ios/rudict-ios-Prefix.pch"; + INFOPLIST_FILE = "rudict-iosTests/rudict-iosTests-Info.plist"; + PRODUCT_NAME = "$(TARGET_NAME)"; + TEST_HOST = "$(BUNDLE_LOADER)"; + WRAPPER_EXTENSION = xctest; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 843BF9151A3CFE20005FC6F3 /* Build configuration list for PBXProject "rudict-ios" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 843BF9501A3CFE21005FC6F3 /* Debug */, + 843BF9511A3CFE21005FC6F3 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 843BF9521A3CFE21005FC6F3 /* Build configuration list for PBXNativeTarget "rudict-ios" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 843BF9531A3CFE21005FC6F3 /* Debug */, + 843BF9541A3CFE21005FC6F3 /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; + 843BF9551A3CFE21005FC6F3 /* Build configuration list for PBXNativeTarget "rudict-iosTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 843BF9561A3CFE21005FC6F3 /* Debug */, + 843BF9571A3CFE21005FC6F3 /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; +/* End XCConfigurationList section */ + }; + rootObject = 843BF9121A3CFE20005FC6F3 /* Project object */; +} diff --git a/rudict/rudict-ios/AppDelegate.h b/rudict/rudict-ios/AppDelegate.h new file mode 100644 index 0000000..a2f1681 --- /dev/null +++ b/rudict/rudict-ios/AppDelegate.h @@ -0,0 +1,15 @@ +// +// AppDelegate.h +// rudict-ios +// +// Created by Admin on 14.12.14. +// Copyright (c) 2014 Vladislav. All rights reserved. +// + +#import + +@interface AppDelegate : UIResponder + +@property (strong, nonatomic) UIWindow *window; + +@end diff --git a/rudict/rudict-ios/AppDelegate.m b/rudict/rudict-ios/AppDelegate.m new file mode 100644 index 0000000..d097c52 --- /dev/null +++ b/rudict/rudict-ios/AppDelegate.m @@ -0,0 +1,46 @@ +// +// AppDelegate.m +// rudict-ios +// +// Created by Admin on 14.12.14. +// Copyright (c) 2014 Vladislav. All rights reserved. +// + +#import "AppDelegate.h" + +@implementation AppDelegate + +- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions +{ + // Override point for customization after application launch. + return YES; +} + +- (void)applicationWillResignActive:(UIApplication *)application +{ + // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state. + // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game. +} + +- (void)applicationDidEnterBackground:(UIApplication *)application +{ + // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. + // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits. +} + +- (void)applicationWillEnterForeground:(UIApplication *)application +{ + // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background. +} + +- (void)applicationDidBecomeActive:(UIApplication *)application +{ + // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface. +} + +- (void)applicationWillTerminate:(UIApplication *)application +{ + // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:. +} + +@end diff --git a/rudict/rudict-ios/Base.lproj/Main_iPad.storyboard b/rudict/rudict-ios/Base.lproj/Main_iPad.storyboard new file mode 100644 index 0000000..dbcd82a --- /dev/null +++ b/rudict/rudict-ios/Base.lproj/Main_iPad.storyboard @@ -0,0 +1,143 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + Loaded by the First View Controller — an instance of FirstViewController — specified in the app delegate. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Loaded by the Second View Controller — an instance of SecondViewController — specified in the app delegate. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/rudict/rudict-ios/Base.lproj/Main_iPhone.storyboard b/rudict/rudict-ios/Base.lproj/Main_iPhone.storyboard new file mode 100644 index 0000000..c04ade7 --- /dev/null +++ b/rudict/rudict-ios/Base.lproj/Main_iPhone.storyboard @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/rudict/rudict-ios/FirstViewController.h b/rudict/rudict-ios/FirstViewController.h new file mode 100644 index 0000000..c69f390 --- /dev/null +++ b/rudict/rudict-ios/FirstViewController.h @@ -0,0 +1,13 @@ +// +// FirstViewController.h +// rudict-ios +// +// Created by Admin on 14.12.14. +// Copyright (c) 2014 Vladislav. All rights reserved. +// + +#import + +@interface FirstViewController : UIViewController + +@end diff --git a/rudict/rudict-ios/FirstViewController.m b/rudict/rudict-ios/FirstViewController.m new file mode 100644 index 0000000..ce78955 --- /dev/null +++ b/rudict/rudict-ios/FirstViewController.m @@ -0,0 +1,29 @@ +// +// FirstViewController.m +// rudict-ios +// +// Created by Admin on 14.12.14. +// Copyright (c) 2014 Vladislav. All rights reserved. +// + +#import "FirstViewController.h" + +@interface FirstViewController () + +@end + +@implementation FirstViewController + +- (void)viewDidLoad +{ + [super viewDidLoad]; + // Do any additional setup after loading the view, typically from a nib. +} + +- (void)didReceiveMemoryWarning +{ + [super didReceiveMemoryWarning]; + // Dispose of any resources that can be recreated. +} + +@end diff --git a/rudict/rudict-ios/Images.xcassets/AppIcon.appiconset/Contents.json b/rudict/rudict-ios/Images.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000..91bf9c1 --- /dev/null +++ b/rudict/rudict-ios/Images.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,53 @@ +{ + "images" : [ + { + "idiom" : "iphone", + "size" : "29x29", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "40x40", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "60x60", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "29x29", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "29x29", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "40x40", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "40x40", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "76x76", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "76x76", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/rudict/rudict-ios/Images.xcassets/LaunchImage.launchimage/Contents.json b/rudict/rudict-ios/Images.xcassets/LaunchImage.launchimage/Contents.json new file mode 100644 index 0000000..6f870a4 --- /dev/null +++ b/rudict/rudict-ios/Images.xcassets/LaunchImage.launchimage/Contents.json @@ -0,0 +1,51 @@ +{ + "images" : [ + { + "orientation" : "portrait", + "idiom" : "iphone", + "extent" : "full-screen", + "minimum-system-version" : "7.0", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "subtype" : "retina4", + "extent" : "full-screen", + "minimum-system-version" : "7.0", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "extent" : "full-screen", + "minimum-system-version" : "7.0", + "scale" : "1x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "extent" : "full-screen", + "minimum-system-version" : "7.0", + "scale" : "1x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "extent" : "full-screen", + "minimum-system-version" : "7.0", + "scale" : "2x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "extent" : "full-screen", + "minimum-system-version" : "7.0", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/rudict/rudict-ios/Images.xcassets/first.imageset/Contents.json b/rudict/rudict-ios/Images.xcassets/first.imageset/Contents.json new file mode 100644 index 0000000..a345b09 --- /dev/null +++ b/rudict/rudict-ios/Images.xcassets/first.imageset/Contents.json @@ -0,0 +1,18 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x", + "filename" : "first.png" + }, + { + "idiom" : "universal", + "scale" : "2x", + "filename" : "first@2x.png" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/rudict/rudict-ios/Images.xcassets/first.imageset/first.png b/rudict/rudict-ios/Images.xcassets/first.imageset/first.png new file mode 100644 index 0000000..9300ee2 Binary files /dev/null and b/rudict/rudict-ios/Images.xcassets/first.imageset/first.png differ diff --git a/rudict/rudict-ios/Images.xcassets/first.imageset/first@2x.png b/rudict/rudict-ios/Images.xcassets/first.imageset/first@2x.png new file mode 100644 index 0000000..374d78e Binary files /dev/null and b/rudict/rudict-ios/Images.xcassets/first.imageset/first@2x.png differ diff --git a/rudict/rudict-ios/Images.xcassets/second.imageset/Contents.json b/rudict/rudict-ios/Images.xcassets/second.imageset/Contents.json new file mode 100644 index 0000000..2136402 --- /dev/null +++ b/rudict/rudict-ios/Images.xcassets/second.imageset/Contents.json @@ -0,0 +1,18 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x", + "filename" : "second.png" + }, + { + "idiom" : "universal", + "scale" : "2x", + "filename" : "second@2x.png" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/rudict/rudict-ios/Images.xcassets/second.imageset/second.png b/rudict/rudict-ios/Images.xcassets/second.imageset/second.png new file mode 100644 index 0000000..1100b48 Binary files /dev/null and b/rudict/rudict-ios/Images.xcassets/second.imageset/second.png differ diff --git a/rudict/rudict-ios/Images.xcassets/second.imageset/second@2x.png b/rudict/rudict-ios/Images.xcassets/second.imageset/second@2x.png new file mode 100644 index 0000000..368d38f Binary files /dev/null and b/rudict/rudict-ios/Images.xcassets/second.imageset/second@2x.png differ diff --git a/rudict/rudict-ios/SecondViewController.h b/rudict/rudict-ios/SecondViewController.h new file mode 100644 index 0000000..dbb2e8c --- /dev/null +++ b/rudict/rudict-ios/SecondViewController.h @@ -0,0 +1,13 @@ +// +// SecondViewController.h +// rudict-ios +// +// Created by Admin on 14.12.14. +// Copyright (c) 2014 Vladislav. All rights reserved. +// + +#import + +@interface SecondViewController : UIViewController + +@end diff --git a/rudict/rudict-ios/SecondViewController.m b/rudict/rudict-ios/SecondViewController.m new file mode 100644 index 0000000..87059c3 --- /dev/null +++ b/rudict/rudict-ios/SecondViewController.m @@ -0,0 +1,29 @@ +// +// SecondViewController.m +// rudict-ios +// +// Created by Admin on 14.12.14. +// Copyright (c) 2014 Vladislav. All rights reserved. +// + +#import "SecondViewController.h" + +@interface SecondViewController () + +@end + +@implementation SecondViewController + +- (void)viewDidLoad +{ + [super viewDidLoad]; + // Do any additional setup after loading the view, typically from a nib. +} + +- (void)didReceiveMemoryWarning +{ + [super didReceiveMemoryWarning]; + // Dispose of any resources that can be recreated. +} + +@end diff --git a/rudict/rudict-ios/cpp-ios-stuff.h b/rudict/rudict-ios/cpp-ios-stuff.h new file mode 100644 index 0000000..70e94fb --- /dev/null +++ b/rudict/rudict-ios/cpp-ios-stuff.h @@ -0,0 +1,17 @@ +// +// cpp-ios-stuff.h +// rudict-ios +// +// Created by Admin on 14.12.14. +// Copyright (c) 2014 Vladislav. All rights reserved. +// + +#ifndef rudict_ios_cpp_ios_stuff_h +#define rudict_ios_cpp_ios_stuff_h + +//Function is implemented in file reporter.cpp + +const char* CreateReportJsonUtf8(const char* crequest); + + +#endif diff --git a/rudict/rudict-ios/en.lproj/InfoPlist.strings b/rudict/rudict-ios/en.lproj/InfoPlist.strings new file mode 100644 index 0000000..477b28f --- /dev/null +++ b/rudict/rudict-ios/en.lproj/InfoPlist.strings @@ -0,0 +1,2 @@ +/* Localized versions of Info.plist keys */ + diff --git a/rudict/rudict-ios/main.m b/rudict/rudict-ios/main.m new file mode 100644 index 0000000..ba6e914 --- /dev/null +++ b/rudict/rudict-ios/main.m @@ -0,0 +1,18 @@ +// +// main.m +// rudict-ios +// +// Created by Admin on 14.12.14. +// Copyright (c) 2014 Vladislav. All rights reserved. +// + +#import + +#import "AppDelegate.h" + +int main(int argc, char * argv[]) +{ + @autoreleasepool { + return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class])); + } +} diff --git a/rudict/rudict-ios/rudict-ios-Info.plist b/rudict/rudict-ios/rudict-ios-Info.plist new file mode 100644 index 0000000..ab0ca56 --- /dev/null +++ b/rudict/rudict-ios/rudict-ios-Info.plist @@ -0,0 +1,59 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleDisplayName + ${PRODUCT_NAME} + CFBundleExecutable + ${EXECUTABLE_NAME} + CFBundleIdentifier + fishrungames.${PRODUCT_NAME:rfc1034identifier} + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + ${PRODUCT_NAME} + CFBundlePackageType + APPL + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1.0 + LSRequiresIPhoneOS + + UIMainStoryboardFile + Main_iPhone + UIMainStoryboardFile~ipad + Main_iPad + UIRequiredDeviceCapabilities + + armv7 + + UIStatusBarTintParameters + + UINavigationBar + + Style + UIBarStyleDefault + Translucent + + + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + + diff --git a/rudict/rudict-ios/rudict-ios-Prefix.pch b/rudict/rudict-ios/rudict-ios-Prefix.pch new file mode 100644 index 0000000..82a2bb4 --- /dev/null +++ b/rudict/rudict-ios/rudict-ios-Prefix.pch @@ -0,0 +1,16 @@ +// +// Prefix header +// +// The contents of this file are implicitly included at the beginning of every source file. +// + +#import + +#ifndef __IPHONE_5_0 +#warning "This project uses features only available in iOS SDK 5.0 and later." +#endif + +#ifdef __OBJC__ + #import + #import +#endif diff --git a/rudict/rudict-iosTests/en.lproj/InfoPlist.strings b/rudict/rudict-iosTests/en.lproj/InfoPlist.strings new file mode 100644 index 0000000..477b28f --- /dev/null +++ b/rudict/rudict-iosTests/en.lproj/InfoPlist.strings @@ -0,0 +1,2 @@ +/* Localized versions of Info.plist keys */ + diff --git a/rudict/rudict-iosTests/rudict-iosTests-Info.plist b/rudict/rudict-iosTests/rudict-iosTests-Info.plist new file mode 100644 index 0000000..11811ee --- /dev/null +++ b/rudict/rudict-iosTests/rudict-iosTests-Info.plist @@ -0,0 +1,22 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + ${EXECUTABLE_NAME} + CFBundleIdentifier + fishrungames.${PRODUCT_NAME:rfc1034identifier} + CFBundleInfoDictionaryVersion + 6.0 + CFBundlePackageType + BNDL + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1 + + diff --git a/rudict/rudict-iosTests/rudict_iosTests.m b/rudict/rudict-iosTests/rudict_iosTests.m new file mode 100644 index 0000000..59b5aff --- /dev/null +++ b/rudict/rudict-iosTests/rudict_iosTests.m @@ -0,0 +1,34 @@ +// +// rudict_iosTests.m +// rudict-iosTests +// +// Created by Admin on 14.12.14. +// Copyright (c) 2014 Vladislav. All rights reserved. +// + +#import + +@interface rudict_iosTests : XCTestCase + +@end + +@implementation rudict_iosTests + +- (void)setUp +{ + [super setUp]; + // Put setup code here. This method is called before the invocation of each test method in the class. +} + +- (void)tearDown +{ + // Put teardown code here. This method is called after the invocation of each test method in the class. + [super tearDown]; +} + +- (void)testExample +{ + XCTFail(@"No implementation for \"%s\"", __PRETTY_FUNCTION__); +} + +@end