Move utils, set version to 1.4-demo

alllexey · alllexey · commit 3d80b7507728 · 2025-09-29T17:45:20.000+03:00
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -12,7 +12,7 @@ android {
         minSdk = 26
         targetSdk = 36
         versionCode = 1
-        versionName = "1.3.1"
+        versionName = "1.4-demo"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/app/src/main/java/me/alllexey123/itmowidgets/AppContainer.kt b/app/src/main/java/me/alllexey123/itmowidgets/AppContainer.kt
@@ -10,7 +10,7 @@ import me.alllexey123.itmowidgets.data.remote.QrCodeRemoteDataSourceImpl
 import me.alllexey123.itmowidgets.data.remote.ScheduleRemoteDataSourceImpl
 import me.alllexey123.itmowidgets.data.repository.QrCodeRepository
 import me.alllexey123.itmowidgets.data.repository.ScheduleRepository
-import me.alllexey123.itmowidgets.util.PreferencesStorage
+import me.alllexey123.itmowidgets.data.PreferencesStorage
 import me.alllexey123.itmowidgets.util.QrBitmapRenderer
 import me.alllexey123.itmowidgets.util.QrCodeGenerator
 import java.io.File
diff --git a/app/src/main/java/me/alllexey123/itmowidgets/data/PreferencesStorage.kt b/app/src/main/java/me/alllexey123/itmowidgets/data/PreferencesStorage.kt
@@ -1,4 +1,4 @@
-package me.alllexey123.itmowidgets.util
+package me.alllexey123.itmowidgets.data
 
 import android.content.SharedPreferences
 import api.myitmo.storage.Storage
diff --git a/app/src/main/java/me/alllexey123/itmowidgets/ui/settings/SettingsFragment.kt b/app/src/main/java/me/alllexey123/itmowidgets/ui/settings/SettingsFragment.kt
@@ -13,19 +13,19 @@ import androidx.preference.SwitchPreference
 import me.alllexey123.itmowidgets.AppContainer
 import me.alllexey123.itmowidgets.ItmoWidgetsApp
 import me.alllexey123.itmowidgets.R
-import me.alllexey123.itmowidgets.util.ACCESS_TOKEN_EXPIRES_KEY
-import me.alllexey123.itmowidgets.util.ACCESS_TOKEN_KEY
-import me.alllexey123.itmowidgets.util.BEFOREHAND_SCHEDULING_KEY
-import me.alllexey123.itmowidgets.util.DYNAMIC_QR_COLORS_KEY
-import me.alllexey123.itmowidgets.util.HIDE_PREVIOUS_LESSONS_KEY
-import me.alllexey123.itmowidgets.util.HIDE_TEACHER_KEY
-import me.alllexey123.itmowidgets.util.ID_TOKEN_KEY
-import me.alllexey123.itmowidgets.util.LAST_UPDATE_TIMESTAMP_KEY
-import me.alllexey123.itmowidgets.util.LESSON_WIDGET_STYLE_CHANGED_KEY
-import me.alllexey123.itmowidgets.util.REFRESH_TOKEN_EXPIRES_KEY
-import me.alllexey123.itmowidgets.util.REFRESH_TOKEN_KEY
-import me.alllexey123.itmowidgets.util.SMART_SCHEDULING_KEY
-import me.alllexey123.itmowidgets.util.WidgetUtils
+import me.alllexey123.itmowidgets.data.ACCESS_TOKEN_EXPIRES_KEY
+import me.alllexey123.itmowidgets.data.ACCESS_TOKEN_KEY
+import me.alllexey123.itmowidgets.data.BEFOREHAND_SCHEDULING_KEY
+import me.alllexey123.itmowidgets.data.DYNAMIC_QR_COLORS_KEY
+import me.alllexey123.itmowidgets.data.HIDE_PREVIOUS_LESSONS_KEY
+import me.alllexey123.itmowidgets.data.HIDE_TEACHER_KEY
+import me.alllexey123.itmowidgets.data.ID_TOKEN_KEY
+import me.alllexey123.itmowidgets.data.LAST_UPDATE_TIMESTAMP_KEY
+import me.alllexey123.itmowidgets.data.LESSON_WIDGET_STYLE_CHANGED_KEY
+import me.alllexey123.itmowidgets.data.REFRESH_TOKEN_EXPIRES_KEY
+import me.alllexey123.itmowidgets.data.REFRESH_TOKEN_KEY
+import me.alllexey123.itmowidgets.data.SMART_SCHEDULING_KEY
+import me.alllexey123.itmowidgets.ui.widgets.WidgetUtils
 import java.lang.Thread.sleep
 import java.text.SimpleDateFormat
 import java.util.Date
diff --git a/app/src/main/java/me/alllexey123/itmowidgets/ui/widgets/WidgetUtils.kt b/app/src/main/java/me/alllexey123/itmowidgets/ui/widgets/WidgetUtils.kt
@@ -1,4 +1,4 @@
-package me.alllexey123.itmowidgets.util
+package me.alllexey123.itmowidgets.ui.widgets
 
 import android.content.Context
 import me.alllexey123.itmowidgets.workers.LessonWidgetUpdateWorker
diff --git a/app/src/main/java/me/alllexey123/itmowidgets/ui/widgets/data/LessonWidgetDataManager.kt b/app/src/main/java/me/alllexey123/itmowidgets/ui/widgets/data/LessonWidgetDataManager.kt
@@ -3,8 +3,8 @@ package me.alllexey123.itmowidgets.ui.widgets.data
 import api.myitmo.model.Lesson
 import me.alllexey123.itmowidgets.R
 import me.alllexey123.itmowidgets.data.repository.ScheduleRepository
-import me.alllexey123.itmowidgets.util.LINE_STYLE
-import me.alllexey123.itmowidgets.util.PreferencesStorage
+import me.alllexey123.itmowidgets.data.LINE_STYLE
+import me.alllexey123.itmowidgets.data.PreferencesStorage
 import me.alllexey123.itmowidgets.util.ScheduleUtils
 import java.time.LocalDate
 import java.time.LocalDateTime

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ android {`
`12`	`12`	`minSdk = 26`
`13`	`13`	`targetSdk = 36`
`14`	`14`	`versionCode = 1`
`15`		`- versionName = "1.3.1"`
	`15`	`+ versionName = "1.4-demo"`
`16`	`16`
`17`	`17`	`testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package me.alllexey123.itmowidgets.util`
	`1`	`+package me.alllexey123.itmowidgets.data`
`2`	`2`
`3`	`3`	`import android.content.SharedPreferences`
`4`	`4`	`import api.myitmo.storage.Storage`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package me.alllexey123.itmowidgets.util`
	`1`	`+package me.alllexey123.itmowidgets.ui.widgets`
`2`	`2`
`3`	`3`	`import android.content.Context`
`4`	`4`	`import me.alllexey123.itmowidgets.workers.LessonWidgetUpdateWorker`