diff --git a/Natives/Assets.xcassets/AppIcon-Black.appiconset/Contents.json b/Natives/Assets.xcassets/AppIcon-Black.appiconset/Contents.json new file mode 100644 index 00000000..9221b9bb --- /dev/null +++ b/Natives/Assets.xcassets/AppIcon-Black.appiconset/Contents.json @@ -0,0 +1,98 @@ +{ + "images" : [ + { + "idiom" : "iphone", + "scale" : "2x", + "size" : "20x20" + }, + { + "idiom" : "iphone", + "scale" : "3x", + "size" : "20x20" + }, + { + "idiom" : "iphone", + "scale" : "2x", + "size" : "29x29" + }, + { + "idiom" : "iphone", + "scale" : "3x", + "size" : "29x29" + }, + { + "idiom" : "iphone", + "scale" : "2x", + "size" : "40x40" + }, + { + "idiom" : "iphone", + "scale" : "3x", + "size" : "40x40" + }, + { + "idiom" : "iphone", + "scale" : "2x", + "size" : "60x60" + }, + { + "idiom" : "iphone", + "scale" : "3x", + "size" : "60x60" + }, + { + "idiom" : "ipad", + "scale" : "1x", + "size" : "20x20" + }, + { + "idiom" : "ipad", + "scale" : "2x", + "size" : "20x20" + }, + { + "idiom" : "ipad", + "scale" : "1x", + "size" : "29x29" + }, + { + "idiom" : "ipad", + "scale" : "2x", + "size" : "29x29" + }, + { + "idiom" : "ipad", + "scale" : "1x", + "size" : "40x40" + }, + { + "idiom" : "ipad", + "scale" : "2x", + "size" : "40x40" + }, + { + "idiom" : "ipad", + "scale" : "1x", + "size" : "76x76" + }, + { + "idiom" : "ipad", + "scale" : "2x", + "size" : "76x76" + }, + { + "idiom" : "ipad", + "scale" : "2x", + "size" : "83.5x83.5" + }, + { + "idiom" : "ios-marketing", + "scale" : "1x", + "size" : "1024x1024" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon1024x1024.png b/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon1024x1024.png deleted file mode 100644 index c5d57138..00000000 Binary files a/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon1024x1024.png and /dev/null differ diff --git a/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon20x20@2x~ipad.png b/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon20x20@2x~ipad.png deleted file mode 100644 index 56a3c7a1..00000000 Binary files a/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon20x20@2x~ipad.png and /dev/null differ diff --git a/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon20x20@2x~iphone.png b/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon20x20@2x~iphone.png deleted file mode 100644 index 56a3c7a1..00000000 Binary files a/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon20x20@2x~iphone.png and /dev/null differ diff --git a/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon20x20@3x~iphone.png b/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon20x20@3x~iphone.png deleted file mode 100644 index 8fa1e078..00000000 Binary files a/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon20x20@3x~iphone.png and /dev/null differ diff --git a/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon20x20~ipad.png b/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon20x20~ipad.png deleted file mode 100644 index 83c3dd74..00000000 Binary files a/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon20x20~ipad.png and /dev/null differ diff --git a/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon29x29@2x~ipad.png b/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon29x29@2x~ipad.png deleted file mode 100644 index 4e19fe60..00000000 Binary files a/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon29x29@2x~ipad.png and /dev/null differ diff --git a/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon29x29@2x~iphone.png b/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon29x29@2x~iphone.png deleted file mode 100644 index 4e19fe60..00000000 Binary files a/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon29x29@2x~iphone.png and /dev/null differ diff --git a/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon29x29@3x~iphone.png b/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon29x29@3x~iphone.png deleted file mode 100644 index d027ba65..00000000 Binary files a/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon29x29@3x~iphone.png and /dev/null differ diff --git a/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon29x29~ipad.png b/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon29x29~ipad.png deleted file mode 100644 index 8f5ec747..00000000 Binary files a/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon29x29~ipad.png and /dev/null differ diff --git a/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon40x40@2x~ipad.png b/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon40x40@2x~ipad.png deleted file mode 100644 index aba403e0..00000000 Binary files a/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon40x40@2x~ipad.png and /dev/null differ diff --git a/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon40x40@2x~iphone.png b/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon40x40@2x~iphone.png deleted file mode 100644 index aba403e0..00000000 Binary files a/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon40x40@2x~iphone.png and /dev/null differ diff --git a/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon40x40@3x~iphone.png b/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon40x40@3x~iphone.png deleted file mode 100644 index 8107730d..00000000 Binary files a/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon40x40@3x~iphone.png and /dev/null differ diff --git a/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon40x40~ipad.png b/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon40x40~ipad.png deleted file mode 100644 index 56a3c7a1..00000000 Binary files a/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon40x40~ipad.png and /dev/null differ diff --git a/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon60x60@2x~iphone.png b/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon60x60@2x~iphone.png deleted file mode 100644 index 8107730d..00000000 Binary files a/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon60x60@2x~iphone.png and /dev/null differ diff --git a/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon60x60@3x~iphone.png b/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon60x60@3x~iphone.png deleted file mode 100644 index 04f1ecd6..00000000 Binary files a/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon60x60@3x~iphone.png and /dev/null differ diff --git a/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon76x76@2x~ipad.png b/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon76x76@2x~ipad.png deleted file mode 100644 index 8704c7ed..00000000 Binary files a/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon76x76@2x~ipad.png and /dev/null differ diff --git a/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon76x76~ipad.png b/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon76x76~ipad.png deleted file mode 100644 index eee9a36a..00000000 Binary files a/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon76x76~ipad.png and /dev/null differ diff --git a/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon83x83@2x~ipad.png b/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon83x83@2x~ipad.png deleted file mode 100644 index bd219127..00000000 Binary files a/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon83x83@2x~ipad.png and /dev/null differ diff --git a/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon_1024x1024.png b/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon_1024x1024.png new file mode 100644 index 00000000..3b70cefc Binary files /dev/null and b/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon_1024x1024.png differ diff --git a/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon_20x20.png b/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon_20x20.png new file mode 100644 index 00000000..f840120e Binary files /dev/null and b/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon_20x20.png differ diff --git a/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon_20x20@2x.png b/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon_20x20@2x.png new file mode 100644 index 00000000..987180ae Binary files /dev/null and b/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon_20x20@2x.png differ diff --git a/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon_20x20@3x.png b/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon_20x20@3x.png new file mode 100644 index 00000000..4e159184 Binary files /dev/null and b/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon_20x20@3x.png differ diff --git a/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon_29x29.png b/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon_29x29.png new file mode 100644 index 00000000..c2330f37 Binary files /dev/null and b/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon_29x29.png differ diff --git a/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon_29x29@2x.png b/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon_29x29@2x.png new file mode 100644 index 00000000..57918e7d Binary files /dev/null and b/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon_29x29@2x.png differ diff --git a/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon_29x29@3x.png b/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon_29x29@3x.png new file mode 100644 index 00000000..2d5f5bdc Binary files /dev/null and b/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon_29x29@3x.png differ diff --git a/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon_40x40.png b/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon_40x40.png new file mode 100644 index 00000000..987180ae Binary files /dev/null and b/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon_40x40.png differ diff --git a/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon_40x40@2x.png b/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon_40x40@2x.png new file mode 100644 index 00000000..5583bff8 Binary files /dev/null and b/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon_40x40@2x.png differ diff --git a/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon_40x40@3x.png b/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon_40x40@3x.png new file mode 100644 index 00000000..0260a341 Binary files /dev/null and b/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon_40x40@3x.png differ diff --git a/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon_60x60@2x.png b/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon_60x60@2x.png new file mode 100644 index 00000000..0260a341 Binary files /dev/null and b/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon_60x60@2x.png differ diff --git a/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon_60x60@3x.png b/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon_60x60@3x.png new file mode 100644 index 00000000..2c01ed21 Binary files /dev/null and b/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon_60x60@3x.png differ diff --git a/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon_76x76.png b/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon_76x76.png new file mode 100644 index 00000000..37727bc9 Binary files /dev/null and b/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon_76x76.png differ diff --git a/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon_76x76@2x.png b/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon_76x76@2x.png new file mode 100644 index 00000000..d38f16e9 Binary files /dev/null and b/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon_76x76@2x.png differ diff --git a/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon_83x83@2x.png b/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon_83x83@2x.png new file mode 100644 index 00000000..3b895078 Binary files /dev/null and b/Natives/Assets.xcassets/AppIcon.appiconset/AppIcon_83x83@2x.png differ diff --git a/Natives/Assets.xcassets/AppIcon.appiconset/Contents.json b/Natives/Assets.xcassets/AppIcon.appiconset/Contents.json index a153b142..b9cae6b7 100644 --- a/Natives/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/Natives/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,109 +1,109 @@ { "images" : [ { - "filename" : "AppIcon20x20@2x~iphone.png", + "filename" : "AppIcon_20x20@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "20x20" }, { - "filename" : "AppIcon20x20@3x~iphone.png", + "filename" : "AppIcon_20x20@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "20x20" }, { - "filename" : "AppIcon29x29@2x~iphone.png", + "filename" : "AppIcon_29x29@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "29x29" }, { - "filename" : "AppIcon29x29@3x~iphone.png", + "filename" : "AppIcon_29x29@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "29x29" }, { - "filename" : "AppIcon40x40@2x~iphone.png", + "filename" : "AppIcon_40x40@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "40x40" }, { - "filename" : "AppIcon40x40@3x~iphone.png", + "filename" : "AppIcon_40x40@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "40x40" }, { - "filename" : "AppIcon60x60@2x~iphone.png", + "filename" : "AppIcon_60x60@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "60x60" }, { - "filename" : "AppIcon60x60@3x~iphone.png", + "filename" : "AppIcon_60x60@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "60x60" }, { - "filename" : "AppIcon20x20~ipad.png", + "filename" : "AppIcon_20x20.png", "idiom" : "ipad", "scale" : "1x", "size" : "20x20" }, { - "filename" : "AppIcon20x20@2x~ipad.png", + "filename" : "AppIcon_40x40.png", "idiom" : "ipad", "scale" : "2x", "size" : "20x20" }, { - "filename" : "AppIcon29x29~ipad.png", + "filename" : "AppIcon_29x29.png", "idiom" : "ipad", "scale" : "1x", "size" : "29x29" }, { - "filename" : "AppIcon29x29@2x~ipad.png", + "filename" : "AppIcon_29x29@2x.png", "idiom" : "ipad", "scale" : "2x", "size" : "29x29" }, { - "filename" : "AppIcon40x40~ipad.png", + "filename" : "AppIcon_40x40.png", "idiom" : "ipad", "scale" : "1x", "size" : "40x40" }, { - "filename" : "AppIcon40x40@2x~ipad.png", + "filename" : "AppIcon_40x40@2x.png", "idiom" : "ipad", "scale" : "2x", "size" : "40x40" }, { - "filename" : "AppIcon76x76~ipad.png", + "filename" : "AppIcon_76x76.png", "idiom" : "ipad", "scale" : "1x", "size" : "76x76" }, { - "filename" : "AppIcon76x76@2x~ipad.png", + "filename" : "AppIcon_76x76@2x.png", "idiom" : "ipad", "scale" : "2x", "size" : "76x76" }, { - "filename" : "AppIcon83x83@2x~ipad.png", + "filename" : "AppIcon_83x83@2x.png", "idiom" : "ipad", "scale" : "2x", "size" : "83.5x83.5" }, { - "filename" : "AppIcon1024x1024.png", + "filename" : "AppIcon_1024x1024.png", "idiom" : "ios-marketing", "scale" : "1x", "size" : "1024x1024" diff --git a/Natives/Assets.xcassets/AppLogo.imageset/AppLogo_63x515.png b/Natives/Assets.xcassets/AppLogo.imageset/AppLogo_63x515.png new file mode 100644 index 00000000..128d204f Binary files /dev/null and b/Natives/Assets.xcassets/AppLogo.imageset/AppLogo_63x515.png differ diff --git a/Natives/Assets.xcassets/AppLogo.imageset/AppLogo_63x515@2x.png b/Natives/Assets.xcassets/AppLogo.imageset/AppLogo_63x515@2x.png new file mode 100644 index 00000000..7d5dfc57 Binary files /dev/null and b/Natives/Assets.xcassets/AppLogo.imageset/AppLogo_63x515@2x.png differ diff --git a/Natives/Assets.xcassets/AppLogo.imageset/AppLogo_63x515@3x.png b/Natives/Assets.xcassets/AppLogo.imageset/AppLogo_63x515@3x.png new file mode 100644 index 00000000..d008e900 Binary files /dev/null and b/Natives/Assets.xcassets/AppLogo.imageset/AppLogo_63x515@3x.png differ diff --git a/Natives/Assets.xcassets/LaunchScreen.imageset/Contents.json b/Natives/Assets.xcassets/AppLogo.imageset/Contents.json similarity index 67% rename from Natives/Assets.xcassets/LaunchScreen.imageset/Contents.json rename to Natives/Assets.xcassets/AppLogo.imageset/Contents.json index e4c1ab12..dec196d4 100644 --- a/Natives/Assets.xcassets/LaunchScreen.imageset/Contents.json +++ b/Natives/Assets.xcassets/AppLogo.imageset/Contents.json @@ -1,15 +1,17 @@ { "images" : [ { + "filename" : "AppLogo_63x515.png", "idiom" : "universal", "scale" : "1x" }, { + "filename" : "AppLogo_63x515@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "LaunchScreen1024x1024.png", + "filename" : "AppLogo_63x515@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Natives/Assets.xcassets/Contents.json b/Natives/Assets.xcassets/Contents.json index 73c00596..2aa0709e 100644 --- a/Natives/Assets.xcassets/Contents.json +++ b/Natives/Assets.xcassets/Contents.json @@ -2,5 +2,8 @@ "info" : { "author" : "xcode", "version" : 1 + }, + "properties" : { + "compression-type" : "lossless" } } diff --git a/Natives/Assets.xcassets/LaunchScreen.imageset/LaunchScreen1024x1024.png b/Natives/Assets.xcassets/LaunchScreen.imageset/LaunchScreen1024x1024.png deleted file mode 100644 index f49ca242..00000000 Binary files a/Natives/Assets.xcassets/LaunchScreen.imageset/LaunchScreen1024x1024.png and /dev/null differ diff --git a/Natives/LoginViewController.m b/Natives/LoginViewController.m index 69a9a873..15476957 100644 --- a/Natives/LoginViewController.m +++ b/Natives/LoginViewController.m @@ -98,20 +98,11 @@ void loginAccountInput(UINavigationController *controller, int type, const char* CGFloat widthSplit = width / 4.0; CGFloat widthSplit2 = width / 2.0; - UIImageView *logoView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"LaunchScreen"]]; - logoView.frame = CGRectMake((width / 4) - 50, 0, (width / 2) / 4, rawHeight); + UIImageView *logoView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"AppLogo"]]; + logoView.frame = CGRectMake(0, (rawHeight / 2) - 35, width, 70); [logoView setContentMode:UIViewContentModeScaleAspectFit]; [self.view addSubview:logoView]; - UILabel *logoWaterView = [[UILabel alloc] initWithFrame:CGRectMake(logoView.frame.origin.x + logoView.frame.size.width + 30, 0, width - ((width / 2) / 4), rawHeight)]; - logoWaterView.text = @"PojavLauncher"; - logoWaterView.lineBreakMode = NSLineBreakByWordWrapping; - logoWaterView.adjustsFontSizeToFitWidth = YES; - logoWaterView.numberOfLines = 1; - logoWaterView.minimumScaleFactor = 20./logoWaterView.font.pointSize; - [self.view addSubview:logoWaterView]; - [logoWaterView setFont:[UIFont boldSystemFontOfSize:(logoView.frame.size.width / 2.0)]]; - if(@available (iOS 14.0, *)) { diff --git a/Natives/en.lproj/LaunchScreen.storyboard b/Natives/en.lproj/LaunchScreen.storyboard index bf94a6d9..727c692f 100644 --- a/Natives/en.lproj/LaunchScreen.storyboard +++ b/Natives/en.lproj/LaunchScreen.storyboard @@ -1,8 +1,8 @@ - - + + - + @@ -28,10 +28,17 @@ - - - + + + + + + + + + + @@ -51,7 +58,7 @@ - + diff --git a/Natives/resources/Assets.car b/Natives/resources/Assets.car index 15e8cd8c..932b0406 100644 Binary files a/Natives/resources/Assets.car and b/Natives/resources/Assets.car differ