fixed sizes in smaller devices

gustavo-munhoz · May 15, 2024 · 1ded598 · 1ded598
1 parent ad366be
commit 1ded598
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 57 deletions.
diff --git a/mini1.xcodeproj/project.pbxproj b/mini1.xcodeproj/project.pbxproj
@@ -376,7 +376,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_ASSET_PATHS = "\"mini1/Preview Content\"";
 				DEVELOPMENT_TEAM = 7U55BCTM6U;
 				ENABLE_PREVIEWS = YES;
@@ -394,7 +394,7 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = br.com.zhorse.mini1;
+				PRODUCT_BUNDLE_IDENTIFIER = dev.mnhz.dareu;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -413,7 +413,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_ASSET_PATHS = "\"mini1/Preview Content\"";
 				DEVELOPMENT_TEAM = 7U55BCTM6U;
 				ENABLE_PREVIEWS = YES;
@@ -431,7 +431,7 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = br.com.zhorse.mini1;
+				PRODUCT_BUNDLE_IDENTIFIER = dev.mnhz.dareu;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";

diff --git a/mini1/Assets.xcassets/AppIcon.appiconset/Contents.json b/mini1/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "icon.png",
+      "filename" : "icon.jpg",
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"

diff --git a/mini1/Assets.xcassets/AppIcon.appiconset/icon.jpg b/mini1/Assets.xcassets/AppIcon.appiconset/icon.jpg
diff --git a/mini1/Assets.xcassets/AppIcon.appiconset/icon.png b/mini1/Assets.xcassets/AppIcon.appiconset/icon.png
diff --git a/mini1/View/AddChallengeView.swift b/mini1/View/AddChallengeView.swift
@@ -34,6 +34,7 @@ struct AddChallengeView2: View {
                     .font(.system(size: 34))
                     .fontDesign(.monospaced)
                     .fontWeight(.bold)
+                    .minimumScaleFactor(0.5)
 
                 VStack(alignment: .leading) {
                     HStack {
@@ -49,6 +50,7 @@ struct AddChallengeView2: View {
                             .font(.system(size: 17))
                             .padding(.leading, 16)
                     }
+                    .minimumScaleFactor(0.5)
 
                     HStack {
                         Text("Categoria")
@@ -68,6 +70,7 @@ struct AddChallengeView2: View {
                             }
                         }
                     }
+                    .minimumScaleFactor(0.5)
                 }
 
 //                .onChange(of: focusedField, perform: { newValue in

diff --git a/mini1/View/ContentView.swift b/mini1/View/ContentView.swift
@@ -460,7 +460,7 @@ struct ContentView: View {
                     setChangeDaySubscription()
                 }
 
-                .padding(.horizontal, 24)
+                .padding(.all, 24)
             }
             .navigationBarBackButtonHidden()
         }

