Merge pull request #17 from SimformSolutionsPvtLtd/development

Development
SimformSolutionsPvtLtd · Jan 9, 2025 · 286fbbf · 286fbbf
2 parents f39cd7f + 5bb2eee
commit 286fbbf
Show file tree

Hide file tree

Showing 23 changed files with 99 additions and 98 deletions.
diff --git a/Example/en.lproj/Localizable.strings b/Example/en.lproj/Localizable.strings
@@ -6,5 +6,5 @@
 
 */
 
-"ok" = "Ok";
+"Ok" = "Ok";
 "cancel" = "Cancel";
diff --git a/SSDateTimePicker.podspec b/SSDateTimePicker.podspec
@@ -13,6 +13,7 @@ Pod::Spec.new do |spec|
   spec.platform     = :ios, "15.0"
   spec.source       = { :git => "https://github.com/SimformSolutionsPvtLtd/SSDateTimePicker.git", :tag => spec.version.to_s }
   spec.source_files  = "Sources", "Sources/SSDateTimePicker/SSDateTimePicker/**/*.{swift, xcassets}"
+  spec.resources    = "Sources/SSDateTimePicker/**/*.{xcassets,storyboard,xib,plist,json,strings,lproj}"
   spec.swift_versions = "5.9"
 
 end
diff --git a/Sources/SSDateTimePicker/SSDateTimePicker.xcodeproj/project.pbxproj b/Sources/SSDateTimePicker/SSDateTimePicker.xcodeproj/project.pbxproj
diff --git a/...TimePicker/Common/CornerRadiusStyle.swift → ...mePicker/Common/SSCornerRadiusStyle.swift b/...TimePicker/Common/CornerRadiusStyle.swift → ...mePicker/Common/SSCornerRadiusStyle.swift
@@ -8,7 +8,7 @@
 import Foundation
 import SwiftUI
 
