[Structure] Move fragments, activities and adapters to specific modules

app/src/main/AndroidManifest.xml

@@ -29,22 +29,22 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".messages.MessagesComposeActivity"
+            android:name="pl.szczodrzynski.edziennik.ui.modules.messages.MessagesComposeActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/messages_compose_title"
             android:theme="@style/AppTheme.Black" />
         <activity
-            android:name=".activities.FeedbackActivity"
+            android:name=".ui.modules.base.FeedbackActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:label="@string/app_name"
             android:theme="@style/AppTheme" />
         <activity
-            android:name=".login.LoginActivity"
+            android:name="pl.szczodrzynski.edziennik.ui.modules.login.LoginActivity"
             android:configChanges="orientation|screenSize"
             android:launchMode="singleTop"
             android:theme="@style/AppTheme.Light" />
         <activity
-            android:name=".intro.ChangelogIntroActivity"
+            android:name=".ui.modules.intro.ChangelogIntroActivity"
             android:configChanges="orientation|keyboardHidden"
             android:label="@string/app_name"
             android:theme="@style/Theme.Intro" />
@@ -57,7 +57,7 @@
              |_|    |_|_|  \___|_.__/ \__,_|___/\___/
         -->
         <activity
-            android:name=".activities.CrashActivity"
+            android:name=".ui.modules.base.CrashActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:process=":error_activity"
             android:theme="@style/DeadTheme" />
@@ -72,7 +72,7 @@
                                                                         |___/
         -->
         <activity
-            android:name=".activities.CrashGtfoActivity"
+            android:name=".ui.modules.base.CrashGtfoActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:theme="@style/DeadTheme" />
         <activity
@@ -103,7 +103,7 @@
             android:theme="@style/AppTheme.NoDisplay" />
 
         <activity
-            android:name=".activities.SettingsLicenseActivity"
+            android:name=".ui.modules.settings.SettingsLicenseActivity"
             android:configChanges="orientation|keyboardHidden"
             android:theme="@style/AppTheme" />
 
@@ -113,14 +113,14 @@
             android:theme="@style/Base.Theme.AppCompat" />
 
         <activity
-            android:name=".activities.WebPushConfigActivity"
+            android:name=".ui.modules.webpush.WebPushConfigActivity"
             android:configChanges="orientation|keyboardHidden"
             android:theme="@style/AppTheme.Dark" />
 
         <activity
-            android:name=".activities.CounterActivity"
+            android:name=".ui.modules.home.CounterActivity"
             android:theme="@style/AppTheme.Black" />
-        <activity android:name=".activities.QrScannerActivity" />
+        <activity android:name=".ui.modules.webpush.QrScannerActivity" />
 
         <provider
             android:name="androidx.core.content.FileProvider"
@@ -231,4 +231,4 @@
 
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
-</manifest>
+</manifest>

app/src/main/java/pl/szczodrzynski/edziennik/App.java

@@ -63,7 +63,7 @@ import me.leolin.shortcutbadger.ShortcutBadger;
 import okhttp3.ConnectionSpec;
 import okhttp3.OkHttpClient;
 import okhttp3.TlsVersion;
-import pl.szczodrzynski.edziennik.activities.CrashActivity;
+import pl.szczodrzynski.edziennik.ui.modules.base.CrashActivity;
 import pl.szczodrzynski.edziennik.api.Edziennik;
 import pl.szczodrzynski.edziennik.api.Iuczniowie;
 import pl.szczodrzynski.edziennik.api.Librus;
@@ -74,7 +74,7 @@ import pl.szczodrzynski.edziennik.datamodels.DebugLog;
 import pl.szczodrzynski.edziennik.datamodels.LoginStore;
 import pl.szczodrzynski.edziennik.datamodels.Profile;
 import pl.szczodrzynski.edziennik.datamodels.ProfileFull;
-import pl.szczodrzynski.edziennik.models.AppConfig;
+import pl.szczodrzynski.edziennik.utils.models.AppConfig;
 import pl.szczodrzynski.edziennik.network.NetworkUtils;
 import pl.szczodrzynski.edziennik.network.TLSSocketFactory;
 import pl.szczodrzynski.edziennik.receivers.JobsCreator;

app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt

@@ -48,15 +48,28 @@ import pl.szczodrzynski.edziennik.databinding.ActivitySzkolnyBinding
 import pl.szczodrzynski.edziennik.datamodels.LoginStore
 import pl.szczodrzynski.edziennik.datamodels.Profile
 import pl.szczodrzynski.edziennik.datamodels.ProfileFull
-import pl.szczodrzynski.edziennik.dialogs.ChangelogDialog
+import pl.szczodrzynski.edziennik.ui.dialogs.changelog.ChangelogDialog
-import pl.szczodrzynski.edziennik.fragments.*
+import pl.szczodrzynski.edziennik.ui.modules.homework.HomeworkFragment
-import pl.szczodrzynski.edziennik.homework.HomeworkFragment
+import pl.szczodrzynski.edziennik.ui.modules.login.LoginActivity
-import pl.szczodrzynski.edziennik.login.LoginActivity
+import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesDetailsFragment
-import pl.szczodrzynski.edziennik.messages.MessagesDetailsFragment
+import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesFragment
-import pl.szczodrzynski.edziennik.messages.MessagesFragment
+import pl.szczodrzynski.edziennik.utils.models.NavTarget
-import pl.szczodrzynski.edziennik.models.NavTarget
 import pl.szczodrzynski.edziennik.network.ServerRequest
 import pl.szczodrzynski.edziennik.sync.SyncJob
+import pl.szczodrzynski.edziennik.ui.modules.agenda.RegisterAgendaDefaultFragment
+import pl.szczodrzynski.edziennik.ui.modules.announcements.RegisterAnnouncementsFragment
+import pl.szczodrzynski.edziennik.ui.modules.attendance.RegisterAttendancesFragment
+import pl.szczodrzynski.edziennik.ui.modules.base.DebugFragment
+import pl.szczodrzynski.edziennik.ui.modules.base.FeedbackFragment
+import pl.szczodrzynski.edziennik.ui.modules.base.HelpFragment
+import pl.szczodrzynski.edziennik.ui.modules.grades.editor.GradesEditorFragment
+import pl.szczodrzynski.edziennik.ui.modules.grades.RegisterGradesFragment
+import pl.szczodrzynski.edziennik.ui.modules.home.HomeFragment
+import pl.szczodrzynski.edziennik.ui.modules.notices.RegisterNoticesFragment
+import pl.szczodrzynski.edziennik.ui.modules.notifications.RegisterNotificationsFragment
+import pl.szczodrzynski.edziennik.ui.modules.settings.ProfileManagerFragment
+import pl.szczodrzynski.edziennik.ui.modules.settings.SettingsNewFragment
+import pl.szczodrzynski.edziennik.ui.modules.timetable.RegisterTimetableFragment
 import pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoTouch
 import pl.szczodrzynski.edziennik.utils.Utils
 import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetPrimaryItem

app/src/main/java/pl/szczodrzynski/edziennik/Notifier.java

@@ -17,8 +17,8 @@ import java.util.Collections;
 import java.util.List;
 
 import pl.szczodrzynski.edziennik.datamodels.ProfileFull;
-import pl.szczodrzynski.edziennik.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Date;
-import pl.szczodrzynski.edziennik.models.Time;
+import pl.szczodrzynski.edziennik.utils.models.Time;
 import pl.szczodrzynski.edziennik.receivers.BootReceiver;
 import pl.szczodrzynski.edziennik.sync.SyncJob;
 import pl.szczodrzynski.edziennik.sync.SyncService;
