diff --git a/Natives/AboutLauncherViewController.m b/Natives/AboutLauncherViewController.m index 8af304f1..4f453d85 100644 --- a/Natives/AboutLauncherViewController.m +++ b/Natives/AboutLauncherViewController.m @@ -2,6 +2,8 @@ #include "utils.h" +#import + @interface AboutLauncherViewController () { } @@ -35,6 +37,20 @@ self.view.backgroundColor = [UIColor whiteColor]; } + struct utsname systemInfo; + uname(&systemInfo); + NSString* deviceModel = [NSString stringWithCString:systemInfo.machine + encoding:NSUTF8StringEncoding]; + NSString *currSysVer = [[UIDevice currentDevice] systemVersion]; + + UILabel *logoVerView = [[UILabel alloc] initWithFrame:CGRectMake(20, scrollView.frame.size.height - 5, width, 20)]; + logoVerView.text = [NSString stringWithFormat:@"version 1.3 (development) on %@ with iOS %@", deviceModel, currSysVer]; + logoVerView.lineBreakMode = NSLineBreakByWordWrapping; + logoVerView.numberOfLines = 1; + [logoVerView sizeToFit]; + [scrollView addSubview:logoVerView]; + [logoVerView setFont:[UIFont boldSystemFontOfSize:10]]; + UILabel *logoNoteView = [[UILabel alloc] initWithFrame:CGRectMake(20.0, 10.0, width - 40, 700)]; logoNoteView.text = @"Created by PojavLauncherTeam in 2021. We do not exist on TikTok. No one from the dev team makes TikTok videos.\n\nDuyKhanhTran - lead iOS port developer\nDoregon - UI/UX design\nSpecial thanks to Hayden Seay, for porting OpenJDK 16, making this possible, and hosting on Procursus."; logoNoteView.lineBreakMode = NSLineBreakByWordWrapping; @@ -55,7 +71,7 @@ safetyNoteView.numberOfLines = 0; [safetyNoteView sizeToFit]; [scrollView addSubview:safetyNoteView]; - + self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"Send your logs" style:UIBarButtonItemStyleDone target:self action:@selector(latestLogShare)]; scrollView.contentSize = CGSizeMake(scrollView.frame.size.width, scrollView.frame.size.height + 20); diff --git a/Natives/LoginViewController.m b/Natives/LoginViewController.m index 9e74e0c4..d5aaa707 100644 --- a/Natives/LoginViewController.m +++ b/Natives/LoginViewController.m @@ -12,8 +12,6 @@ #include "ios_uikit_bridge.h" #include "utils.h" -#import - #define TYPE_SELECTACC 0 #define TYPE_MICROSOFT 1 #define TYPE_MOJANG 2 @@ -81,12 +79,6 @@ void loginAccountInput(UINavigationController *controller, int type, const char* self.view.backgroundColor = [UIColor whiteColor]; } - struct utsname systemInfo; - uname(&systemInfo); - NSString* deviceModel = [NSString stringWithCString:systemInfo.machine - encoding:NSUTF8StringEncoding]; - NSString *currSysVer = [[UIDevice currentDevice] systemVersion]; - CGFloat widthSplit = width / 4.0; CGFloat widthSplit2 = width / 2.0; @@ -132,14 +124,6 @@ void loginAccountInput(UINavigationController *controller, int type, const char* [button_accounts setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; [button_accounts addTarget:self action:@selector(loginAccount:) forControlEvents:UIControlEventTouchUpInside]; [scrollView addSubview:button_accounts]; - - UILabel *logoVerView = [[UILabel alloc] initWithFrame:CGRectMake(20, button_faq.frame.origin.y - 25, width - 40, 15)]; - logoVerView.text = [NSString stringWithFormat:@"version 1.3 (development) on %@ with iOS %@", deviceModel, currSysVer]; - logoVerView.lineBreakMode = NSLineBreakByWordWrapping; - logoVerView.textAlignment = NSTextAlignmentCenter; - logoVerView.numberOfLines = 0; - [scrollView addSubview:logoVerView]; - [logoVerView setFont:[UIFont boldSystemFontOfSize:10]]; } - (void)traitCollectionDidChange:(UITraitCollection *)previousTraitCollection {