-struct CornerRadiusStyle: ViewModifier {
+struct SSCornerRadiusStyle: ViewModifier {
 
     // MARK: - Properties
 
@@ -19,12 +19,12 @@ struct CornerRadiusStyle: ViewModifier {
 
     func body(content: Content) -> some View {
         content
-            .clipShape(CornerRadiusShape(radius: radius, corners: corners))
+            .clipShape(SSCornerRadiusShape(radius: radius, corners: corners))
     }
 
 }
 
-struct CornerRadiusShape: Shape {
+struct SSCornerRadiusShape: Shape {
 
     //MARK: - Property
 

diff --git a/...DateTimePicker/Common/ImageConstant.swift → ...teTimePicker/Common/SSImageConstant.swift b/...DateTimePicker/Common/ImageConstant.swift → ...teTimePicker/Common/SSImageConstant.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 
-struct ImageConstant {
+struct SSImageConstant {
 
     static let chevronRight = "chevron.right"
     static let chevronLeft = "chevron.left"

diff --git a/...teTimePicker/Common/LocalizedString.swift → ...TimePicker/Common/SSLocalizedString.swift b/...teTimePicker/Common/LocalizedString.swift → ...TimePicker/Common/SSLocalizedString.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 
-class LocalizedString {
+class SSLocalizedString {
 
     static let ok = "Ok".localized()
     static let cancel = "Cancel".localized()

diff --git a/...icker/SSDateTimePicker/Common/Utils.swift → ...ker/SSDateTimePicker/Common/SSUtils.swift b/...icker/SSDateTimePicker/Common/Utils.swift → ...ker/SSDateTimePicker/Common/SSUtils.swift
@@ -1,5 +1,5 @@
 //
-//  Utils.swift
+//  SSUtils.swift
 //  SSDateTimePicker
 //
 //  Created by Rizwana Desai on 18/12/23.

diff --git a/...icker/Extensions/Calendar+Extension.swift → ...ker/Extensions/SSCalendar+Extension.swift b/...icker/Extensions/Calendar+Extension.swift → ...ker/Extensions/SSCalendar+Extension.swift
diff --git a/...mePicker/Extensions/Color+Extension.swift → ...Picker/Extensions/SSColor+Extension.swift b/...mePicker/Extensions/Color+Extension.swift → ...Picker/Extensions/SSColor+Extension.swift
diff --git a/...imePicker/Extensions/Date+Extension.swift → ...ePicker/Extensions/SSDate+Extension.swift b/...imePicker/Extensions/Date+Extension.swift → ...ePicker/Extensions/SSDate+Extension.swift
diff --git a/...Extensions/DateComponents+Extension.swift → ...tensions/SSDateComponents+Extension.swift b/...Extensions/DateComponents+Extension.swift → ...tensions/SSDateComponents+Extension.swift
diff --git a/.../Extensions/DateFormatter+Extension.swift → ...xtensions/SSDateFormatter+Extension.swift b/.../Extensions/DateFormatter+Extension.swift → ...xtensions/SSDateFormatter+Extension.swift
diff --git a/...TimePicker/Extensions/Int+Extension.swift → ...mePicker/Extensions/SSInt+Extension.swift b/...TimePicker/Extensions/Int+Extension.swift → ...mePicker/Extensions/SSInt+Extension.swift
diff --git a/...ePicker/Extensions/String+Extension.swift → ...icker/Extensions/SSString+Extension.swift b/...ePicker/Extensions/String+Extension.swift → ...icker/Extensions/SSString+Extension.swift
diff --git a/...imePicker/Extensions/View+Extension.swift → ...ePicker/Extensions/SSView+Extension.swift b/...imePicker/Extensions/View+Extension.swift → ...ePicker/Extensions/SSView+Extension.swift
@@ -38,7 +38,7 @@ extension View {
     ///
     /// - Returns: A modified version of the view with the specified corner radius applied.
     func cornerRadius(_ radius: CGFloat, corners: UIRectCorner) -> some View {
-        ModifiedContent(content: self, modifier: CornerRadiusStyle(radius: radius, corners: corners))
+        ModifiedContent(content: self, modifier: SSCornerRadiusStyle(radius: radius, corners: corners))
     }
 
     /// Applies a theme-specific button style to the view using a custom modifier.
@@ -54,7 +54,7 @@ extension View {
     ///
     /// - Returns: A modified version of the view with the specified text color and font for a themed button.
     func themeButton(_ txtColor: Color, _ font: Font) -> some View {
-        self.modifier(ThemeButtonModifier(textColor: txtColor, font: font))
+        self.modifier(SSThemeButtonModifier(textColor: txtColor, font: font))
     }
 
 }
diff --git a/Sources/SSDateTimePicker/SSDateTimePicker/Views/Date picker/SSDatePicker.swift b/Sources/SSDateTimePicker/SSDateTimePicker/Views/Date picker/SSDatePicker.swift
@@ -66,9 +66,9 @@ public struct SSDatePicker: View, DatePickerConfigurationDirectAccess {
             case .date:
                 dateSectionView
             case .month:
-                MonthSelectionView()
+                SSMonthSelectionView()
             case .year:
-                YearSelectionView(currentView: $currentView)
+                SSYearSelectionView(currentView: $currentView)
             }
         }
     }
@@ -101,7 +101,7 @@ public struct SSDatePicker: View, DatePickerConfigurationDirectAccess {
 
     private var lblSelectedDate: some View {
         VStack(alignment: .leading, spacing: SSPickerConstants.verticleSpacingTen) {
-            Text(LocalizedString.selectDate)
+            Text(SSLocalizedString.selectDate)
                 .font(headerTitleFont)
                 .foregroundColor(headerTitleColor)
             Text(datePickerManager.selectedDate?.formatedString(headerDateFormat) ?? datePickerManager.currentMonth.monthYear)
@@ -125,7 +125,7 @@ public struct SSDatePicker: View, DatePickerConfigurationDirectAccess {
     private var datesView: some View {
         VStack(spacing: SSPickerConstants.verticleSpacingDates) {
             ForEach(weeks, id: \.self) { week in
-                WeekDatesView(week: week)
+                SSWeekDatesView(week: week)
             }
         }
     }
@@ -172,15 +172,15 @@ public struct SSDatePicker: View, DatePickerConfigurationDirectAccess {
         Button {
             self.datePickerManager.actionPrev(for: currentView)
         } label: {
-            self.imageNextPrev(ImageConstant.chevronLeft)
+            self.imageNextPrev(SSImageConstant.chevronLeft)
         }
     }
 
     private var btnNext: some View {
         Button {
             self.datePickerManager.actionNext(for: currentView)
         } label: {
-            self.imageNextPrev(ImageConstant.chevronRight)
+            self.imageNextPrev(SSImageConstant.chevronRight)
         }
     }
 
@@ -204,7 +204,7 @@ public struct SSDatePicker: View, DatePickerConfigurationDirectAccess {
                 self.actionCancel()
             }
         } label: {
-            Text(LocalizedString.cancel)
+            Text(SSLocalizedString.cancel)
                 .themeButton(buttonsForegroundColor, buttonsFont)
         }
     }
@@ -215,7 +215,7 @@ public struct SSDatePicker: View, DatePickerConfigurationDirectAccess {
                 self.actionOk()
             }
         } label: {
-            Text(LocalizedString.ok)
+            Text(SSLocalizedString.ok)
                 .themeButton(buttonsForegroundColor, buttonsFont)
         }
     }

diff --git a/...mePicker/Views/Date picker/DateView.swift → ...Picker/Views/Date picker/SSDateView.swift b/...mePicker/Views/Date picker/DateView.swift → ...Picker/Views/Date picker/SSDateView.swift
@@ -7,7 +7,7 @@
 
 import SwiftUI
 
-struct DateView: View, DatePickerConfigurationDirectAccess {
+struct SSDateView: View, DatePickerConfigurationDirectAccess {
 
     // MARK: - Properties
 

diff --git a/...iews/Date picker/MonthSelectionView.swift → ...ws/Date picker/SSMonthSelectionView.swift b/...iews/Date picker/MonthSelectionView.swift → ...ws/Date picker/SSMonthSelectionView.swift
@@ -7,7 +7,7 @@
 
 import SwiftUI
 
-struct MonthSelectionView: View, DatePickerConfigurationDirectAccess {
+struct SSMonthSelectionView: View, DatePickerConfigurationDirectAccess {
 
     // MARK: - Properties
 

diff --git a/...ker/Views/Date picker/WeekDatesView.swift → ...r/Views/Date picker/SSWeekDatesView.swift b/...ker/Views/Date picker/WeekDatesView.swift → ...r/Views/Date picker/SSWeekDatesView.swift
@@ -7,7 +7,7 @@
 
 import SwiftUI
 
-struct WeekDatesView: View, DatePickerConfigurationDirectAccess {
+struct SSWeekDatesView: View, DatePickerConfigurationDirectAccess {
 
     // MARK: - Properties
 
@@ -43,7 +43,7 @@ struct WeekDatesView: View, DatePickerConfigurationDirectAccess {
     private var datesForWeek: some View {
         HStack(spacing: SSPickerConstants.horizontalSpacingDates) {
             ForEach(dates, id: \.self) { date in
-                DateView(date: date, weekDateInSelectedMonth: week)
+                SSDateView(date: date, weekDateInSelectedMonth: week)
             }
         }
     }

diff --git a/...Views/Date picker/YearSelectionView.swift → ...ews/Date picker/SSYearSelectionView.swift b/...Views/Date picker/YearSelectionView.swift → ...ews/Date picker/SSYearSelectionView.swift
@@ -7,7 +7,7 @@
 
 import SwiftUI
 
-public struct YearSelectionView: View, DatePickerConfigurationDirectAccess {
+public struct SSYearSelectionView: View, DatePickerConfigurationDirectAccess {
 
     // MARK: - Properties
 

diff --git a/.../SSDateTimePicker/Views/ThemeButton.swift → ...SDateTimePicker/Views/SSThemeButton.swift b/.../SSDateTimePicker/Views/ThemeButton.swift → ...SDateTimePicker/Views/SSThemeButton.swift
@@ -7,7 +7,7 @@
 
 import SwiftUI
 
-struct ThemeButtonModifier: ViewModifier {
+struct SSThemeButtonModifier: ViewModifier {
 
     var textColor: Color
     var font: Font

diff --git a/Sources/SSDateTimePicker/SSDateTimePicker/Views/Time Picker/SSTimePicker.swift b/Sources/SSDateTimePicker/SSDateTimePicker/Views/Time Picker/SSTimePicker.swift
@@ -74,7 +74,7 @@ public struct SSTimePicker: View, TimePickerConfigurationDirectAccess {
 
     private var lblSelectedDate: some View {
         VStack(alignment: .leading, spacing: SSPickerConstants.verticleSpacingTen) {
-            Text(LocalizedString.selectTime)
+            Text(SSLocalizedString.selectTime)
                 .font(headerTitleFont)
                 .foregroundColor(headerTitleColor)
             textFieldHourMinutes
@@ -103,7 +103,7 @@ public struct SSTimePicker: View, TimePickerConfigurationDirectAccess {
             ToolbarItem(placement: .keyboard) {
                 HStack {
                     Spacer()
-                    Button(LocalizedString.done) {
+                    Button(SSLocalizedString.done) {
                         actionDone()
                     }
                 }
@@ -124,7 +124,7 @@ public struct SSTimePicker: View, TimePickerConfigurationDirectAccess {
                 timePickerManager.selectedTimeFromat = .am
             }
         } label: {
-            labelTimeFormat(LocalizedString.am, isSelected: timePickerManager.selectedTimeFromat == .am)
+            labelTimeFormat(SSLocalizedString.am, isSelected: timePickerManager.selectedTimeFromat == .am)
         }
     }
 
@@ -134,7 +134,7 @@ public struct SSTimePicker: View, TimePickerConfigurationDirectAccess {
                 timePickerManager.selectedTimeFromat = .pm
             }
         } label: {
-            labelTimeFormat(LocalizedString.pm, isSelected: timePickerManager.selectedTimeFromat == .pm)
+            labelTimeFormat(SSLocalizedString.pm, isSelected: timePickerManager.selectedTimeFromat == .pm)
         }
     }
 
@@ -152,7 +152,7 @@ public struct SSTimePicker: View, TimePickerConfigurationDirectAccess {
                 self.actionCancel()
             }
         } label: {
-            Text(LocalizedString.cancel)
+            Text(SSLocalizedString.cancel)
                 .themeButton(buttonsForegroundColor, buttonFont)
         }
     }
@@ -163,7 +163,7 @@ public struct SSTimePicker: View, TimePickerConfigurationDirectAccess {
                 self.actionOk()
             }
         } label: {
-            Text(LocalizedString.ok)
+            Text(SSLocalizedString.ok)
                 .themeButton(buttonsForegroundColor, buttonFont)
         }
     }

diff --git a/Sources/SSDateTimePicker/SSDateTimePicker/Views/Time Picker/SSTimeTextField.swift b/Sources/SSDateTimePicker/SSDateTimePicker/Views/Time Picker/SSTimeTextField.swift
@@ -50,7 +50,7 @@ struct SSTimeTextField: View, TimePickerConfigurationDirectAccess {
     }
 
     private var txtField: some View {
-        TextField(isHourField ? LocalizedString.hour : LocalizedString.minute, text: $time)
+        TextField(isHourField ? SSLocalizedString.hour : SSLocalizedString.minute, text: $time)
             .focused($isFocused)
             .keyboardType(.numberPad)
             .multilineTextAlignment(.center)