diff --git a/mini1/View/OnboardingView.swift b/mini1/View/OnboardingView.swift
@@ -32,6 +32,9 @@ struct OnboardingView: View {
             .frame(maxWidth: .infinity)
 
             Image("LogoOnboarding3")
+                .resizable()
+                .frame(idealWidth: UIScreen.main.bounds.width, minHeight: 160)
+                .aspectRatio(contentMode: .fit)
                 .padding(.top, 10)
 
 
@@ -69,7 +72,9 @@ struct OnboardingView: View {
                 .frame(height: 44)
                 .padding(.leading, 16)
                 .overlay(RoundedRectangle(cornerRadius: 8).stroke(Color("AppGray02")))
-                .padding(.bottom, 94)
+
+            Spacer()
+                .frame(maxHeight: .infinity)
 
             NavigationLink(destination:
                 OnboardingView2(userData: userData) {
@@ -105,8 +110,8 @@ struct OnboardingView: View {
             }
 
         }
-        .padding(.horizontal, 24)
-        .frame(maxHeight: .infinity, alignment: .top)
+        .padding([.horizontal, .bottom], 32)
+        .frame(height: UIScreen.main.bounds.height, alignment: .top)
         .background(Color("AppGray03"))
         .navigationBarBackButtonHidden()
     }

diff --git a/mini1/View/OnboardingView3.swift b/mini1/View/OnboardingView3.swift
@@ -32,8 +32,13 @@ struct OnboardingView3: View {
             .frame(maxWidth: .infinity)
 
             Image("Logo")
+                .resizable()
+                .scaledToFit()
+                .frame(minHeight: 200)
                 .padding(.top, 10)
-
+
+            Spacer()
+                .frame(minHeight: 20)
 
             Text("Bem-vindo")
                 .fontDesign(.monospaced)
@@ -42,10 +47,6 @@ struct OnboardingView3: View {
                 .foregroundColor(Color("AppBlack"))
                 .frame(maxWidth: .infinity, alignment: .leading)
 
-//            Text("Compartilhe desafios com os seus amigos!")
-//                .fixedSize(horizontal: false, vertical: true)
-//                .frame(maxWidth: .infinity, alignment: .leading)
-//                .padding(.bottom, 14)
             HStack{
 
                 Circle()
@@ -74,6 +75,7 @@ struct OnboardingView3: View {
                     }
                 }
             }
+            .minimumScaleFactor(0.5)
 
             HStack{
 
@@ -107,6 +109,7 @@ struct OnboardingView3: View {
                     .foregroundColor(Color("AppBlack"))
                 }
             }
+            .minimumScaleFactor(0.5)
 
             HStack{
 
@@ -136,52 +139,13 @@ struct OnboardingView3: View {
                     }
                 }
             }
+            .minimumScaleFactor(0.5)
 
-//            TextField("Nome", text: $userData.player1Name)
-//                .font(.system(size: 17))
-//                .frame(height: 44)
-//                .padding(.leading, 16)
-//                .overlay(RoundedRectangle(cornerRadius: 8).stroke(Color("AppGray02")))
-//                .padding(.bottom, 10)
-//
-//            Text("Quem você vai desafiar?")
-//                .font(.system(.footnote, weight: .regular))
-//                .foregroundColor(Color("AppGray02"))
-//                .frame(maxWidth: .infinity, alignment: .leading)
-//
-//            TextField("Desafiante", text: $userData.player2Name)
-//                .font(.system(size: 17))
-//                .frame(height: 44)
-//                .padding(.leading, 14)
-//                .overlay(RoundedRectangle(cornerRadius: 8).stroke(Color("AppGray02")))
-//                .padding(.bottom, 46)
-
-            HStack {
-                Rectangle()
-                    .frame(height: 60)
-                    .foregroundColor(.clear)
-//                    .padding(.bottom, 126)
-            }
+            Spacer()
+                .frame(minHeight: 20)
 
             NavigationLink(destination:
                 OnboardingView(userData: userData)) {
-//                HStack {
-//                    Text("pular")
-//                        .foregroundColor(Color("AppBlack"))
-//                        .font(.callout)
-//                }
-//                .frame(maxWidth: .infinity)
-//                .frame(height: 50)
-//                .background(Color("AppGray03"))
-//                .cornerRadius(10)
-//                .overlay(RoundedRectangle(cornerRadius: 10)
-//                    .strokeBorder(Color("AppPink"), lineWidth: 1))
-//                .padding(.bottom, 2)
-//            }
-//
-//            NavigationLink(destination: OnboardingView2(userData: userData) {
-//                userData.didShowOnboarding = true
-//            }) {
                 HStack {
                     Text("próximo")
                         .foregroundColor(.white)
@@ -195,7 +159,7 @@ struct OnboardingView3: View {
             }
 
         }
-        .padding(.horizontal, 24)
+        .padding([.horizontal, .bottom], 24)
         .frame(maxHeight: .infinity, alignment: .top)
         .background(Color("AppGray03"))
     }