Skip to content

Commit

Permalink
updated for 2024 && bug fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@yusufusta
yusufusta committed Mar 13, 2024
1 parent 23dbb4c commit b0aa086
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 18 deletions.
Binary file added .DS_Store
View file
Binary file not shown.
14 changes: 8 additions & 6 deletions iftarvakti.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,11 +278,12 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = iftarvakti/iftarvakti.entitlements;
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_ASSET_PATHS = "\"iftarvakti/Preview Content\"";
DEVELOPMENT_TEAM = D9W8FTBJLT;
DEVELOPMENT_TEAM = 9BHDCG64CC;
ENABLE_HARDENED_RUNTIME = YES;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
Expand All @@ -295,7 +296,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 13.0;
MARKETING_VERSION = 3.0;
MARKETING_VERSION = 3.5;
PRODUCT_BUNDLE_IDENTIFIER = com.yusufusta.iftarvakti;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES;
Expand All @@ -309,11 +310,12 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = iftarvakti/iftarvakti.entitlements;
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_ASSET_PATHS = "\"iftarvakti/Preview Content\"";
DEVELOPMENT_TEAM = D9W8FTBJLT;
DEVELOPMENT_TEAM = 9BHDCG64CC;
ENABLE_HARDENED_RUNTIME = YES;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
Expand All @@ -326,7 +328,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 13.0;
MARKETING_VERSION = 3.0;
MARKETING_VERSION = 3.5;
PRODUCT_BUNDLE_IDENTIFIER = com.yusufusta.iftarvakti;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES;
Expand Down
21 changes: 16 additions & 5 deletions iftarvakti/Api.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,20 +46,31 @@ class Api {
}

func getVakitlerAsync(ilceId : String) async -> Vakitler? {
print("ilce",ilceId)
let url = URL(string: "https://ezanvakti.herokuapp.com/vakitler/\(ilceId)")!
let urlSession = URLSession.shared

let cache = URLCache(memoryCapacity: 20 * 1024 * 1024, diskCapacity: 100 * 1024 * 1024, diskPath: "vakitlerCache")
let configuration = URLSessionConfiguration.default
configuration.urlCache = cache
configuration.requestCachePolicy = .returnCacheDataElseLoad

let urlSession = URLSession(configuration: configuration)
var users : Vakitler

do {
let (data, _) = try await urlSession.data(from: url)
users = try! JSONDecoder().decode(Vakitler.self, from: data)
let (data, response) = try await urlSession.data(from: url)

// Önbellekten yüklenip yüklenmediğini kontrol et
if let httpResponse = response as? HTTPURLResponse, let cachedResponse = urlSession.configuration.urlCache?.cachedResponse(for: URLRequest(url: url)) {
}

users = try JSONDecoder().decode(Vakitler.self, from: data)
}
catch {
print("Error loading \(url): \(String(describing: error))")
print("Error loading \(url): \(error)")
return nil
}

return users
}

}
23 changes: 16 additions & 7 deletions iftarvakti/MenuAppViewModel.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,12 @@ class MenuAppViewModel : ObservableObject {

var time : Int = 100;

init() {
self.run()
}

func run() -> Void {
print("run started")
api.getIller() {
(ils) in
self.iller = ils
Expand All @@ -44,19 +49,18 @@ class MenuAppViewModel : ObservableObject {
let geriKalanZaman = self.getTodayAksamVakit(vakitler: self.vakitler!);
var geriKalanZaman2 = self.getTodayImsakVakit(vakitler: self.vakitler!);

if (geriKalanZaman == -1 || geriKalanZaman2 == -1) {
exit(1)
}

let topBarStyle = UserDefaults.standard.string(forKey: "topBarStyle") ?? "saatKisa"
let selectedIlStr = UserDefaults.standard.string(forKey: "selectedIlStr")
let selectedIlceStr = UserDefaults.standard.string(forKey: "selectedIlceStr")

var kalanSure = Int((geriKalanZaman! - Date().timeIntervalSince1970))
var kalanSure2 = Int((geriKalanZaman2! - Date().timeIntervalSince1970))

if kalanSure2 < -10 {
geriKalanZaman2 = self.getTodayImsakVakit(vakitler: self.vakitler!, another_day:true);
kalanSure2 = Int((geriKalanZaman2! - Date().timeIntervalSince1970))
}

if (kalanSure2 > kalanSure && (kalanSure < 1 && kalanSure > -60)) {

if (kalanSure > 0 && (kalanSure < kalanSure2 || kalanSure2 < 0)) {
self.vakitTur = 0;

if (kalanSure < 1 && kalanSure > -60) {
Expand All @@ -70,6 +74,11 @@ class MenuAppViewModel : ObservableObject {
}
} else {
self.vakitTur = 1;
if kalanSure2 < 0 {
geriKalanZaman2 = self.getTodayImsakVakit(vakitler: self.vakitler!, another_day:true);
kalanSure2 = Int((geriKalanZaman2! - Date().timeIntervalSince1970))
}

kalanSure = kalanSure2

if (kalanSure < 1 && kalanSure > -60) {
Expand Down

0 comments on commit b0aa086

Please sign in to comment.