friday commit

This commit is contained in:
Bilal
2024-10-04 21:02:53 +05:30
parent 17b634e132
commit 6628061420
7 changed files with 39 additions and 15 deletions

View File

@@ -2895,7 +2895,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = WOKA/WOKA.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 4;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 4S9A74ZB6H;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -2939,7 +2939,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = WOKA/WOKA.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = 4S9A74ZB6H;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
GENERATE_INFOPLIST_FILE = YES;

View File

@@ -128,7 +128,7 @@ class AuthFunc{
}
/*
Logout PopUP Handling
Func to handle guest to do normal login
*/
func guestUserLoginPopUp() -> Bool{
if AuthFunc.shareInstance.getUserType() == 3{

View File

@@ -10,6 +10,7 @@ import Foundation
// enum to check envirnments
enum EnvironmentCheck{
case staging
case development
case production
}
@@ -20,6 +21,7 @@ struct APIEndPoints {
struct BaseURL {
static let staging = "https://wokaland.com/secret-panel-10102023/hidden-admin-portal-20092023/api/"
static let development = "https://wokanative.betadelivery.com/api/"
static let production = ""
static let appUrl = "https://apps.apple.com/in/app/woka/id6465305185"
@@ -170,7 +172,7 @@ struct APIEndPoints {
// Helper method to get base URL based on current environment
private static func baseURLForCurrentEnvironment() -> URL? {
// Determine environment (e.g., staging, production) and return appropriate base URL
return URL(string: BaseURL.staging)
// Determine environment (e.g., staging, production, development) and return appropriate base URL
return URL(string: BaseURL.development)
}
}

View File

@@ -51,8 +51,6 @@ class ShopCategoryVM{
vc.view.applyGradient(colors: [color2, color1], startPoint: CGPoint(x: 0, y: 0), endPoint: CGPoint(x: 0.8, y: 0))
}
// MARK: - Get SuperCategory
func getCategory(){

View File

@@ -6,6 +6,7 @@
//
import UIKit
import Alamofire
class SideMenuVC: UIViewController {
@@ -95,7 +96,17 @@ class SideMenuVC: UIViewController {
@IBAction func logoutBtnTapped(_ sender: LocalisedElementsButton) {
PersistentStorage.shared.addOthersCount()
let reachability = NetworkReachabilityManager()
/*
do a network check
*/
if reachability?.isReachable == false{
self.toast(msg: K.ConstantString.noInternet, time: 2)
return
}
vm.deleteDataCount = 0
// if its guest user navigate him to login
if AuthFunc.shareInstance.getUserType() == 3{
self.sideMenuController?.hideMenu()

View File

@@ -12,7 +12,8 @@ class SideMenuVM{
weak var vc : SideMenuVC!
var syncTimer : Timer?
var deleteDataCount = 0
func initView(){
/*
@@ -201,6 +202,16 @@ class SideMenuVM{
UIApplication.setRootView(LoginNavVC.instantiate(from: .AuthenticationSB))
}
}else{
//directly logout if 4 attempts are made.
if self.deleteDataCount == 4{
logoutUser { isDone in
self.vc.sideMenuController?.hideMenu()
AuthFunc.shareInstance.logout()
UIApplication.setRootView(LoginNavVC.instantiate(from: .AuthenticationSB))
}
return
}
self.deleteDataCount += 1
startSyncTimer()
}
}

View File

@@ -67,13 +67,15 @@ class ThemeOneVM{
// Set initial small scale in viewDidLoad
self.vc.allIconView.transform = CGAffineTransform(scaleX: 0.5, y: 0.5) // Set initial scale to 50% of original size
DispatchQueue.main.async {
// Perform the animation after the view has been laid out
UIView.animate(withDuration: 0.7, delay: 0, options: [], animations: {
self.vc.allIconView.transform = CGAffineTransform.identity // Reset the transform to original size
}, completion: {_ in
})
}
// Perform the animation after the view has been laid out
UIView.animate(withDuration: 0.7, delay: 0, options: [], animations: {
self.vc.allIconView.transform = CGAffineTransform.identity // Reset the transform to original size
}, completion: {_ in
})
// DispatchQueue.main.async {
//
// }
if let adsData = AuthFunc.shareInstance.adsData{
// check if ads data contains ad for webseries