@@ -221,7 +221,7 @@ public class Notifier {
          | . ` |/ _ \| __| |  _| |/ __/ _` | __| |/ _ \| '_ \
          | |\  | (_) | |_| | | | | (_| (_| | |_| | (_) | | | |
          |_| \_|\___/ \__|_|_| |_|\___\__,_|\__|_|\___/|_| |*/
-    public void add(pl.szczodrzynski.edziennik.models.Notification notification) {
+    public void add(pl.szczodrzynski.edziennik.utils.models.Notification notification) {
         app.appConfig.notifications.add(notification);
     }
 
@@ -235,8 +235,8 @@ public class Notifier {
         }
 
         int unreadCount = 0;
-        List<pl.szczodrzynski.edziennik.models.Notification> notificationList = new ArrayList<>();
+        List<pl.szczodrzynski.edziennik.utils.models.Notification> notificationList = new ArrayList<>();
-        for (pl.szczodrzynski.edziennik.models.Notification notification: app.appConfig.notifications) {
+        for (pl.szczodrzynski.edziennik.utils.models.Notification notification: app.appConfig.notifications) {
             if (!notification.notified) {
                 notification.seen = false;
                 notification.notified = true;
@@ -250,7 +250,7 @@ public class Notifier {
             }
         }
 
-        for (pl.szczodrzynski.edziennik.models.Notification notification: notificationList) {
+        for (pl.szczodrzynski.edziennik.utils.models.Notification notification: notificationList) {
             Intent intent = new Intent(app, MainActivity.class);
             notification.fillIntent(intent);
             PendingIntent pendingIntent = PendingIntent.getActivity(app, notification.id, intent, 0);
@@ -258,9 +258,9 @@ public class Notifier {
                     // title, text, type, date
                     .setContentTitle(notification.title)
                     .setContentText(notification.text)
-                    .setSubText(pl.szczodrzynski.edziennik.models.Notification.stringType(app, notification.type))
+                    .setSubText(pl.szczodrzynski.edziennik.utils.models.Notification.stringType(app, notification.type))
                     .setWhen(notification.addedDate)
-                    .setTicker(app.getString(R.string.notification_ticker_format, pl.szczodrzynski.edziennik.models.Notification.stringType(app, notification.type)))
+                    .setTicker(app.getString(R.string.notification_ticker_format, pl.szczodrzynski.edziennik.utils.models.Notification.stringType(app, notification.type)))
                     // icon, color, lights, priority
                     .setSmallIcon(R.drawable.ic_notification)
                     .setColor(notificationColor)
@@ -349,7 +349,7 @@ public class Notifier {
     }
 
     public void dump() {
-        for (pl.szczodrzynski.edziennik.models.Notification notification: app.appConfig.notifications) {
+        for (pl.szczodrzynski.edziennik.utils.models.Notification notification: app.appConfig.notifications) {
             Log.d(TAG, "Profile"+notification.profileId+" Notification from "+ Date.fromMillis(notification.addedDate).getFormattedString()+" "+ Time.fromMillis(notification.addedDate).getStringHMS()+" - "+notification.text);
         }
     }

app/src/main/java/pl/szczodrzynski/edziennik/WidgetTimetable.java

@@ -32,11 +32,11 @@ import pl.szczodrzynski.edziennik.datamodels.EventFull;
 import pl.szczodrzynski.edziennik.datamodels.LessonChange;
 import pl.szczodrzynski.edziennik.datamodels.LessonFull;
 import pl.szczodrzynski.edziennik.datamodels.Profile;
-import pl.szczodrzynski.edziennik.fragments.HomeFragment;
+import pl.szczodrzynski.edziennik.ui.modules.home.HomeFragment;
-import pl.szczodrzynski.edziennik.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Date;
-import pl.szczodrzynski.edziennik.models.ItemWidgetTimetableModel;
+import pl.szczodrzynski.edziennik.utils.models.ItemWidgetTimetableModel;
-import pl.szczodrzynski.edziennik.models.Time;
+import pl.szczodrzynski.edziennik.utils.models.Time;
-import pl.szczodrzynski.edziennik.models.Week;
+import pl.szczodrzynski.edziennik.utils.models.Week;
 import pl.szczodrzynski.edziennik.widgets.WidgetConfig;
 import pl.szczodrzynski.edziennik.sync.SyncJob;
 import pl.szczodrzynski.edziennik.widgets.timetable.LessonDetailsActivity;

app/src/main/java/pl/szczodrzynski/edziennik/api/Edziennik.java

@@ -62,8 +62,8 @@ import pl.szczodrzynski.edziennik.datamodels.NoticeFull;
 import pl.szczodrzynski.edziennik.datamodels.Profile;
 import pl.szczodrzynski.edziennik.datamodels.ProfileFull;
 import pl.szczodrzynski.edziennik.datamodels.Team;
-import pl.szczodrzynski.edziennik.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Date;
-import pl.szczodrzynski.edziennik.models.Notification;
+import pl.szczodrzynski.edziennik.utils.models.Notification;
 import pl.szczodrzynski.edziennik.network.ServerRequest;
 import pl.szczodrzynski.edziennik.sync.SyncJob;
 import pl.szczodrzynski.edziennik.utils.Themes;

app/src/main/java/pl/szczodrzynski/edziennik/api/Iuczniowie.java

@@ -59,11 +59,11 @@ import pl.szczodrzynski.edziennik.datamodels.ProfileFull;
 import pl.szczodrzynski.edziennik.datamodels.Subject;
 import pl.szczodrzynski.edziennik.datamodels.Teacher;
 import pl.szczodrzynski.edziennik.datamodels.Team;
-import pl.szczodrzynski.edziennik.messages.MessagesComposeInfo;
+import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesComposeInfo;
-import pl.szczodrzynski.edziennik.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Date;
-import pl.szczodrzynski.edziennik.models.Endpoint;
+import pl.szczodrzynski.edziennik.utils.models.Endpoint;
-import pl.szczodrzynski.edziennik.models.Time;
+import pl.szczodrzynski.edziennik.utils.models.Time;
-import pl.szczodrzynski.edziennik.models.Week;
+import pl.szczodrzynski.edziennik.utils.models.Week;
 
 import static pl.szczodrzynski.edziennik.api.AppError.CODE_INVALID_LOGIN;
 import static pl.szczodrzynski.edziennik.api.AppError.CODE_INVALID_SCHOOL_NAME;

app/src/main/java/pl/szczodrzynski/edziennik/api/Librus.java

@@ -73,11 +73,11 @@ import pl.szczodrzynski.edziennik.datamodels.ProfileFull;
 import pl.szczodrzynski.edziennik.datamodels.Subject;
 import pl.szczodrzynski.edziennik.datamodels.Teacher;
 import pl.szczodrzynski.edziennik.datamodels.Team;
-import pl.szczodrzynski.edziennik.messages.MessagesComposeInfo;
+import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesComposeInfo;
-import pl.szczodrzynski.edziennik.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Date;
-import pl.szczodrzynski.edziennik.models.Endpoint;
+import pl.szczodrzynski.edziennik.utils.models.Endpoint;
-import pl.szczodrzynski.edziennik.models.Time;
+import pl.szczodrzynski.edziennik.utils.models.Time;
-import pl.szczodrzynski.edziennik.models.Week;
+import pl.szczodrzynski.edziennik.utils.models.Week;
 import pl.szczodrzynski.edziennik.utils.Utils;
 
 import static java.net.HttpURLConnection.HTTP_BAD_REQUEST;

app/src/main/java/pl/szczodrzynski/edziennik/api/Mobidziennik.java

@@ -65,11 +65,11 @@ import pl.szczodrzynski.edziennik.datamodels.ProfileFull;
 import pl.szczodrzynski.edziennik.datamodels.Subject;
 import pl.szczodrzynski.edziennik.datamodels.Teacher;
 import pl.szczodrzynski.edziennik.datamodels.Team;
-import pl.szczodrzynski.edziennik.messages.MessagesComposeInfo;
+import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesComposeInfo;
-import pl.szczodrzynski.edziennik.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Date;
-import pl.szczodrzynski.edziennik.models.Endpoint;
+import pl.szczodrzynski.edziennik.utils.models.Endpoint;
-import pl.szczodrzynski.edziennik.models.Time;
+import pl.szczodrzynski.edziennik.utils.models.Time;
-import pl.szczodrzynski.edziennik.models.Week;
+import pl.szczodrzynski.edziennik.utils.models.Week;
 
 import static pl.szczodrzynski.edziennik.api.AppError.CODE_INVALID_LOGIN;
 import static pl.szczodrzynski.edziennik.api.AppError.CODE_MAINTENANCE;

app/src/main/java/pl/szczodrzynski/edziennik/api/Vulcan.java

@@ -59,11 +59,11 @@ import pl.szczodrzynski.edziennik.datamodels.ProfileFull;
 import pl.szczodrzynski.edziennik.datamodels.Subject;
 import pl.szczodrzynski.edziennik.datamodels.Teacher;
 import pl.szczodrzynski.edziennik.datamodels.Team;
-import pl.szczodrzynski.edziennik.messages.MessagesComposeInfo;
+import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesComposeInfo;
-import pl.szczodrzynski.edziennik.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Date;
-import pl.szczodrzynski.edziennik.models.Endpoint;
+import pl.szczodrzynski.edziennik.utils.models.Endpoint;
-import pl.szczodrzynski.edziennik.models.Time;
+import pl.szczodrzynski.edziennik.utils.models.Time;
-import pl.szczodrzynski.edziennik.models.Week;
+import pl.szczodrzynski.edziennik.utils.models.Week;
 import pl.szczodrzynski.edziennik.utils.Utils;
 
 import static pl.szczodrzynski.edziennik.api.AppError.CODE_OTHER;

app/src/main/java/pl/szczodrzynski/edziennik/api/interfaces/EdziennikInterface.java

@@ -7,12 +7,11 @@ import androidx.annotation.Nullable;
 import java.util.Map;
 
 import pl.szczodrzynski.edziennik.datamodels.LoginStore;
-import pl.szczodrzynski.edziennik.datamodels.Message;
 import pl.szczodrzynski.edziennik.datamodels.MessageFull;
 import pl.szczodrzynski.edziennik.datamodels.Profile;
 import pl.szczodrzynski.edziennik.datamodels.ProfileFull;
-import pl.szczodrzynski.edziennik.messages.MessagesComposeInfo;
+import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesComposeInfo;
-import pl.szczodrzynski.edziennik.models.Endpoint;
+import pl.szczodrzynski.edziennik.utils.models.Endpoint;
 
 public interface EdziennikInterface {
 

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/Librus.kt

@@ -19,8 +19,8 @@ import pl.szczodrzynski.edziennik.datamodels.LoginStore
 import pl.szczodrzynski.edziennik.datamodels.MessageFull
 import pl.szczodrzynski.edziennik.datamodels.Profile
 import pl.szczodrzynski.edziennik.datamodels.ProfileFull
-import pl.szczodrzynski.edziennik.messages.MessagesComposeInfo
+import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesComposeInfo
-import pl.szczodrzynski.edziennik.models.Endpoint
+import pl.szczodrzynski.edziennik.utils.models.Endpoint
 import pl.szczodrzynski.edziennik.utils.Utils.d
 import java.lang.Exception
 
@@ -198,4 +198,4 @@ class Librus(val app: App, val profile: Profile?, val loginStore: LoginStore) :
     override fun isEndpointEnabled(profile: Profile?, defaultActive: Boolean, name: String?): Boolean {
         TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
-}
+}

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/models/DataStore.kt

@@ -4,7 +4,7 @@ import android.util.LongSparseArray
 import androidx.core.util.forEach
 import androidx.core.util.isNotEmpty
 import pl.szczodrzynski.edziennik.datamodels.*
-import pl.szczodrzynski.edziennik.models.Date
+import pl.szczodrzynski.edziennik.utils.models.Date
 
 data class DataStore(private val appDb: AppDb, val profileId: Int) {
     val teacherList: LongSparseArray<Teacher> = LongSparseArray()
@@ -115,4 +115,4 @@ data class DataStore(private val appDb: AppDb, val profileId: Int) {
         if (messageMetadataList.isNotEmpty())
             appDb.metadataDao().setSeen(messageMetadataList)
     }
-}
+}

app/src/main/java/pl/szczodrzynski/edziennik/datamodels/Announcement.java

@@ -5,7 +5,7 @@ import androidx.room.ColumnInfo;
 import androidx.room.Entity;
 import androidx.room.Ignore;
 import androidx.room.Index;
-import pl.szczodrzynski.edziennik.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Date;
 
 @Entity(tableName = "announcements",
         primaryKeys = {"profileId", "announcementId"},

app/src/main/java/pl/szczodrzynski/edziennik/datamodels/AppDb.java

@@ -6,7 +6,7 @@ import androidx.room.Room;
 import androidx.room.RoomDatabase;
 import androidx.room.TypeConverters;
 import androidx.room.migration.Migration;
-import pl.szczodrzynski.edziennik.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Date;
 
 import android.content.Context;
 

app/src/main/java/pl/szczodrzynski/edziennik/datamodels/Attendance.java

@@ -6,8 +6,8 @@ import androidx.room.Entity;
 import androidx.room.Ignore;
 import androidx.room.Index;
 
-import pl.szczodrzynski.edziennik.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Date;
-import pl.szczodrzynski.edziennik.models.Time;
+import pl.szczodrzynski.edziennik.utils.models.Time;
 
 @Entity(tableName = "attendances",
         primaryKeys = {"profileId", "attendanceId", "attendanceLessonDate", "attendanceStartTime"},

app/src/main/java/pl/szczodrzynski/edziennik/datamodels/AttendanceDao.java

@@ -8,11 +8,10 @@ import androidx.room.Insert;
 import androidx.room.OnConflictStrategy;
 import androidx.room.Query;
 import androidx.room.RawQuery;
-import pl.szczodrzynski.edziennik.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Date;
 
 import java.util.List;
 
-import static pl.szczodrzynski.edziennik.datamodels.Attendance.TYPE_PRESENT;
 import static pl.szczodrzynski.edziennik.datamodels.Metadata.TYPE_ATTENDANCE;
 
 @Dao

app/src/main/java/pl/szczodrzynski/edziennik/datamodels/ConverterDate.java

@@ -2,7 +2,7 @@ package pl.szczodrzynski.edziennik.datamodels;
 
 import androidx.room.TypeConverter;
 
-import pl.szczodrzynski.edziennik.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Date;
 
 public class ConverterDate {
 

app/src/main/java/pl/szczodrzynski/edziennik/datamodels/ConverterTime.java

@@ -2,7 +2,7 @@ package pl.szczodrzynski.edziennik.datamodels;
 
 import androidx.room.TypeConverter;
 
-import pl.szczodrzynski.edziennik.models.Time;
+import pl.szczodrzynski.edziennik.utils.models.Time;
 
 public class ConverterTime {
 

app/src/main/java/pl/szczodrzynski/edziennik/datamodels/Event.java

@@ -4,8 +4,8 @@ import androidx.room.ColumnInfo;
 import androidx.room.Entity;
 import androidx.room.Ignore;
 import androidx.room.Index;
-import pl.szczodrzynski.edziennik.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Date;
-import pl.szczodrzynski.edziennik.models.Time;
+import pl.szczodrzynski.edziennik.utils.models.Time;
 
 @Entity(tableName = "events",
         primaryKeys = {"profileId", "eventId"},

app/src/main/java/pl/szczodrzynski/edziennik/datamodels/EventDao.java

@@ -14,8 +14,8 @@ import android.util.Log;
 
 import java.util.List;
 
-import pl.szczodrzynski.edziennik.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Date;
-import pl.szczodrzynski.edziennik.models.Time;
+import pl.szczodrzynski.edziennik.utils.models.Time;
 
 import static pl.szczodrzynski.edziennik.datamodels.Metadata.TYPE_EVENT;
 import static pl.szczodrzynski.edziennik.datamodels.Metadata.TYPE_HOMEWORK;

app/src/main/java/pl/szczodrzynski/edziennik/datamodels/Lesson.java

@@ -8,8 +8,8 @@ import androidx.room.Ignore;
 import androidx.room.Index;
 import androidx.annotation.NonNull;
 
-import pl.szczodrzynski.edziennik.models.Time;
+import pl.szczodrzynski.edziennik.utils.models.Time;
-import pl.szczodrzynski.edziennik.models.Week;
+import pl.szczodrzynski.edziennik.utils.models.Week;
 
 @Entity(tableName = "lessons",
         primaryKeys = {"profileId", "lessonWeekDay", "lessonStartTime", "lessonEndTime"},

app/src/main/java/pl/szczodrzynski/edziennik/datamodels/LessonChange.java

@@ -7,8 +7,8 @@ import androidx.annotation.NonNull;
 
 import java.util.List;
 
-import pl.szczodrzynski.edziennik.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Date;
-import pl.szczodrzynski.edziennik.models.Time;
+import pl.szczodrzynski.edziennik.utils.models.Time;
 
 @Entity(tableName = "lessonChanges",
         primaryKeys = {"profileId", "lessonChangeDate", "lessonChangeStartTime", "lessonChangeEndTime"},

app/src/main/java/pl/szczodrzynski/edziennik/datamodels/LessonChangeDao.java

@@ -11,8 +11,8 @@ import androidx.room.RawQuery;
 
 import java.util.List;
 
-import pl.szczodrzynski.edziennik.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Date;
-import pl.szczodrzynski.edziennik.models.db.LessonChangeCounter;
+import pl.szczodrzynski.edziennik.utils.models.db.LessonChangeCounter;
 
 import static pl.szczodrzynski.edziennik.datamodels.Metadata.TYPE_LESSON_CHANGE;
 import static pl.szczodrzynski.edziennik.utils.Utils.d;

app/src/main/java/pl/szczodrzynski/edziennik/datamodels/LessonDao.java

@@ -9,12 +9,11 @@ import androidx.room.OnConflictStrategy;
 import androidx.room.Query;
 import androidx.room.RawQuery;
 import androidx.annotation.NonNull;
-import android.util.Log;
 
 import java.util.List;
 
-import pl.szczodrzynski.edziennik.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Date;
-import pl.szczodrzynski.edziennik.models.Time;
+import pl.szczodrzynski.edziennik.utils.models.Time;
 
 @Dao
 public abstract class LessonDao {

app/src/main/java/pl/szczodrzynski/edziennik/datamodels/LessonFull.java

@@ -5,7 +5,7 @@ import android.content.Context;
 import androidx.annotation.Nullable;
 
 import pl.szczodrzynski.edziennik.R;
-import pl.szczodrzynski.edziennik.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Date;
 
 import static pl.szczodrzynski.edziennik.datamodels.LessonChange.TYPE_ADDED;
 import static pl.szczodrzynski.edziennik.datamodels.LessonChange.TYPE_CANCELLED;

app/src/main/java/pl/szczodrzynski/edziennik/datamodels/LuckyNumber.java

@@ -4,7 +4,7 @@ import androidx.room.ColumnInfo;
 import androidx.room.Entity;
 import androidx.annotation.NonNull;
 
-import pl.szczodrzynski.edziennik.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Date;
 
 @Entity(tableName = "luckyNumbers",
         primaryKeys = {"profileId", "luckyNumberDate"})

app/src/main/java/pl/szczodrzynski/edziennik/datamodels/LuckyNumberDao.java

@@ -8,7 +8,7 @@ import androidx.room.Query;
 
 import java.util.List;
 
-import pl.szczodrzynski.edziennik.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Date;
 
 @Dao
 public interface LuckyNumberDao {

app/src/main/java/pl/szczodrzynski/edziennik/datamodels/MetadataDao.java

@@ -9,7 +9,7 @@ import androidx.room.Transaction;
 
 import java.util.List;
 
-import pl.szczodrzynski.edziennik.models.db.UnreadCounter;
+import pl.szczodrzynski.edziennik.utils.models.db.UnreadCounter;
 
 import static pl.szczodrzynski.edziennik.datamodels.Metadata.TYPE_ANNOUNCEMENT;
 import static pl.szczodrzynski.edziennik.datamodels.Metadata.TYPE_ATTENDANCE;

app/src/main/java/pl/szczodrzynski/edziennik/datamodels/Profile.kt

@@ -3,25 +3,20 @@ package pl.szczodrzynski.edziennik.datamodels
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import android.content.Context
-import android.graphics.BitmapFactory
 import android.graphics.PorterDuff
 import android.graphics.PorterDuffColorFilter
 import android.graphics.drawable.Drawable
-import android.media.ThumbnailUtils
 import android.net.ConnectivityManager
-import android.net.NetworkInfo
 import android.widget.ImageView
-import androidx.core.graphics.drawable.RoundedBitmapDrawable
 import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory
 
-import com.google.gson.JsonElement
 import com.google.gson.JsonObject
 
 import androidx.room.Ignore
 import pl.droidsonroids.gif.GifDrawable
 import pl.szczodrzynski.edziennik.colorFromName
 
-import pl.szczodrzynski.edziennik.models.Date
+import pl.szczodrzynski.edziennik.utils.models.Date
 import pl.szczodrzynski.navlib.ImageHolder
 import pl.szczodrzynski.navlib.R
 import pl.szczodrzynski.navlib.drawer.IDrawerProfile

app/src/main/java/pl/szczodrzynski/edziennik/sync/MyFirebaseMessagingService.java

@@ -23,8 +23,8 @@ import pl.szczodrzynski.edziennik.datamodels.EventType;
 import pl.szczodrzynski.edziennik.datamodels.FeedbackMessage;
 import pl.szczodrzynski.edziennik.datamodels.ProfileFull;
 import pl.szczodrzynski.edziennik.datamodels.Team;
-import pl.szczodrzynski.edziennik.fragments.DebugFragment;
+import pl.szczodrzynski.edziennik.ui.modules.base.DebugFragment;
-import pl.szczodrzynski.edziennik.models.Notification;
+import pl.szczodrzynski.edziennik.utils.models.Notification;
 import pl.szczodrzynski.edziennik.network.ServerRequest;
 
 import static pl.szczodrzynski.edziennik.App.APP_URL;
@@ -195,7 +195,7 @@ public class MyFirebaseMessagingService extends FirebaseMessagingService {
                                 app.checkDevModePassword();
                                 feedbackMessage.text = "devmode "+(App.devMode ? "allowed" : "disallowed");
                             }
-                            Intent intent = new Intent("pl.szczodrzynski.edziennik.activities.FeedbackActivity");
+                            Intent intent = new Intent("pl.szczodrzynski.edziennik.ui.modules.base.FeedbackActivity");
                             intent.putExtra("type", "user_chat");
                             intent.putExtra("message", app.gson.toJson(feedbackMessage));
                             app.sendBroadcast(intent);
@@ -217,7 +217,7 @@ public class MyFirebaseMessagingService extends FirebaseMessagingService {
                         feedbackMessage.fromUser = remoteMessage.getData().get("from_user");
                         feedbackMessage.fromUserName = remoteMessage.getData().get("from_user_name");
                         feedbackMessage.sentTime = Long.parseLong(remoteMessage.getData().get("sent_time"));
-                        Intent intent = new Intent("pl.szczodrzynski.edziennik.activities.FeedbackActivity");
+                        Intent intent = new Intent("pl.szczodrzynski.edziennik.ui.modules.base.FeedbackActivity");
                         intent.putExtra("type", "user_chat");
                         intent.putExtra("message", app.gson.toJson(feedbackMessage));
                         app.sendBroadcast(intent);

app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/GenericDialog.java

@@ -1,15 +1,11 @@
-package pl.szczodrzynski.edziennik.dialogs;
+package pl.szczodrzynski.edziennik.ui.dialogs;
 
 import android.content.Context;
-import android.content.res.Resources;
-import androidx.annotation.ColorInt;
-import android.util.TypedValue;
 import android.view.View;
 
 import com.afollestad.materialdialogs.MaterialDialog;
 
 import pl.szczodrzynski.edziennik.App;
-import pl.szczodrzynski.edziennik.R;
 
 public class GenericDialog {
     private App app;

app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/changelog/ChangelogDialog.java

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.dialogs;
+package pl.szczodrzynski.edziennik.ui.dialogs.changelog;
 
 import android.app.Dialog;
 import android.os.Bundle;

app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventListAdapter.java

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.adapters;
+package pl.szczodrzynski.edziennik.ui.dialogs.event;
 
 import android.content.Context;
 import android.graphics.PorterDuff;
@@ -20,9 +20,7 @@ import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.datamodels.Event;
 import pl.szczodrzynski.edziennik.datamodels.EventFull;
-import pl.szczodrzynski.edziennik.dialogs.EventListDialog;
+import pl.szczodrzynski.edziennik.utils.models.Date;
-import pl.szczodrzynski.edziennik.dialogs.EventManualDialog;
-import pl.szczodrzynski.edziennik.models.Date;
 import pl.szczodrzynski.edziennik.utils.Utils;
 
 import static pl.szczodrzynski.edziennik.datamodels.Event.TYPE_HOMEWORK;

app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventListDialog.java

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.dialogs;
+package pl.szczodrzynski.edziennik.ui.dialogs.event;
 
 import android.content.Context;
 import android.content.DialogInterface;
@@ -16,20 +16,13 @@ import androidx.lifecycle.LifecycleOwner;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import java.util.Calendar;
-import java.util.List;
-import java.util.Locale;
-
 import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
-import pl.szczodrzynski.edziennik.adapters.EventListAdapter;
 import pl.szczodrzynski.edziennik.datamodels.LessonChange;
 import pl.szczodrzynski.edziennik.datamodels.LessonFull;
-import pl.szczodrzynski.edziennik.fragments.agenda.LessonChangeEvent;
+import pl.szczodrzynski.edziennik.ui.dialogs.lessonchange.LessonChangeDialog;
-import pl.szczodrzynski.edziennik.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Date;
-import pl.szczodrzynski.edziennik.models.Time;
+import pl.szczodrzynski.edziennik.utils.models.Time;
-import pl.szczodrzynski.edziennik.models.db.LessonChangeCounter;
-import pl.szczodrzynski.edziennik.utils.Colors;
 
 public class EventListDialog {
     private App app;

app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventManualDialog.java

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.dialogs;
+package pl.szczodrzynski.edziennik.ui.dialogs.event;
 
 
 import android.app.Activity;
@@ -46,9 +46,9 @@ import pl.szczodrzynski.edziennik.datamodels.ProfileFull;
 import pl.szczodrzynski.edziennik.datamodels.Subject;
 import pl.szczodrzynski.edziennik.datamodels.Teacher;
 import pl.szczodrzynski.edziennik.datamodels.Team;
-import pl.szczodrzynski.edziennik.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Date;
-import pl.szczodrzynski.edziennik.models.Time;
+import pl.szczodrzynski.edziennik.utils.models.Time;
-import pl.szczodrzynski.edziennik.models.Week;
+import pl.szczodrzynski.edziennik.utils.models.Week;
 import pl.szczodrzynski.edziennik.network.ServerRequest;
 import pl.szczodrzynski.edziennik.utils.TextInputDropDown;
 import pl.szczodrzynski.edziennik.utils.Themes;

app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/grade/GradeDetailsDialog.java

@@ -1,38 +1,26 @@
-package pl.szczodrzynski.edziennik.dialogs;
+package pl.szczodrzynski.edziennik.ui.dialogs.grade;
 
 import android.content.Context;
 import android.content.DialogInterface;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffColorFilter;
-import android.graphics.Typeface;
 import android.os.AsyncTask;
 import android.view.View;
-import android.widget.LinearLayout;
-import android.widget.TextView;
 
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.graphics.ColorUtils;
-import androidx.lifecycle.LifecycleOwner;
 import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 
 import com.afollestad.materialdialogs.MaterialDialog;
 
 import java.text.DecimalFormat;
-import java.util.ArrayList;
 import java.util.List;
 
 import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
-import pl.szczodrzynski.edziennik.adapters.EventListAdapter;
+import pl.szczodrzynski.edziennik.ui.modules.grades.GradesListAdapter;
-import pl.szczodrzynski.edziennik.adapters.GradesListAdapter;
 import pl.szczodrzynski.edziennik.databinding.DialogGradeDetailsBinding;
 import pl.szczodrzynski.edziennik.datamodels.Grade;
 import pl.szczodrzynski.edziennik.datamodels.GradeFull;
-import pl.szczodrzynski.edziennik.datamodels.LessonChange;
-import pl.szczodrzynski.edziennik.datamodels.LessonFull;
-import pl.szczodrzynski.edziennik.models.Date;
-import pl.szczodrzynski.edziennik.models.Time;
 import pl.szczodrzynski.edziennik.utils.Colors;
 
 import static pl.szczodrzynski.edziennik.datamodels.Profile.COLOR_MODE_DEFAULT;

app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/lessonchange/LessonChangeDialog.java

@@ -1,11 +1,8 @@
-package pl.szczodrzynski.edziennik.dialogs;
+package pl.szczodrzynski.edziennik.ui.dialogs.lessonchange;
 
 import android.content.Context;
-import android.content.res.Resources;
-import android.util.TypedValue;
 import android.view.View;
 
-import androidx.annotation.ColorInt;
 import androidx.databinding.DataBindingUtil;
 import androidx.lifecycle.LifecycleOwner;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -17,13 +14,11 @@ import java.util.List;
 
 import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
-import pl.szczodrzynski.edziennik.adapters.TimetableAdapter;
+import pl.szczodrzynski.edziennik.ui.modules.timetable.TimetableAdapter;
 import pl.szczodrzynski.edziennik.databinding.DialogLessonChangeListBinding;
-import pl.szczodrzynski.edziennik.datamodels.Lesson;
-import pl.szczodrzynski.edziennik.datamodels.LessonChange;
 import pl.szczodrzynski.edziennik.datamodels.LessonFull;
-import pl.szczodrzynski.edziennik.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Date;
-import pl.szczodrzynski.edziennik.models.Time;
+import pl.szczodrzynski.edziennik.utils.models.Time;
 
 public class LessonChangeDialog {
     private App app;

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/LessonChangeEvent.java

@@ -1,13 +1,12 @@
-package pl.szczodrzynski.edziennik.fragments.agenda;
+package pl.szczodrzynski.edziennik.ui.modules.agenda;
 
-import com.github.tibolte.agendacalendarview.models.BaseCalendarEvent;
 import com.github.tibolte.agendacalendarview.models.CalendarEvent;
 import com.github.tibolte.agendacalendarview.models.IDayItem;
 import com.github.tibolte.agendacalendarview.models.IWeekItem;
 
 import java.util.Calendar;
 
-import pl.szczodrzynski.edziennik.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Date;
 
 public class LessonChangeEvent implements CalendarEvent {
 

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/LessonChangeEventRenderer.java

@@ -1,8 +1,6 @@
-package pl.szczodrzynski.edziennik.fragments.agenda;
+package pl.szczodrzynski.edziennik.ui.modules.agenda;
 
-import android.graphics.Color;
 import android.view.View;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import androidx.cardview.widget.CardView;
@@ -10,7 +8,6 @@ import androidx.cardview.widget.CardView;
 import com.github.tibolte.agendacalendarview.render.EventRenderer;
 
 import pl.szczodrzynski.edziennik.R;
-import pl.szczodrzynski.edziennik.datamodels.Lesson;
 
 public class LessonChangeEventRenderer extends EventRenderer<LessonChangeEvent> {
     @Override

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/RegisterAgendaCalendarFragment.java

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.fragments;
+package pl.szczodrzynski.edziennik.ui.modules.agenda;
 
 import android.app.Activity;
 import android.content.Context;
@@ -30,8 +30,8 @@ import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.databinding.FragmentRegisterAgendaCalendarBinding;
 import pl.szczodrzynski.edziennik.datamodels.EventFull;
 import pl.szczodrzynski.edziennik.datamodels.LessonFull;
-import pl.szczodrzynski.edziennik.dialogs.EventListDialog;
+import pl.szczodrzynski.edziennik.ui.dialogs.event.EventListDialog;
-import pl.szczodrzynski.edziennik.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Date;
 import pl.szczodrzynski.edziennik.utils.Themes;
 
 import static pl.szczodrzynski.edziennik.utils.Utils.intToStr;

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/RegisterAgendaDefaultFragment.java

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.fragments;
+package pl.szczodrzynski.edziennik.ui.modules.agenda;
 
 import android.app.Activity;
 import android.content.Context;
@@ -40,14 +40,12 @@ import pl.szczodrzynski.edziennik.databinding.FragmentRegisterAgendaCalendarBind
 import pl.szczodrzynski.edziennik.databinding.FragmentRegisterAgendaDefaultBinding;
 import pl.szczodrzynski.edziennik.datamodels.EventFull;
 import pl.szczodrzynski.edziennik.datamodels.LessonFull;
-import pl.szczodrzynski.edziennik.dialogs.EventListDialog;
+import pl.szczodrzynski.edziennik.ui.dialogs.event.EventListDialog;
-import pl.szczodrzynski.edziennik.dialogs.EventManualDialog;
+import pl.szczodrzynski.edziennik.ui.dialogs.event.EventManualDialog;
-import pl.szczodrzynski.edziennik.dialogs.LessonChangeDialog;
+import pl.szczodrzynski.edziennik.ui.dialogs.lessonchange.LessonChangeDialog;
-import pl.szczodrzynski.edziennik.fragments.agenda.LessonChangeEvent;
+import pl.szczodrzynski.edziennik.utils.models.Date;
-import pl.szczodrzynski.edziennik.fragments.agenda.LessonChangeEventRenderer;
+import pl.szczodrzynski.edziennik.utils.models.Time;
-import pl.szczodrzynski.edziennik.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.db.LessonChangeCounter;
-import pl.szczodrzynski.edziennik.models.Time;
-import pl.szczodrzynski.edziennik.models.db.LessonChangeCounter;
 import pl.szczodrzynski.edziennik.utils.Colors;
 import pl.szczodrzynski.edziennik.utils.Themes;
 import pl.szczodrzynski.edziennik.utils.Utils;

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/announcements/AnnouncementsAdapter.java

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.adapters;
+package pl.szczodrzynski.edziennik.ui.modules.announcements;
 
 import android.content.Context;
 import android.graphics.PorterDuff;

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/announcements/RegisterAnnouncementsFragment.java

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.fragments;
+package pl.szczodrzynski.edziennik.ui.modules.announcements;
 
 import android.os.AsyncTask;
 import android.os.Bundle;
@@ -19,7 +19,6 @@ import androidx.recyclerview.widget.RecyclerView;
 import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.MainActivity;
-import pl.szczodrzynski.edziennik.adapters.AnnouncementsAdapter;
 import pl.szczodrzynski.edziennik.databinding.DialogAnnouncementBinding;
 import pl.szczodrzynski.edziennik.databinding.FragmentRegisterSchoolNoticesBinding;
 import pl.szczodrzynski.edziennik.utils.Themes;

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendancesAdapter.java

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.adapters;
+package pl.szczodrzynski.edziennik.ui.modules.attendance;
 
 import android.content.Context;
 import android.graphics.PorterDuff;
@@ -125,4 +125,4 @@ public class AttendancesAdapter extends RecyclerView.Adapter<AttendancesAdapter.
             attendanceTime = itemView.findViewById(R.id.attendanceTime);
         }
     }
-}
+}

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/RegisterAttendancesFragment.java

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.fragments;
+package pl.szczodrzynski.edziennik.ui.modules.attendance;
 
 import androidx.appcompat.widget.PopupMenu;
 import androidx.databinding.DataBindingUtil;
@@ -39,12 +39,11 @@ import antonkozyriatskyi.circularprogressindicator.CircularProgressIndicator;
 import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.MainActivity;
-import pl.szczodrzynski.edziennik.adapters.AttendancesAdapter;
 import pl.szczodrzynski.edziennik.databinding.FragmentRegisterAttendancesBinding;
 import pl.szczodrzynski.edziennik.datamodels.AttendanceFull;
 import pl.szczodrzynski.edziennik.datamodels.Subject;
-import pl.szczodrzynski.edziennik.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Date;
-import pl.szczodrzynski.edziennik.models.Week;
+import pl.szczodrzynski.edziennik.utils.models.Week;
 import pl.szczodrzynski.edziennik.utils.Themes;
 import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetPrimaryItem;
 

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/CrashActivity.java

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.activities;
+package pl.szczodrzynski.edziennik.ui.modules.base;
 
 /*
  * Copyright 2014-2017 Eduard Ereza Martínez
@@ -177,4 +177,4 @@ public final class CrashActivity extends AppCompatActivity {
             Toast.makeText(CrashActivity.this, R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show();
         }
     }
-}
+}

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/CrashGtfoActivity.java

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.activities;
+package pl.szczodrzynski.edziennik.ui.modules.base;
 
 import android.content.Context;
 import android.os.Bundle;

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/DebugFragment.java

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.fragments;
+package pl.szczodrzynski.edziennik.ui.modules.base;
 
 import android.os.Bundle;
 import androidx.annotation.NonNull;

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/FeedbackActivity.java

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.activities;
+package pl.szczodrzynski.edziennik.ui.modules.base;
 
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.databinding.DataBindingUtil;
@@ -352,7 +352,7 @@ public class FeedbackActivity extends AppCompatActivity {
     @Override
     protected void onResume() {
         super.onResume();
-        registerReceiver(receiver, new IntentFilter("pl.szczodrzynski.edziennik.activities.FeedbackActivity"));
+        registerReceiver(receiver, new IntentFilter("pl.szczodrzynski.edziennik.ui.modules.base.FeedbackActivity"));
     }
 
     @Override

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/FeedbackFragment.kt

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.fragments
+package pl.szczodrzynski.edziennik.ui.modules.base
 
 import android.content.BroadcastReceiver
 import android.content.Context
@@ -323,7 +323,7 @@ class FeedbackFragment : Fragment() {
     override fun onResume() {
         super.onResume()
         if (receiver != null)
-            activity.registerReceiver(receiver, IntentFilter("pl.szczodrzynski.edziennik.activities.FeedbackActivity"))
+            activity.registerReceiver(receiver, IntentFilter("pl.szczodrzynski.edziennik.ui.modules.base.FeedbackActivity"))
     }
 
     override fun onPause() {
@@ -331,4 +331,4 @@ class FeedbackFragment : Fragment() {
         if (receiver != null)
             activity.unregisterReceiver(receiver)
     }
-}
+}

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/HelpFragment.kt

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.fragments
+package pl.szczodrzynski.edziennik.ui.modules.base
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/LoadingFragment.kt

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.fragments
+package pl.szczodrzynski.edziennik.ui.modules.base
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -20,4 +20,4 @@ class LoadingFragment : Fragment() {
         b = FragmentLoadingBinding.inflate(inflater)
         return b.root
     }
-}
+}

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/TemplateFragment.kt

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.fragments
+package pl.szczodrzynski.edziennik.ui.modules.base
 
 import android.os.Bundle
 import android.view.LayoutInflater

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/GradesListAdapter.java

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.adapters;
+package pl.szczodrzynski.edziennik.ui.modules.grades;
 
 import android.content.Context;
 import android.graphics.PorterDuff;
@@ -20,8 +20,8 @@ import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.datamodels.Grade;
 import pl.szczodrzynski.edziennik.datamodels.GradeFull;
-import pl.szczodrzynski.edziennik.dialogs.GradeDetailsDialog;
+import pl.szczodrzynski.edziennik.ui.dialogs.grade.GradeDetailsDialog;
-import pl.szczodrzynski.edziennik.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Date;
 import pl.szczodrzynski.edziennik.utils.Colors;
 
 import static pl.szczodrzynski.edziennik.datamodels.Profile.COLOR_MODE_DEFAULT;

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/GradesSubjectAdapter.java

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.adapters;
+package pl.szczodrzynski.edziennik.ui.modules.grades;
 
 import android.content.Context;
 import android.graphics.PorterDuff;
@@ -33,7 +33,8 @@ import pl.szczodrzynski.edziennik.MainActivity;
 import pl.szczodrzynski.edziennik.datamodels.AppDb;
 import pl.szczodrzynski.edziennik.datamodels.GradeFull;
 import pl.szczodrzynski.edziennik.datamodels.Subject;
-import pl.szczodrzynski.edziennik.models.ItemGradesSubjectModel;
+import pl.szczodrzynski.edziennik.ui.modules.grades.GradesListAdapter;
+import pl.szczodrzynski.edziennik.utils.models.ItemGradesSubjectModel;
 import pl.szczodrzynski.edziennik.utils.Anim;
 import pl.szczodrzynski.edziennik.utils.Colors;
 import pl.szczodrzynski.edziennik.utils.Utils;

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/RegisterGradesFragment.java

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.fragments;
+package pl.szczodrzynski.edziennik.ui.modules.grades;
 
 import android.os.AsyncTask;
 import android.os.Bundle;
@@ -23,12 +23,11 @@ import java.util.List;
 import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.MainActivity;
-import pl.szczodrzynski.edziennik.adapters.GradesSubjectAdapter;
 import pl.szczodrzynski.edziennik.databinding.FragmentRegisterGradesBinding;
 import pl.szczodrzynski.edziennik.datamodels.Grade;
 import pl.szczodrzynski.edziennik.datamodels.GradeFull;
 import pl.szczodrzynski.edziennik.datamodels.Subject;
-import pl.szczodrzynski.edziennik.models.ItemGradesSubjectModel;
+import pl.szczodrzynski.edziennik.utils.models.ItemGradesSubjectModel;
 import pl.szczodrzynski.edziennik.utils.Themes;
 import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetPrimaryItem;
 import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetSeparatorItem;
@@ -39,9 +38,9 @@ import static pl.szczodrzynski.edziennik.datamodels.Profile.YEAR_1_AVG_2_SEM;
 import static pl.szczodrzynski.edziennik.datamodels.Profile.YEAR_1_SEM_2_AVG;
 import static pl.szczodrzynski.edziennik.datamodels.Profile.YEAR_1_SEM_2_SEM;
 import static pl.szczodrzynski.edziennik.datamodels.Profile.YEAR_ALL_GRADES;
-import static pl.szczodrzynski.edziennik.models.AppConfig.ORDER_BY_DATE_ASC;
+import static pl.szczodrzynski.edziennik.utils.models.AppConfig.ORDER_BY_DATE_ASC;
-import static pl.szczodrzynski.edziennik.models.AppConfig.ORDER_BY_DATE_DESC;
+import static pl.szczodrzynski.edziennik.utils.models.AppConfig.ORDER_BY_DATE_DESC;
-import static pl.szczodrzynski.edziennik.models.AppConfig.ORDER_BY_SUBJECT_ASC;
+import static pl.szczodrzynski.edziennik.utils.models.AppConfig.ORDER_BY_SUBJECT_ASC;
 
 public class RegisterGradesFragment extends Fragment {
 

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/editor/GradesEditorAdapter.kt

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.adapters
+package pl.szczodrzynski.edziennik.ui.modules.grades.editor
 
 import android.content.Context
 import android.graphics.PorterDuff
@@ -15,8 +15,7 @@ import com.daimajia.swipe.SwipeLayout
 import com.mikepenz.iconics.view.IconicsImageView
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.R
-import pl.szczodrzynski.edziennik.fragments.GradesEditorFragment
+import pl.szczodrzynski.edziennik.ui.modules.grades.editor.GradesEditorFragment.Companion.modifyGradeChooser
-import pl.szczodrzynski.edziennik.fragments.GradesEditorFragment.Companion.modifyGradeChooser
 import pl.szczodrzynski.edziennik.utils.Colors.gradeNameToColor
 import java.text.DecimalFormat
 

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/editor/GradesEditorFragment.kt

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.fragments
+package pl.szczodrzynski.edziennik.ui.modules.grades.editor
 
 import android.graphics.PorterDuff
 import android.graphics.PorterDuffColorFilter
@@ -13,7 +13,6 @@ import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.afollestad.materialdialogs.MaterialDialog
 import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.adapters.GradesEditorAdapter
 import pl.szczodrzynski.edziennik.databinding.FragmentGradesEditorBinding
 import pl.szczodrzynski.edziennik.datamodels.Grade
 import pl.szczodrzynski.edziennik.datamodels.Profile.Companion.YEAR_1_AVG_2_AVG

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/CounterActivity.java

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.activities;
+package pl.szczodrzynski.edziennik.ui.modules.home;
 
 import androidx.databinding.DataBindingUtil;
 import android.os.AsyncTask;
@@ -16,11 +16,11 @@ import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.databinding.ActivityCounterBinding;
 import pl.szczodrzynski.edziennik.datamodels.LessonFull;
-import pl.szczodrzynski.edziennik.fragments.HomeFragment;
+import pl.szczodrzynski.edziennik.ui.modules.home.HomeFragment;
-import pl.szczodrzynski.edziennik.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Date;
-import pl.szczodrzynski.edziennik.models.Time;
+import pl.szczodrzynski.edziennik.utils.models.Time;
 
-import static pl.szczodrzynski.edziennik.fragments.HomeFragment.updateInterval;
+import static pl.szczodrzynski.edziennik.ui.modules.home.HomeFragment.updateInterval;
 
 public class CounterActivity extends AppCompatActivity {
 

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeFragment.java

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.fragments;
+package pl.szczodrzynski.edziennik.ui.modules.home;
 
 import android.app.Activity;
 import android.content.Context;
@@ -29,7 +29,6 @@ import androidx.databinding.DataBindingUtil;
 import androidx.fragment.app.Fragment;
 
 import com.afollestad.materialdialogs.MaterialDialog;
-import com.google.gson.JsonObject;
 import com.mikepenz.iconics.IconicsColor;
 import com.mikepenz.iconics.IconicsDrawable;
 import com.mikepenz.iconics.IconicsSize;
@@ -42,22 +41,17 @@ import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.BuildConfig;
 import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.MainActivity;
-import pl.szczodrzynski.edziennik.api.AppError;
-import pl.szczodrzynski.edziennik.api.interfaces.SyncCallback;
-import pl.szczodrzynski.edziennik.api.v2.librus.Librus;
 import pl.szczodrzynski.edziennik.databinding.CardLuckyNumberBinding;
 import pl.szczodrzynski.edziennik.databinding.CardUpdateBinding;
 import pl.szczodrzynski.edziennik.databinding.FragmentHomeBinding;
 import pl.szczodrzynski.edziennik.datamodels.GradeFull;
 import pl.szczodrzynski.edziennik.datamodels.LessonFull;
-import pl.szczodrzynski.edziennik.datamodels.LoginStore;
 import pl.szczodrzynski.edziennik.datamodels.Profile;
-import pl.szczodrzynski.edziennik.datamodels.ProfileFull;
 import pl.szczodrzynski.edziennik.datamodels.Subject;
-import pl.szczodrzynski.edziennik.messages.MessagesComposeActivity;
+import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesComposeActivity;
-import pl.szczodrzynski.edziennik.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Date;
-import pl.szczodrzynski.edziennik.models.ItemGradesSubjectModel;
+import pl.szczodrzynski.edziennik.utils.models.ItemGradesSubjectModel;
-import pl.szczodrzynski.edziennik.models.Time;
+import pl.szczodrzynski.edziennik.utils.models.Time;
 import pl.szczodrzynski.edziennik.receivers.BootReceiver;
 import pl.szczodrzynski.edziennik.utils.Colors;
 import pl.szczodrzynski.edziennik.utils.Themes;
@@ -72,7 +66,6 @@ import static pl.szczodrzynski.edziennik.datamodels.Grade.TYPE_SEMESTER2_FINAL;
 import static pl.szczodrzynski.edziennik.datamodels.Grade.TYPE_SEMESTER2_PROPOSED;
 import static pl.szczodrzynski.edziennik.datamodels.Grade.TYPE_YEAR_FINAL;
 import static pl.szczodrzynski.edziennik.datamodels.Grade.TYPE_YEAR_PROPOSED;
-import static pl.szczodrzynski.edziennik.datamodels.LoginStore.LOGIN_TYPE_LIBRUS;
 import static pl.szczodrzynski.edziennik.datamodels.LoginStore.LOGIN_TYPE_MOBIDZIENNIK;
 
 public class HomeFragment extends Fragment {

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeTimetableCard.java

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.fragments;
+package pl.szczodrzynski.edziennik.ui.modules.home;
 
 import android.content.Intent;
 import android.os.AsyncTask;
@@ -23,17 +23,16 @@ import java.util.TimerTask;
 import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.MainActivity;
-import pl.szczodrzynski.edziennik.activities.CounterActivity;
 import pl.szczodrzynski.edziennik.databinding.CardTimetableBinding;
 import pl.szczodrzynski.edziennik.datamodels.EventFull;
 import pl.szczodrzynski.edziennik.datamodels.LessonFull;
-import pl.szczodrzynski.edziennik.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Date;
-import pl.szczodrzynski.edziennik.models.Time;
+import pl.szczodrzynski.edziennik.utils.models.Time;
-import pl.szczodrzynski.edziennik.models.Week;
+import pl.szczodrzynski.edziennik.utils.models.Week;
 
 import static pl.szczodrzynski.edziennik.datamodels.LessonChange.TYPE_CANCELLED;
 import static pl.szczodrzynski.edziennik.datamodels.LessonChange.TYPE_CHANGE;
-import static pl.szczodrzynski.edziennik.fragments.HomeFragment.updateInterval;
+import static pl.szczodrzynski.edziennik.ui.modules.home.HomeFragment.updateInterval;
 import static pl.szczodrzynski.edziennik.utils.Utils.bs;
 
 public class HomeTimetableCard {

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/homework/HomeworkAdapter.java

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.homework;
+package pl.szczodrzynski.edziennik.ui.modules.homework;
 
 import android.content.Context;
 import android.graphics.PorterDuff;
@@ -18,9 +18,9 @@ import java.util.List;
 import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.datamodels.EventFull;
-import pl.szczodrzynski.edziennik.dialogs.EventManualDialog;
+import pl.szczodrzynski.edziennik.ui.dialogs.event.EventManualDialog;
-import pl.szczodrzynski.edziennik.fragments.HomeFragment;
+import pl.szczodrzynski.edziennik.ui.modules.home.HomeFragment;
-import pl.szczodrzynski.edziennik.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Date;
 
 import static pl.szczodrzynski.edziennik.utils.Utils.bs;
 

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/homework/HomeworkDate.kt

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.homework
+package pl.szczodrzynski.edziennik.ui.modules.homework
 
 class HomeworkDate {
     companion object {

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/homework/HomeworkFragment.kt

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.homework
+package pl.szczodrzynski.edziennik.ui.modules.homework
 
 import android.os.AsyncTask
 import android.os.Bundle
@@ -9,14 +9,13 @@ import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.viewpager.widget.ViewPager
 import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
-import kotlinx.android.synthetic.main.activity_szkolny.*
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.MainActivity
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.databinding.FragmentHomeworkBinding
 import pl.szczodrzynski.edziennik.datamodels.Metadata
-import pl.szczodrzynski.edziennik.dialogs.EventManualDialog
+import pl.szczodrzynski.edziennik.ui.dialogs.event.EventManualDialog
-import pl.szczodrzynski.edziennik.messages.MessagesFragment
+import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesFragment
 import pl.szczodrzynski.edziennik.utils.Themes
 import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetPrimaryItem
 import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetSeparatorItem

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/homework/HomeworkListFragment.kt

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.homework
+package pl.szczodrzynski.edziennik.ui.modules.homework
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -13,7 +13,7 @@ import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.databinding.HomeworkListBinding
 import pl.szczodrzynski.edziennik.datamodels.Event
 import pl.szczodrzynski.edziennik.getInt
-import pl.szczodrzynski.edziennik.models.Date
+import pl.szczodrzynski.edziennik.utils.models.Date
 import pl.szczodrzynski.edziennik.utils.Themes
 
 class HomeworkListFragment : Fragment() {

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/intro/ChangelogIntroActivity.java

@@ -1,10 +1,9 @@
-package pl.szczodrzynski.edziennik.intro;
+package pl.szczodrzynski.edziennik.ui.modules.intro;
 
 import android.os.Build;
 import android.os.Bundle;
 
 import com.heinrichreimersoftware.materialintro.app.IntroActivity;
-import com.heinrichreimersoftware.materialintro.slide.SimpleSlide;
 
 import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.BuildConfig;

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/intro/FragmentSlideMod.java

@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package pl.szczodrzynski.edziennik.intro;
+package pl.szczodrzynski.edziennik.ui.modules.intro;
 
 import android.content.Context;
 import android.os.Build;
@@ -284,4 +284,4 @@ public class FragmentSlideMod implements Slide, RestorableSlide, ButtonCtaSlide
             return localInflater.inflate(getArguments().getInt(ARGUMENT_LAYOUT_RES), container, false);
         }
     }
-}
+}

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginActivity.java

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.login;
+package pl.szczodrzynski.edziennik.ui.modules.login;
 
 import androidx.databinding.DataBindingUtil;
 import android.os.Bundle;

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginChooserFragment.java

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.login;
+package pl.szczodrzynski.edziennik.ui.modules.login;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -13,7 +13,7 @@ import androidx.fragment.app.Fragment;
 import androidx.navigation.NavController;
 import androidx.navigation.Navigation;
 import pl.szczodrzynski.edziennik.App;
-import pl.szczodrzynski.edziennik.activities.FeedbackActivity;
+import pl.szczodrzynski.edziennik.ui.modules.base.FeedbackActivity;
 import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.databinding.FragmentLoginChooserBinding;
 

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginFinishFragment.java

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.login;
+package pl.szczodrzynski.edziennik.ui.modules.login;
 
 import android.app.Activity;
 import android.content.Intent;

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginIuczniowieFragment.java

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.login;
+package pl.szczodrzynski.edziennik.ui.modules.login;
 
 import android.os.Bundle;
 

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginIuczniowieHelpFragment.java

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.login;
+package pl.szczodrzynski.edziennik.ui.modules.login;
 
 import androidx.databinding.DataBindingUtil;
 import android.os.Bundle;

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginLibrusFragment.java

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.login;
+package pl.szczodrzynski.edziennik.ui.modules.login;
 
 import android.os.Bundle;
 

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginLibrusHelpFragment.java

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.login;
+package pl.szczodrzynski.edziennik.ui.modules.login;
 
 import androidx.databinding.DataBindingUtil;
 import android.os.Bundle;

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginMigrationFragment.java

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.login;
+package pl.szczodrzynski.edziennik.ui.modules.login;
 
 import android.app.Activity;
 import android.content.Context;
@@ -32,8 +32,8 @@ import pl.szczodrzynski.edziennik.datamodels.Profile;
 import pl.szczodrzynski.edziennik.datamodels.Subject;
 import pl.szczodrzynski.edziennik.datamodels.Teacher;
 import pl.szczodrzynski.edziennik.datamodels.Team;
-import pl.szczodrzynski.edziennik.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Date;
-import pl.szczodrzynski.edziennik.models.Time;
+import pl.szczodrzynski.edziennik.utils.models.Time;
 
 import android.util.LongSparseArray;
 import android.view.LayoutInflater;

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginMigrationSyncFragment.java

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.login;
+package pl.szczodrzynski.edziennik.ui.modules.login;
 
 import android.app.Activity;
 import android.content.Context;

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginMobidziennikFragment.java

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.login;
+package pl.szczodrzynski.edziennik.ui.modules.login;
 
 import androidx.databinding.DataBindingUtil;
 import android.os.Bundle;

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginMobidziennikHelpFragment.java

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.login;
+package pl.szczodrzynski.edziennik.ui.modules.login;
 
 import androidx.databinding.DataBindingUtil;
 import android.os.Bundle;

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginProfileObject.java

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.login;
+package pl.szczodrzynski.edziennik.ui.modules.login;
 
 
 import java.util.ArrayList;

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginProgressFragment.java

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.login;
+package pl.szczodrzynski.edziennik.ui.modules.login;
 
 import androidx.databinding.DataBindingUtil;
 

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginSummaryFragment.java

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.login;
+package pl.szczodrzynski.edziennik.ui.modules.login;
 
 import androidx.databinding.DataBindingUtil;
 

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginSyncErrorFragment.java

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.login;
+package pl.szczodrzynski.edziennik.ui.modules.login;
 
 import android.os.Bundle;
 
@@ -11,7 +11,6 @@ import androidx.navigation.Navigation;
 import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.databinding.FragmentLoginSyncErrorBinding;
-import pl.szczodrzynski.edziennik.login.LoginActivity;
 
 import android.view.LayoutInflater;
 import android.view.View;

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginSyncFragment.java

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.login;
+package pl.szczodrzynski.edziennik.ui.modules.login;
 
 
 import android.content.Context;
@@ -224,4 +224,4 @@ public class LoginSyncFragment extends Fragment {
 
         begin();
     }
-}
+}

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginTemplateFragment.java

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.login;
+package pl.szczodrzynski.edziennik.ui.modules.login;
 
 import androidx.databinding.DataBindingUtil;
 import android.os.Bundle;

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginVulcanFragment.java

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.login;
+package pl.szczodrzynski.edziennik.ui.modules.login;
 
 import android.content.Intent;
 import android.graphics.Color;
@@ -36,7 +36,7 @@ import javax.crypto.ShortBufferException;
 
 import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
-import pl.szczodrzynski.edziennik.activities.QrScannerActivity;
+import pl.szczodrzynski.edziennik.ui.modules.webpush.QrScannerActivity;
 import pl.szczodrzynski.edziennik.api.AppError;
 import pl.szczodrzynski.edziennik.databinding.FragmentLoginVulcanBinding;
 import pl.szczodrzynski.edziennik.utils.Utils;

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginVulcanHelpFragment.java

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.login;
+package pl.szczodrzynski.edziennik.ui.modules.login;
 
 import androidx.databinding.DataBindingUtil;
 import android.os.Bundle;

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesAdapter.java

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.messages;
+package pl.szczodrzynski.edziennik.ui.modules.messages;
 
 import android.graphics.Typeface;
 import android.text.Html;
@@ -18,8 +18,7 @@ import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.databinding.MessagesItemBinding;
 import pl.szczodrzynski.edziennik.datamodels.MessageFull;
-import pl.szczodrzynski.edziennik.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Date;
-import pl.szczodrzynski.edziennik.utils.Utils;
 
 import static pl.szczodrzynski.edziennik.datamodels.Message.TYPE_DRAFT;
 import static pl.szczodrzynski.edziennik.datamodels.Message.TYPE_SENT;

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesComposeActivity.java

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.messages;
+package pl.szczodrzynski.edziennik.ui.modules.messages;
 
 import android.content.Context;
 import android.graphics.Color;

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesComposeInfo.java

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.messages;
+package pl.szczodrzynski.edziennik.ui.modules.messages;
 
 public class MessagesComposeInfo {
     /**

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesComposeSuggestionAdapter.java

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.messages;
+package pl.szczodrzynski.edziennik.ui.modules.messages;
 
 import android.content.Context;
 import android.text.Html;
@@ -188,4 +188,4 @@ public class MessagesComposeSuggestionAdapter extends ArrayAdapter<Teacher> {
             }
         }
     }
-}
+}

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesDetailsFragment.java

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.messages;
+package pl.szczodrzynski.edziennik.ui.modules.messages;
 
 import android.content.Context;
 import android.content.Intent;
@@ -60,8 +60,8 @@ import pl.szczodrzynski.edziennik.datamodels.MessageFull;
 import pl.szczodrzynski.edziennik.datamodels.MessageRecipientFull;
 import pl.szczodrzynski.edziennik.datamodels.Profile;
 import pl.szczodrzynski.edziennik.datamodels.ProfileFull;
-import pl.szczodrzynski.edziennik.models.Date;
+import pl.szczodrzynski.edziennik.utils.models.Date;
-import pl.szczodrzynski.edziennik.models.Time;
+import pl.szczodrzynski.edziennik.utils.models.Time;
 import pl.szczodrzynski.edziennik.utils.Anim;
 import pl.szczodrzynski.edziennik.utils.Themes;
 import pl.szczodrzynski.edziennik.utils.Utils;
@@ -673,4 +673,4 @@ public class MessagesDetailsFragment extends Fragment {
                                 .show();
                         b.messageSender.setOnClickListener(onClickListener);
                         b.messageProfileBackground.setOnClickListener(onClickListener);
-                    }*/
+                    }*/

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesFragment.kt

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.messages
+package pl.szczodrzynski.edziennik.ui.modules.messages
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -103,4 +103,4 @@ class MessagesFragment : Fragment() {
             return mFragmentTitleList[position]
         }
     }
-}
+}

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesListFragment.java

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.messages;
+package pl.szczodrzynski.edziennik.ui.modules.messages;
 
 
 import android.content.Context;

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesUtils.java

@@ -1,11 +1,9 @@
-package pl.szczodrzynski.edziennik.messages;
+package pl.szczodrzynski.edziennik.ui.modules.messages;
 
-import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.RectF;
-import android.graphics.drawable.Drawable;
 
 import androidx.core.graphics.ColorUtils;
 import pl.szczodrzynski.edziennik.App;

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/RegisterMessagesWebFragment.java

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.fragments;
+package pl.szczodrzynski.edziennik.ui.modules.messages;
 
 import android.Manifest;
 import android.annotation.SuppressLint;

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/SlideExplode.java

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.messages;
+package pl.szczodrzynski.edziennik.ui.modules.messages;
 
 import android.animation.Animator;
 import android.animation.ObjectAnimator;

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/Transitions.java

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.messages;
+package pl.szczodrzynski.edziennik.ui.modules.messages;
 
 import android.animation.TimeInterpolator;
 

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/notices/NoticesAdapter.kt

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.adapters
+package pl.szczodrzynski.edziennik.ui.modules.notices
 
 import android.content.Context
 import android.graphics.PorterDuff
@@ -20,7 +20,7 @@ import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.datamodels.Notice
 import pl.szczodrzynski.edziennik.datamodels.NoticeFull
-import pl.szczodrzynski.edziennik.models.Date
+import pl.szczodrzynski.edziennik.utils.models.Date
 
 import pl.szczodrzynski.edziennik.datamodels.LoginStore.LOGIN_TYPE_MOBIDZIENNIK
 import pl.szczodrzynski.edziennik.utils.Utils.bs
@@ -88,4 +88,4 @@ class NoticesAdapter//getting the context and product list with constructor
         var noticesItemTeacherName: TextView = itemView.findViewById(R.id.noticesItemTeacherName)
         var noticesItemAddedDate: TextView = itemView.findViewById(R.id.noticesItemAddedDate)
     }
-}
+}

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/notices/RegisterNoticesFragment.java

@@ -1,4 +1,4 @@
-package pl.szczodrzynski.edziennik.fragments;
+package pl.szczodrzynski.edziennik.ui.modules.notices;
 
 import android.graphics.Color;
 import android.os.AsyncTask;
@@ -25,7 +25,6 @@ import com.mikepenz.iconics.typeface.library.community.material.CommunityMateria
 import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.MainActivity;
-import pl.szczodrzynski.edziennik.adapters.NoticesAdapter;
 import pl.szczodrzynski.edziennik.databinding.FragmentRegisterNoticesBinding;
 import pl.szczodrzynski.edziennik.datamodels.Notice;
 import pl.szczodrzynski.edziennik.datamodels.NoticeFull;