diff --git a/android/app/build.gradle b/android/app/build.gradle index 3aed7458..c70f8fd1 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -101,8 +101,8 @@ android { applicationId "com.studysmart" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 7 - versionName "1.0.1" + versionCode 8 + versionName "2.0.0" } signingConfigs { release { diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index a7ee49f3..68dad4a3 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -6,8 +6,8 @@ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png old mode 100644 new mode 100755 index a2f59082..8239502c Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png old mode 100644 new mode 100755 index 1b523998..58d2e676 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/logo.png b/android/app/src/main/res/mipmap-hdpi/logo.png deleted file mode 100755 index 32fac752..00000000 Binary files a/android/app/src/main/res/mipmap-hdpi/logo.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png old mode 100644 new mode 100755 index ff10afd6..6600e57d Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png old mode 100644 new mode 100755 index 115a4c76..c238f18f Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/logo.png b/android/app/src/main/res/mipmap-mdpi/logo.png deleted file mode 100755 index 32fac752..00000000 Binary files a/android/app/src/main/res/mipmap-mdpi/logo.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png old mode 100644 new mode 100755 index dcd3cd80..e14704f0 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png old mode 100644 new mode 100755 index 459ca609..37f73c3b Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/logo.png b/android/app/src/main/res/mipmap-xhdpi/logo.png deleted file mode 100755 index 32fac752..00000000 Binary files a/android/app/src/main/res/mipmap-xhdpi/logo.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png old mode 100644 new mode 100755 index 8ca12fe0..7477af46 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png old mode 100644 new mode 100755 index 8e19b410..65c85066 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/logo.png b/android/app/src/main/res/mipmap-xxhdpi/logo.png deleted file mode 100755 index 32fac752..00000000 Binary files a/android/app/src/main/res/mipmap-xxhdpi/logo.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png old mode 100644 new mode 100755 index b824ebdd..5a2ca413 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png old mode 100644 new mode 100755 index 4c19a13c..3a616ab1 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/logo.png b/android/app/src/main/res/mipmap-xxxhdpi/logo.png deleted file mode 100755 index 32fac752..00000000 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/logo.png and /dev/null differ diff --git a/ios/SS.xcodeproj/project.pbxproj b/ios/SS.xcodeproj/project.pbxproj index 284316cb..80de0648 100644 --- a/ios/SS.xcodeproj/project.pbxproj +++ b/ios/SS.xcodeproj/project.pbxproj @@ -5,6 +5,7 @@ }; objectVersion = 46; objects = { + /* Begin PBXBuildFile section */ 00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; }; 00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */; }; @@ -48,11 +49,10 @@ 76238572C2B7443BACF4071F /* Octicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = D163C66979F844828EA04F40 /* Octicons.ttf */; }; 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; }; 85EB134AED7F3165F1BF2327 /* libPods-SSTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CDDD21820DA70457783C8FCB /* libPods-SSTests.a */; }; + 8BB164C34CCF47E3BF34F286 /* Fontisto.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E9B8642727384C3FB4C4F166 /* Fontisto.ttf */; }; 94E93235CA1B43F7A3C4B871 /* Feather.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 9443FBF30EC049768F0FB4AD /* Feather.ttf */; }; A71A733433087B1B2F42517E /* libPods-SS-tvOSTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 478953D25871C5A32D571849 /* libPods-SS-tvOSTests.a */; }; ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */; }; - ED297163215061F000B7C4FE /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED297162215061F000B7C4FE /* JavaScriptCore.framework */; }; - ED2971652150620600B7C4FE /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED2971642150620600B7C4FE /* JavaScriptCore.framework */; }; B1B1239D41174BEEBE6F184C /* FontAwesome5_Brands.ttf in Resources */ = {isa = PBXBuildFile; fileRef = D1ADAF7261E54C8BB26A746F /* FontAwesome5_Brands.ttf */; }; B476E2158C224D49B7E748A0 /* SimpleLineIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 3C16C3EEF4E04F6DAEDB701B /* SimpleLineIcons.ttf */; }; BAFA96F3CC224B7FBB6241F1 /* MaterialIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 01E5926B0EA64B26AA13FF7A /* MaterialIcons.ttf */; }; @@ -63,7 +63,6 @@ ED2971652150620600B7C4FE /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED2971642150620600B7C4FE /* JavaScriptCore.framework */; }; F1AA57A4F2144C5DA7312166 /* Entypo.ttf in Resources */ = {isa = PBXBuildFile; fileRef = A6180C7CF2AB4C83BC56D090 /* Entypo.ttf */; }; F873B8C4AE754A58928CD508 /* FontAwesome5_Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 0A5A5DA81CE841208DEAEFDA /* FontAwesome5_Regular.ttf */; }; - 8BB164C34CCF47E3BF34F286 /* Fontisto.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E9B8642727384C3FB4C4F166 /* Fontisto.ttf */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -428,10 +427,10 @@ D1ADAF7261E54C8BB26A746F /* FontAwesome5_Brands.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome5_Brands.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Brands.ttf"; sourceTree = ""; }; E0679F4F975B4015B0CF11AB /* MaterialCommunityIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = MaterialCommunityIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/MaterialCommunityIcons.ttf"; sourceTree = ""; }; E31D1ED3B84D4EF4B910951D /* AntDesign.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = AntDesign.ttf; path = "../node_modules/react-native-vector-icons/Fonts/AntDesign.ttf"; sourceTree = ""; }; + E9B8642727384C3FB4C4F166 /* Fontisto.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Fontisto.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Fontisto.ttf"; sourceTree = ""; }; ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; ED2971642150620600B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS12.0.sdk/System/Library/Frameworks/JavaScriptCore.framework; sourceTree = DEVELOPER_DIR; }; FDB5A298E87D4AA3826BCDFC /* libRNGoogleSignin.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNGoogleSignin.a; sourceTree = ""; }; - E9B8642727384C3FB4C4F166 /* Fontisto.ttf */ = {isa = PBXFileReference; name = "Fontisto.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Fontisto.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -1551,7 +1550,7 @@ baseConfigurationReference = 13432559BD6E813A1BD6B8C9 /* Pods-SS.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CURRENT_PROJECT_VERSION = 4; + CURRENT_PROJECT_VERSION = 7; DEAD_CODE_STRIPPING = NO; DEVELOPMENT_TEAM = TLUY6DGT96; HEADER_SEARCH_PATHS = ( @@ -1563,7 +1562,7 @@ INFOPLIST_FILE = SS/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 1.1; + MARKETING_VERSION = 2.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -1581,7 +1580,7 @@ baseConfigurationReference = 5DC5D8492A230477C4228901 /* Pods-SS.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CURRENT_PROJECT_VERSION = 4; + CURRENT_PROJECT_VERSION = 7; DEVELOPMENT_TEAM = TLUY6DGT96; HEADER_SEARCH_PATHS = ( "$(inherited)", @@ -1592,7 +1591,7 @@ INFOPLIST_FILE = SS/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 1.1; + MARKETING_VERSION = 2.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", diff --git a/ios/SS/Images.xcassets/AppIcon.appiconset/studyb shadow 120-1.png b/ios/SS/Images.xcassets/AppIcon.appiconset/studyb shadow 120-1.png index d42167e5..49eab9f7 100644 Binary files a/ios/SS/Images.xcassets/AppIcon.appiconset/studyb shadow 120-1.png and b/ios/SS/Images.xcassets/AppIcon.appiconset/studyb shadow 120-1.png differ diff --git a/ios/SS/Images.xcassets/AppIcon.appiconset/studyb shadow 120.png b/ios/SS/Images.xcassets/AppIcon.appiconset/studyb shadow 120.png index d42167e5..49eab9f7 100644 Binary files a/ios/SS/Images.xcassets/AppIcon.appiconset/studyb shadow 120.png and b/ios/SS/Images.xcassets/AppIcon.appiconset/studyb shadow 120.png differ diff --git a/ios/SS/Images.xcassets/AppIcon.appiconset/studyb shadow 180.png b/ios/SS/Images.xcassets/AppIcon.appiconset/studyb shadow 180.png index 194e3bea..251c2295 100644 Binary files a/ios/SS/Images.xcassets/AppIcon.appiconset/studyb shadow 180.png and b/ios/SS/Images.xcassets/AppIcon.appiconset/studyb shadow 180.png differ diff --git a/ios/SS/Images.xcassets/AppIcon.appiconset/studyb shadow 40.png b/ios/SS/Images.xcassets/AppIcon.appiconset/studyb shadow 40.png index 19354368..149574d2 100644 Binary files a/ios/SS/Images.xcassets/AppIcon.appiconset/studyb shadow 40.png and b/ios/SS/Images.xcassets/AppIcon.appiconset/studyb shadow 40.png differ diff --git a/ios/SS/Images.xcassets/AppIcon.appiconset/studyb shadow 58.png b/ios/SS/Images.xcassets/AppIcon.appiconset/studyb shadow 58.png index 46966603..65dc032f 100644 Binary files a/ios/SS/Images.xcassets/AppIcon.appiconset/studyb shadow 58.png and b/ios/SS/Images.xcassets/AppIcon.appiconset/studyb shadow 58.png differ diff --git a/ios/SS/Images.xcassets/AppIcon.appiconset/studyb shadow 60png.png b/ios/SS/Images.xcassets/AppIcon.appiconset/studyb shadow 60png.png index 4425c14a..a68f4013 100644 Binary files a/ios/SS/Images.xcassets/AppIcon.appiconset/studyb shadow 60png.png and b/ios/SS/Images.xcassets/AppIcon.appiconset/studyb shadow 60png.png differ diff --git a/ios/SS/Images.xcassets/AppIcon.appiconset/studyb shadow 80.png b/ios/SS/Images.xcassets/AppIcon.appiconset/studyb shadow 80.png index 4966d410..fec41da0 100644 Binary files a/ios/SS/Images.xcassets/AppIcon.appiconset/studyb shadow 80.png and b/ios/SS/Images.xcassets/AppIcon.appiconset/studyb shadow 80.png differ diff --git a/ios/SS/Images.xcassets/AppIcon.appiconset/studyb shadow 87.png b/ios/SS/Images.xcassets/AppIcon.appiconset/studyb shadow 87.png index 9cb1c382..c5cd7538 100644 Binary files a/ios/SS/Images.xcassets/AppIcon.appiconset/studyb shadow 87.png and b/ios/SS/Images.xcassets/AppIcon.appiconset/studyb shadow 87.png differ diff --git a/ios/SS/Images.xcassets/AppIcon.appiconset/studyb shadow.png b/ios/SS/Images.xcassets/AppIcon.appiconset/studyb shadow.png index 9e0a0cb7..ed7d0d81 100644 Binary files a/ios/SS/Images.xcassets/AppIcon.appiconset/studyb shadow.png and b/ios/SS/Images.xcassets/AppIcon.appiconset/studyb shadow.png differ diff --git a/ios/SS/Images.xcassets/Logo.imageset/Contents.json b/ios/SS/Images.xcassets/Logo.imageset/Contents.json index ca1997d3..1a690f57 100644 --- a/ios/SS/Images.xcassets/Logo.imageset/Contents.json +++ b/ios/SS/Images.xcassets/Logo.imageset/Contents.json @@ -2,17 +2,17 @@ "images" : [ { "idiom" : "universal", - "filename" : "studyb logo.png", + "filename" : "studyb logo white.png", "scale" : "1x" }, { "idiom" : "universal", - "filename" : "studyb logo@2x.png", + "filename" : "studyb logo white@2x.png", "scale" : "2x" }, { "idiom" : "universal", - "filename" : "studyb logo@3x.png", + "filename" : "studyb logo white@3x.png", "scale" : "3x" } ], diff --git a/ios/SS/Images.xcassets/Logo.imageset/studyb logo white.png b/ios/SS/Images.xcassets/Logo.imageset/studyb logo white.png new file mode 100644 index 00000000..af95f0d0 Binary files /dev/null and b/ios/SS/Images.xcassets/Logo.imageset/studyb logo white.png differ diff --git a/ios/SS/Images.xcassets/Logo.imageset/studyb logo white@2x.png b/ios/SS/Images.xcassets/Logo.imageset/studyb logo white@2x.png new file mode 100644 index 00000000..b5f9fdac Binary files /dev/null and b/ios/SS/Images.xcassets/Logo.imageset/studyb logo white@2x.png differ diff --git a/ios/SS/Images.xcassets/Logo.imageset/studyb logo white@3x.png b/ios/SS/Images.xcassets/Logo.imageset/studyb logo white@3x.png new file mode 100644 index 00000000..a73b401e Binary files /dev/null and b/ios/SS/Images.xcassets/Logo.imageset/studyb logo white@3x.png differ diff --git a/ios/SS/Images.xcassets/Logo.imageset/studyb logo.png b/ios/SS/Images.xcassets/Logo.imageset/studyb logo.png deleted file mode 100644 index 32fac752..00000000 Binary files a/ios/SS/Images.xcassets/Logo.imageset/studyb logo.png and /dev/null differ diff --git a/ios/SS/Images.xcassets/Logo.imageset/studyb logo@2x.png b/ios/SS/Images.xcassets/Logo.imageset/studyb logo@2x.png deleted file mode 100644 index 3a165f73..00000000 Binary files a/ios/SS/Images.xcassets/Logo.imageset/studyb logo@2x.png and /dev/null differ diff --git a/ios/SS/Images.xcassets/Logo.imageset/studyb logo@3x.png b/ios/SS/Images.xcassets/Logo.imageset/studyb logo@3x.png deleted file mode 100644 index c328308f..00000000 Binary files a/ios/SS/Images.xcassets/Logo.imageset/studyb logo@3x.png and /dev/null differ