Move language files to user module

* Rewrite the files LanguageContext, LanguageProvider, LanguageProviderAppDefined, LanguageProviderDevice in Swift
* They live in the User module

Author: nan-li

iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/project.pbxproj

@@ -1,7 +1,7 @@
 /**
  * Modified MIT License
  *
- * Copyright 2021 OneSignal
+ * Copyright 2023 OneSignal
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -24,18 +24,24 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#import "LanguageProviderAppDefined.h"
-#import "OneSignalHelper.h"
-#import "LanguageContext.h"
 
-@implementation LanguageProviderAppDefined
+import Foundation
+import OneSignalCore
 
-- (void)setLanguage:(NSString *)language {
-    [OneSignalUserDefaults.initStandard saveStringForKey:OSUD_LANGUAGE withValue:language];
-}
+public class LanguageContext {
+    var strategy: LanguageProvider
 
-- (NSString *)language {
-    return [OneSignalUserDefaults.initStandard getSavedStringForKey:OSUD_LANGUAGE defaultValue:DEFAULT_LANGUAGE];
-}
+    var language: String {
+        return strategy.language
+    }
 
-@end
+    init() {
+        let languageAppDefined = OneSignalUserDefaults.initShared().getSavedString(forKey: OSUD_LANGUAGE, defaultValue: nil)
+
+        if languageAppDefined == nil {
+            strategy = LanguageProviderDevice()
+        } else {
+            strategy = LanguageProviderAppDefined()
+        }
+    }
+}

iOS_SDK/OneSignalSDK/Source/LanguageProviderAppDefined.m renamed to iOS_SDK/OneSignalSDK/OneSignalUser/Source/Language/LanguageContext.swift

@@ -1,7 +1,7 @@
 /**
  * Modified MIT License
  *
- * Copyright 2021 OneSignal
+ * Copyright 2023 OneSignal
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,8 +25,8 @@
  * THE SOFTWARE.
  */
 
-@protocol LanguageProvider <NSObject>
+import Foundation
 
-@property (readonly, nonnull)NSString* language;
-
-@end
+protocol LanguageProvider {
+    var language: String { get }
+}

iOS_SDK/OneSignalSDK/Source/LanguageProvider.h renamed to iOS_SDK/OneSignalSDK/OneSignalUser/Source/Language/LanguageProvider.swift

@@ -1,7 +1,7 @@
 /**
  * Modified MIT License
  *
- * Copyright 2021 OneSignal
+ * Copyright 2023 OneSignal
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,17 +25,17 @@
  * THE SOFTWARE.
  */
 
-#import "LanguageProviderDevice.h"
-#import "OneSignalHelper.h"
-#import "LanguageContext.h"
+import Foundation
+import OneSignalCore
 
-@implementation LanguageProviderDevice
+class LanguageProviderAppDefined: LanguageProvider {
+    var language: String {
+        get {
+            return OneSignalUserDefaults.initShared().getSavedString(forKey: OSUD_LANGUAGE, defaultValue: DEFAULT_LANGUAGE) ?? DEFAULT_LANGUAGE
+        }
 
-- (NSString *)language {
-    let preferredLanguages = [NSLocale preferredLanguages];
-    if (preferredLanguages && preferredLanguages.count > 0)
-        return [preferredLanguages objectAtIndex:0];
-    return DEFAULT_LANGUAGE;
+        set {
+            OneSignalUserDefaults.initShared().saveString(forKey: OSUD_LANGUAGE, withValue: newValue)
+        }
+    }
 }
-
-@end

iOS_SDK/OneSignalSDK/Source/LanguageProviderDevice.m renamed to iOS_SDK/OneSignalSDK/OneSignalUser/Source/Language/LanguageProviderAppDefined.swift

@@ -1,7 +1,7 @@
 /**
  * Modified MIT License
  *
- * Copyright 2021 OneSignal
+ * Copyright 2023 OneSignal
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,17 +25,18 @@
  * THE SOFTWARE.
  */
 
-#import <Foundation/Foundation.h>
-#import "LanguageProvider.h"
+import Foundation
+import OneSignalCore
 
-NS_ASSUME_NONNULL_BEGIN
+class LanguageProviderDevice: LanguageProvider {
+    var language: String {
+        get {
+            let preferredLanguages = NSLocale.preferredLanguages
 
-@interface LanguageContext : NSObject
-
-- (void)setStrategy:(NSObject<LanguageProvider>*)strategy;
-
-@property (nonatomic, nonnull)NSString* language;
-
-@end
-
-NS_ASSUME_NONNULL_END
+            if !preferredLanguages.isEmpty {
+                return preferredLanguages[0]
+            }
+            return DEFAULT_LANGUAGE
+        }
+    }
+}