[3.9.7-dev]

.idea/misc.xml

@@ -6,8 +6,9 @@
     </configurations>
   </component>
   <component name="EntryPointsManager">
-    <list size="1">
-      <item index="0" class="java.lang.String" itemvalue="org.greenrobot.eventbus.Subscribe" />
+    <list size="2">
+      <item index="0" class="java.lang.String" itemvalue="androidx.databinding.BindingAdapter" />
+      <item index="1" class="java.lang.String" itemvalue="org.greenrobot.eventbus.Subscribe" />
     </list>
   </component>
   <component name="NullableNotNullManager">

app/build.gradle

@@ -131,7 +131,7 @@ dependencies {
     implementation("com.github.ozodrukh:CircularReveal:2.0.1@aar") {transitive = true}
     implementation "com.heinrichreimersoftware:material-intro:1.5.8" // do not update
     implementation "com.jaredrummler:colorpicker:1.0.2"
-    implementation "com.squareup.okhttp3:okhttp:3.12.0"
+    implementation "com.squareup.okhttp3:okhttp:3.12.2"
     implementation "com.theartofdev.edmodo:android-image-cropper:2.8.0" // do not update
     implementation "com.wdullaer:materialdatetimepicker:4.1.2"
     implementation "com.yuyh.json:jsonviewer:1.0.6"

app/proguard/app.pro

@@ -39,4 +39,13 @@
 
 -keep class okhttp3.** { *; }
 
--keep class com.google.android.material.tabs.** {*;}
+-keep class com.google.android.material.tabs.** {*;}
+
+# ServiceLoader support
+        -keepnames class kotlinx.coroutines.internal.MainDispatcherFactory {}
+-keepnames class kotlinx.coroutines.CoroutineExceptionHandler {}
+
+# Most of volatile fields are updated with AFU and should not be mangled
+-keepclassmembernames class kotlinx.** {
+    volatile <fields>;
+}

app/src/main/AndroidManifest.xml

@@ -105,6 +105,11 @@
             android:excludeFromRecents="true"
             android:noHistory="true"
             android:theme="@style/AppTheme.NoDisplay" />
+        <activity android:name=".widgets.timetable.LessonDialogActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:excludeFromRecents="true"
+            android:noHistory="true"
+            android:theme="@style/AppTheme.NoDisplay" />
         <activity
             android:name=".ui.modules.settings.SettingsLicenseActivity"
             android:configChanges="orientation|keyboardHidden"

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

@@ -68,11 +68,6 @@ import me.leolin.shortcutbadger.ShortcutBadger;
 import okhttp3.ConnectionSpec;
 import okhttp3.OkHttpClient;
 import okhttp3.TlsVersion;
-import pl.szczodrzynski.edziennik.data.api.Edziennik;
-import pl.szczodrzynski.edziennik.data.api.Iuczniowie;
-import pl.szczodrzynski.edziennik.data.api.Librus;
-import pl.szczodrzynski.edziennik.data.api.Mobidziennik;
-import pl.szczodrzynski.edziennik.data.api.Vulcan;
 import pl.szczodrzynski.edziennik.data.db.AppDb;
 import pl.szczodrzynski.edziennik.data.db.modules.debuglog.DebugLog;
 import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore;
@@ -141,12 +136,6 @@ public class App extends androidx.multidex.MultiDexApplication implements Config
     public PersistentCookieJar cookieJar;
     public OkHttpClient http;
     public OkHttpClient httpLazy;
-    //public Jakdojade apiJakdojade;
-    public Edziennik apiEdziennik;
-    public Mobidziennik apiMobidziennik;
-    public Iuczniowie apiIuczniowie;
-    public Librus apiLibrus;
-    public Vulcan apiVulcan;
 
     public SharedPreferences appSharedPrefs; // sharedPreferences for APPCONFIG + JOBS STORE
     public AppConfig appConfig; // APPCONFIG: common for all profiles
@@ -204,12 +193,6 @@ public class App extends androidx.multidex.MultiDexApplication implements Config
         db = AppDb.getDatabase(this);
         gson = new Gson();
         networkUtils = new NetworkUtils(this);
-        apiEdziennik = new Edziennik(this);
-        //apiJakdojade = new Jakdojade(this);
-        apiMobidziennik = new Mobidziennik(this);
-        apiIuczniowie = new Iuczniowie(this);
-        apiLibrus = new Librus(this);
-        apiVulcan = new Vulcan(this);
 
         Iconics.init(getApplicationContext());
         Iconics.registerFont(SzkolnyFont.INSTANCE);

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

@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-11-11.
+ */
+
+package pl.szczodrzynski.edziennik;
+
+import android.graphics.Paint;
+import android.widget.TextView;
+
+import androidx.databinding.BindingAdapter;
+
+public class Binding {
+    @BindingAdapter("strikeThrough")
+    public static void strikeThrough(TextView textView, Boolean strikeThrough) {
+        if (strikeThrough) {
+            textView.setPaintFlags(textView.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
+        } else {
+            textView.setPaintFlags(textView.getPaintFlags() & ~Paint.STRIKE_THRU_TEXT_FLAG);
+        }
+    }
+}

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

@@ -4,17 +4,23 @@ import android.Manifest
 import android.app.Activity
 import android.content.Context
 import android.content.pm.PackageManager
+import android.graphics.Typeface
 import android.os.Build
 import android.os.Bundle
 import android.text.*
 import android.text.style.ForegroundColorSpan
 import android.text.style.StrikethroughSpan
+import android.text.style.StyleSpan
 import android.util.LongSparseArray
 import android.util.SparseArray
+import android.view.View
 import android.widget.TextView
 import androidx.annotation.StringRes
 import androidx.core.app.ActivityCompat
 import androidx.core.util.forEach
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.Observer
 import com.google.gson.JsonArray
 import com.google.gson.JsonElement
 import com.google.gson.JsonObject
@@ -89,6 +95,15 @@ fun String.swapFirstLastName(): String {
     }
 }
 
+fun String.getFirstLastName(): Pair<String, String>? {
+    return this.split(" ").let {
+        if (it.size >= 2) Pair(it[0], it[1])
+        else null
+    }
+}
+
+fun String.getLastFirstName() = this.getFirstLastName()
+
 fun changeStringCase(s: String): String {
     val delimiters = " '-/"
     val sb = StringBuilder()
@@ -147,8 +162,9 @@ fun colorFromName(context: Context, name: String?): Int {
     return context.getColorFromRes(color)
 }
 
-fun MutableList<out Profile>.filterOutArchived() {
+fun MutableList<Profile>.filterOutArchived(): MutableList<Profile> {
     this.removeAll { it.archived }
+    return this
 }
 
 fun Activity.isStoragePermissionGranted(): Boolean {
@@ -343,6 +359,11 @@ fun CharSequence?.asStrikethroughSpannable(): Spannable {
     spannable.setSpan(StrikethroughSpan(), 0, spannable.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
     return spannable
 }
+fun CharSequence?.asItalicSpannable(): Spannable {
+    val spannable = SpannableString(this)
+    spannable.setSpan(StyleSpan(Typeface.ITALIC), 0, spannable.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+    return spannable
+}
 
 /**
  * Returns a new read-only list only of those given elements, that are not empty.
@@ -408,4 +429,20 @@ fun JsonObject(vararg properties: Pair<String, Any>): JsonObject {
 }
 
 fun JsonArray?.isNullOrEmpty(): Boolean = (this?.size() ?: 0) == 0
-fun JsonArray.isEmpty(): Boolean = this.size() == 0
+fun JsonArray.isEmpty(): Boolean = this.size() == 0
+
+@Suppress("UNCHECKED_CAST")
+inline fun <T : View> T.onClick(crossinline onClickListener: (v: T) -> Unit) {
+    setOnClickListener { v: View ->
+        onClickListener(v as T)
+    }
+}
+
+fun <T> LiveData<T>.observeOnce(lifecycleOwner: LifecycleOwner, observer: Observer<T>) {
+    observe(lifecycleOwner, object : Observer<T> {
+        override fun onChanged(t: T?) {
+            observer.onChanged(t)
+            removeObserver(this)
+        }
+    })
+}

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

@@ -38,18 +38,20 @@ import pl.droidsonroids.gif.GifDrawable
 import pl.szczodrzynski.edziennik.App.APP_URL
 import pl.szczodrzynski.edziennik.api.v2.events.*
 import pl.szczodrzynski.edziennik.api.v2.events.task.EdziennikTask
-import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikInterface.*
 import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata.*
 import pl.szczodrzynski.edziennik.databinding.ActivitySzkolnyBinding
 import pl.szczodrzynski.edziennik.network.ServerRequest
 import pl.szczodrzynski.edziennik.sync.AppManagerDetectedEvent
 import pl.szczodrzynski.edziennik.sync.SyncWorker
 import pl.szczodrzynski.edziennik.ui.dialogs.changelog.ChangelogDialog
+import pl.szczodrzynski.edziennik.ui.dialogs.settings.ProfileRemoveDialog
+import pl.szczodrzynski.edziennik.ui.dialogs.sync.SyncViewListDialog
 import pl.szczodrzynski.edziennik.ui.modules.agenda.AgendaFragment
 import pl.szczodrzynski.edziennik.ui.modules.announcements.AnnouncementsFragment
 import pl.szczodrzynski.edziennik.ui.modules.attendance.AttendanceFragment
 import pl.szczodrzynski.edziennik.ui.modules.base.DebugFragment
 import pl.szczodrzynski.edziennik.ui.modules.behaviour.BehaviourFragment
+import pl.szczodrzynski.edziennik.ui.modules.error.ErrorSnackbar
 import pl.szczodrzynski.edziennik.ui.modules.feedback.FeedbackFragment
 import pl.szczodrzynski.edziennik.ui.modules.feedback.HelpFragment
 import pl.szczodrzynski.edziennik.ui.modules.grades.GradesFragment
@@ -57,7 +59,7 @@ import pl.szczodrzynski.edziennik.ui.modules.grades.editor.GradesEditorFragment
 import pl.szczodrzynski.edziennik.ui.modules.home.HomeFragment
 import pl.szczodrzynski.edziennik.ui.modules.homework.HomeworkFragment
 import pl.szczodrzynski.edziennik.ui.modules.login.LoginActivity
-import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesDetailsFragment
+import pl.szczodrzynski.edziennik.ui.modules.messages.MessageFragment
 import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesFragment
 import pl.szczodrzynski.edziennik.ui.modules.notifications.NotificationsFragment
 import pl.szczodrzynski.edziennik.ui.modules.settings.ProfileManagerFragment
@@ -203,7 +205,7 @@ class MainActivity : AppCompatActivity() {
             list += NavTarget(TARGET_GRADES_EDITOR, R.string.menu_grades_editor, GradesEditorFragment::class)
             list += NavTarget(TARGET_HELP, R.string.menu_help, HelpFragment::class)
             list += NavTarget(TARGET_FEEDBACK, R.string.menu_feedback, FeedbackFragment::class)
-            list += NavTarget(TARGET_MESSAGES_DETAILS, R.string.menu_message, MessagesDetailsFragment::class)
+            list += NavTarget(TARGET_MESSAGES_DETAILS, R.string.menu_message, MessageFragment::class)
             list += NavTarget(DRAWER_ITEM_DEBUG, R.string.menu_debug, DebugFragment::class)
 
             list
@@ -214,6 +216,7 @@ class MainActivity : AppCompatActivity() {
     val navView: NavView by lazy { b.navView }
     val drawer: NavDrawer by lazy { navView.drawer }
     val bottomSheet: NavBottomSheet by lazy { navView.bottomSheet }
+    val errorSnackbar: ErrorSnackbar by lazy { ErrorSnackbar(this) }
 
     val swipeRefreshLayout: SwipeRefreshLayoutNoTouch by lazy { b.swipeRefreshLayout }
 
@@ -246,6 +249,8 @@ class MainActivity : AppCompatActivity() {
 
         setContentView(b.root)
 
+        errorSnackbar.setCoordinator(b.navView.coordinator, b.navView.bottomBar)
+
         navLoading = true
 
         b.navView.apply {
@@ -345,7 +350,7 @@ class MainActivity : AppCompatActivity() {
         if (!profileListEmpty) {
             handleIntent(intent?.extras)
         }
-        app.db.profileDao().getAllFull().observe(this, Observer { profiles ->
+        app.db.profileDao().allFull.observe(this, Observer { profiles ->
             // TODO fix weird -1 profiles ???
             profiles.removeAll { it.id < 0 }
             drawer.setProfileList(profiles)
@@ -362,7 +367,7 @@ class MainActivity : AppCompatActivity() {
         if (app.profile != null)
             setDrawerItems()
 
-        app.db.metadataDao().getUnreadCounts().observe(this, Observer { unreadCounters ->
+        app.db.metadataDao().unreadCounts.observe(this, Observer { unreadCounters ->
             unreadCounters.map {
                 it.type = it.thingType
             }
@@ -371,6 +376,11 @@ class MainActivity : AppCompatActivity() {
 
         b.swipeRefreshLayout.isEnabled = true
         b.swipeRefreshLayout.setOnRefreshListener { this.syncCurrentFeature() }
+        b.swipeRefreshLayout.setColorSchemeResources(
+                R.color.md_blue_500,
+                R.color.md_amber_500,
+                R.color.md_green_500
+        )
 
         isStoragePermissionGranted()
 
@@ -464,7 +474,7 @@ class MainActivity : AppCompatActivity() {
                         .withIcon(CommunityMaterial.Icon2.cmd_sync)
                         .withOnClickListener(View.OnClickListener {
                             bottomSheet.close()
-                            app.apiEdziennik.guiSyncFeature(app, this, App.profileId, R.string.sync_dialog_title, R.string.sync_dialog_text, R.string.sync_done, fragmentToFeature(navTargetId))
+                            SyncViewListDialog(this, navTargetId)
                         }),
                 BottomSheetSeparatorItem(false),
                 BottomSheetPrimaryItem(false)
@@ -573,7 +583,12 @@ class MainActivity : AppCompatActivity() {
     }
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onSyncErrorEvent(event: ApiTaskErrorEvent) {
-
+        navView.toolbar.apply {
+            subtitleFormat = R.string.toolbar_subtitle
+            subtitleFormatWithUnread = R.plurals.toolbar_subtitle_with_unread
+            subtitle = "Gotowe"
+        }
+        errorSnackbar.addError(event.error).show()
     }
     @Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
     fun onAppManagerDetectedEvent(event: AppManagerDetectedEvent) {
@@ -605,22 +620,7 @@ class MainActivity : AppCompatActivity() {
                 .setCancelable(false)
                 .show()
     }
-    private fun fragmentToFeature(currentFragment: Int): Int {
-        return when (currentFragment) {
-            DRAWER_ITEM_TIMETABLE -> FEATURE_TIMETABLE
-            DRAWER_ITEM_AGENDA -> FEATURE_AGENDA
-            DRAWER_ITEM_GRADES -> FEATURE_GRADES
-            DRAWER_ITEM_HOMEWORK -> FEATURE_HOMEWORK
-            DRAWER_ITEM_BEHAVIOUR -> FEATURE_NOTICES
-            DRAWER_ITEM_ATTENDANCE -> FEATURE_ATTENDANCE
-            DRAWER_ITEM_MESSAGES -> when (MessagesFragment.pageSelection) {
-                1 -> FEATURE_MESSAGES_OUTBOX
-                else -> FEATURE_MESSAGES_INBOX
-            }
-            DRAWER_ITEM_ANNOUNCEMENTS -> FEATURE_ANNOUNCEMENTS
-            else -> FEATURE_ALL
-        }
-    }
+
     private fun fragmentToSyncName(currentFragment: Int): Int {
         return when (currentFragment) {
             DRAWER_ITEM_TIMETABLE -> R.string.sync_feature_timetable
@@ -701,7 +701,8 @@ class MainActivity : AppCompatActivity() {
             }
             intentTargetId != -1 -> {
                 drawer.currentProfile = app.profile.id
-                loadTarget(intentTargetId, extras)
+                if (navTargetId != intentTargetId)
+                    loadTarget(intentTargetId, extras)
             }
             else -> {
                 drawer.currentProfile = app.profile.id
@@ -1042,7 +1043,7 @@ class MainActivity : AppCompatActivity() {
                 }
                 loadTarget(DRAWER_ITEM_SETTINGS, null)
             } else if (item.itemId == 2) {
-                app.apiEdziennik.guiRemoveProfile(this@MainActivity, profileId, profile.name?.getText(this).toString())
+                ProfileRemoveDialog(this, profileId, profile.name?.getText(this)?.toString() ?: "?")
             }
             true
         }

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

@@ -1,450 +0,0 @@
-package pl.szczodrzynski.edziennik;
-
-import android.app.PendingIntent;
-import android.appwidget.AppWidgetManager;
-import android.appwidget.AppWidgetProvider;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.PorterDuff;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-import android.os.Build;
-import android.util.SparseArray;
-import android.view.View;
-import android.widget.RemoteViews;
-
-import com.mikepenz.iconics.IconicsColor;
-import com.mikepenz.iconics.IconicsDrawable;
-import com.mikepenz.iconics.IconicsSize;
-import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-
-import pl.szczodrzynski.edziennik.api.v2.events.task.EdziennikTask;
-import pl.szczodrzynski.edziennik.data.db.modules.events.EventFull;
-import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonChange;
-import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonFull;
-import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile;
-import pl.szczodrzynski.edziennik.ui.modules.home.HomeFragment;
-import pl.szczodrzynski.edziennik.utils.models.Date;
-import pl.szczodrzynski.edziennik.utils.models.ItemWidgetTimetableModel;
-import pl.szczodrzynski.edziennik.utils.models.Time;
-import pl.szczodrzynski.edziennik.utils.models.Week;
-import pl.szczodrzynski.edziennik.widgets.WidgetConfig;
-import pl.szczodrzynski.edziennik.widgets.timetable.LessonDetailsActivity;
-import pl.szczodrzynski.edziennik.widgets.timetable.WidgetTimetableService;
-
-import static pl.szczodrzynski.edziennik.ExtensionsKt.filterOutArchived;
-import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.TYPE_HOMEWORK;
-import static pl.szczodrzynski.edziennik.utils.Utils.bs;
-
-
-public class WidgetTimetable extends AppWidgetProvider {
-
-
-    public static final String ACTION_SYNC_DATA = "ACTION_SYNC_DATA";
-    private static final String TAG = "WidgetTimetable";
-    private static int modeInt = 0;
-
-    public WidgetTimetable() {
-        // Start the worker thread
-        //HandlerThread sWorkerThread = new HandlerThread("WidgetTimetable-worker");
-        //sWorkerThread.start();
-        //Handler sWorkerQueue = new Handler(sWorkerThread.getLooper());
-    }
-
-    public static SparseArray<List<ItemWidgetTimetableModel>> timetables = null;
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        if (ACTION_SYNC_DATA.equals(intent.getAction())) {
-            EdziennikTask.Companion.sync().enqueue(context);
-        }
-        super.onReceive(context, intent);
-    }
-
-    public static PendingIntent getPendingSelfIntent(Context context, String action) {
-        Intent intent = new Intent(context, WidgetTimetable.class);
-        intent.setAction(action);
-        return getPendingSelfIntent(context, intent);
-    }
-    public static PendingIntent getPendingSelfIntent(Context context, Intent intent) {
-        return PendingIntent.getBroadcast(context, 0, intent, 0);
-    }
-
-    public static Bitmap drawableToBitmap (Drawable drawable) {
-
-        if (drawable instanceof BitmapDrawable) {
-            return ((BitmapDrawable)drawable).getBitmap();
-        }
-
-        Bitmap bitmap = Bitmap.createBitmap(drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);
-        Canvas canvas = new Canvas(bitmap);
-        drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
-        drawable.draw(canvas);
-
-        return bitmap;
-    }
-
-    @Override
-    public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
-        ComponentName thisWidget = new ComponentName(context, WidgetTimetable.class);
-
-        timetables = new SparseArray<>();
-        //timetables.clear();
-
-        App app = (App)context.getApplicationContext();
-
-        int[] allWidgetIds = appWidgetManager.getAppWidgetIds(thisWidget);
-        // There may be multiple widgets active, so update all of them
-        for (int appWidgetId : allWidgetIds) {
-
-            //d(TAG, "thr "+Thread.currentThread().getName());
-
-            WidgetConfig widgetConfig = app.appConfig.widgetTimetableConfigs.get(appWidgetId);
-            if (widgetConfig == null) {
-                widgetConfig = new WidgetConfig(app.profileFirstId());
-                app.appConfig.widgetTimetableConfigs.put(appWidgetId, widgetConfig);
-                app.appConfig.savePending = true;
-            }
-
-            RemoteViews views;
-            if (widgetConfig.bigStyle) {
-                views = new RemoteViews(context.getPackageName(), widgetConfig.darkTheme ? R.layout.widget_timetable_dark_big : R.layout.widget_timetable_big);
-            }
-            else {
-                views = new RemoteViews(context.getPackageName(), widgetConfig.darkTheme ? R.layout.widget_timetable_dark : R.layout.widget_timetable);
-            }
-
-            PorterDuff.Mode mode = PorterDuff.Mode.DST_IN;
-            /*if (widgetConfig.darkTheme) {
-                switch (modeInt) {
-                    case 0:
-                        mode = PorterDuff.Mode.ADD;
-                        d(TAG, "ADD");
-                        break;
-                    case 1:
-                        mode = PorterDuff.Mode.DST_ATOP;
-                        d(TAG, "DST_ATOP");
-                        break;
-                    case 2:
-                        mode = PorterDuff.Mode.DST_IN;
-                        d(TAG, "DST_IN");
-                        break;
-                    case 3:
-                        mode = PorterDuff.Mode.DST_OUT;
-                        d(TAG, "DST_OUT");
-                        break;
-                    case 4:
-                        mode = PorterDuff.Mode.DST_OVER;
-                        d(TAG, "DST_OVER");
-                        break;
-                    case 5:
-                        mode = PorterDuff.Mode.LIGHTEN;
-                        d(TAG, "LIGHTEN");
-                        break;
-                    case 6:
-                        mode = PorterDuff.Mode.MULTIPLY;
-                        d(TAG, "MULTIPLY");
-                        break;
-                    case 7:
-                        mode = PorterDuff.Mode.OVERLAY;
-                        d(TAG, "OVERLAY");
-                        break;
-                    case 8:
-                        mode = PorterDuff.Mode.SCREEN;
-                        d(TAG, "SCREEN");
-                        break;
-                    case 9:
-                        mode = PorterDuff.Mode.SRC_ATOP;
-                        d(TAG, "SRC_ATOP");
-                        break;
-                    case 10:
-                        mode = PorterDuff.Mode.SRC_IN;
-                        d(TAG, "SRC_IN");
-                        break;
-                    case 11:
-                        mode = PorterDuff.Mode.SRC_OUT;
-                        d(TAG, "SRC_OUT");
-                        break;
-                    case 12:
-                        mode = PorterDuff.Mode.SRC_OVER;
-                        d(TAG, "SRC_OVER");
-                        break;
-                    case 13:
-                        mode = PorterDuff.Mode.XOR;
-                        d(TAG, "XOR");
-                        break;
-                    default:
-                        modeInt = 0;
-                        mode = PorterDuff.Mode.ADD;
-                        d(TAG, "ADD");
-                        break;
-                }
-            }*/
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
-                // this code seems to crash the launcher on >= P
-                float transparency = widgetConfig.opacity;  //0...1
-                long colorFilter = 0x01000000L * (long) (255f * transparency);
-                try {
-                    final Method[] declaredMethods = Class.forName("android.widget.RemoteViews").getDeclaredMethods();
-                    final int len = declaredMethods.length;
-                    if (len > 0) {
-                        for (int m = 0; m < len; m++) {
-                            final Method method = declaredMethods[m];
-                            if (method.getName().equals("setDrawableParameters")) {
-                                method.setAccessible(true);
-                                method.invoke(views, R.id.widgetTimetableListView, true, -1, (int) colorFilter, mode, -1);
-                                method.invoke(views, R.id.widgetTimetableHeader, true, -1, (int) colorFilter, mode, -1);
-                                break;
-                            }
-                        }
-                    }
-                } catch (ClassNotFoundException e) {
-                    e.printStackTrace();
-                } catch (InvocationTargetException e) {
-                    e.printStackTrace();
-                } catch (IllegalAccessException e) {
-                    e.printStackTrace();
-                } catch (IllegalArgumentException e) {
-                    e.printStackTrace();
-                }
-            }
-
-            Intent refreshIntent = new Intent(context, WidgetTimetable.class);
-            refreshIntent.setAction(AppWidgetManager.ACTION_APPWIDGET_UPDATE);
-            refreshIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, appWidgetIds);
-            PendingIntent pendingRefreshIntent = PendingIntent.getBroadcast(context,
-                    0, refreshIntent, PendingIntent.FLAG_UPDATE_CURRENT);
-            views.setOnClickPendingIntent(R.id.widgetTimetableRefresh, pendingRefreshIntent);
-
-            views.setOnClickPendingIntent(R.id.widgetTimetableSync, WidgetTimetable.getPendingSelfIntent(context, ACTION_SYNC_DATA));
-
-            views.setImageViewBitmap(R.id.widgetTimetableRefresh, new IconicsDrawable(context, CommunityMaterial.Icon2.cmd_refresh)
-                    .color(IconicsColor.colorInt(Color.WHITE))
-                    .size(IconicsSize.dp(widgetConfig.bigStyle ? 24 : 16)).toBitmap());
-
-            views.setImageViewBitmap(R.id.widgetTimetableSync, new IconicsDrawable(context, CommunityMaterial.Icon2.cmd_sync)
-                    .color(IconicsColor.colorInt(Color.WHITE))
-                    .size(IconicsSize.dp(widgetConfig.bigStyle ? 24 : 16)).toBitmap());
-
-            boolean unified = widgetConfig.profileId == -1;
-
-            List<Profile> profileList = new ArrayList<>();
-            if (unified) {
-                profileList = app.db.profileDao().getAllNow();
-                filterOutArchived(profileList);
-            }
-            else {
-                Profile profile = app.db.profileDao().getFullByIdNow(widgetConfig.profileId);
-                if (profile != null) {
-                    profileList.add(profile);
-                }
-            }
-
-            //d(TAG, "Profiles: "+ Arrays.toString(profileList.toArray()));
-
-            if (profileList == null || profileList.size() == 0) {
-                views.setViewVisibility(R.id.widgetTimetableLoading, View.VISIBLE);
-                views.setTextViewText(R.id.widgetTimetableLoading, app.getString(R.string.widget_timetable_profile_doesnt_exist));
-            }
-            else {
-                views.setViewVisibility(R.id.widgetTimetableLoading, View.GONE);
-                //Register profile;
-
-                long bellSyncDiffMillis = 0;
-                if (app.appConfig.bellSyncDiff != null) {
-                    bellSyncDiffMillis = app.appConfig.bellSyncDiff.hour * 60 * 60 * 1000 + app.appConfig.bellSyncDiff.minute * 60 * 1000 + app.appConfig.bellSyncDiff.second * 1000;
-                    bellSyncDiffMillis *= app.appConfig.bellSyncMultiplier;
-                    bellSyncDiffMillis *= -1;
-                }
-
-                List<ItemWidgetTimetableModel> lessonList = new ArrayList<>();
-
-                Time syncedNow = Time.fromMillis(Time.getNow().getInMillis() + bellSyncDiffMillis);
-
-                Date today = Date.getToday();
-
-                int openProfileId = -1;
-                Date displayingDate = null;
-                int displayingWeekDay = 0;
-                if (unified) {
-                    views.setTextViewText(R.id.widgetTimetableSubtitle, app.getString(R.string.widget_timetable_title_unified));
-                }
-                else {
-                    views.setTextViewText(R.id.widgetTimetableSubtitle, profileList.get(0).getName());
-                    openProfileId = profileList.get(0).getId();
-                }
-
-                List<LessonFull> lessons = app.db.lessonDao().getAllWeekNow(unified ? -1 : openProfileId, today.clone().stepForward(0, 0, -today.getWeekDay()), today);
-
-                int scrollPos = 0;
-
-                for (Profile profile: profileList) {
-                    Date profileDisplayingDate = HomeFragment.findDateWithLessons(profile.getId(), lessons, syncedNow, 1);
-                    int profileDisplayingWeekDay = profileDisplayingDate.getWeekDay();
-                    int dayDiff = Date.diffDays(profileDisplayingDate, Date.getToday());
-
-                    //d(TAG, "For profile "+profile.name+" displayingDate is "+profileDisplayingDate.getStringY_m_d());
-                    if (displayingDate == null || profileDisplayingDate.getValue() < displayingDate.getValue()) {
-                        displayingDate = profileDisplayingDate;
-                        displayingWeekDay = profileDisplayingWeekDay;
-                        //d(TAG, "Setting as global dd");
-                        if (dayDiff == 0) {
-                            views.setTextViewText(R.id.widgetTimetableTitle, app.getString(R.string.day_today_format, Week.getFullDayName(displayingWeekDay)));
-                        } else if (dayDiff == 1) {
-                            views.setTextViewText(R.id.widgetTimetableTitle, app.getString(R.string.day_tomorrow_format, Week.getFullDayName(displayingWeekDay)));
-                        } else {
-                            views.setTextViewText(R.id.widgetTimetableTitle, Week.getFullDayName(displayingWeekDay) + " " + profileDisplayingDate.getStringDm());
-                        }
-                    }
-                }
-
-                for (Profile profile: profileList) {
-                    int pos = 0;
-
-                    List<EventFull> events = app.db.eventDao().getAllByDateNow(profile.getId(), displayingDate);
-                    if (events == null)
-                        events = new ArrayList<>();
-
-                    if (unified) {
-                        ItemWidgetTimetableModel separator = new ItemWidgetTimetableModel();
-                        separator.profileId = profile.getId();
-                        separator.bigStyle = widgetConfig.bigStyle;
-                        separator.darkTheme = widgetConfig.darkTheme;
-                        separator.separatorProfileName = profile.getName();
-                        lessonList.add(separator);
-                    }
-
-                    for (LessonFull lesson : lessons) {
-                        //d(TAG, "Profile "+profile.id+" Lesson profileId "+lesson.profileId+" weekDay "+lesson.weekDay+", "+lesson);
-                        if (profile.getId() != lesson.profileId || displayingWeekDay != lesson.weekDay)
-                            continue;
-                        //d(TAG, "Not skipped");
-                        ItemWidgetTimetableModel model = new ItemWidgetTimetableModel();
-
-                        model.bigStyle = widgetConfig.bigStyle;
-                        model.darkTheme = widgetConfig.darkTheme;
-
-                        model.profileId = profile.getId();
-
-                        model.lessonDate = displayingDate;
-                        model.startTime = lesson.startTime;
-                        model.endTime = lesson.endTime;
-
-                        model.lessonPassed = (syncedNow.getValue() > lesson.endTime.getValue()) && displayingWeekDay == Week.getTodayWeekDay();
-                        model.lessonCurrent = (Time.inRange(lesson.startTime, lesson.endTime, syncedNow)) && displayingWeekDay == Week.getTodayWeekDay();
-
-                        if (model.lessonCurrent) {
-                            scrollPos = pos;
-                        } else if (model.lessonPassed) {
-                            scrollPos = pos + 1;
-                        }
-                        pos++;
-
-                        model.subjectName = bs(lesson.subjectLongName);
-                        model.classroomName = lesson.classroomName;
-
-                        model.bellSyncDiffMillis = bellSyncDiffMillis;
-
-                        if (lesson.changeId != 0) {
-                            if (lesson.changeType == LessonChange.TYPE_CHANGE) {
-                                model.lessonChange = true;
-                                if (lesson.changedClassroomName()) {
-                                    model.newClassroomName = lesson.changeClassroomName;
-                                }
-
-                                if (lesson.changedSubjectLongName()) {
-                                    model.newSubjectName = lesson.changeSubjectLongName;
-                                }
-                            }
-                            if (lesson.changeType == LessonChange.TYPE_CANCELLED) {
-                                model.lessonCancelled = true;
-                            }
-                        }
-
-                        for (EventFull event : events) {
-                            if (event.startTime == null)
-                                continue;
-                            if (event.eventDate.getValue() == displayingDate.getValue()
-                                    && event.startTime.getValue() == lesson.startTime.getValue()) {
-                                model.eventColors.add(event.type == TYPE_HOMEWORK ? ItemWidgetTimetableModel.EVENT_COLOR_HOMEWORK : event.getColor());
-                            }
-                        }
-
-                        lessonList.add(model);
-                    }
-                }
-
-                if (lessonList.size() == 0) {
-                    views.setViewVisibility(R.id.widgetTimetableLoading, View.VISIBLE);
-                    views.setRemoteAdapter(R.id.widgetTimetableListView, new Intent());
-                    views.setTextViewText(R.id.widgetTimetableLoading, app.getString(R.string.widget_timetable_no_lessons));
-                    appWidgetManager.updateAppWidget(appWidgetId, views);
-                }
-                else {
-                    views.setViewVisibility(R.id.widgetTimetableLoading, View.GONE);
-
-                    timetables.put(appWidgetId, lessonList);
-                    //WidgetTimetableListProvider.widgetsLessons.put(appWidgetId, lessons);
-                    //views.setRemoteAdapter(R.id.widgetTimetableListView, new Intent());
-                    Intent listIntent = new Intent(context, WidgetTimetableService.class);
-                    listIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
-                    listIntent.setData(Uri.parse(listIntent.toUri(Intent.URI_INTENT_SCHEME)));
-                    views.setRemoteAdapter(R.id.widgetTimetableListView, listIntent);
-
-                    // template to handle the click listener for each item
-                    Intent intentTemplate = new Intent(context, LessonDetailsActivity.class);
-                    // Old activities shouldn't be in the history stack
-                    intentTemplate.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
-                    PendingIntent pendingIntentTimetable = PendingIntent.getActivity(context,
-                            0,
-                            intentTemplate,
-                            0);
-                    views.setPendingIntentTemplate(R.id.widgetTimetableListView, pendingIntentTimetable);
-
-                    Intent openIntent = new Intent(context, MainActivity.class);
-                    openIntent.setAction("android.intent.action.MAIN");
-                    if (!unified) {
-                        openIntent.putExtra("profileId", openProfileId);
-                        openIntent.putExtra("timetableDate", displayingDate.getValue());
-                    }
-                    openIntent.putExtra("fragmentId", MainActivity.DRAWER_ITEM_TIMETABLE);
-                    PendingIntent pendingOpenIntent = PendingIntent.getActivity(context,
-                            appWidgetId, openIntent, PendingIntent.FLAG_UPDATE_CURRENT);
-                    views.setOnClickPendingIntent(R.id.widgetTimetableHeader, pendingOpenIntent);
-
-                    if (!unified)
-                        views.setScrollPosition(R.id.widgetTimetableListView, scrollPos);
-                }
-            }
-
-            appWidgetManager.updateAppWidget(appWidgetId, views);
-            appWidgetManager.notifyAppWidgetViewDataChanged(appWidgetId, R.id.widgetTimetableListView);
-        }
-        //modeInt++;
-    }
-
-    @Override
-    public void onEnabled(Context context) {
-        // Enter relevant functionality for when the first widget is created
-    }
-
-    @Override
-    public void onDeleted(Context context, int[] appWidgetIds) {
-        App app = (App) context.getApplicationContext();
-        for (int appWidgetId: appWidgetIds) {
-            app.appConfig.widgetTimetableConfigs.remove(appWidgetId);
-        }
-        app.saveConfig("widgetTimetableConfigs");
-    }
-}
-

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

@@ -0,0 +1,371 @@
+package pl.szczodrzynski.edziennik
+
+import android.app.PendingIntent
+import android.appwidget.AppWidgetManager
+import android.appwidget.AppWidgetProvider
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.graphics.Bitmap
+import android.graphics.Canvas
+import android.graphics.Color
+import android.graphics.PorterDuff
+import android.graphics.drawable.BitmapDrawable
+import android.graphics.drawable.Drawable
+import android.net.Uri
+import android.os.Build
+import android.util.SparseArray
+import android.view.View
+import android.widget.RemoteViews
+import com.mikepenz.iconics.IconicsDrawable
+import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
+import com.mikepenz.iconics.utils.colorInt
+import com.mikepenz.iconics.utils.sizeDp
+import pl.szczodrzynski.edziennik.api.v2.events.task.EdziennikTask
+import pl.szczodrzynski.edziennik.data.db.modules.events.Event.TYPE_HOMEWORK
+import pl.szczodrzynski.edziennik.data.db.modules.timetable.Lesson
+import pl.szczodrzynski.edziennik.utils.models.Date
+import pl.szczodrzynski.edziennik.utils.models.ItemWidgetTimetableModel
+import pl.szczodrzynski.edziennik.utils.models.Time
+import pl.szczodrzynski.edziennik.utils.models.Week
+import pl.szczodrzynski.edziennik.widgets.WidgetConfig
+import pl.szczodrzynski.edziennik.widgets.timetable.LessonDialogActivity
+import pl.szczodrzynski.edziennik.widgets.timetable.WidgetTimetableService
+import java.lang.reflect.InvocationTargetException
+
+
+class WidgetTimetable : AppWidgetProvider() {
+
+    override fun onReceive(context: Context, intent: Intent) {
+        if (ACTION_SYNC_DATA == intent.action) {
+            EdziennikTask.sync().enqueue(context)
+        }
+        super.onReceive(context, intent)
+    }
+
+    override fun onUpdate(context: Context, appWidgetManager: AppWidgetManager, appWidgetIds: IntArray) {
+        val thisWidget = ComponentName(context, WidgetTimetable::class.java)
+
+        timetables = SparseArray()
+        //timetables.clear();
+
+        val app = context.applicationContext as App
+
+        var bellSyncDiffMillis: Long = 0
+        if (app.appConfig.bellSyncDiff != null) {
+            bellSyncDiffMillis = (app.appConfig.bellSyncDiff.hour * 60 * 60 * 1000 + app.appConfig.bellSyncDiff.minute * 60 * 1000 + app.appConfig.bellSyncDiff.second * 1000).toLong()
+            bellSyncDiffMillis *= app.appConfig.bellSyncMultiplier.toLong()
+            bellSyncDiffMillis *= -1
+        }
+
+        val allWidgetIds = appWidgetManager.getAppWidgetIds(thisWidget)
+
+        allWidgetIds?.forEach { appWidgetId ->
+            var widgetConfig = app.appConfig.widgetTimetableConfigs[appWidgetId]
+            if (widgetConfig == null) {
+                widgetConfig = WidgetConfig(app.profileFirstId())
+                app.appConfig.widgetTimetableConfigs[appWidgetId] = widgetConfig
+                app.appConfig.savePending = true
+            }
+
+            val views = if (widgetConfig.bigStyle) {
+                RemoteViews(context.packageName, if (widgetConfig.darkTheme) R.layout.widget_timetable_dark_big else R.layout.widget_timetable_big)
+            } else {
+                RemoteViews(context.packageName, if (widgetConfig.darkTheme) R.layout.widget_timetable_dark else R.layout.widget_timetable)
+            }
+
+            val refreshIntent = Intent(app, WidgetTimetable::class.java)
+            refreshIntent.action = AppWidgetManager.ACTION_APPWIDGET_UPDATE
+            refreshIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, appWidgetIds)
+            val pendingRefreshIntent = PendingIntent.getBroadcast(context,
+                    0, refreshIntent, PendingIntent.FLAG_UPDATE_CURRENT)
+            views.setOnClickPendingIntent(R.id.widgetTimetableRefresh, pendingRefreshIntent)
+
+            views.setOnClickPendingIntent(R.id.widgetTimetableSync, getPendingSelfIntent(context, ACTION_SYNC_DATA))
+
+            views.setImageViewBitmap(R.id.widgetTimetableRefresh, IconicsDrawable(context, CommunityMaterial.Icon2.cmd_refresh)
+                    .colorInt(Color.WHITE)
+                    .sizeDp(if (widgetConfig.bigStyle) 24 else 16).toBitmap())
+
+            views.setImageViewBitmap(R.id.widgetTimetableSync, IconicsDrawable(context, CommunityMaterial.Icon2.cmd_sync)
+                    .colorInt(Color.WHITE)
+                    .sizeDp(if (widgetConfig.bigStyle) 24 else 16).toBitmap())
+
+            prepareAppWidget(app, appWidgetId, views, widgetConfig, bellSyncDiffMillis)
+
+            appWidgetManager.updateAppWidget(appWidgetId, views)
+            appWidgetManager.notifyAppWidgetViewDataChanged(appWidgetId, R.id.widgetTimetableListView)
+        }
+    }
+
+    private fun prepareAppWidget(
+            app: App,
+            appWidgetId: Int,
+            views: RemoteViews,
+            widgetConfig: WidgetConfig,
+            bellSyncDiffMillis: Long
+    ) {
+        // get the current bell-synced time
+        val now = Time.fromMillis(Time.getNow().inMillis + bellSyncDiffMillis)
+
+        // set the widget transparency
+        val mode = PorterDuff.Mode.DST_IN
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
+            // this code seems to crash the launcher on >= P
+            val transparency = widgetConfig.opacity  //0...1
+            val colorFilter = 0x01000000L * (255f * transparency).toLong()
+            try {
+                val declaredMethods = Class.forName("android.widget.RemoteViews").declaredMethods
+                val len = declaredMethods.size
+                if (len > 0) {
+                    for (m in 0 until len) {
+                        val method = declaredMethods[m]
+                        if (method.name == "setDrawableParameters") {
+                            method.isAccessible = true
+                            method.invoke(views, R.id.widgetTimetableListView, true, -1, colorFilter.toInt(), mode, -1)
+                            method.invoke(views, R.id.widgetTimetableHeader, true, -1, colorFilter.toInt(), mode, -1)
+                            break
+                        }
+                    }
+                }
+            } catch (e: ClassNotFoundException) {
+                e.printStackTrace()
+            } catch (e: InvocationTargetException) {
+                e.printStackTrace()
+            } catch (e: IllegalAccessException) {
+                e.printStackTrace()
+            } catch (e: IllegalArgumentException) {
+                e.printStackTrace()
+            }
+        }
+
+        val unified = widgetConfig.profileId == -1
+
+        // get all profiles or one profile with the specified id
+        val profileList = if (unified)
+            app.db.profileDao().allNow.filterOutArchived()
+        else
+            listOfNotNull(app.db.profileDao().getByIdNow(widgetConfig.profileId))
+
+        // no profile was found
+        if (profileList.isEmpty()) {
+            views.setViewVisibility(R.id.widgetTimetableLoading, View.VISIBLE)
+            views.setTextViewText(R.id.widgetTimetableLoading, app.getString(R.string.widget_timetable_profile_doesnt_exist))
+            return
+        }
+
+        views.setViewVisibility(R.id.widgetTimetableLoading, View.GONE)
+
+        // set lesson search bounds
+        val today = Date.getToday()
+        val searchEnd = today.clone().stepForward(0, 0, 7)
+
+        var scrollPos = 0
+
+        var profileId: Int? = null
+        var displayingDate: Date? = null
+
+        val models = mutableListOf<ItemWidgetTimetableModel>()
+
+        // get all lessons within the search bounds
+        val lessonList = app.db.timetableDao().getBetweenDatesNow(today, searchEnd)
+
+        for (profile in profileList) {
+
+            // add a profile separator with its name
+            if (unified) {
+                val separator = ItemWidgetTimetableModel()
+                separator.profileId = profile.id
+                separator.bigStyle = widgetConfig.bigStyle
+                separator.darkTheme = widgetConfig.darkTheme
+                separator.separatorProfileName = profile.name
+                models.add(separator)
+            }
+
+            // search for lessons to display
+            val timetableDate = Date.getToday()
+            var checkedDays = 0
+            var lessons = lessonList.filter { it.profileId == profile.id && it.displayDate == timetableDate && it.type != Lesson.TYPE_NO_LESSONS }
+            while ((lessons.isEmpty() || lessons.none {
+                        it.displayDate != today || (it.displayDate == today && it.displayEndTime != null && it.displayEndTime!! >= now)
+                    }) && checkedDays < 7) {
+                timetableDate.stepForward(0, 0, 1)
+                lessons = lessonList.filter { it.profileId == profile.id && it.displayDate == timetableDate && it.type != Lesson.TYPE_NO_LESSONS }
+                checkedDays++
+            }
+
+            // set the displayingDate to show in the header
+            if (!unified) {
+                if (lessons.isNotEmpty())
+                    displayingDate = timetableDate
+                profileId = profile.id
+            }
+
+            // get all events for the current date
+            val events = app.db.eventDao().getAllByDateNow(profile.id, timetableDate)?.filterNotNull() ?: emptyList()
+
+            lessons.forEachIndexed { pos, lesson ->
+                val model = ItemWidgetTimetableModel()
+
+                model.bigStyle = widgetConfig.bigStyle
+                model.darkTheme = widgetConfig.darkTheme
+
+                model.profileId = profile.id
+
+                model.lessonId = lesson.id
+                model.lessonDate = timetableDate
+                model.startTime = lesson.startTime
+                model.endTime = lesson.endTime
+
+                // check if the lesson has already passed or it's currently in progress
+                if (lesson.displayDate == today) {
+                    lesson.displayEndTime?.let { endTime ->
+                        model.lessonPassed = now > endTime
+                        lesson.displayStartTime?.let { startTime ->
+                            model.lessonCurrent = now in startTime..endTime
+                        }
+                    }
+                }
+
+                // set where should the list view scroll to
+                if (model.lessonCurrent) {
+                    scrollPos = pos
+                } else if (model.lessonPassed) {
+                    scrollPos = pos + 1
+                }
+
+                // set the subject and classroom name
+                model.subjectName = lesson.displaySubjectName
+                model.classroomName = lesson.displayClassroom
+
+                // set the bell sync to calculate progress in ListProvider
+                model.bellSyncDiffMillis = bellSyncDiffMillis
+
+                // make the model aware of the lesson type
+                when (lesson.type) {
+                    Lesson.TYPE_CANCELLED -> {
+                        model.lessonCancelled = true
+                    }
+                    Lesson.TYPE_CHANGE,
+                        Lesson.TYPE_SHIFTED_SOURCE,
+                        Lesson.TYPE_SHIFTED_TARGET -> {
+                        model.lessonChange = true
+                    }
+                }
+
+                // add every event on this lesson
+                for (event in events) {
+                    if (event.startTime != null && event.startTime != lesson.displayStartTime)
+                        continue
+                    model.eventColors.add(if (event.type == TYPE_HOMEWORK) ItemWidgetTimetableModel.EVENT_COLOR_HOMEWORK else event.getColor())
+                }
+
+                models += model
+            }
+        }
+
+        if (unified) {
+            // set the title for an unified widget
+            views.setTextViewText(R.id.widgetTimetableTitle, app.getString(R.string.widget_timetable_title_unified))
+            views.setViewVisibility(R.id.widgetTimetableSubtitle, View.GONE)
+        } else {
+            // set the title to present the widget's profile
+            views.setTextViewText(R.id.widgetTimetableTitle, profileList[0].name)
+            views.setViewVisibility(R.id.widgetTimetableTitle, View.VISIBLE)
+            // make the subtitle show current date for these lessons
+            displayingDate?.let {
+                when (Date.diffDays(it, Date.getToday())) {
+                    0 -> views.setTextViewText(R.id.widgetTimetableSubtitle, app.getString(R.string.day_today_format, Week.getFullDayName(it.weekDay)))
+                    1 -> views.setTextViewText(R.id.widgetTimetableSubtitle, app.getString(R.string.day_tomorrow_format, Week.getFullDayName(it.weekDay)))
+                    else -> views.setTextViewText(R.id.widgetTimetableSubtitle, Week.getFullDayName(it.weekDay) + " " + it.formattedString)
+                }
+            }
+        }
+
+        // intent running when the header is clicked
+        val openIntent = Intent(app, MainActivity::class.java)
+        openIntent.action = "android.intent.action.MAIN"
+        if (!unified) {
+            // per-profile widget should redirect to it + correct day
+            profileId?.let {
+                openIntent.putExtra("profileId", it)
+            }
+            displayingDate?.let {
+                openIntent.putExtra("timetableDate", it.value)
+            }
+        }
+        openIntent.putExtra("fragmentId", MainActivity.DRAWER_ITEM_TIMETABLE)
+        val pendingOpenIntent = PendingIntent.getActivity(app, appWidgetId, openIntent, 0)
+        views.setOnClickPendingIntent(R.id.widgetTimetableHeader, pendingOpenIntent)
+
+        if (lessonList.isEmpty()) {
+            views.setViewVisibility(R.id.widgetTimetableLoading, View.VISIBLE)
+            views.setRemoteAdapter(R.id.widgetTimetableListView, Intent())
+            views.setTextViewText(R.id.widgetTimetableLoading, app.getString(R.string.widget_timetable_no_lessons))
+            return
+        }
+
+        timetables!!.put(appWidgetId, models)
+
+        // apply the list service to the list view
+        val listIntent = Intent(app, WidgetTimetableService::class.java)
+        listIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId)
+        listIntent.data = Uri.parse(listIntent.toUri(Intent.URI_INTENT_SCHEME))
+        views.setRemoteAdapter(R.id.widgetTimetableListView, listIntent)
+
+        // create an intent used to display the lesson details dialog
+        val intentTemplate = Intent(app, LessonDialogActivity::class.java)
+        intentTemplate.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK)
+        val pendingIntentTimetable = PendingIntent.getActivity(app, appWidgetId, intentTemplate, 0)
+        views.setPendingIntentTemplate(R.id.widgetTimetableListView, pendingIntentTimetable)
+
+        if (!unified)
+            views.setScrollPosition(R.id.widgetTimetableListView, scrollPos)
+    }
+
+    override fun onEnabled(context: Context) {
+        // Enter relevant functionality for when the first widget is created
+    }
+
+    override fun onDeleted(context: Context, appWidgetIds: IntArray) {
+        val app = context.applicationContext as App
+        for (appWidgetId in appWidgetIds) {
+            app.appConfig.widgetTimetableConfigs.remove(appWidgetId)
+        }
+        app.saveConfig("widgetTimetableConfigs")
+    }
+
+    companion object {
+
+
+        val ACTION_SYNC_DATA = "ACTION_SYNC_DATA"
+        private val TAG = "WidgetTimetable"
+        private val modeInt = 0
+
+        var timetables: SparseArray<List<ItemWidgetTimetableModel>>? = null
+
+        fun getPendingSelfIntent(context: Context, action: String): PendingIntent {
+            val intent = Intent(context, WidgetTimetable::class.java)
+            intent.action = action
+            return getPendingSelfIntent(context, intent)
+        }
+
+        fun getPendingSelfIntent(context: Context, intent: Intent): PendingIntent {
+            return PendingIntent.getBroadcast(context, 0, intent, 0)
+        }
+
+        fun drawableToBitmap(drawable: Drawable): Bitmap {
+
+            if (drawable is BitmapDrawable) {
+                return drawable.bitmap
+            }
+
+            val bitmap = Bitmap.createBitmap(drawable.intrinsicWidth, drawable.intrinsicHeight, Bitmap.Config.ARGB_8888)
+            val canvas = Canvas(bitmap)
+            drawable.setBounds(0, 0, canvas.width, canvas.height)
+            drawable.draw(canvas)
+
+            return bitmap
+        }
+    }
+}

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

@@ -109,7 +109,7 @@ const val ERROR_LOGIN_MOBIDZIENNIK_WEB_INVALID_ADDRESS      = 206
 const val ERROR_LOGIN_MOBIDZIENNIK_WEB_OTHER                = 210
 const val ERROR_MOBIDZIENNIK_WEB_ACCESS_DENIED              = 211
 const val ERROR_MOBIDZIENNIK_WEB_NO_SESSION_KEY             = 212
-const val ERROR_MOBIDZIENNIK_WEB_NO_SESSION_VALUE           = 212
+const val ERROR_MOBIDZIENNIK_WEB_NO_SESSION_VALUE           = 216
 const val ERROR_MOBIDZIENNIK_WEB_NO_SERVER_ID               = 213
 const val ERROR_MOBIDZIENNIK_WEB_INVALID_RESPONSE           = 214
 const val ERROR_LOGIN_MOBIDZIENNIK_WEB_NO_SESSION_ID        = 215
@@ -163,3 +163,5 @@ const val EXCEPTION_LIBRUS_MESSAGES_REQUEST                 = 911
 const val EXCEPTION_IDZIENNIK_WEB_REQUEST                   = 912
 const val EXCEPTION_IDZIENNIK_WEB_API_REQUEST               = 913
 const val EXCEPTION_IDZIENNIK_API_REQUEST                   = 914
+
+const val LOGIN_NO_ARGUMENTS                                = 1201

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

@@ -7,39 +7,36 @@ package pl.szczodrzynski.edziennik.api.v2
 import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_AGENDA
 import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_ANNOUNCEMENTS
 import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_ATTENDANCE
+import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_BEHAVIOUR
 import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_GRADES
 import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_HOME
 import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_HOMEWORK
 import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_MESSAGES
-import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_BEHAVIOUR
 import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_TIMETABLE
 import pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_RECEIVED
 import pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_SENT
 
-const val FEATURE_ALL = 0
-const val FEATURE_TIMETABLE = 1
-const val FEATURE_AGENDA = 2
-const val FEATURE_GRADES = 3
-const val FEATURE_HOMEWORK = 4
-const val FEATURE_BEHAVIOUR = 5
-const val FEATURE_ATTENDANCE = 6
-const val FEATURE_MESSAGES_INBOX = 7
-const val FEATURE_MESSAGES_SENT = 8
-const val FEATURE_ANNOUNCEMENTS = 9
+internal const val FEATURE_TIMETABLE = 1
+internal const val FEATURE_AGENDA = 2
+internal const val FEATURE_GRADES = 3
+internal const val FEATURE_HOMEWORK = 4
+internal const val FEATURE_BEHAVIOUR = 5
+internal const val FEATURE_ATTENDANCE = 6
+internal const val FEATURE_MESSAGES_INBOX = 7
+internal const val FEATURE_MESSAGES_SENT = 8
+internal const val FEATURE_ANNOUNCEMENTS = 9
 
-const val FEATURE_ALWAYS_NEEDED = 100
-const val FEATURE_STUDENT_INFO = 101
-const val FEATURE_STUDENT_NUMBER = 109
-const val FEATURE_SCHOOL_INFO = 102
-const val FEATURE_CLASS_INFO = 103
-const val FEATURE_TEAM_INFO = 104
-const val FEATURE_LUCKY_NUMBER = 105
-const val FEATURE_TEACHERS = 106
-const val FEATURE_SUBJECTS = 107
-const val FEATURE_CLASSROOMS = 108
-const val FEATURE_PUSH_CONFIG = 120
-
-const val FEATURE_MESSAGE_GET = 201
+internal const val FEATURE_ALWAYS_NEEDED = 100
+internal const val FEATURE_STUDENT_INFO = 101
+internal const val FEATURE_STUDENT_NUMBER = 109
+internal const val FEATURE_SCHOOL_INFO = 102
+internal const val FEATURE_CLASS_INFO = 103
+internal const val FEATURE_TEAM_INFO = 104
+internal const val FEATURE_LUCKY_NUMBER = 105
+internal const val FEATURE_TEACHERS = 106
+internal const val FEATURE_SUBJECTS = 107
+internal const val FEATURE_CLASSROOMS = 108
+internal const val FEATURE_PUSH_CONFIG = 120
 
 object Features {
     private fun getAllNecessary(): List<Int> = listOf(

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

@@ -60,4 +60,8 @@ object Regexes {
     val IDZIENNIK_LOGIN_FIRST_STUDENT by lazy {
         """<option.*?value="([0-9]+)"\sdata-id-ucznia="([A-z0-9]+?)".*?>(.+?)\s(.+?)\s*\((.+?),\s*(.+?)\)</option>""".toRegex(RegexOption.DOT_MATCHES_ALL)
     }
+
+    val VULCAN_SHITFT_ANNOTATION by lazy {
+        """\(przeniesiona (z|na) lekcj[ię] ([0-9]+), (.+)\)""".toRegex()
+    }
 }

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/events/MessageGetEvent.kt

@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-11-12.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.events
+
+import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageFull
+
+data class MessageGetEvent(val message: MessageFull)

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/events/task/EdziennikTask.kt

@@ -12,6 +12,7 @@ import pl.szczodrzynski.edziennik.api.v2.mobidziennik.Mobidziennik
 import pl.szczodrzynski.edziennik.api.v2.template.Template
 import pl.szczodrzynski.edziennik.api.v2.vulcan.Vulcan
 import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
+import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageFull
 
 open class EdziennikTask(override val profileId: Int, val request: Any) : IApiTask(profileId) {
     companion object {
@@ -21,7 +22,7 @@ open class EdziennikTask(override val profileId: Int, val request: Any) : IApiTa
         fun sync() = EdziennikTask(-1, SyncRequest())
         fun syncProfile(profileId: Int, viewIds: List<Pair<Int, Int>>? = null, arguments: JsonObject? = null) = EdziennikTask(profileId, SyncProfileRequest(viewIds, arguments))
         fun syncProfileList(profileList: List<Int>) = EdziennikTask(-1, SyncProfileListRequest(profileList))
-        fun messageGet(profileId: Int, messageId: Int) = EdziennikTask(profileId, MessageGetRequest(messageId))
+        fun messageGet(profileId: Int, message: MessageFull) = EdziennikTask(profileId, MessageGetRequest(message))
         fun announcementsRead(profileId: Int) = EdziennikTask(profileId, AnnouncementsReadRequest())
     }
 
@@ -39,7 +40,7 @@ open class EdziennikTask(override val profileId: Int, val request: Any) : IApiTa
             // get the requested profile and login store
             val profile = app.db.profileDao().getByIdNow(profileId)
             this.profile = profile
-            if (profile == null || !profile.syncEnabled) {
+            if (profile == null) {
                 return
             }
             val loginStore = app.db.loginStoreDao().getByIdNow(profile.loginStoreId) ?: return
@@ -69,7 +70,7 @@ open class EdziennikTask(override val profileId: Int, val request: Any) : IApiTa
                     featureIds = request.viewIds?.flatMap { Features.getIdsByView(it.first, it.second) } ?: Features.getAllIds(),
                     viewId = request.viewIds?.get(0)?.first,
                     arguments = request.arguments)
-            is MessageGetRequest -> edziennikInterface?.getMessage(request.messageId)
+            is MessageGetRequest -> edziennikInterface?.getMessage(request.message)
             is FirstLoginRequest -> edziennikInterface?.firstLogin()
             is AnnouncementsReadRequest -> edziennikInterface?.markAllAnnouncementsAsRead()
         }
@@ -87,6 +88,6 @@ open class EdziennikTask(override val profileId: Int, val request: Any) : IApiTa
     class SyncRequest
     data class SyncProfileRequest(val viewIds: List<Pair<Int, Int>>? = null, val arguments: JsonObject? = null)
     data class SyncProfileListRequest(val profileList: List<Int>)
-    data class MessageGetRequest(val messageId: Int)
+    data class MessageGetRequest(val message: MessageFull)
     class AnnouncementsReadRequest
-}
+}

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/Idziennik.kt

@@ -16,6 +16,7 @@ import pl.szczodrzynski.edziennik.api.v2.interfaces.EdziennikInterface
 import pl.szczodrzynski.edziennik.api.v2.models.ApiError
 import pl.szczodrzynski.edziennik.api.v2.prepare
 import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
+import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageFull
 import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
 import pl.szczodrzynski.edziennik.utils.Utils.d
 
@@ -61,7 +62,7 @@ class Idziennik(val app: App, val profile: Profile?, val loginStore: LoginStore,
         }
     }
 
-    override fun getMessage(messageId: Int) {
+    override fun getMessage(message: MessageFull) {
 
     }
 

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/api/IdziennikApiMessagesInbox.kt

@@ -75,7 +75,7 @@ class IdziennikApiMessagesInbox(override val data: DataIdziennik,
                         /*messageId*/ messageId
                 )
 
-                data.messageList.add(message)
+                data.messageIgnoreList.add(message)
                 data.messageRecipientList.add(messageRecipient)
                 data.messageMetadataList.add(Metadata(
                         profileId,

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/api/IdziennikApiMessagesSent.kt

@@ -74,7 +74,7 @@ class IdziennikApiMessagesSent(override val data: DataIdziennik,
                     data.messageRecipientIgnoreList.add(messageRecipient)
                 }
 
-                data.messageList.add(message)
+                data.messageIgnoreList.add(message)
                 data.metadataList.add(Metadata(profileId, Metadata.TYPE_MESSAGE, message.id, true, true, sentDate))
             }
 

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

@@ -5,10 +5,11 @@
 package pl.szczodrzynski.edziennik.api.v2.interfaces
 
 import com.google.gson.JsonObject
+import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageFull
 
 interface EdziennikInterface {
     fun sync(featureIds: List<Int>, viewId: Int? = null, arguments: JsonObject? = null)
-    fun getMessage(messageId: Int)
+    fun getMessage(message: MessageFull)
     fun markAllAnnouncementsAsRead()
     fun firstLogin()
     fun cancel()

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

@@ -10,13 +10,16 @@ import pl.szczodrzynski.edziennik.api.v2.*
 import pl.szczodrzynski.edziennik.api.v2.interfaces.EdziennikCallback
 import pl.szczodrzynski.edziennik.api.v2.interfaces.EdziennikInterface
 import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusData
+import pl.szczodrzynski.edziennik.api.v2.librus.data.messages.LibrusMessagesGetMessage
 import pl.szczodrzynski.edziennik.api.v2.librus.data.synergia.LibrusSynergiaMarkAllAnnouncementsAsRead
 import pl.szczodrzynski.edziennik.api.v2.librus.firstlogin.LibrusFirstLogin
 import pl.szczodrzynski.edziennik.api.v2.librus.login.LibrusLogin
 import pl.szczodrzynski.edziennik.api.v2.librus.login.LibrusLoginApi
+import pl.szczodrzynski.edziennik.api.v2.librus.login.LibrusLoginMessages
 import pl.szczodrzynski.edziennik.api.v2.librus.login.LibrusLoginSynergia
 import pl.szczodrzynski.edziennik.api.v2.models.ApiError
 import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
+import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageFull
 import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
 import pl.szczodrzynski.edziennik.utils.Utils.d
 
@@ -78,8 +81,16 @@ class Librus(val app: App, val profile: Profile?, val loginStore: LoginStore, va
         }
     }
 
-    override fun getMessage(messageId: Int) {
-
+    override fun getMessage(message: MessageFull) {
+        LibrusLoginApi(data) {
+            LibrusLoginSynergia(data) {
+                LibrusLoginMessages(data) {
+                    LibrusMessagesGetMessage(data, message) {
+                        completed()
+                    }
+                }
+            }
+        }
     }
 
     override fun markAllAnnouncementsAsRead() {

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

@@ -44,16 +44,16 @@ class LibrusApiTimetables(override val data: DataLibrus,
                     val lessonRange = lessonRangeEl?.asJsonArray?.asJsonObjectList()
                     if (lessonRange?.isNullOrEmpty() == false)
                         lessonsFound = true
-                    lessonRange?.forEachIndexed { index, lesson ->
+                    lessonRange?.forEach { lesson ->
                         parseLesson(lessonDate, lesson)
                     }
                 }
 
                 if (day.isNullOrEmpty() || !lessonsFound) {
-                    data.lessonNewList += Lesson(profileId, lessonDate.value.toLong()).apply {
+                    data.lessonNewList.add(Lesson(profileId, lessonDate.value.toLong()).apply {
                         type = Lesson.TYPE_NO_LESSONS
                         date = lessonDate
-                    }
+                    })
                 }
             }
 
@@ -187,6 +187,6 @@ class LibrusApiTimetables(override val data: DataLibrus,
                             System.currentTimeMillis()
                     ))
         }
-        data.lessonNewList += lessonObject
+        data.lessonNewList.add(lessonObject)
     }
 }

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

@@ -22,8 +22,8 @@ class LibrusApiUsers(override val data: DataLibrus,
 
             users?.forEach { user ->
                 val id = user.getLong("Id") ?: return@forEach
-                val firstName = user.getString("FirstName")?.fixWhiteSpaces() ?: ""
-                val lastName = user.getString("LastName")?.fixWhiteSpaces() ?: ""
+                val firstName = user.getString("FirstName")?.fixName() ?: ""
+                val lastName = user.getString("LastName")?.fixName() ?: ""
 
                 data.teacherList.put(id, Teacher(profileId, id, firstName, lastName))
             }

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/messages/LibrusMessagesGetList.kt

@@ -13,6 +13,7 @@ import pl.szczodrzynski.edziennik.api.v2.librus.ENDPOINT_LIBRUS_MESSAGES_SENT
 import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusMessages
 import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
 import pl.szczodrzynski.edziennik.data.db.modules.messages.Message
+import pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_RECEIVED
 import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageRecipient
 import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
 import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher
@@ -20,7 +21,7 @@ import pl.szczodrzynski.edziennik.singleOrNull
 import pl.szczodrzynski.edziennik.utils.Utils
 import pl.szczodrzynski.edziennik.utils.models.Date
 
-class LibrusMessagesGetList(override val data: DataLibrus, private val type: Int = Message.TYPE_RECEIVED,
+class LibrusMessagesGetList(override val data: DataLibrus, private val type: Int = TYPE_RECEIVED,
                             archived: Boolean = false, val onSuccess: () -> Unit) : LibrusMessages(data) {
     companion object {
         const val TAG = "LibrusMessagesGetList"
@@ -28,7 +29,7 @@ class LibrusMessagesGetList(override val data: DataLibrus, private val type: Int
 
     init {
         val endpoint = when (type) {
-            Message.TYPE_RECEIVED -> "Inbox/action/GetList"
+            TYPE_RECEIVED -> "Inbox/action/GetList"
             Message.TYPE_SENT -> "Outbox/action/GetList"
             else -> null
         }
@@ -46,34 +47,38 @@ class LibrusMessagesGetList(override val data: DataLibrus, private val type: Int
                         else -> 0
                     }
                     val sentDate = Date.fromIso(element.select("sendDate").text().trim())
-                    var senderId: Long = -1
-                    var receiverId: Long = -1
 
-                    when (type) {
-                        Message.TYPE_RECEIVED -> {
-                            val senderFirstName = element.select("senderFirstName").text().trim()
-                            val senderLastName = element.select("senderLastName").text().trim()
-                            senderId = data.teacherList.singleOrNull {
-                                it.name == senderFirstName && it.surname == senderLastName
-                            }?.id ?: -1
-                        }
+                    val recipientFirstName = element.select(when (type) {
+                        TYPE_RECEIVED -> "senderFirstName"
+                        else -> "receiverFirstName"
+                    }).text().trim()
 
-                        Message.TYPE_SENT -> {
-                            val receiverFirstName = element.select("receiverFirstName").text().trim()
-                            val receiverLastName = element.select("receiverLastName").text().trim()
-                            receiverId = data.teacherList.singleOrNull {
-                                it.name == receiverFirstName && it.surname == receiverLastName
-                            }?.id ?: {
-                                val teacherObject = Teacher(
-                                        profileId,
-                                        -1 * Utils.crc16("$receiverFirstName $receiverLastName".toByteArray()).toLong(),
-                                        receiverFirstName,
-                                        receiverLastName
-                                )
-                                data.teacherList.put(teacherObject.id, teacherObject)
-                                teacherObject.id
-                            }.invoke()
-                        }
+                    val recipientLastName = element.select(when (type) {
+                        TYPE_RECEIVED -> "senderLastName"
+                        else -> "receiverLastName"
+                    }).text().trim()
+
+                    val recipientId = data.teacherList.singleOrNull {
+                        it.name == recipientFirstName && it.surname == recipientLastName
+                    }?.id ?: {
+                        val teacherObject = Teacher(
+                                profileId,
+                                -1 * Utils.crc16("$recipientFirstName $recipientLastName".toByteArray()).toLong(),
+                                recipientFirstName,
+                                recipientLastName
+                        )
+                        data.teacherList.put(teacherObject.id, teacherObject)
+                        teacherObject.id
+                    }.invoke()
+
+                    val senderId = when (type) {
+                        TYPE_RECEIVED -> recipientId
+                        else -> -1
+                    }
+
+                    val receiverId = when (type) {
+                        TYPE_RECEIVED -> -1
+                        else -> recipientId
                     }
 
                     val notified = when (type) {
@@ -99,7 +104,7 @@ class LibrusMessagesGetList(override val data: DataLibrus, private val type: Int
                             id
                     )
 
-                    data.messageList.add(messageObject)
+                    data.messageIgnoreList.add(messageObject)
                     data.messageRecipientList.add(messageRecipientObject)
                     data.metadataList.add(Metadata(
                             profileId,
@@ -112,7 +117,7 @@ class LibrusMessagesGetList(override val data: DataLibrus, private val type: Int
                 }
 
                 when (type) {
-                    Message.TYPE_RECEIVED -> data.setSyncNext(ENDPOINT_LIBRUS_MESSAGES_RECEIVED, SYNC_ALWAYS)
+                    TYPE_RECEIVED -> data.setSyncNext(ENDPOINT_LIBRUS_MESSAGES_RECEIVED, SYNC_ALWAYS)
                     Message.TYPE_SENT -> data.setSyncNext(ENDPOINT_LIBRUS_MESSAGES_SENT, DAY, DRAWER_ITEM_MESSAGES)
                 }
                 onSuccess()

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/messages/LibrusMessagesGetMessage.kt

@@ -0,0 +1,132 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-11-11
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.librus.data.messages
+
+import android.util.Base64
+import org.greenrobot.eventbus.EventBus
+import pl.szczodrzynski.edziennik.api.v2.events.MessageGetEvent
+import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
+import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusMessages
+import pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_RECEIVED
+import pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_SENT
+import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageFull
+import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageRecipientFull
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
+import pl.szczodrzynski.edziennik.fixName
+import pl.szczodrzynski.edziennik.singleOrNull
+import pl.szczodrzynski.edziennik.utils.models.Date
+import java.nio.charset.Charset
+
+class LibrusMessagesGetMessage(
+        override val data: DataLibrus,
+        private val messageObject: MessageFull,
+        val onSuccess: () -> Unit
+) : LibrusMessages(data) {
+    companion object {
+        const val TAG = "LibrusMessagesGetMessage"
+    }
+
+    init { data.profile?.also { profile ->
+        messagesGet(TAG, "GetMessage", parameters = mapOf(
+                "messageId" to messageObject.id,
+                "archive" to 0
+        )) { doc ->
+            val message = doc.select("response GetMessage data").first()
+
+            val body = Base64.decode(message.select("Message").text(), Base64.DEFAULT)
+                    .toString(Charset.defaultCharset())
+                    .replace("\n", "<br>")
+                    .replace("<!\\[CDATA\\[", "")
+                    .replace("]]>", "")
+
+            messageObject.apply {
+                this.body = body
+
+                clearAttachments()
+                message.select("attachments ArrayItem").forEach {
+                    val attachmentId = it.select("id").text().toLong()
+                    val attachmentName = it.select("filename").text()
+                    addAttachment(attachmentId, attachmentName, -1)
+                }
+            }
+
+            val messageRecipientList = mutableListOf<MessageRecipientFull>()
+
+            when (messageObject.type) {
+                TYPE_RECEIVED -> {
+                    val senderLoginId = message.select("senderId").text()
+                    data.teacherList.singleOrNull { it.id == messageObject.senderId }?.loginId = senderLoginId
+
+                    val readDateText = message.select("readDate").text()
+                    val readDate = when (readDateText.isNotEmpty()) {
+                        true -> Date.fromIso(readDateText)
+                        else -> 0
+                    }
+
+                    val messageRecipientObject = MessageRecipientFull(
+                            profileId,
+                            -1,
+                            -1,
+                            readDate,
+                            messageObject.id
+                    )
+
+                    messageRecipientObject.fullName = profile.accountNameLong ?: profile.studentNameLong
+
+                    messageRecipientList.add(messageRecipientObject)
+                }
+
+                TYPE_SENT -> {
+
+                    message.select("receivers ArrayItem").forEach { receiver ->
+                        val receiverFirstName = receiver.select("firstName").text().fixName()
+                        val receiverLastName = receiver.select("lastName").text().fixName()
+                        val receiverLoginId = receiver.select("receiverId").text()
+
+                        val teacher = data.teacherList.singleOrNull { it.name == receiverFirstName && it.surname == receiverLastName }
+                        val receiverId = teacher?.id ?: -1
+                        teacher?.loginId = receiverLoginId
+
+                        val readDateText = message.select("readed").text()
+                        val readDate = when (readDateText.isNotEmpty()) {
+                            true -> Date.fromIso(readDateText)
+                            else -> 0
+                        }
+
+                        val messageRecipientObject = MessageRecipientFull(
+                                profileId,
+                                receiverId,
+                                -1,
+                                readDate,
+                                messageObject.id
+                        )
+
+                        messageRecipientObject.fullName = "$receiverFirstName $receiverLastName"
+
+                        messageRecipientList.add(messageRecipientObject)
+                    }
+                }
+            }
+
+            if (!messageObject.seen) {
+                data.messageMetadataList.add(Metadata(
+                        messageObject.profileId,
+                        Metadata.TYPE_MESSAGE,
+                        messageObject.id,
+                        true,
+                        true,
+                        messageObject.addedDate
+                ))
+            }
+
+            messageObject.recipients = messageRecipientList
+            data.messageRecipientList.addAll(messageRecipientList)
+            data.messageList.add(messageObject)
+
+            EventBus.getDefault().postSticky(MessageGetEvent(messageObject))
+            onSuccess()
+        }
+    } ?: onSuccess()}
+}

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/Mobidziennik.kt

@@ -16,6 +16,7 @@ import pl.szczodrzynski.edziennik.api.v2.mobidziennikLoginMethods
 import pl.szczodrzynski.edziennik.api.v2.models.ApiError
 import pl.szczodrzynski.edziennik.api.v2.prepare
 import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
+import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageFull
 import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
 import pl.szczodrzynski.edziennik.utils.Utils.d
 
@@ -61,7 +62,7 @@ class Mobidziennik(val app: App, val profile: Profile?, val loginStore: LoginSto
         }
     }
 
-    override fun getMessage(messageId: Int) {
+    override fun getMessage(message: MessageFull) {
 
     }
 

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/api/MobidziennikApiTeams.kt

@@ -4,7 +4,6 @@
 
 package pl.szczodrzynski.edziennik.api.v2.mobidziennik.data.api
 
-import pl.szczodrzynski.edziennik.App.profileId
 import pl.szczodrzynski.edziennik.api.v2.mobidziennik.DataMobidziennik
 import pl.szczodrzynski.edziennik.data.db.modules.teams.Team
 import pl.szczodrzynski.edziennik.getById
@@ -25,7 +24,7 @@ class MobidziennikApiTeams(val data: DataMobidziennik, tableTeams: List<String>?
                 val teacherId = cols[4].toLongOrNull() ?: -1
 
                 val teamObject = Team(
-                        profileId,
+                        data.profileId,
                         id,
                         name,
                         type,

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/api/MobidziennikApiTimetable.kt

@@ -4,7 +4,6 @@
 
 package pl.szczodrzynski.edziennik.api.v2.mobidziennik.data.api
 
-import pl.szczodrzynski.edziennik.App.profileId
 import pl.szczodrzynski.edziennik.api.v2.mobidziennik.DataMobidziennik
 import pl.szczodrzynski.edziennik.api.v2.models.DataRemoveModel
 import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
@@ -93,7 +92,7 @@ class MobidziennikApiTimetable(val data: DataMobidziennik, rows: List<String>) {
 
         for (day in dataDays) {
             val lessonDate = Date.fromValue(day)
-            data.lessonNewList += Lesson(profileId, lessonDate.value.toLong()).apply {
+            data.lessonNewList += Lesson(data.profileId, lessonDate.value.toLong()).apply {
                 type = Lesson.TYPE_NO_LESSONS
                 date = lessonDate
             }

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/web/MobidziennikWebMessagesAll.kt

@@ -8,9 +8,7 @@ import org.jsoup.Jsoup
 import pl.szczodrzynski.edziennik.DAY
 import pl.szczodrzynski.edziennik.api.v2.mobidziennik.DataMobidziennik
 import pl.szczodrzynski.edziennik.api.v2.mobidziennik.ENDPOINT_MOBIDZIENNIK_WEB_MESSAGES_ALL
-import pl.szczodrzynski.edziennik.api.v2.mobidziennik.ENDPOINT_MOBIDZIENNIK_WEB_MESSAGES_INBOX
 import pl.szczodrzynski.edziennik.api.v2.mobidziennik.data.MobidziennikWeb
-import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
 import pl.szczodrzynski.edziennik.data.db.modules.messages.Message
 import pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_RECEIVED
 import pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_SENT
@@ -79,7 +77,7 @@ class MobidziennikWebMessagesAll(override val data: DataMobidziennik,
                         -1
                 )
 
-                data.messageList.add(message)
+                data.messageIgnoreList.add(message)
                 data.metadataList.add(Metadata(profileId, Metadata.TYPE_MESSAGE, message.id, true, true, addedDate))
             }
 

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/web/MobidziennikWebMessagesInbox.kt

@@ -67,7 +67,7 @@ class MobidziennikWebMessagesInbox(override val data: DataMobidziennik,
                 if (hasAttachments)
                     message.setHasAttachments()
 
-                data.messageList.add(message)
+                data.messageIgnoreList.add(message)
                 data.messageMetadataList.add(
                         Metadata(
                                 profileId,

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

@@ -4,6 +4,7 @@
 
 package pl.szczodrzynski.edziennik.api.v2.models
 
+import android.content.Context
 import com.google.gson.JsonObject
 import im.wangchao.mhttp.Request
 import im.wangchao.mhttp.Response
@@ -52,6 +53,15 @@ class ApiError(val tag: String, val errorCode: Int) {
         )
     }
 
+    fun getStringReason(context: Context): String {
+        return context.resources.getIdentifier("error_${errorCode}_reason", "string", context.packageName).let {
+            if (it != 0)
+                context.getString(it)
+            else
+                "?"
+        }
+    }
+
     override fun toString(): String {
         return "ApiError(tag='$tag', errorCode=$errorCode, profileId=$profileId, throwable=$throwable, apiResponse=$apiResponse, request=$request, response=$response, isCritical=$isCritical)"
     }

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

@@ -156,6 +156,7 @@ open class Data(val app: App, val profile: Profile?, val loginStore: LoginStore)
     val teacherAbsenceList = mutableListOf<TeacherAbsence>()
 
     val messageList = mutableListOf<Message>()
+    val messageIgnoreList = mutableListOf<Message>()
     val messageRecipientList = mutableListOf<MessageRecipient>()
     val messageRecipientIgnoreList = mutableListOf<MessageRecipient>()
 
@@ -205,7 +206,7 @@ open class Data(val app: App, val profile: Profile?, val loginStore: LoginStore)
         announcementList.clear()
         luckyNumberList.clear()
         teacherAbsenceList.clear()
-        messageList.clear()
+        messageIgnoreList.clear()
         messageRecipientList.clear()
         messageRecipientIgnoreList.clear()
         metadataList.clear()
@@ -285,6 +286,11 @@ open class Data(val app: App, val profile: Profile?, val loginStore: LoginStore)
             }
         }
 
+        if (metadataList.isNotEmpty())
+            db.metadataDao().addAllIgnore(metadataList)
+        if (messageMetadataList.isNotEmpty())
+            db.metadataDao().setSeen(messageMetadataList)
+
         // not extracted from DB - always new data
         if (lessonList.isNotEmpty()) {
             db.lessonDao().clear(profile.id)
@@ -316,15 +322,13 @@ open class Data(val app: App, val profile: Profile?, val loginStore: LoginStore)
             db.teacherAbsenceDao().addAll(teacherAbsenceList)
 
         if (messageList.isNotEmpty())
-            db.messageDao().addAllIgnore(messageList)
+            db.messageDao().addAll(messageList)
+        if (messageIgnoreList.isNotEmpty())
+            db.messageDao().addAllIgnore(messageIgnoreList)
         if (messageRecipientList.isNotEmpty())
             db.messageRecipientDao().addAll(messageRecipientList)
         if (messageRecipientIgnoreList.isNotEmpty())
             db.messageRecipientDao().addAllIgnore(messageRecipientIgnoreList)
-        if (metadataList.isNotEmpty())
-            db.metadataDao().addAllIgnore(metadataList)
-        if (messageMetadataList.isNotEmpty())
-            db.metadataDao().setSeen(messageMetadataList)
     }
 
     fun notifyAndSyncEvents(onSuccess: () -> Unit) {

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/Template.kt

@@ -16,6 +16,7 @@ import pl.szczodrzynski.edziennik.api.v2.template.firstlogin.TemplateFirstLogin
 import pl.szczodrzynski.edziennik.api.v2.template.login.TemplateLogin
 import pl.szczodrzynski.edziennik.api.v2.templateLoginMethods
 import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
+import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageFull
 import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
 import pl.szczodrzynski.edziennik.utils.Utils.d
 
@@ -61,7 +62,7 @@ class Template(val app: App, val profile: Profile?, val loginStore: LoginStore,
         }
     }
 
-    override fun getMessage(messageId: Int) {
+    override fun getMessage(message: MessageFull) {
 
     }
 

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/Vulcan.kt

@@ -12,10 +12,13 @@ import pl.szczodrzynski.edziennik.api.v2.interfaces.EdziennikInterface
 import pl.szczodrzynski.edziennik.api.v2.models.ApiError
 import pl.szczodrzynski.edziennik.api.v2.prepare
 import pl.szczodrzynski.edziennik.api.v2.vulcan.data.VulcanData
+import pl.szczodrzynski.edziennik.api.v2.vulcan.data.api.VulcanApiMessagesChangeStatus
 import pl.szczodrzynski.edziennik.api.v2.vulcan.firstlogin.VulcanFirstLogin
 import pl.szczodrzynski.edziennik.api.v2.vulcan.login.VulcanLogin
+import pl.szczodrzynski.edziennik.api.v2.vulcan.login.VulcanLoginApi
 import pl.szczodrzynski.edziennik.api.v2.vulcanLoginMethods
 import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
+import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageFull
 import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
 import pl.szczodrzynski.edziennik.utils.Utils.d
 
@@ -61,8 +64,12 @@ class Vulcan(val app: App, val profile: Profile?, val loginStore: LoginStore, va
         }
     }
 
-    override fun getMessage(messageId: Int) {
-
+    override fun getMessage(message: MessageFull) {
+        VulcanLoginApi(data) {
+            VulcanApiMessagesChangeStatus(data, message) {
+                completed()
+            }
+        }
     }
 
     override fun markAllAnnouncementsAsRead() {

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/data/VulcanData.kt

@@ -64,6 +64,10 @@ class VulcanData(val data: DataVulcan, val onSuccess: () -> Unit) {
                 data.startProgress(R.string.edziennik_progress_endpoint_attendance)
                 VulcanApiAttendance(data, onSuccess)
             }
+            ENDPOINT_VULCAN_API_TIMETABLE -> {
+                data.startProgress(R.string.edziennik_progress_endpoint_timetable)
+                VulcanApiTimetable(data, onSuccess)
+            }
             ENDPOINT_VULCAN_API_MESSAGES_INBOX -> {
                 data.startProgress(R.string.edziennik_progress_endpoint_messages_inbox)
                 VulcanApiMessagesInbox(data, onSuccess)

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/data/api/VulcanApiAttendance.kt

@@ -55,7 +55,7 @@ class VulcanApiAttendance(override val data: DataVulcan, val onSuccess: () -> Un
                         lessonSemester,
                         attendance.getString("PrzedmiotNazwa") + attendanceCategory.name.let { " - $it" },
                         lessonDate,
-                        data.lessonRanges.get(attendance.getInt("IdPoraLekcji") ?: 0)?.startTime,
+                        data.lessonRanges.get(attendance.getInt("Numer") ?: 0)?.startTime,
                         type)
 
                 data.attendanceList.add(attendanceObject)

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/data/api/VulcanApiDictionaries.kt

@@ -35,7 +35,7 @@ class VulcanApiDictionaries(override val data: DataVulcan, val onSuccess: () ->
             elements?.getJsonArray("KategorieUwag")?.forEach { saveNoticeType(it.asJsonObject) }
             elements?.getJsonArray("KategorieFrekwencji")?.forEach { saveAttendanceType(it.asJsonObject) }
 
-            data.setSyncNext(ENDPOINT_VULCAN_API_DICTIONARIES, 4*DAY)
+            data.setSyncNext(ENDPOINT_VULCAN_API_DICTIONARIES, 4 * DAY)
             onSuccess()
         }
     }
@@ -73,7 +73,7 @@ class VulcanApiDictionaries(override val data: DataVulcan, val onSuccess: () ->
     }
 
     private fun saveLessonRange(lessonRange: JsonObject) {
-        val lessonNumber = lessonRange.getInt("Id") ?: return
+        val lessonNumber = lessonRange.getInt("Numer") ?: return
         val startTime = lessonRange.getString("PoczatekTekst")?.let { Time.fromH_m(it) } ?: return
         val endTime = lessonRange.getString("KoniecTekst")?.let { Time.fromH_m(it) } ?: return
 
@@ -126,8 +126,7 @@ class VulcanApiDictionaries(override val data: DataVulcan, val onSuccess: () ->
                 Attendance.TYPE_ABSENT_EXCUSED
             else
                 Attendance.TYPE_ABSENT
-        }
-        else {
+        } else {
             val belated = attendanceType.getBoolean("Spoznienie") ?: false
             val released = attendanceType.getBoolean("Zwolnienie") ?: false
             val present = attendanceType.getBoolean("Obecnosc") ?: true

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/data/api/VulcanApiMessagesChangeStatus.kt

@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-11-12
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.vulcan.data.api
+
+import pl.szczodrzynski.edziennik.api.v2.VULCAN_API_ENDPOINT_MESSAGES_CHANGE_STATUS
+import pl.szczodrzynski.edziennik.api.v2.vulcan.DataVulcan
+import pl.szczodrzynski.edziennik.api.v2.vulcan.data.VulcanApi
+import pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_SENT
+import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageFull
+import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageRecipient
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
+
+class VulcanApiMessagesChangeStatus(
+        override val data: DataVulcan,
+        private val messageObject: MessageFull,
+        val onSuccess: () -> Unit
+) : VulcanApi(data) {
+    companion object {
+        const val TAG = "VulcanApiMessagesChangeStatus"
+    }
+
+    init {
+        data.profile?.also { profile ->
+            apiGet(TAG, VULCAN_API_ENDPOINT_MESSAGES_CHANGE_STATUS, parameters = mapOf(
+                    "WiadomoscId" to messageObject.id,
+                    "FolderWiadomosci" to "Odebrane",
+                    "Status" to "Widoczna",
+                    "LoginId" to data.studentLoginId,
+                    "IdUczen" to data.studentId
+            )) { _, _ ->
+
+                if (!messageObject.seen) {
+                    data.messageMetadataList.add(Metadata(
+                            profileId,
+                            Metadata.TYPE_MESSAGE,
+                            messageObject.id,
+                            true,
+                            true,
+                            messageObject.addedDate
+                    ))
+                }
+
+                if (messageObject.type != TYPE_SENT) {
+                    val messageRecipientObject = MessageRecipient(
+                            profileId,
+                            -1,
+                            -1,
+                            System.currentTimeMillis(),
+                            messageObject.id
+                    )
+
+                    data.messageRecipientList.add(messageRecipientObject)
+                }
+
+                onSuccess()
+            }
+        }
+    }
+}

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/data/api/VulcanApiMessagesInbox.kt

@@ -14,6 +14,8 @@ import pl.szczodrzynski.edziennik.data.db.modules.messages.Message
 import pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_RECEIVED
 import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageRecipient
 import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
+import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher
+import pl.szczodrzynski.edziennik.utils.Utils
 import pl.szczodrzynski.edziennik.utils.models.Date
 
 class VulcanApiMessagesInbox(override val data: DataVulcan, val onSuccess: () -> Unit) : VulcanApi(data) {
@@ -43,7 +45,22 @@ class VulcanApiMessagesInbox(override val data: DataVulcan, val onSuccess: () ->
 
                     val senderLoginId = message.getString("NadawcaId") ?: return@forEach
                     val senderId = data.teacherList
-                            .singleOrNull { it.loginId == senderLoginId }?.id ?: return@forEach
+                            .singleOrNull { it.loginId == senderLoginId }?.id ?: {
+
+                        val senderName = message.getString("Nadawca") ?: ""
+
+                        senderName.getLastFirstName()?.let { (senderLastName, senderFirstName) ->
+                            val teacherObject = Teacher(
+                                    profileId,
+                                    -1 * Utils.crc16(senderName.toByteArray()).toLong(),
+                                    senderFirstName,
+                                    senderLastName,
+                                    senderLoginId
+                            )
+                            data.teacherList.put(teacherObject.id, teacherObject)
+                            teacherObject.id
+                        }
+                    }.invoke() ?: -1
 
                     val sentDate = message.getLong("DataWyslaniaUnixEpoch")?.let { it * 1000 }
                             ?: -1
@@ -68,7 +85,7 @@ class VulcanApiMessagesInbox(override val data: DataVulcan, val onSuccess: () ->
                             id
                     )
 
-                    data.messageList.add(messageObject)
+                    data.messageIgnoreList.add(messageObject)
                     data.messageRecipientList.add(messageRecipientObject)
                     data.metadataList.add(Metadata(
                             profileId,

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/data/api/VulcanApiMessagesSent.kt

@@ -14,6 +14,8 @@ import pl.szczodrzynski.edziennik.data.db.modules.messages.Message
 import pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_SENT
 import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageRecipient
 import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
+import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher
+import pl.szczodrzynski.edziennik.utils.Utils
 import pl.szczodrzynski.edziennik.utils.models.Date
 
 class VulcanApiMessagesSent(override val data: DataVulcan, val onSuccess: () -> Unit) : VulcanApi(data) {
@@ -23,11 +25,11 @@ class VulcanApiMessagesSent(override val data: DataVulcan, val onSuccess: () ->
 
     init {
         data.profile?.also { profile ->
-            val startDate: String = when (profile.empty) {
-                true -> profile.getSemesterStart(profile.currentSemester).stringY_m_d
-                else -> Date.getToday().stepForward(0, -1, 0).stringY_m_d
+            val startDate: Long = when (profile.empty) {
+                true -> profile.getSemesterStart(profile.currentSemester).inUnix
+                else -> Date.getToday().stepForward(0, -1, 0).inUnix
             }
-            val endDate: String = profile.getSemesterEnd(profile.currentSemester).stringY_m_d
+            val endDate: Long = profile.getSemesterEnd(profile.currentSemester).inUnix
 
             apiGet(TAG, VULCAN_API_ENDPOINT_MESSAGES_SENT, parameters = mapOf(
                     "DataPoczatkowa" to startDate,
@@ -43,23 +45,27 @@ class VulcanApiMessagesSent(override val data: DataVulcan, val onSuccess: () ->
                     val unreadBy = message.getInt("Nieprzeczytane") ?: 0
                     val sentDate = message.getLong("DataWyslaniaUnixEpoch")?.let { it * 1000 } ?: -1
 
-                    val messageObject = Message(
-                            profileId,
-                            id,
-                            subject,
-                            body,
-                            TYPE_SENT,
-                            -1,
-                            -1
-                    )
-
                     message.getJsonArray("Adresaci")?.asJsonObjectList()
-                            ?.forEachIndexed { _, recipient ->
+                            ?.onEach { receiver ->
 
-                                val recipientLoginId = recipient.getString("LoginId")
-                                        ?: return@forEachIndexed
-                                val recipientId = data.teacherList.singleOrNull { it.loginId == recipientLoginId }?.id
-                                        ?: return@forEachIndexed
+                                val receiverLoginId = receiver.getString("LoginId")
+                                        ?: return@onEach
+                                val receiverId = data.teacherList.singleOrNull { it.loginId == receiverLoginId }?.id
+                                        ?: {
+                                            val receiverName = receiver.getString("Nazwa") ?: ""
+
+                                            receiverName.getLastFirstName()?.let { (receiverLastName, receiverFirstName) ->
+                                                val teacherObject = Teacher(
+                                                        profileId,
+                                                        -1 * Utils.crc16(receiverName.toByteArray()).toLong(),
+                                                        receiverFirstName,
+                                                        receiverLastName,
+                                                        receiverLoginId
+                                                )
+                                                data.teacherList.put(teacherObject.id, teacherObject)
+                                                teacherObject.id
+                                            }
+                                        }.invoke() ?: -1
 
                                 val readDate: Long = when (readBy) {
                                     0 -> 0
@@ -71,7 +77,7 @@ class VulcanApiMessagesSent(override val data: DataVulcan, val onSuccess: () ->
 
                                 val messageRecipientObject = MessageRecipient(
                                         profileId,
-                                        recipientId,
+                                        receiverId,
                                         -1,
                                         readDate,
                                         id
@@ -80,7 +86,17 @@ class VulcanApiMessagesSent(override val data: DataVulcan, val onSuccess: () ->
                                 data.messageRecipientList.add(messageRecipientObject)
                             }
 
-                    data.messageList.add(messageObject)
+                    val messageObject = Message(
+                            profileId,
+                            id,
+                            subject,
+                            body,
+                            TYPE_SENT,
+                            -1,
+                            -1
+                    )
+
+                    data.messageIgnoreList.add(messageObject)
                     data.metadataList.add(Metadata(
                             profileId,
                             Metadata.TYPE_MESSAGE,

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/data/api/VulcanApiTimetable.kt

@@ -0,0 +1,186 @@
+/*
+ * Copyright (c) Kacper Ziubryniewicz 2019-11-13
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.vulcan.data.api
+
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.api.v2.Regexes
+import pl.szczodrzynski.edziennik.api.v2.VULCAN_API_ENDPOINT_TIMETABLE
+import pl.szczodrzynski.edziennik.api.v2.models.DataRemoveModel
+import pl.szczodrzynski.edziennik.api.v2.vulcan.DataVulcan
+import pl.szczodrzynski.edziennik.api.v2.vulcan.ENDPOINT_VULCAN_API_TIMETABLE
+import pl.szczodrzynski.edziennik.api.v2.vulcan.data.VulcanApi
+import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
+import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
+import pl.szczodrzynski.edziennik.data.db.modules.subjects.Subject
+import pl.szczodrzynski.edziennik.data.db.modules.timetable.Lesson
+import pl.szczodrzynski.edziennik.utils.Utils.crc16
+import pl.szczodrzynski.edziennik.utils.Utils.d
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class VulcanApiTimetable(override val data: DataVulcan, val onSuccess: () -> Unit) : VulcanApi(data) {
+    companion object {
+        const val TAG = "VulcanApiTimetable"
+    }
+
+    init {
+        data.profile?.also { profile ->
+            val currentWeekStart = Date.getToday().let { it.stepForward(0, 0, -it.weekDay) }
+            val getDate = data.arguments?.getString("weekStart") ?: currentWeekStart.stringY_m_d
+
+            val weekStart = Date.fromY_m_d(getDate)
+            val weekEnd = weekStart.clone().stepForward(0, 0, 6)
+
+            apiGet(TAG, VULCAN_API_ENDPOINT_TIMETABLE, parameters = mapOf(
+                    "DataPoczatkowa" to weekStart.stringY_m_d,
+                    "DataKoncowa" to weekEnd.stringY_m_d,
+                    "IdUczen" to data.studentId,
+                    "IdOddzial" to data.studentClassId,
+                    "IdOkresKlasyfikacyjny" to data.studentSemesterId
+            )) { json, _ ->
+                val dates: MutableSet<Int> = mutableSetOf()
+                val lessons: MutableList<Lesson> = mutableListOf()
+
+                json.getJsonArray("Data")?.asJsonObjectList()?.forEach { lesson ->
+                    val lessonDate = Date.fromY_m_d(lesson.getString("DzienTekst"))
+                    val lessonNumber = lesson.getInt("NumerLekcji")
+                    val lessonRange = data.lessonRanges.singleOrNull { it.lessonNumber == lessonNumber }
+                    val startTime = lessonRange?.startTime
+                    val endTime = lessonRange?.endTime
+                    val teacherId = lesson.getLong("IdPracownik")
+                    val teamId = data.studentClassId.toLong()
+                    val classroom = lesson.getString("Classroom")
+
+                    val oldTeacherId = lesson.getLong("IdPracownikOld")
+
+                    val changeAnnotation = lesson.getString("AdnotacjaOZmianie") ?: ""
+                    val type = when {
+                        changeAnnotation.startsWith("(przeniesiona z") -> Lesson.TYPE_SHIFTED_TARGET
+                        changeAnnotation.startsWith("(przeniesiona na") -> Lesson.TYPE_SHIFTED_SOURCE
+                        changeAnnotation.startsWith("(zastępstwo") -> Lesson.TYPE_CHANGE
+                        lesson.getBoolean("PrzekreslonaNazwa") == true -> Lesson.TYPE_CANCELLED
+                        else -> Lesson.TYPE_NORMAL
+                    }
+
+                    val subjectId = lesson.getLong("IdPrzedmiot")?.let {
+                        when (it) {
+                            0L -> {
+                                val subjectName = lesson.getString("PrzedmiotNazwa") ?: ""
+
+                                data.subjectList.singleOrNull { subject -> subject.longName == subjectName }?.id
+                                        ?: {
+                                            /**
+                                             * CREATE A NEW SUBJECT IF IT DOESN'T EXIST
+                                             */
+
+                                            val subjectObject = Subject(
+                                                    profileId,
+                                                    -1 * crc16(subjectName.toByteArray()).toLong(),
+                                                    subjectName,
+                                                    subjectName
+                                            )
+                                            data.subjectList.put(subjectObject.id, subjectObject)
+                                            subjectObject.id
+                                        }.invoke()
+                            }
+                            else -> it
+                        }
+                    }
+
+                    val id = lessonDate.combineWith(startTime) / 6L * 10L + (lesson.hashCode() and 0xFFFF)
+
+                    val lessonObject = Lesson(profileId, id).apply {
+                        this.type = type
+
+                        when (type) {
+                            Lesson.TYPE_NORMAL, Lesson.TYPE_CHANGE, Lesson.TYPE_SHIFTED_TARGET -> {
+                                this.date = lessonDate
+                                this.lessonNumber = lessonNumber
+                                this.startTime = startTime
+                                this.endTime = endTime
+                                this.subjectId = subjectId
+                                this.teacherId = teacherId
+                                this.teamId = teamId
+                                this.classroom = classroom
+
+                                this.oldTeacherId = oldTeacherId
+                            }
+
+                            Lesson.TYPE_CANCELLED, Lesson.TYPE_SHIFTED_SOURCE -> {
+                                this.oldDate = lessonDate
+                                this.oldLessonNumber = lessonNumber
+                                this.oldStartTime = startTime
+                                this.oldEndTime = endTime
+                                this.oldSubjectId = subjectId
+                                this.oldTeacherId = teacherId
+                                this.oldTeamId = teamId
+                                this.oldClassroom = classroom
+                            }
+                        }
+
+                        if (type == Lesson.TYPE_SHIFTED_SOURCE || type == Lesson.TYPE_SHIFTED_TARGET) {
+                            val shift = Regexes.VULCAN_SHITFT_ANNOTATION.find(changeAnnotation)
+                            val oldLessonNumber = shift?.get(2)?.toInt()
+                            val oldLessonDate = shift?.get(3)?.let { Date.fromd_m_Y(it) }
+
+                            val oldLessonRange = data.lessonRanges.singleOrNull { it.lessonNumber == oldLessonNumber }
+                            val oldStartTime = oldLessonRange?.startTime
+                            val oldEndTime = oldLessonRange?.endTime
+
+                            when (type) {
+                                Lesson.TYPE_SHIFTED_SOURCE -> {
+                                    this.lessonNumber = oldLessonNumber
+                                    this.date = oldLessonDate
+                                    this.startTime = oldStartTime
+                                    this.endTime = oldEndTime
+                                }
+
+                                Lesson.TYPE_SHIFTED_TARGET -> {
+                                    this.oldLessonNumber = oldLessonNumber
+                                    this.oldDate = oldLessonDate
+                                    this.oldStartTime = oldStartTime
+                                    this.oldEndTime = oldEndTime
+                                }
+                            }
+                        }
+                    }
+
+                    if (type != Lesson.TYPE_NORMAL) {
+                        data.metadataList.add(Metadata(
+                                profileId,
+                                Metadata.TYPE_LESSON_CHANGE,
+                                id,
+                                profile.empty,
+                                profile.empty,
+                                System.currentTimeMillis()
+                        ))
+                    }
+
+                    dates.add(lessonDate.value)
+                    lessons.add(lessonObject)
+                }
+
+                val date: Date = weekStart.clone()
+                while (date <= weekEnd) {
+                    if (!dates.contains(date.value)) {
+                        lessons.add(Lesson(profileId, date.value.toLong()).apply {
+                            this.type = Lesson.TYPE_NO_LESSONS
+                            this.date = date.clone()
+                        })
+                    }
+
+                    date.stepForward(0, 0, 1)
+                }
+
+                d(TAG, "Clearing lessons between ${weekStart.stringY_m_d} and ${weekEnd.stringY_m_d} - timetable downloaded for $getDate")
+
+                data.lessonNewList.addAll(lessons)
+                data.toRemove.add(DataRemoveModel.Timetable.between(weekStart, weekEnd))
+
+                data.setSyncNext(ENDPOINT_VULCAN_API_TIMETABLE, SYNC_ALWAYS)
+                onSuccess()
+            }
+        }
+    }
+}

app/src/main/java/pl/szczodrzynski/edziennik/data/api/interfaces/AttachmentGetCallback.java

@@ -1,11 +0,0 @@
-package pl.szczodrzynski.edziennik.data.api.interfaces;
-
-import im.wangchao.mhttp.Request;
-
-/**
- * Callback containing a {@link Request.Builder} which has correct headers and body to download a corresponding message attachment when ran.
- * {@code onSuccess} has to be ran on the UI thread.
- */
-public interface AttachmentGetCallback {
-    void onSuccess(Request.Builder builder);
-}

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

@@ -1,92 +0,0 @@
-package pl.szczodrzynski.edziennik.data.api.interfaces;
-
-import android.content.Context;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import java.util.Map;
-
-import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore;
-import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageFull;
-import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile;
-import pl.szczodrzynski.edziennik.data.db.modules.profiles.ProfileFull;
-import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher;
-import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesComposeInfo;
-import pl.szczodrzynski.edziennik.utils.models.Endpoint;
-
-public interface EdziennikInterface {
-
-    /**
-     * Sync all Edziennik data.
-     * Ran always on worker thread.
-     *
-     * @param activityContext a {@link Context}, used for resource extractions, passed back to {@link SyncCallback}
-     * @param callback ran on worker thread.
-     * @param profileId
-     * @param profile
-     * @param loginStore
-     */
-    void sync(@NonNull Context activityContext, @NonNull SyncCallback callback, int profileId, @Nullable Profile profile, @NonNull LoginStore loginStore);
-    void syncMessages(@NonNull Context activityContext, @NonNull SyncCallback errorCallback, @NonNull ProfileFull profile);
-    void syncFeature(@NonNull Context activityContext, @NonNull SyncCallback callback, @NonNull ProfileFull profile, int ... featureList);
-
-    int FEATURE_ALL = 0;
-    int FEATURE_TIMETABLE = 1;
-    int FEATURE_AGENDA = 2;
-    int FEATURE_GRADES = 3;
-    int FEATURE_HOMEWORK = 4;
-    int FEATURE_NOTICES = 5;
-    int FEATURE_ATTENDANCE = 6;
-    int FEATURE_MESSAGES_INBOX = 7;
-    int FEATURE_MESSAGES_OUTBOX = 8;
-    int FEATURE_ANNOUNCEMENTS = 9;
-
-    /**
-     * Download a single message or get its recipient list if it's already downloaded.
-     *
-     * May be executed on any thread.
-     *
-     * @param activityContext
-     * @param errorCallback used for error reporting. Ran on a background thread.
-     * @param profile
-     * @param message a message of which body and recipient list should be downloaded.
-     * @param messageCallback always executed on UI thread.
-     */
-    void getMessage(@NonNull Context activityContext, @NonNull SyncCallback errorCallback, @NonNull ProfileFull profile, @NonNull MessageFull message, @NonNull MessageGetCallback messageCallback);
-    void getAttachment(@NonNull Context activityContext, @NonNull SyncCallback errorCallback, @NonNull ProfileFull profile, @NonNull MessageFull message, long attachmentId, @NonNull AttachmentGetCallback attachmentCallback);
-    //void getMessageList(@NonNull Context activityContext, @NonNull SyncCallback errorCallback, @NonNull ProfileFull profile, int type, @NonNull MessageListCallback messageCallback);
-    /**
-     * Download a list of available message recipients.
-     *
-     * Updates a database-saved {@code teacherList} with {@code loginId}s.
-     *
-     * A {@link Teacher} is considered as a recipient when its {@code loginId} is not null.
-     *
-     * May be executed on any thread.
-     *
-     * @param activityContext
-     * @param errorCallback used for error reporting. Ran on a background thread.
-     * @param profile
-     * @param recipientListGetCallback always executed on UI thread.
-     */
-    void getRecipientList(@NonNull Context activityContext, @NonNull SyncCallback errorCallback, @NonNull ProfileFull profile, @NonNull RecipientListGetCallback recipientListGetCallback);
-    MessagesComposeInfo getComposeInfo(@NonNull ProfileFull profile);
-
-
-    /**
-     *
-     * @param profile a {@link Profile} containing already changed endpoints
-     * @return a map of configurable {@link Endpoint}s along with their names, {@code null} when unsupported
-     */
-    Map<String, Endpoint> getConfigurableEndpoints(Profile profile);
-
-    /**
-     * Check if the specified endpoint is enabled for the current profile.
-     *
-     * @param profile a {@link Profile} containing already changed endpoints
-     * @param defaultActive if the endpoint is enabled by default.
-     * @param name the endpoint's name
-     * @return {@code true} if the endpoint is enabled, {@code false} when it's not. Return {@code defaultActive} if unsupported.
-     */
-    boolean isEndpointEnabled(Profile profile, boolean defaultActive, String name);
-}

app/src/main/java/pl/szczodrzynski/edziennik/data/api/interfaces/ErrorCallback.java

@@ -1,11 +0,0 @@
-package pl.szczodrzynski.edziennik.data.api.interfaces;
-
-import android.content.Context;
-
-import androidx.annotation.NonNull;
-
-import pl.szczodrzynski.edziennik.data.api.AppError;
-
-public interface ErrorCallback {
-    void onError(Context activityContext, @NonNull AppError error);
-}

app/src/main/java/pl/szczodrzynski/edziennik/data/api/interfaces/LoginCallback.java

@@ -1,5 +0,0 @@
-package pl.szczodrzynski.edziennik.data.api.interfaces;
-
-public interface LoginCallback {
-    void onSuccess();
-}

app/src/main/java/pl/szczodrzynski/edziennik/data/api/interfaces/MessageGetCallback.java

@@ -1,11 +0,0 @@
-package pl.szczodrzynski.edziennik.data.api.interfaces;
-
-import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageFull;
-
-/**
- * Callback containing a {@link MessageFull} which already has its {@code body} and {@code recipients}.
- * {@code onSuccess} is always ran on the UI thread.
- */
-public interface MessageGetCallback {
-    void onSuccess(MessageFull message);
-}

app/src/main/java/pl/szczodrzynski/edziennik/data/api/interfaces/MessageListCallback.java

@@ -1,9 +0,0 @@
-package pl.szczodrzynski.edziennik.data.api.interfaces;
-
-import java.util.List;
-
-import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageFull;
-
-public interface MessageListCallback {
-    void onSuccess(List<MessageFull> messageList);
-}

app/src/main/java/pl/szczodrzynski/edziennik/data/api/interfaces/ProgressCallback.java

@@ -1,8 +0,0 @@
-package pl.szczodrzynski.edziennik.data.api.interfaces;
-
-import androidx.annotation.StringRes;
-
-public interface ProgressCallback extends ErrorCallback {
-    void onProgress(int progressStep);
-    void onActionStarted(@StringRes int stringResId);
-}

app/src/main/java/pl/szczodrzynski/edziennik/data/api/interfaces/RecipientListGetCallback.java

@@ -1,9 +0,0 @@
-package pl.szczodrzynski.edziennik.data.api.interfaces;
-
-import java.util.List;
-
-import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher;
-
-public interface RecipientListGetCallback {
-    void onSuccess(List<Teacher> teacherList);
-}

app/src/main/java/pl/szczodrzynski/edziennik/data/api/interfaces/SyncCallback.java

@@ -1,19 +0,0 @@
-package pl.szczodrzynski.edziennik.data.api.interfaces;
-
-import android.content.Context;
-
-import java.util.List;
-
-import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore;
-import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile;
-import pl.szczodrzynski.edziennik.data.db.modules.profiles.ProfileFull;
-
-/**
- * A callback used for error reporting, progress information.
- * All the methods are always ran on a worker thread.
- */
-public interface SyncCallback extends ProgressCallback {
-    void onLoginFirst(List<Profile> profileList, LoginStore loginStore);
-    void onSuccess(Context activityContext, ProfileFull profileFull);
-
-}

app/src/main/java/pl/szczodrzynski/edziennik/data/api/v2/ApiLoginResult.kt

@@ -1,6 +0,0 @@
-package pl.szczodrzynski.edziennik.data.api.v2
-
-import pl.szczodrzynski.edziennik.data.api.AppError
-import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
-
-data class ApiLoginResult(val loginStore: LoginStore, val error: AppError?)

app/src/main/java/pl/szczodrzynski/edziennik/data/api/v2/FirstLoginResult.kt

@@ -1,6 +0,0 @@
-package pl.szczodrzynski.edziennik.data.api.v2
-
-import pl.szczodrzynski.edziennik.data.api.AppError
-import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
-
-data class FirstLoginResult(val profileList: ArrayList<Profile>, val error: AppError?)

app/src/main/java/pl/szczodrzynski/edziennik/data/api/v2/librus/firstlogin/FirstLoginLibrus.kt

@@ -1,12 +0,0 @@
-package pl.szczodrzynski.edziennik.data.api.v2.librus.firstlogin
-
-import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.data.api.interfaces.ProgressCallback
-import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
-import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
-
-class FirstLoginLibrus(val app: App, val loginStore: LoginStore, val progressCallback: ProgressCallback, val onSuccess: (profileList: List<Profile>) -> Unit) {
-    init {
-
-    }
-}

app/src/main/java/pl/szczodrzynski/edziennik/data/api/v2/librus/firstlogin/FirstLoginSynergia.kt

@@ -1,12 +0,0 @@
-package pl.szczodrzynski.edziennik.data.api.v2.librus.firstlogin
-
-import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.data.api.interfaces.ProgressCallback
-import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
-import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
-
-class FirstLoginSynergia(val app: App, val loginStore: LoginStore, val progressCallback: ProgressCallback, val onSuccess: (profileList: List<Profile>) -> Unit) {
-    init {
-
-    }
-}

app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/events/Event.java

@@ -5,6 +5,7 @@ import androidx.room.ColumnInfo;
 import androidx.room.Entity;
 import androidx.room.Ignore;
 import androidx.room.Index;
+
 import pl.szczodrzynski.edziennik.utils.models.Date;
 import pl.szczodrzynski.edziennik.utils.models.Time;
 
@@ -85,6 +86,23 @@ public class Event {
         this.teamId = teamId;
     }
 
+    @Override
+    public Event clone() throws CloneNotSupportedException {
+        return new Event(
+                profileId,
+                id,
+                eventDate.clone(),
+                startTime == null ? null : startTime.clone(),
+                topic,
+                color,
+                type,
+                addedManually,
+                subjectId,
+                teacherId,
+                teamId
+        );
+    }
+
     @Override
     public String toString() {
         return "Event{" +

app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/messages/Message.java

@@ -1,19 +1,19 @@
 package pl.szczodrzynski.edziennik.data.db.modules.messages;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import androidx.annotation.Nullable;
 import androidx.room.ColumnInfo;
 import androidx.room.Entity;
 import androidx.room.Ignore;
 import androidx.room.Index;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Entity(tableName = "messages",
         primaryKeys = {"profileId", "messageId"},
         indices = {@Index(value = {"profileId"})})
 public class Message {
-    int profileId;
+    public int profileId;
 
     @ColumnInfo(name = "messageId")
     public long id;

app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/messages/MessageDao.java

@@ -1,7 +1,6 @@
 package pl.szczodrzynski.edziennik.data.db.modules.messages;
 
-import java.util.List;
-
+import androidx.annotation.Nullable;
 import androidx.lifecycle.LiveData;
 import androidx.room.Dao;
 import androidx.room.Insert;
@@ -11,6 +10,8 @@ import androidx.room.RawQuery;
 import androidx.sqlite.db.SimpleSQLiteQuery;
 import androidx.sqlite.db.SupportSQLiteQuery;
 
+import java.util.List;
+
 import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata;
 
 import static pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_DELETED;
@@ -23,6 +24,9 @@ public abstract class MessageDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     public abstract long add(Message message);
 
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    public abstract void addAll(List<Message> messageList);
+
     @Insert(onConflict = OnConflictStrategy.IGNORE)
     public abstract void addAllIgnore(List<Message> messageList);
 
@@ -56,6 +60,7 @@ public abstract class MessageDao {
                 "ORDER BY addedDate DESC"));
     }
 
+    @Nullable
     public MessageFull getById(int profileId, long messageId) {
         return getOneNow(new SimpleSQLiteQuery("SELECT \n" +
                 "*, \n" +

app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/messages/MessageFull.java

@@ -1,13 +1,15 @@
 package pl.szczodrzynski.edziennik.data.db.modules.messages;
 
+import androidx.annotation.Nullable;
+import androidx.room.Ignore;
+
 import java.util.ArrayList;
 import java.util.List;
 
-import androidx.room.Ignore;
-
 public class MessageFull extends Message {
     public String senderFullName = null;
     @Ignore
+    @Nullable
     public List<MessageRecipientFull> recipients = null;
 
     public MessageFull addRecipient(MessageRecipientFull recipient) {

app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/timetable/LessonFull.kt

@@ -62,6 +62,25 @@ class LessonFull(profileId: Int, id: Long) : Lesson(profileId, id) {
             return classroom ?: oldClassroom
         }
 
+    val displayTeamId: Long?
+        get() {
+            if (type == TYPE_SHIFTED_SOURCE)
+                return oldTeamId
+            return teamId ?: oldTeamId
+        }
+    val displaySubjectId: Long?
+        get() {
+            if (type == TYPE_SHIFTED_SOURCE)
+                return oldSubjectId
+            return subjectId ?: oldSubjectId
+        }
+    val displayTeacherId: Long?
+        get() {
+            if (type == TYPE_SHIFTED_SOURCE)
+                return oldTeacherId
+            return teacherId ?: oldTeacherId
+        }
+
     // metadata
     var seen: Boolean = false
     var notified: Boolean = false

app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/timetable/TimetableDao.kt

@@ -10,6 +10,27 @@ import pl.szczodrzynski.edziennik.utils.models.Date
 
 @Dao
 interface TimetableDao {
+    companion object {
+        private const val QUERY = """
+            SELECT 
+            timetable.*,
+            subjects.subjectLongName AS subjectName,
+            teachers.teacherName ||" "|| teachers.teacherSurname AS teacherName,
+            teams.teamName AS teamName,
+            oldS.subjectLongName AS oldSubjectName,
+            oldT.teacherName ||" "|| oldT.teacherSurname AS oldTeacherName,
+            oldG.teamName AS oldTeamName,
+            metadata.seen, metadata.notified, metadata.addedDate
+            FROM timetable
+            LEFT JOIN subjects USING(profileId, subjectId)
+            LEFT JOIN teachers USING(profileId, teacherId)
+            LEFT JOIN teams USING(profileId, teamId)
+            LEFT JOIN subjects AS oldS ON timetable.profileId = oldS.profileId AND timetable.oldSubjectId = oldS.subjectId
+            LEFT JOIN teachers AS oldT ON timetable.profileId = oldT.profileId AND timetable.oldTeacherId = oldT.teacherId
+            LEFT JOIN teams AS oldG ON timetable.profileId = oldG.profileId AND timetable.oldTeamId = oldG.teamId
+            LEFT JOIN metadata ON id = thingId AND thingType = ${Metadata.TYPE_LESSON_CHANGE} AND metadata.profileId = timetable.profileId
+        """
+    }
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     operator fun plusAssign(lessonList: List<Lesson>)
@@ -25,25 +46,31 @@ interface TimetableDao {
     fun clearBetweenDates(profileId: Int, dateFrom: Date, dateTo: Date)
 
     @Query("""
-        SELECT 
-        timetable.*,
-        subjects.subjectLongName AS subjectName,
-        teachers.teacherName ||" "|| teachers.teacherSurname AS teacherName,
-        teams.teamName AS teamName,
-        oldS.subjectLongName AS oldSubjectName,
-        oldT.teacherName ||" "|| oldT.teacherSurname AS oldTeacherName,
-        oldG.teamName AS oldTeamName,
-        metadata.seen, metadata.notified, metadata.addedDate
-        FROM timetable
-        LEFT JOIN subjects USING(profileId, subjectId)
-        LEFT JOIN teachers USING(profileId, teacherId)
-        LEFT JOIN teams USING(profileId, teamId)
-        LEFT JOIN subjects AS oldS ON timetable.profileId = oldS.profileId AND timetable.oldSubjectId = oldS.subjectId
-        LEFT JOIN teachers AS oldT ON timetable.profileId = oldT.profileId AND timetable.oldTeacherId = oldT.teacherId
-        LEFT JOIN teams AS oldG ON timetable.profileId = oldG.profileId AND timetable.oldTeamId = oldG.teamId
-        LEFT JOIN metadata ON id = thingId AND thingType = ${Metadata.TYPE_LESSON_CHANGE} AND metadata.profileId = timetable.profileId
+        $QUERY
         WHERE timetable.profileId = :profileId AND (type != 3 AND date = :date) OR ((type = 3 OR type = 1) AND oldDate = :date)
-        ORDER BY type
+        ORDER BY id, type
     """)
     fun getForDate(profileId: Int, date: Date) : LiveData<List<LessonFull>>
+
+    @Query("""
+        $QUERY
+        WHERE timetable.profileId = :profileId AND ((type != 3 AND date > :today) OR ((type = 3 OR type = 1) AND oldDate > :today)) AND timetable.subjectId = :subjectId
+        ORDER BY id, type
+        LIMIT 1
+    """)
+    fun getNextWithSubject(profileId: Int, today: Date, subjectId: Long) : LiveData<LessonFull>
+
+    @Query("""
+        $QUERY
+        WHERE (type != 3 AND date >= :dateFrom AND date <= :dateTo) OR ((type = 3 OR type = 1) AND oldDate >= :dateFrom AND oldDate <= :dateTo)
+        ORDER BY profileId, id, type
+    """)
+    fun getBetweenDatesNow(dateFrom: Date, dateTo: Date) : List<LessonFull>
+
+    @Query("""
+        $QUERY
+        WHERE timetable.profileId = :profileId AND timetable.id = :lessonId
+        ORDER BY id, type
+    """)
+    fun getByIdNow(profileId: Int, lessonId: Long) : LessonFull?
 }

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

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-11-12.
+ */
+
+package pl.szczodrzynski.edziennik.ui.dialogs.event
+
+import android.app.Activity
+import androidx.appcompat.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.utils.models.Date
+import pl.szczodrzynski.edziennik.utils.models.Time
+
+class EventAddTypeDialog(
+        val activity: Activity,
+        val profileId: Int,
+        val date: Date? = null,
+        val time: Time? = null
+) {
+    companion object {
+        private const val TAG = "EventAddTypeDialog"
+    }
+
+    private lateinit var dialog: AlertDialog
+
+    init { run {
+        dialog = MaterialAlertDialogBuilder(activity)
+                .setItems(R.array.main_menu_add_options) { dialog, which ->
+                    dialog.dismiss()
+                    EventManualDialog(activity, profileId)
+                            .show(
+                                    activity.application as App,
+                                    null,
+                                    date,
+                                    time,
+                                    when (which) {
+                                        1 -> EventManualDialog.DIALOG_HOMEWORK
+                                        else -> EventManualDialog.DIALOG_EVENT
+                                    }
+                            )
+
+                }
+                .setNegativeButton(R.string.cancel) { dialog, _ -> dialog.dismiss() }
+                .show()
+    }}
+}

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

@@ -36,7 +36,6 @@ import java.util.List;
 import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.MainActivity;
 import pl.szczodrzynski.edziennik.R;
-import pl.szczodrzynski.edziennik.data.api.AppError;
 import pl.szczodrzynski.edziennik.data.db.modules.events.Event;
 import pl.szczodrzynski.edziennik.data.db.modules.events.EventFull;
 import pl.szczodrzynski.edziennik.data.db.modules.events.EventType;
@@ -54,7 +53,6 @@ import pl.szczodrzynski.edziennik.utils.models.Time;
 import pl.szczodrzynski.edziennik.utils.models.Week;
 
 import static pl.szczodrzynski.edziennik.App.APP_URL;
-import static pl.szczodrzynski.edziennik.data.api.AppError.CODE_OTHER;
 import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.COLOR_DEFAULT;
 import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.TYPE_HOMEWORK;
 import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.TYPE_UNDEFINED;
@@ -374,7 +372,8 @@ public class EventManualDialog {
                 }
             } catch (Exception e) {
                 activity.runOnUiThread(() -> {
-                    app.apiEdziennik.guiShowErrorDialog(activity, new AppError(TAG, 379, CODE_OTHER, null, e), R.string.error_occured);
+                    // TODO show error in EventManualDialog
+                    //app.apiEdziennik.guiShowErrorDialog(activity, new AppError(TAG, 379, CODE_OTHER, null, e), R.string.error_occured);
                 });
             }
         });

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

@@ -0,0 +1,386 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-11-12.
+ */
+
+package pl.szczodrzynski.edziennik.ui.dialogs.event
+
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
+import androidx.lifecycle.Observer
+import com.google.android.material.datepicker.MaterialDatePicker
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import kotlinx.coroutines.*
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.data.db.modules.events.Event
+import pl.szczodrzynski.edziennik.data.db.modules.subjects.Subject
+import pl.szczodrzynski.edziennik.data.db.modules.teams.Team
+import pl.szczodrzynski.edziennik.data.db.modules.timetable.Lesson
+import pl.szczodrzynski.edziennik.data.db.modules.timetable.LessonFull
+import pl.szczodrzynski.edziennik.databinding.DialogEventManualV2Binding
+import pl.szczodrzynski.edziennik.utils.TextInputDropDown
+import pl.szczodrzynski.edziennik.utils.models.Date
+import pl.szczodrzynski.edziennik.utils.models.Time
+import pl.szczodrzynski.edziennik.utils.models.Week
+import kotlin.coroutines.CoroutineContext
+
+class EventManualV2Dialog(
+        val activity: AppCompatActivity,
+        val profileId: Int,
+        val defaultLesson: LessonFull? = null,
+        val defaultDate: Date? = null,
+        val defaultTime: Time? = null,
+        val defaultType: Int? = null,
+        val editingEvent: Event? = null,
+        val onShowListener: ((tag: String) -> Unit)? = null,
+        val onDismissListener: ((tag: String) -> Unit)? = null
+) : CoroutineScope {
+
+    companion object {
+        private const val TAG = "EventManualDialog"
+    }
+
+    private lateinit var job: Job
+    override val coroutineContext: CoroutineContext
+        get() = job + Dispatchers.Main
+
+    private val app by lazy { activity.application as App }
+    private lateinit var b: DialogEventManualV2Binding
+    private lateinit var dialog: AlertDialog
+    private lateinit var event: Event
+    private var defaultLoaded = false
+
+    init { run {
+        if (activity.isFinishing)
+            return@run
+        job = Job()
+        onShowListener?.invoke(TAG)
+        b = DialogEventManualV2Binding.inflate(activity.layoutInflater)
+        dialog = MaterialAlertDialogBuilder(activity)
+                .setTitle(R.string.dialog_event_manual_title)
+                .setView(b.root)
+                .setNegativeButton(R.string.cancel) { dialog, _ -> dialog.dismiss() }
+                .setPositiveButton(R.string.save) { _, _ -> saveEvent() }
+                .setOnDismissListener {
+                    onDismissListener?.invoke(TAG)
+                }
+                .show()
+
+        event = editingEvent?.clone() ?: Event().also { event ->
+            event.profileId = profileId
+            /*defaultDate?.let {
+                event.eventDate = it
+                b.date = it
+            }
+            defaultTime?.let {
+                event.startTime = it
+                b.time = it
+            }
+            defaultType?.let {
+                event.type = it
+            }*/
+        }
+
+        loadLists()
+    }}
+
+    private fun loadLists() { launch {
+        val deferred = async(Dispatchers.Default) {
+            // get the team list
+            val teams = app.db.teamDao().getAllNow(profileId)
+            b.teamDropdown.clear()
+            b.teamDropdown += TextInputDropDown.Item(
+                    -1,
+                    activity.getString(R.string.dialog_event_manual_no_team),
+                    ""
+            )
+            b.teamDropdown += teams.map { TextInputDropDown.Item(it.id, it.name, tag = it) }
+
+            // get the subject list
+            val subjects = app.db.subjectDao().getAllNow(profileId)
+            b.subjectDropdown.clear()
+            b.subjectDropdown += TextInputDropDown.Item(
+                    -1,
+                    activity.getString(R.string.dialog_event_manual_no_subject),
+                    ""
+            )
+            b.subjectDropdown += subjects.map { TextInputDropDown.Item(it.id, it.longName, tag = it) }
+
+            // get the teacher list
+            val teachers = app.db.teacherDao().getAllNow(profileId)
+            b.teacherDropdown.clear()
+            b.teacherDropdown += TextInputDropDown.Item(
+                    -1,
+                    activity.getString(R.string.dialog_event_manual_no_teacher),
+                    ""
+            )
+            b.teacherDropdown += teachers.map { TextInputDropDown.Item(it.id, it.fullName, tag = it) }
+        }
+        deferred.await()
+
+        b.teamDropdown.isEnabled = true
+        b.subjectDropdown.isEnabled = true
+        b.teacherDropdown.isEnabled = true
+
+        // copy IDs from event being edited
+        editingEvent?.let {
+            b.teamDropdown.select(it.teamId)
+            b.subjectDropdown.select(it.subjectId)
+            b.teacherDropdown.select(it.teacherId)
+        }
+
+        // copy IDs from the LessonFull
+        defaultLesson?.let {
+            b.teamDropdown.select(it.displayTeamId)
+            b.subjectDropdown.select(it.displaySubjectId)
+            b.teacherDropdown.select(it.displayTeacherId)
+        }
+
+        loadDates()
+    }}
+
+    private fun loadDates() { launch {
+        val date = Date.getToday()
+        val today = date.value
+        var weekDay = date.weekDay
+
+        val deferred = async(Dispatchers.Default) {
+            val dates = mutableListOf<TextInputDropDown.Item>()
+            // item choosing the next lesson of specific subject
+            b.subjectDropdown.selected?.let {
+                if (it.tag is Subject) {
+                    dates += TextInputDropDown.Item(
+                            -it.id,
+                            activity.getString(R.string.dialog_event_manual_date_next_lesson, it.tag.longName)
+                    )
+                }
+            }
+
+            // TODAY
+            dates += TextInputDropDown.Item(
+                    date.value.toLong(),
+                    activity.getString(R.string.dialog_event_manual_date_today, date.formattedString),
+                    tag = date.clone()
+            )
+
+            // TOMORROW
+            if (weekDay < 4) {
+                date.stepForward(0, 0, 1)
+                weekDay++
+                dates += TextInputDropDown.Item(
+                        date.value.toLong(),
+                        activity.getString(R.string.dialog_event_manual_date_tomorrow, date.formattedString),
+                        tag = date.clone()
+                )
+            }
+            // REMAINING SCHOOL DAYS OF THE CURRENT WEEK
+            while (weekDay < 4) {
+                date.stepForward(0, 0, 1) // step one day forward
+                weekDay++
+                dates += TextInputDropDown.Item(
+                        date.value.toLong(),
+                        activity.getString(R.string.dialog_event_manual_date_this_week, Week.getFullDayName(weekDay), date.formattedString),
+                        tag = date.clone()
+                )
+            }
+            // go to next week Monday
+            date.stepForward(0, 0, -weekDay + 7)
+            weekDay = 0
+            // ALL SCHOOL DAYS OF THE NEXT WEEK
+            while (weekDay < 4) {
+                dates += TextInputDropDown.Item(
+                        date.value.toLong(),
+                        activity.getString(R.string.dialog_event_manual_date_next_week, Week.getFullDayName(weekDay), date.formattedString),
+                        tag = date.clone()
+                )
+                date.stepForward(0, 0, 1) // step one day forward
+                weekDay++
+            }
+            dates += TextInputDropDown.Item(
+                    -1L,
+                    activity.getString(R.string.dialog_event_manual_date_other)
+            )
+            dates
+        }
+
+        val dates = deferred.await()
+        b.dateDropdown.clear().append(dates)
+
+        editingEvent?.let {
+            b.dateDropdown.select(it.eventDate.value.toLong())
+        }
+
+        defaultLesson?.let {
+            b.dateDropdown.select(it.displayDate?.value?.toLong())
+        }
+
+        if (b.dateDropdown.selected == null) {
+            b.dateDropdown.select(today.toLong())
+        }
+
+        b.dateDropdown.isEnabled = true
+
+        b.dateDropdown.setOnChangeListener { item ->
+            when {
+                // next lesson with specified subject
+                item.id < -1 -> {
+                    app.db.timetableDao().getNextWithSubject(profileId, Date.getToday(), -item.id).observeOnce(activity, Observer {
+                        val lessonDate = it?.displayDate ?: return@Observer
+                        b.dateDropdown.selected = TextInputDropDown.Item(
+                                lessonDate.value.toLong(),
+                                lessonDate.formattedString,
+                                tag = lessonDate
+                        )
+                        // TODO load correct hour when selecting next lesson
+                        b.dateDropdown.updateText()
+                        it.let {
+                            b.teamDropdown.select(it.displayTeamId)
+                            b.subjectDropdown.select(it.displaySubjectId)
+                            b.teacherDropdown.select(it.displayTeacherId)
+                        }
+                        defaultLoaded = false
+                        loadHours()
+                    })
+                    return@setOnChangeListener false
+                }
+                // custom date
+                item.id == -1L -> {
+                    MaterialDatePicker.Builder
+                            .datePicker()
+                            .setSelection((b.dateDropdown.selectedId?.let { Date.fromValue(it.toInt()) } ?: Date.getToday()).inMillis)
+                            .build()
+                            .apply {
+                                addOnPositiveButtonClickListener {
+                                    val dateSelected = Date.fromMillis(it)
+                                    b.dateDropdown.selected = TextInputDropDown.Item(
+                                            dateSelected.value.toLong(),
+                                            dateSelected.formattedString,
+                                            tag = dateSelected
+                                    )
+                                    b.dateDropdown.updateText()
+                                    loadHours()
+                                }
+                                show(this@EventManualV2Dialog.activity.supportFragmentManager, "MaterialDatePicker")
+                            }
+
+                    return@setOnChangeListener false
+                }
+                // a specific date
+                else -> {
+                    b.dateDropdown.select(item)
+                    loadHours()
+                }
+            }
+            return@setOnChangeListener true
+        }
+
+        loadHours()
+    }}
+
+    private fun loadHours() {
+        b.timeDropdown.isEnabled = false
+        // get the selected date
+        val date = b.dateDropdown.selectedId?.let { Date.fromValue(it.toInt()) } ?: return
+        // get all lessons for selected date
+        app.db.timetableDao().getForDate(profileId, date).observeOnce(activity, Observer { lessons ->
+            val hours = mutableListOf<TextInputDropDown.Item>()
+            // add All day time choice
+            hours += TextInputDropDown.Item(
+                    0L,
+                    activity.getString(R.string.dialog_event_manual_all_day)
+            )
+            lessons.forEach { lesson ->
+                if (lesson.type == Lesson.TYPE_NO_LESSONS) {
+                    // indicate there are no lessons this day
+                    hours += TextInputDropDown.Item(
+                            -2L,
+                            activity.getString(R.string.dialog_event_manual_no_lessons)
+                    )
+                    return@forEach
+                }
+                // create the lesson caption
+                val text = listOfNotEmpty(
+                        lesson.displayStartTime?.stringHM ?: "",
+                        lesson.displaySubjectName?.let {
+                            when {
+                                lesson.type == Lesson.TYPE_CANCELLED -> it.asStrikethroughSpannable()
+                                lesson.type != Lesson.TYPE_NORMAL -> it.asItalicSpannable()
+                                else -> it
+                            }
+                        } ?: ""
+                )
+                // add an item with LessonFull as the tag
+                hours += TextInputDropDown.Item(
+                        lesson.displayStartTime?.value?.toLong() ?: -1,
+                        text.concat(" "),
+                        tag = lesson
+                )
+            }
+            b.timeDropdown.clear().append(hours)
+
+            if (defaultLoaded) {
+                b.timeDropdown.deselect()
+                // select the TEAM_CLASS if possible
+                b.teamDropdown.items.singleOrNull {
+                    it.tag is Team && it.tag.type == Team.TYPE_CLASS
+                }?.let {
+                    b.teamDropdown.select(it)
+                } ?: b.teamDropdown.deselect()
+
+                // clear subject, teacher selection
+                b.subjectDropdown.deselect()
+                b.teacherDropdown.deselect()
+            }
+            else {
+                editingEvent?.let {
+                    b.timeDropdown.select(it.startTime?.value?.toLong())
+                }
+
+                defaultLesson?.let {
+                    b.timeDropdown.select(it.displayStartTime?.value?.toLong())
+                }
+            }
+            defaultLoaded = true
+            b.timeDropdown.isEnabled = true
+
+            // attach a listener to time dropdown
+            b.timeDropdown.setOnChangeListener { item ->
+                when {
+                    // custom start hour
+                    item.id == -1L -> {
+
+                        return@setOnChangeListener false
+                    }
+                    // no lessons this day
+                    item.id == -2L -> {
+                        b.timeDropdown.deselect()
+                        return@setOnChangeListener false
+                    }
+                    // selected a specific lesson
+                    else -> {
+                        if (item.tag is LessonFull) {
+                            // update team, subject, teacher dropdowns,
+                            // using the LessonFull from item tag
+                            b.teamDropdown.deselect()
+                            b.subjectDropdown.deselect()
+                            b.teacherDropdown.deselect()
+                            item.tag.displayTeamId?.let { 
+                                b.teamDropdown.select(it)
+                            }
+                            item.tag.displaySubjectId?.let {
+                                b.subjectDropdown.select(it)
+                            }
+                            item.tag.displayTeacherId?.let {
+                                b.teacherDropdown.select(it)
+                            }
+                        }
+                    }
+                }
+                return@setOnChangeListener true
+            }
+        })
+    }
+
+    private fun saveEvent() {
+
+    }
+}

app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/ProfileRemoveDialog.kt

@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-11-13.
+ */
+
+package pl.szczodrzynski.edziennik.ui.dialogs.settings
+
+import android.widget.Toast
+import androidx.appcompat.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import kotlinx.coroutines.*
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.MainActivity
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.databinding.DialogLessonDetailsBinding
+import pl.szczodrzynski.edziennik.utils.models.Notification
+import java.util.*
+import kotlin.coroutines.CoroutineContext
+
+class ProfileRemoveDialog(
+        val activity: MainActivity,
+        val profileId: Int,
+        val profileName: String
+) : CoroutineScope {
+    companion object {
+        private const val TAG = "ProfileRemoveDialog"
+    }
+
+    private lateinit var job: Job
+    override val coroutineContext: CoroutineContext
+        get() = job + Dispatchers.Main
+
+    private val app by lazy { activity.application as App }
+    private lateinit var b: DialogLessonDetailsBinding
+    private lateinit var dialog: AlertDialog
+
+    init { run {
+        job = Job()
+
+        dialog = MaterialAlertDialogBuilder(activity)
+                .setTitle(R.string.profile_menu_remove_confirm)
+                .setMessage(activity.getString(R.string.profile_menu_remove_confirm_text_format, profileName, profileName))
+                .setPositiveButton(R.string.remove) { _, _ ->
+                    removeProfile()
+                }
+                .setNeutralButton(R.string.cancel) { dialog, _ -> dialog.dismiss() }
+                .setCancelable(false)
+                .show()
+    }}
+
+    private fun removeProfile() { launch {
+        val deferred = async(Dispatchers.Default) {
+            val profileObject = app.db.profileDao().getByIdNow(profileId) ?: return@async
+            app.db.announcementDao().clear(profileId)
+            app.db.attendanceDao().clear(profileId)
+            app.db.eventDao().clear(profileId)
+            app.db.eventTypeDao().clear(profileId)
+            app.db.gradeDao().clear(profileId)
+            app.db.gradeCategoryDao().clear(profileId)
+            app.db.lessonDao().clear(profileId)
+            app.db.lessonChangeDao().clear(profileId)
+            app.db.luckyNumberDao().clear(profileId)
+            app.db.noticeDao().clear(profileId)
+            app.db.subjectDao().clear(profileId)
+            app.db.teacherDao().clear(profileId)
+            app.db.teamDao().clear(profileId)
+            app.db.messageRecipientDao().clear(profileId)
+            app.db.messageDao().clear(profileId)
+            app.db.endpointTimerDao().clear(profileId)
+            app.db.attendanceTypeDao().clear(profileId)
+            app.db.classroomDao().clear(profileId)
+            app.db.lessonRangeDao().clear(profileId)
+            app.db.noticeTypeDao().clear(profileId)
+            app.db.teacherAbsenceDao().clear(profileId)
+            app.db.teacherAbsenceTypeDao().clear(profileId)
+            app.db.timetableDao().clear(profileId)
+
+            val loginStoreId = profileObject.loginStoreId
+            val profilesUsingLoginStore = app.db.profileDao().getIdsByLoginStoreIdNow(loginStoreId)
+            if (profilesUsingLoginStore.size == 1) {
+                app.db.loginStoreDao().remove(loginStoreId)
+            }
+            app.db.profileDao().remove(profileId)
+            app.db.metadataDao().deleteAll(profileId)
+
+            val toRemove = ArrayList<Notification>()
+            for (notification in app.appConfig.notifications) {
+                if (notification.profileId == profileId) {
+                    toRemove.add(notification)
+                }
+            }
+            app.appConfig.notifications.removeAll(toRemove)
+
+            app.profile = null
+            App.profileId = -1
+
+            app.profileLoadById(app.profileLastId())
+        }
+        deferred.await()
+        dialog.dismiss()
+        activity.reloadTarget()
+        Toast.makeText(activity, R.string.dialog_profile_remove_success, Toast.LENGTH_LONG).show()
+    }}
+}

app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/SyncViewListDialog.kt

@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-11-13.
+ */
+
+package pl.szczodrzynski.edziennik.ui.dialogs.sync
+
+import androidx.appcompat.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.MainActivity
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.api.v2.events.task.EdziennikTask
+import pl.szczodrzynski.edziennik.databinding.DialogLessonDetailsBinding
+import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesFragment
+import kotlin.coroutines.CoroutineContext
+
+class SyncViewListDialog(
+        val activity: MainActivity,
+        val currentViewId: Int? = null
+) : CoroutineScope {
+    companion object {
+        private const val TAG = "SyncViewListDialog"
+    }
+
+    private lateinit var job: Job
+    override val coroutineContext: CoroutineContext
+        get() = job + Dispatchers.Main
+
+    private val app by lazy { activity.application as App }
+    private lateinit var b: DialogLessonDetailsBinding
+    private lateinit var dialog: AlertDialog
+
+    init { run {
+        job = Job()
+
+        val viewIds = arrayOf(
+                MainActivity.DRAWER_ITEM_TIMETABLE,
+                MainActivity.DRAWER_ITEM_AGENDA,
+                MainActivity.DRAWER_ITEM_GRADES,
+                MainActivity.DRAWER_ITEM_HOMEWORK,
+                MainActivity.DRAWER_ITEM_BEHAVIOUR,
+                MainActivity.DRAWER_ITEM_ATTENDANCE,
+                MainActivity.DRAWER_ITEM_MESSAGES,
+                MainActivity.DRAWER_ITEM_MESSAGES,
+                MainActivity.DRAWER_ITEM_ANNOUNCEMENTS
+        )
+
+        val items = arrayOf<String>(
+                app.getString(R.string.menu_timetable),
+                app.getString(R.string.menu_agenda),
+                app.getString(R.string.menu_grades),
+                app.getString(R.string.menu_homework),
+                app.getString(R.string.menu_notices),
+                app.getString(R.string.menu_attendance),
+                app.getString(R.string.title_messages_inbox_single),
+                app.getString(R.string.title_messages_sent_single),
+                app.getString(R.string.menu_announcements)
+        )
+
+        val everything = currentViewId == MainActivity.DRAWER_ITEM_HOME
+        val checkedItems = booleanArrayOf(
+                everything || currentViewId == MainActivity.DRAWER_ITEM_TIMETABLE,
+                everything || currentViewId == MainActivity.DRAWER_ITEM_AGENDA,
+                everything || currentViewId == MainActivity.DRAWER_ITEM_GRADES,
+                everything || currentViewId == MainActivity.DRAWER_ITEM_HOMEWORK,
+                everything || currentViewId == MainActivity.DRAWER_ITEM_BEHAVIOUR,
+                everything || currentViewId == MainActivity.DRAWER_ITEM_ATTENDANCE,
+                everything || currentViewId == MainActivity.DRAWER_ITEM_MESSAGES && MessagesFragment.pageSelection != 1,
+                everything || currentViewId == MainActivity.DRAWER_ITEM_MESSAGES && MessagesFragment.pageSelection == 1,
+                everything || currentViewId == MainActivity.DRAWER_ITEM_ANNOUNCEMENTS
+        )
+        val userChooses = checkedItems.toMutableList()
+
+        dialog = MaterialAlertDialogBuilder(activity)
+                .setTitle(R.string.dialog_sync_view_list_title)
+                .setMultiChoiceItems(items, checkedItems) { _, which, isChecked ->
+                    userChooses[which] = isChecked
+                }
+                .setPositiveButton(R.string.ok) { _, _ ->
+                    dialog.dismiss()
+
+                    val selectedViewIds = userChooses.mapIndexed { index, it ->
+                        if (it)
+                            viewIds[index] to when (index) {
+                                7 -> 1
+                                else -> 0
+                            }
+                        else
+                            null
+                    }.let {
+                        listOfNotNull(*it.toTypedArray())
+                    }
+
+                    activity.swipeRefreshLayout.isRefreshing = true
+                    EdziennikTask.syncProfile(
+                            App.profileId,
+                            selectedViewIds
+                    ).enqueue(activity)
+                }
+                .setNegativeButton(R.string.cancel) { _, _ ->
+                    dialog.dismiss()
+                }
+                .show()
+    }}
+}

app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/timetable/LessonDetailsDialog.kt

@@ -0,0 +1,160 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-11-11.
+ */
+
+package pl.szczodrzynski.edziennik.ui.dialogs.timetable
+
+import android.content.Intent
+import android.view.View
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.data.db.modules.timetable.Lesson
+import pl.szczodrzynski.edziennik.data.db.modules.timetable.LessonFull
+import pl.szczodrzynski.edziennik.databinding.DialogLessonDetailsBinding
+import pl.szczodrzynski.edziennik.setText
+import pl.szczodrzynski.edziennik.ui.dialogs.event.EventManualV2Dialog
+import pl.szczodrzynski.edziennik.ui.modules.timetable.v2.TimetableFragment
+import pl.szczodrzynski.edziennik.utils.models.Date
+import pl.szczodrzynski.edziennik.utils.models.Week
+
+class LessonDetailsDialog(
+        val activity: AppCompatActivity,
+        val lesson: LessonFull,
+        val onShowListener: ((tag: String) -> Unit)? = null,
+        val onDismissListener: ((tag: String) -> Unit)? = null
+) {
+    companion object {
+        private const val TAG = "LessonDetailsDialog"
+    }
+
+    private lateinit var b: DialogLessonDetailsBinding
+    private lateinit var dialog: AlertDialog
+
+    init { run {
+        if (activity.isFinishing)
+            return@run
+        onShowListener?.invoke(TAG)
+        b = DialogLessonDetailsBinding.inflate(activity.layoutInflater)
+        dialog = MaterialAlertDialogBuilder(activity)
+                .setView(b.root)
+                .setPositiveButton(R.string.close) { dialog, _ ->
+                    dialog.dismiss()
+                }
+                .setNeutralButton(R.string.add) { dialog, _ ->
+                    EventManualV2Dialog(
+                            activity,
+                            lesson.profileId,
+                            lesson,
+                            onShowListener = onShowListener,
+                            onDismissListener = onDismissListener
+                    )
+                    /*MaterialAlertDialogBuilder(activity)
+                            .setItems(R.array.main_menu_add_options) { dialog2, which ->
+                                dialog2.dismiss()
+                                EventManualDialog(activity, lesson.profileId)
+                                        .show(
+                                                activity.application as App,
+                                                null,
+                                                lesson.displayDate,
+                                                lesson.displayStartTime,
+                                                when (which) {
+                                                    1 -> EventManualDialog.DIALOG_HOMEWORK
+                                                    else -> EventManualDialog.DIALOG_EVENT
+                                                }
+                                        )
+
+                            }
+                            .setNegativeButton(R.string.cancel) { dialog2, _ -> dialog2.dismiss() }
+                            .show()*/
+                }
+                .setOnDismissListener {
+                    onDismissListener?.invoke(TAG)
+                }
+                .show()
+        update()
+    }}
+
+    private fun update() {
+        b.lesson = lesson
+        val lessonDate = lesson.displayDate ?: return
+        b.lessonDate.text = Week.getFullDayName(lessonDate.weekDay) + ", " + lessonDate.formattedString
+
+        if (lesson.type >= Lesson.TYPE_SHIFTED_SOURCE) {
+            b.shiftedLayout.visibility = View.VISIBLE
+            var otherLessonDate: Date? = null
+            when (lesson.type) {
+                Lesson.TYPE_SHIFTED_SOURCE -> {
+                    otherLessonDate = lesson.date
+                    when {
+                        lesson.date != lesson.oldDate -> b.shiftedText.setText(
+                                R.string.timetable_lesson_shifted_other_day,
+                                lesson.date?.stringY_m_d ?: "?",
+                                lesson.startTime?.stringHM ?: "?"
+                        )
+                        lesson.startTime != lesson.oldStartTime -> b.shiftedText.setText(
+                                R.string.timetable_lesson_shifted_same_day,
+                                lesson.startTime?.stringHM ?: "?"
+                        )
+                        else -> b.shiftedText.setText(R.string.timetable_lesson_shifted)
+                    }
+                }
+                Lesson.TYPE_SHIFTED_TARGET -> {
+                    otherLessonDate = lesson.oldDate
+                    when {
+                        lesson.date != lesson.oldDate -> b.shiftedText.setText(
+                                R.string.timetable_lesson_shifted_from_other_day,
+                                lesson.oldDate?.stringY_m_d ?: "?",
+                                lesson.oldStartTime?.stringHM ?: "?"
+                        )
+                        lesson.startTime != lesson.oldStartTime -> b.shiftedText.setText(
+                                R.string.timetable_lesson_shifted_from_same_day,
+                                lesson.oldStartTime?.stringHM ?: "?"
+                        )
+                        else -> b.shiftedText.setText(R.string.timetable_lesson_shifted_from)
+                    }
+                }
+            }
+            b.shiftedGoTo.setOnClickListener {
+                dialog.dismiss()
+                val dateStr = otherLessonDate?.stringY_m_d ?: return@setOnClickListener
+                val intent = Intent(TimetableFragment.ACTION_SCROLL_TO_DATE).apply {
+                    putExtra("date", dateStr)
+                }
+                activity.sendBroadcast(intent)
+            }
+        }
+        else {
+            b.shiftedLayout.visibility = View.GONE
+        }
+
+        if (lesson.type < Lesson.TYPE_SHIFTED_SOURCE && lesson.oldSubjectId != null && lesson.subjectId != lesson.oldSubjectId) {
+            b.oldSubjectName = lesson.oldSubjectName
+        }
+        if (lesson.type != Lesson.TYPE_CANCELLED && lesson.subjectId != null) {
+            b.subjectName = lesson.subjectName
+        }
+
+        if (lesson.type < Lesson.TYPE_SHIFTED_SOURCE && lesson.oldTeacherId != null && lesson.teacherId != lesson.oldTeacherId) {
+            b.oldTeacherName = lesson.oldTeacherName
+        }
+        if (lesson.type != Lesson.TYPE_CANCELLED && lesson.teacherId != null) {
+            b.teacherName = lesson.teacherName
+        }
+
+        if (lesson.oldClassroom != null && lesson.classroom != lesson.oldClassroom) {
+            b.oldClassroom = lesson.oldClassroom
+        }
+        if (lesson.type != Lesson.TYPE_CANCELLED && lesson.classroom != null) {
+            b.classroom = lesson.classroom
+        }
+
+        if (lesson.type < Lesson.TYPE_SHIFTED_SOURCE && lesson.oldTeamId != null && lesson.teamId != lesson.oldTeamId) {
+            b.oldTeamName = lesson.oldTeamName
+        }
+        if (lesson.type != Lesson.TYPE_CANCELLED && lesson.teamId != null) {
+            b.teamName = lesson.teamName
+        }
+    }
+}

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/error/ErrorDialog.kt

@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-11-13.
+ */
+
+package pl.szczodrzynski.edziennik.ui.modules.error
+
+import android.util.Log
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.databinding.DialogLessonDetailsBinding
+import kotlin.coroutines.CoroutineContext
+
+class ErrorDialog(
+        val activity: AppCompatActivity,
+        val exception: Exception
+) : CoroutineScope {
+    companion object {
+        private const val TAG = "ErrorDialog"
+    }
+
+    private lateinit var job: Job
+    override val coroutineContext: CoroutineContext
+        get() = job + Dispatchers.Main
+
+    private val app by lazy { activity.application as App }
+    private lateinit var b: DialogLessonDetailsBinding
+    private lateinit var dialog: AlertDialog
+
+    init { run {
+        job = Job()
+
+        dialog = MaterialAlertDialogBuilder(activity)
+                .setTitle(R.string.error_occured)
+                .setMessage(exception.message + "\n" + Log.getStackTraceString(exception))
+                .setPositiveButton(R.string.ok) { _, _ ->
+                    dialog.dismiss()
+                }
+                .show()
+    }}
+}

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/error/ErrorSnackbar.kt

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-11-13.
+ */
+
+package pl.szczodrzynski.edziennik.ui.modules.error
+
+import android.view.View
+import androidx.appcompat.app.AppCompatActivity
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.core.graphics.ColorUtils
+import com.google.android.material.snackbar.Snackbar
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError
+import pl.szczodrzynski.navlib.getColorFromAttr
+
+class ErrorSnackbar(val activity: AppCompatActivity) {
+    companion object {
+        private const val TAG = "ErrorSnackbar"
+    }
+
+    private var snackbar: Snackbar? = null
+    private lateinit var coordinator: CoordinatorLayout
+    private val errors = mutableListOf<ApiError>()
+
+    fun setCoordinator(coordinatorLayout: CoordinatorLayout, showAbove: View? = null) {
+        this.coordinator = coordinatorLayout
+        snackbar = Snackbar.make(coordinator, R.string.snackbar_error_text, Snackbar.LENGTH_INDEFINITE)
+        snackbar?.setAction(R.string.more) {
+
+        }
+        val bgColor = ColorUtils.compositeColors(
+                getColorFromAttr(activity, R.attr.colorOnSurface) and 0xcfffffff.toInt(),
+                getColorFromAttr(activity, R.attr.colorSurface)
+        )
+        snackbar?.setBackgroundTint(bgColor)
+        showAbove?.let { snackbar?.anchorView = it }
+    }
+
+    fun addError(apiError: ApiError): ErrorSnackbar {
+        errors += apiError
+        snackbar?.setText(apiError.getStringReason(activity))
+        return this
+    }
+
+    fun show() = snackbar?.show()
+    fun dismiss() = snackbar?.dismiss()
+}

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

@@ -15,8 +15,9 @@ import java.util.List;
 
 import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
-import pl.szczodrzynski.edziennik.data.api.AppError;
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError;
 import pl.szczodrzynski.edziennik.databinding.ActivityLoginBinding;
+import pl.szczodrzynski.edziennik.ui.modules.error.ErrorSnackbar;
 
 public class LoginActivity extends AppCompatActivity {
 
@@ -26,7 +27,8 @@ public class LoginActivity extends AppCompatActivity {
     public static final int RESULT_OK = 1;
     public static NavOptions navOptions;
 
-    static AppError error = null;
+    static ApiError error = null;
+    ErrorSnackbar errorSnackbar = new ErrorSnackbar(this);
 
     static List<LoginProfileObject> profileObjects;
     public static boolean firstCompleted = false; // if a profile is already added during *this* login. This means that LoginChooser has to navigateUp onBackPressed. Else, finish the activity.
@@ -69,6 +71,8 @@ public class LoginActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        setTheme(R.style.AppTheme_Light);
+
         firstCompleted = false;
         profileObjects = new ArrayList<>();
         error = null;
@@ -83,6 +87,8 @@ public class LoginActivity extends AppCompatActivity {
         b = DataBindingUtil.inflate(getLayoutInflater(), R.layout.activity_login, null, false);
         setContentView(b.getRoot());
 
+        errorSnackbar.setCoordinator(b.coordinator, null);
+
         app = (App) getApplication();
 
         if (!app.appConfig.loginFinished) {

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

@@ -1,25 +1,23 @@
 package pl.szczodrzynski.edziennik.ui.modules.login;
 
 import android.os.Bundle;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.databinding.DataBindingUtil;
-import androidx.fragment.app.Fragment;
-
 import android.text.Editable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.danimahardhika.cafebar.CafeBar;
-
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.databinding.DataBindingUtil;
+import androidx.fragment.app.Fragment;
 import androidx.navigation.NavController;
 import androidx.navigation.Navigation;
+
 import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
-import pl.szczodrzynski.edziennik.data.api.AppError;
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError;
 import pl.szczodrzynski.edziennik.databinding.FragmentLoginIuczniowieBinding;
+import pl.szczodrzynski.edziennik.ui.modules.error.ErrorSnackbar;
 
 import static pl.szczodrzynski.edziennik.data.api.AppError.CODE_INVALID_LOGIN;
 import static pl.szczodrzynski.edziennik.data.api.AppError.CODE_INVALID_SCHOOL_NAME;
@@ -31,6 +29,7 @@ public class LoginIuczniowieFragment extends Fragment {
     private NavController nav;
     private FragmentLoginIuczniowieBinding b;
     private static final String TAG = "LoginIuczniowie";
+    private ErrorSnackbar errorSnackbar;
 
     public LoginIuczniowieFragment() { }
 
@@ -40,6 +39,7 @@ public class LoginIuczniowieFragment extends Fragment {
         if (getActivity() != null) {
             app = (App) getActivity().getApplicationContext();
             nav = Navigation.findNavController(getActivity(), R.id.nav_host_fragment);
+            errorSnackbar = ((LoginActivity) getActivity()).errorSnackbar;
         }
         else {
             return null;
@@ -54,31 +54,17 @@ public class LoginIuczniowieFragment extends Fragment {
         assert getActivity() != null;
 
         view.postDelayed(() -> {
-            AppError error = LoginActivity.error;
+            ApiError error = LoginActivity.error;
             if (error != null) {
-                switch (error.errorCode) {
+                switch (error.getErrorCode()) {
                     case CODE_INVALID_SCHOOL_NAME:
                         b.loginSchoolNameLayout.setError(getString(R.string.login_error_incorrect_school_name));
                         break;
                     case CODE_INVALID_LOGIN:
                         b.loginPasswordLayout.setError(getString(R.string.login_error_incorrect_login_or_password));
                         break;
-                    default:
-                        CafeBar.builder(getActivity())
-                                .to(b.root)
-                                .content(getString(R.string.login_error, error.asReadableString(getActivity())))
-                                .autoDismiss(false)
-                                .positiveText(R.string.ok)
-                                .onPositive(CafeBar::dismiss)
-                                .floating(true)
-                                .swipeToDismiss(true)
-                                .neutralText(R.string.more)
-                                .onNeutral(cafeBar -> app.apiEdziennik.guiShowErrorDialog(getActivity(), error, R.string.error_details))
-                                .negativeText(R.string.report)
-                                .onNegative((cafeBar -> app.apiEdziennik.guiReportError(getActivity(), error, null)))
-                                .show();
-                        break;
                 }
+                errorSnackbar.addError(error).show();
                 LoginActivity.error = null;
             }
         }, 100);

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

@@ -1,28 +1,26 @@
 package pl.szczodrzynski.edziennik.ui.modules.login;
 
 import android.os.Bundle;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.databinding.DataBindingUtil;
-import androidx.fragment.app.Fragment;
-
 import android.text.Editable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.danimahardhika.cafebar.CafeBar;
-
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.databinding.DataBindingUtil;
+import androidx.fragment.app.Fragment;
 import androidx.navigation.NavController;
 import androidx.navigation.Navigation;
+
 import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
-import pl.szczodrzynski.edziennik.data.api.AppError;
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError;
 import pl.szczodrzynski.edziennik.databinding.FragmentLoginLibrusBinding;
+import pl.szczodrzynski.edziennik.ui.modules.error.ErrorSnackbar;
 
-import static pl.szczodrzynski.edziennik.data.api.AppError.CODE_INVALID_LOGIN;
-import static pl.szczodrzynski.edziennik.data.api.AppError.CODE_LIBRUS_NOT_ACTIVATED;
+import static pl.szczodrzynski.edziennik.api.v2.ErrorsKt.ERROR_LOGIN_DATA_INVALID;
+import static pl.szczodrzynski.edziennik.api.v2.ErrorsKt.ERROR_LOGIN_LIBRUS_PORTAL_NOT_ACTIVATED;
 import static pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore.LOGIN_TYPE_LIBRUS;
 
 public class LoginLibrusFragment extends Fragment {
@@ -31,6 +29,7 @@ public class LoginLibrusFragment extends Fragment {
     private NavController nav;
     private FragmentLoginLibrusBinding b;
     private static final String TAG = "LoginLibrus";
+    private ErrorSnackbar errorSnackbar;
 
     public LoginLibrusFragment() { }
 
@@ -40,6 +39,7 @@ public class LoginLibrusFragment extends Fragment {
         if (getActivity() != null) {
             app = (App) getActivity().getApplicationContext();
             nav = Navigation.findNavController(getActivity(), R.id.nav_host_fragment);
+            errorSnackbar = ((LoginActivity) getActivity()).errorSnackbar;
         }
         else {
             return null;
@@ -54,32 +54,17 @@ public class LoginLibrusFragment extends Fragment {
         assert getActivity() != null;
 
         view.postDelayed(() -> {
-            AppError error = LoginActivity.error;
+            ApiError error = LoginActivity.error;
             if (error != null) {
-                switch (error.errorCode) {
-                    case CODE_INVALID_LOGIN:
+                switch (error.getErrorCode()) {
+                    case ERROR_LOGIN_DATA_INVALID:
                         b.loginPasswordLayout.setError(getString(R.string.login_error_incorrect_login_or_password));
                         break;
-                    case CODE_LIBRUS_NOT_ACTIVATED:
+                    case ERROR_LOGIN_LIBRUS_PORTAL_NOT_ACTIVATED:
                         b.loginEmailLayout.setError(getString(R.string.login_error_account_not_activated));
                         break;
-                    default:
-                        CafeBar.builder(getActivity())
-                                .to(b.root)
-                                .content(getString(R.string.login_error, error.asReadableString(getActivity())))
-                                .duration(10000)
-                                .autoDismiss(false)
-                                .positiveText(R.string.ok)
-                                .onPositive(CafeBar::dismiss)
-                                .floating(true)
-                                .swipeToDismiss(true)
-                                .neutralText(R.string.more)
-                                .onNeutral(cafeBar -> app.apiEdziennik.guiShowErrorDialog(getActivity(), error, R.string.error_details))
-                                .negativeText(R.string.report)
-                                .onNegative((cafeBar -> app.apiEdziennik.guiReportError(getActivity(), error, null)))
-                                .show();
-                        break;
                 }
+                errorSnackbar.addError(error).show();
                 LoginActivity.error = null;
             }
         }, 100);

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

@@ -1,23 +1,23 @@
 package pl.szczodrzynski.edziennik.ui.modules.login;
 
-import androidx.databinding.DataBindingUtil;
 import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
 import android.text.Editable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.danimahardhika.cafebar.CafeBar;
-
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.databinding.DataBindingUtil;
+import androidx.fragment.app.Fragment;
 import androidx.navigation.NavController;
 import androidx.navigation.Navigation;
+
 import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
-import pl.szczodrzynski.edziennik.data.api.AppError;
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError;
 import pl.szczodrzynski.edziennik.databinding.FragmentLoginMobidziennikBinding;
+import pl.szczodrzynski.edziennik.ui.modules.error.ErrorSnackbar;
 
 import static pl.szczodrzynski.edziennik.data.api.AppError.CODE_ARCHIVED;
 import static pl.szczodrzynski.edziennik.data.api.AppError.CODE_INVALID_LOGIN;
@@ -31,6 +31,7 @@ public class LoginMobidziennikFragment extends Fragment {
     private NavController nav;
     private FragmentLoginMobidziennikBinding b;
     private static final String TAG = "LoginMobidziennik";
+    private ErrorSnackbar errorSnackbar;
 
     public LoginMobidziennikFragment() { }
 
@@ -40,6 +41,7 @@ public class LoginMobidziennikFragment extends Fragment {
         if (getActivity() != null) {
             app = (App) getActivity().getApplicationContext();
             nav = Navigation.findNavController(getActivity(), R.id.nav_host_fragment);
+            errorSnackbar = ((LoginActivity) getActivity()).errorSnackbar;
         }
         else {
             return null;
@@ -54,9 +56,9 @@ public class LoginMobidziennikFragment extends Fragment {
         assert getActivity() != null;
 
         view.postDelayed(() -> {
-            AppError error = LoginActivity.error;
+            ApiError error = LoginActivity.error;
             if (error != null) {
-                switch (error.errorCode) {
+                switch (error.getErrorCode()) {
                     case CODE_INVALID_LOGIN:
                         b.loginPasswordLayout.setError(getString(R.string.login_error_incorrect_login_or_password));
                         break;
@@ -69,22 +71,8 @@ public class LoginMobidziennikFragment extends Fragment {
                     case CODE_INVALID_SERVER_ADDRESS:
                         b.loginServerAddressLayout.setError(getString(R.string.login_error_incorrect_address));
                         break;
-                    default:
-                        CafeBar.builder(getActivity())
-                                .to(b.root)
-                                .content(getString(R.string.login_error, error.asReadableString(getActivity())))
-                                .autoDismiss(false)
-                                .positiveText(R.string.ok)
-                                .onPositive(CafeBar::dismiss)
-                                .floating(true)
-                                .swipeToDismiss(true)
-                                .neutralText(R.string.more)
-                                .onNeutral(cafeBar -> app.apiEdziennik.guiShowErrorDialog(getActivity(), error, R.string.error_details))
-                                .negativeText(R.string.report)
-                                .onNegative((cafeBar -> app.apiEdziennik.guiReportError(getActivity(), error, null)))
-                                .show();
-                        break;
                 }
+                errorSnackbar.addError(error).show();
                 LoginActivity.error = null;
             }
         }, 100);

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

@@ -23,11 +23,11 @@ import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.api.v2.events.ApiTaskErrorEvent;
 import pl.szczodrzynski.edziennik.api.v2.events.FirstLoginFinishedEvent;
 import pl.szczodrzynski.edziennik.api.v2.events.task.EdziennikTask;
-import pl.szczodrzynski.edziennik.data.api.AppError;
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError;
 import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore;
 import pl.szczodrzynski.edziennik.databinding.FragmentLoginProgressBinding;
 
-import static pl.szczodrzynski.edziennik.data.api.AppError.CODE_OTHER;
+import static pl.szczodrzynski.edziennik.api.v2.ErrorsKt.LOGIN_NO_ARGUMENTS;
 
 public class LoginProgressFragment extends Fragment {
 
@@ -62,7 +62,7 @@ public class LoginProgressFragment extends Fragment {
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onSyncErrorEvent(ApiTaskErrorEvent event) {
-        LoginActivity.error = event.getError().toAppError();
+        LoginActivity.error = event.getError();
         if (getActivity() == null)
             return;
         nav.navigateUp();
@@ -79,7 +79,7 @@ public class LoginProgressFragment extends Fragment {
         LoginActivity.error = null;
 
         if (args == null) {
-            LoginActivity.error = new AppError(TAG, 72, CODE_OTHER, getString(R.string.login_error_no_arguments));
+            LoginActivity.error = new ApiError(TAG, LOGIN_NO_ARGUMENTS);
             nav.navigateUp();
             return;
         }

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

@@ -1,6 +1,9 @@
 package pl.szczodrzynski.edziennik.ui.modules.login;
 
 import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -8,14 +11,11 @@ import androidx.databinding.DataBindingUtil;
 import androidx.fragment.app.Fragment;
 import androidx.navigation.NavController;
 import androidx.navigation.Navigation;
+
 import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.databinding.FragmentLoginSyncErrorBinding;
 
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
 public class LoginSyncErrorFragment extends Fragment {
 
     private App app;
@@ -44,10 +44,10 @@ public class LoginSyncErrorFragment extends Fragment {
         assert getContext() != null;
         assert getActivity() != null;
 
-        b.errorDetails.setText(LoginActivity.error == null ? "" : LoginActivity.error.asReadableString(getActivity()));
+        b.errorDetails.setText(LoginActivity.error == null ? "" : LoginActivity.error.getStringReason(getActivity()));
 
         b.reportButton.setOnClickListener((v -> {
-            app.apiEdziennik.guiReportError(getActivity(), LoginActivity.error, null);
+            // TODO error report activity open here app.apiEdziennik.guiReportError(getActivity(), LoginActivity.error, null);
         }));
 
         b.nextButton.setOnClickListener((v -> {

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

@@ -65,7 +65,7 @@ class LoginSyncFragment : Fragment() {
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onSyncErrorEvent(event: ApiTaskErrorEvent) {
-        LoginActivity.error = event.error.toAppError()
+        LoginActivity.error = event.error
         nav.navigate(R.id.loginSyncErrorFragment, null, LoginActivity.navOptions)
     }
 

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

@@ -3,27 +3,24 @@ package pl.szczodrzynski.edziennik.ui.modules.login;
 import android.content.Intent;
 import android.graphics.Color;
 import android.os.Bundle;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.databinding.DataBindingUtil;
-import androidx.fragment.app.Fragment;
-
 import android.text.Editable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
 
-import com.danimahardhika.cafebar.CafeBar;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.databinding.DataBindingUtil;
+import androidx.fragment.app.Fragment;
+import androidx.navigation.NavController;
+import androidx.navigation.Navigation;
+
 import com.mikepenz.iconics.IconicsColor;
 import com.mikepenz.iconics.IconicsDrawable;
 import com.mikepenz.iconics.IconicsSize;
 import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial;
 
-import androidx.navigation.NavController;
-import androidx.navigation.Navigation;
-
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
 import java.util.regex.Matcher;
@@ -36,9 +33,10 @@ import javax.crypto.ShortBufferException;
 
 import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
-import pl.szczodrzynski.edziennik.ui.modules.webpush.QrScannerActivity;
-import pl.szczodrzynski.edziennik.data.api.AppError;
+import pl.szczodrzynski.edziennik.api.v2.models.ApiError;
 import pl.szczodrzynski.edziennik.databinding.FragmentLoginVulcanBinding;
+import pl.szczodrzynski.edziennik.ui.modules.error.ErrorSnackbar;
+import pl.szczodrzynski.edziennik.ui.modules.webpush.QrScannerActivity;
 import pl.szczodrzynski.edziennik.utils.Utils;
 
 import static pl.szczodrzynski.edziennik.data.api.AppError.CODE_EXPIRED_TOKEN;
@@ -53,6 +51,7 @@ public class LoginVulcanFragment extends Fragment {
     private NavController nav;
     private FragmentLoginVulcanBinding b;
     private static final String TAG = "LoginVulcan";
+    private ErrorSnackbar errorSnackbar;
 
     public LoginVulcanFragment() { }
 
@@ -62,6 +61,7 @@ public class LoginVulcanFragment extends Fragment {
         if (getActivity() != null) {
             app = (App) getActivity().getApplicationContext();
             nav = Navigation.findNavController(getActivity(), R.id.nav_host_fragment);
+            errorSnackbar = ((LoginActivity) getActivity()).errorSnackbar;
         }
         else {
             return null;
@@ -76,9 +76,9 @@ public class LoginVulcanFragment extends Fragment {
         assert getActivity() != null;
 
         view.postDelayed(() -> {
-            AppError error = LoginActivity.error;
+            ApiError error = LoginActivity.error;
             if (error != null) {
-                switch (error.errorCode) {
+                switch (error.getErrorCode()) {
                     case CODE_INVALID_TOKEN:
                         b.loginTokenLayout.setError(getString(R.string.login_error_incorrect_token));
                         break;
@@ -89,28 +89,14 @@ public class LoginVulcanFragment extends Fragment {
                         b.loginSymbolLayout.setError(getString(R.string.login_error_incorrect_symbol));
                         break;
                     case CODE_INVALID_PIN:
-                        if (!"?".equals(error.errorText)) {
+                        /*if (!"?".equals(error.errorText)) {
                             b.loginPinLayout.setError(getString(R.string.login_error_incorrect_pin_format, error.errorText));
                             break;
-                        }
+                        }*/
                         b.loginPinLayout.setError(getString(R.string.login_error_incorrect_pin));
                         break;
-                    default:
-                        CafeBar.builder(getActivity())
-                                .to(b.root)
-                                .content(getString(R.string.login_error, error.asReadableString(getActivity())))
-                                .autoDismiss(false)
-                                .positiveText(R.string.ok)
-                                .onPositive(CafeBar::dismiss)
-                                .floating(true)
-                                .swipeToDismiss(true)
-                                .neutralText(R.string.more)
-                                .onNeutral(cafeBar -> app.apiEdziennik.guiShowErrorDialog(getActivity(), error, R.string.error_details))
-                                .negativeText(R.string.report)
-                                .onNegative((cafeBar -> app.apiEdziennik.guiReportError(getActivity(), error, null)))
-                                .show();
-                        break;
                 }
+                errorSnackbar.addError(error).show();
                 LoginActivity.error = null;
             }
         }, 100);

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

@@ -0,0 +1,319 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-11-12.
+ */
+
+package pl.szczodrzynski.edziennik.ui.modules.messages
+
+import android.os.Bundle
+import android.os.Environment
+import android.text.Html
+import android.text.TextUtils
+import android.view.Gravity.CENTER_VERTICAL
+import android.view.Gravity.END
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.FrameLayout
+import android.widget.ProgressBar
+import androidx.fragment.app.Fragment
+import com.google.android.material.chip.Chip
+import com.mikepenz.iconics.IconicsColor
+import com.mikepenz.iconics.IconicsDrawable
+import com.mikepenz.iconics.IconicsSize
+import com.mikepenz.iconics.typeface.IIcon
+import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
+import com.mikepenz.iconics.utils.sizeDp
+import kotlinx.coroutines.*
+import org.greenrobot.eventbus.EventBus
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.MainActivity
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.api.v2.events.MessageGetEvent
+import pl.szczodrzynski.edziennik.api.v2.events.task.EdziennikTask
+import pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_SENT
+import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageFull
+import pl.szczodrzynski.edziennik.databinding.MessageFragmentBinding
+import pl.szczodrzynski.edziennik.onClick
+import pl.szczodrzynski.edziennik.utils.Anim
+import pl.szczodrzynski.edziennik.utils.Themes
+import pl.szczodrzynski.edziennik.utils.Utils
+import pl.szczodrzynski.edziennik.utils.Utils.getStringFromFile
+import pl.szczodrzynski.edziennik.utils.Utils.readableFileSize
+import pl.szczodrzynski.edziennik.utils.models.Date
+import pl.szczodrzynski.edziennik.utils.models.Time
+import pl.szczodrzynski.navlib.colorAttr
+import java.io.File
+import kotlin.coroutines.CoroutineContext
+import kotlin.math.min
+
+class MessageFragment : Fragment(), CoroutineScope {
+    companion object {
+        private const val TAG = "MessageFragment"
+    }
+
+    private lateinit var app: App
+    private lateinit var activity: MainActivity
+    private lateinit var b: MessageFragmentBinding
+
+    private lateinit var job: Job
+    override val coroutineContext: CoroutineContext
+        get() = job + Dispatchers.Main
+
+    private lateinit var message: MessageFull
+    private var attachmentList = mutableListOf<Attachment>()
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        activity = (getActivity() as MainActivity?) ?: return null
+        context ?: return null
+        app = activity.application as App
+        context!!.theme.applyStyle(Themes.appTheme, true)
+        b = MessageFragmentBinding.inflate(inflater)
+        job = Job()
+        return b.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        // TODO check if app, activity, b can be null
+        if (app.profile == null || !isAdded)
+            return
+
+        b.closeButton.setImageDrawable(
+                IconicsDrawable(activity, CommunityMaterial.Icon2.cmd_window_close)
+                        .colorAttr(activity, android.R.attr.textColorSecondary)
+                        .sizeDp(12)
+        )
+        b.closeButton.setOnClickListener { activity.navigateUp() }
+
+        val messageId = arguments?.getLong("messageId")
+        if (messageId == null) {
+            activity.navigateUp()
+            return
+        }
+
+        launch {
+            val deferred = async(Dispatchers.Default) {
+                val msg = app.db.messageDao().getById(App.profileId, messageId)?.also {
+                    it.recipients = app.db.messageRecipientDao().getAllByMessageId(it.profileId, it.id)
+                    if (it.body != null && !it.seen) {
+                        app.db.metadataDao().setSeen(it.profileId, it, true)
+                    }
+                }
+                msg
+            }
+            val msg = deferred.await() ?: run {
+                return@launch
+            }
+            message = msg
+            b.subject.text = message.subject
+            checkMessage()
+        }
+
+        // click to expand subject and sender
+        b.subject.onClick {
+            it.maxLines = if (it.maxLines == 30) 2 else 30
+        }
+        b.sender.onClick {
+            it.maxLines = if (it.maxLines == 30) 2 else 30
+        }
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
+    fun onMessageGetEvent(event: MessageGetEvent) {
+        // TODO remove this: message = event.message
+        showMessage()
+    }
+
+    private fun checkMessage() {
+        if (message.body == null) {
+            EdziennikTask.messageGet(App.profileId, message).enqueue(activity)
+            return
+        }
+
+        var readByAll = true
+        message.recipients?.forEach { recipient ->
+            if (recipient.id == -1L)
+                recipient.fullName = app.profile.accountNameLong ?: app.profile.studentNameLong
+            if (message.type == TYPE_SENT && recipient.readDate < 1)
+                readByAll = false
+        }
+        // if a sent msg is not read by everyone, download it again to check the read status
+        if (!readByAll) {
+            EdziennikTask.messageGet(App.profileId, message).enqueue(activity)
+            return
+        }
+
+        showMessage()
+    }
+
+    private fun showMessage() {
+        b.body.text = Html.fromHtml(message.body?.replace("\\[META:[A-z0-9]+;[0-9-]+]".toRegex(), ""))
+        b.date.text = getString(R.string.messages_date_time_format, Date.fromMillis(message.addedDate).formattedStringShort, Time.fromMillis(message.addedDate).stringHM)
+
+        val messageInfo = MessagesUtils.getMessageInfo(app, message, 40, 20, 14, 10)
+        b.profileBackground.setImageBitmap(messageInfo.profileImage)
+        b.sender.text = messageInfo.profileName
+
+        b.subject.text = message.subject
+
+        val messageRecipients = StringBuilder("<ul>")
+        message.recipients?.forEach { recipient ->
+            when (recipient.readDate) {
+                -1L -> messageRecipients.append(getString(
+                        R.string.messages_recipients_list_unknown_state_format,
+                        recipient.fullName
+                ))
+                0L -> messageRecipients.append(getString(
+                        R.string.messages_recipients_list_unread_format,
+                        recipient.fullName
+                ))
+                1L -> messageRecipients.append(getString(
+                        R.string.messages_recipients_list_read_unknown_date_format,
+                        recipient.fullName
+                ))
+                else -> messageRecipients.append(getString(
+                        R.string.messages_recipients_list_read_format,
+                        recipient.fullName,
+                        Date.fromMillis(recipient.readDate).formattedString,
+                        Time.fromMillis(recipient.readDate).stringHM
+                ))
+            }
+        }
+        messageRecipients.append("</ul>")
+        b.recipients.text = Html.fromHtml(messageRecipients.toString())
+
+        showAttachments()
+
+        b.progress.visibility = View.GONE
+        Anim.fadeIn(b.content, 200, null)
+        MessagesFragment.pageSelection = min(message.type, 1)
+    }
+
+    private fun showAttachments() {
+        if (message.attachmentIds != null) {
+            val insertPoint = b.attachments
+
+            val chipLayoutParams = FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+            chipLayoutParams.setMargins(0, Utils.dpToPx(8), 0, Utils.dpToPx(8))
+
+            val progressLayoutParams = FrameLayout.LayoutParams(Utils.dpToPx(18), Utils.dpToPx(18))
+            progressLayoutParams.setMargins(Utils.dpToPx(8), 0, Utils.dpToPx(8), 0)
+            progressLayoutParams.gravity = END or CENTER_VERTICAL
+
+            // CREATE VIEWS AND AN OBJECT FOR EVERY ATTACHMENT
+
+            message.attachmentNames.forEachIndexed { index, name ->
+                val messageId = message.id
+                val id = message.attachmentIds[index]
+                val size = message.attachmentSizes[index]
+                // create the parent
+                val attachmentLayout = FrameLayout(b.root.context)
+                attachmentLayout.setPadding(Utils.dpToPx(16), 0, Utils.dpToPx(16), 0)
+
+                val attachmentChip = Chip(attachmentLayout.context)
+                //attachmentChip.setChipBackgroundColorResource(ThemeUtils.getChipColorRes());
+                attachmentChip.layoutParams = chipLayoutParams
+                attachmentChip.height = Utils.dpToPx(40)
+
+                // show the file size or not
+                if (size == -1L)
+                    attachmentChip.text = getString(R.string.messages_attachment_no_size_format, name)
+                else
+                    attachmentChip.text = getString(R.string.messages_attachment_format, name, readableFileSize(size))
+                attachmentChip.ellipsize = TextUtils.TruncateAt.MIDDLE
+
+                // create an icon for the attachment
+                var icon: IIcon = CommunityMaterial.Icon.cmd_file
+                when (Utils.getExtensionFromFileName(name)) {
+                    "txt" -> icon = CommunityMaterial.Icon.cmd_file_document
+                    "doc", "docx", "odt", "rtf" -> icon = CommunityMaterial.Icon.cmd_file_word
+                    "xls", "xlsx", "ods" -> icon = CommunityMaterial.Icon.cmd_file_excel
+                    "ppt", "pptx", "odp" -> icon = CommunityMaterial.Icon.cmd_file_powerpoint
+                    "pdf" -> icon = CommunityMaterial.Icon.cmd_file_pdf
+                    "mp3", "wav", "aac" -> icon = CommunityMaterial.Icon.cmd_file_music
+                    "mp4", "avi", "3gp", "mkv", "flv" -> icon = CommunityMaterial.Icon.cmd_file_video
+                    "jpg", "jpeg", "png", "bmp", "gif" -> icon = CommunityMaterial.Icon.cmd_file_image
+                    "zip", "rar", "tar", "7z" -> icon = CommunityMaterial.Icon.cmd_file_lock
+                }
+                attachmentChip.chipIcon = IconicsDrawable(activity).color(IconicsColor.colorRes(R.color.colorPrimary)).icon(icon).size(IconicsSize.dp(26))
+                attachmentChip.closeIcon = IconicsDrawable(activity).icon(CommunityMaterial.Icon.cmd_check).size(IconicsSize.dp(18)).color(IconicsColor.colorInt(Utils.getAttr(activity, android.R.attr.textColorPrimary)))
+                attachmentChip.isCloseIconVisible = false
+                // set the object's index in the attachmentList as the tag
+                attachmentChip.tag = index
+                attachmentChip.setOnClickListener { v ->
+                    if (v.tag is Int) {
+                        // TODO downloadAttachment(v.tag as Int)
+                    }
+                }
+                attachmentLayout.addView(attachmentChip)
+
+                val attachmentProgress = ProgressBar(attachmentLayout.context)
+                attachmentProgress.layoutParams = progressLayoutParams
+                attachmentProgress.visibility = View.GONE
+                attachmentLayout.addView(attachmentProgress)
+
+                insertPoint.addView(attachmentLayout)
+                // create an object and add to the list
+                val a = Attachment(App.profileId, messageId, id, name, size, attachmentLayout, attachmentChip, attachmentProgress)
+                attachmentList.add(a)
+                // check if the file is already downloaded. Show the check icon if necessary and set `downloaded` to true.
+                checkAttachment(a)
+
+            }
+        } else {
+            // no attachments found
+            b.attachmentsTitle.visibility = View.GONE
+        }
+    }
+
+    private fun checkAttachment(attachment: Attachment) {
+        val storageDir = Environment.getExternalStoragePublicDirectory("Szkolny.eu")
+        storageDir.mkdirs()
+
+        val attachmentDataFile = File(storageDir, "." + attachment.profileId + "_" + attachment.messageId + "_" + attachment.attachmentId)
+        if (attachmentDataFile.exists()) {
+            try {
+                val attachmentFileName = getStringFromFile(attachmentDataFile)
+                val attachmentFile = File(attachmentFileName)
+                if (attachmentFile.exists()) {
+                    attachment.downloaded = attachmentFileName
+                    attachment.chip.isCloseIconVisible = true
+                }
+            } catch (e: Exception) {
+                e.printStackTrace()
+                //app.apiEdziennik.guiReportException(activity, 355, e)
+            }
+
+        }
+    }
+
+    override fun onStart() {
+        EventBus.getDefault().register(this)
+        super.onStart()
+    }
+    override fun onStop() {
+        super.onStop()
+        EventBus.getDefault().unregister(this)
+    }
+    override fun onDestroy() {
+        super.onDestroy()
+        job.cancel()
+    }
+
+    private class Attachment(
+            var profileId: Int,
+            var messageId: Long,
+            var attachmentId: Long,
+            var attachmentName: String,
+            var attachmentSize: Long,
+            var parent: FrameLayout,
+            var chip: Chip,
+            var progressBar: ProgressBar
+    ) {
+        /**
+         * An absolute path of the downloaded file. `null` if not downloaded yet.
+         */
+        internal var downloaded: String? = null
+    }
+}

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

@@ -4,7 +4,6 @@ import android.content.Context;
 import android.graphics.Color;
 import android.graphics.drawable.BitmapDrawable;
 import android.os.Bundle;
-import android.os.Handler;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MotionEvent;
@@ -13,7 +12,6 @@ import android.widget.Toast;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
 import androidx.databinding.DataBindingUtil;
 
 import com.afollestad.materialdialogs.MaterialDialog;
@@ -35,12 +33,6 @@ import java.util.List;
 
 import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
-import pl.szczodrzynski.edziennik.data.api.AppError;
-import pl.szczodrzynski.edziennik.data.api.Edziennik;
-import pl.szczodrzynski.edziennik.data.api.interfaces.SyncCallback;
-import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore;
-import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile;
-import pl.szczodrzynski.edziennik.data.db.modules.profiles.ProfileFull;
 import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher;
 import pl.szczodrzynski.edziennik.databinding.ActivityComposeMessageBinding;
 import pl.szczodrzynski.edziennik.utils.Colors;
@@ -63,7 +55,7 @@ public class MessagesComposeActivity extends AppCompatActivity {
         b = DataBindingUtil.inflate(getLayoutInflater(), R.layout.activity_compose_message, null, false);
         setContentView(b.getRoot());
 
-        composeInfo = Edziennik.getApi(app, app.profile.getLoginStoreType()).getComposeInfo(app.profile);
+        /*composeInfo = Edziennik.getApi(app, app.profile.getLoginStoreType()).getComposeInfo(app.profile);
 
         Toolbar toolbar = b.toolbar;
         setSupportActionBar(toolbar);
@@ -99,7 +91,7 @@ public class MessagesComposeActivity extends AppCompatActivity {
             MessagesComposeSuggestionAdapter adapter = new MessagesComposeSuggestionAdapter(this, teachers);
             //ArrayAdapter<Teacher> adapter = new ArrayAdapter<>(this, android.R.layout.simple_dropdown_item_1line, teachers);
             b.nachoTextView.setAdapter(adapter);
-        });
+        });*/
         /*app.db.teacherDao().getAllTeachers(App.profileId).observe(this, teachers -> {
 
         });*/

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

@@ -1,17 +1,12 @@
 package pl.szczodrzynski.edziennik.ui.modules.messages;
 
-import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.media.ThumbnailUtils;
 import android.net.Uri;
-import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Environment;
-import android.os.Handler;
-import android.text.Html;
-import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -19,12 +14,18 @@ import android.widget.FrameLayout;
 import android.widget.ProgressBar;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.graphics.drawable.RoundedBitmapDrawable;
+import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory;
+import androidx.databinding.DataBindingUtil;
+import androidx.fragment.app.Fragment;
+
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.google.android.material.chip.Chip;
 import com.mikepenz.iconics.IconicsColor;
 import com.mikepenz.iconics.IconicsDrawable;
 import com.mikepenz.iconics.IconicsSize;
-import com.mikepenz.iconics.typeface.IIcon;
 import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial;
 import com.theartofdev.edmodo.cropper.CropImage;
 
@@ -39,36 +40,16 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.graphics.drawable.RoundedBitmapDrawable;
-import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory;
-import androidx.databinding.DataBindingUtil;
-import androidx.fragment.app.Fragment;
-
-import im.wangchao.mhttp.Response;
-import im.wangchao.mhttp.callback.FileCallbackHandler;
 import pl.szczodrzynski.edziennik.App;
-import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.MainActivity;
-import pl.szczodrzynski.edziennik.data.api.Edziennik;
-import pl.szczodrzynski.edziennik.data.api.AppError;
-import pl.szczodrzynski.edziennik.data.api.interfaces.SyncCallback;
-import pl.szczodrzynski.edziennik.databinding.MessagesDetailsBinding;
-import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore;
+import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageFull;
-import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageRecipientFull;
-import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile;
-import pl.szczodrzynski.edziennik.data.db.modules.profiles.ProfileFull;
-import pl.szczodrzynski.edziennik.utils.models.Date;
-import pl.szczodrzynski.edziennik.utils.models.Time;
-import pl.szczodrzynski.edziennik.utils.Anim;
+import pl.szczodrzynski.edziennik.databinding.MessagesDetailsBinding;
+import pl.szczodrzynski.edziennik.ui.modules.error.ErrorDialog;
 import pl.szczodrzynski.edziennik.utils.Themes;
 import pl.szczodrzynski.edziennik.utils.Utils;
 
 import static android.app.Activity.RESULT_OK;
-import static android.view.Gravity.CENTER_VERTICAL;
-import static android.view.Gravity.END;
 import static pl.szczodrzynski.edziennik.utils.Utils.getResizedBitmap;
 import static pl.szczodrzynski.edziennik.utils.Utils.getStringFromFile;
 import static pl.szczodrzynski.edziennik.utils.Utils.readableFileSize;
@@ -108,7 +89,7 @@ public class MessagesDetailsFragment extends Fragment {
 
         b.messageContent.setVisibility(View.GONE);
 
-        if (messageId != -1) {
+        /*if (messageId != -1) {
             AsyncTask.execute(() -> {
                 if (app == null || app.profile == null || activity == null || b == null || !isAdded())
                     return;
@@ -286,7 +267,7 @@ public class MessagesDetailsFragment extends Fragment {
                 });
 
             });
-        }
+        }*/
 
         // click to expand subject and sender
         b.messageSubject.setOnClickListener(v -> {
@@ -340,7 +321,7 @@ public class MessagesDetailsFragment extends Fragment {
                 }
             } catch (Exception e) {
                 e.printStackTrace();
-                app.apiEdziennik.guiReportException(activity, 355, e);
+                new ErrorDialog(activity, e);
             }
         }
     }
@@ -359,7 +340,7 @@ public class MessagesDetailsFragment extends Fragment {
 
         File storageDir = Utils.getStorageDir();
 
-        Edziennik.getApi(app, app.profile.getLoginStoreType()).getAttachment(activity, new SyncCallback() {
+        /*Edziennik.getApi(app, app.profile.getLoginStoreType()).getAttachment(activity, new SyncCallback() {
             @Override
             public void onLoginFirst(List<Profile> profileList, LoginStore loginStore) {
 
@@ -437,7 +418,7 @@ public class MessagesDetailsFragment extends Fragment {
                     }
                 })
                 .build()
-                .enqueue());
+                .enqueue());*/
     }
 
     @Subscribe(threadMode = ThreadMode.POSTING)
@@ -478,7 +459,7 @@ public class MessagesDetailsFragment extends Fragment {
                                 .positiveText(R.string.ok)
                                 .neutralColor(R.string.report)
                                 .onNeutral((dialog, which) -> {
-                                    app.apiEdziennik.guiReportException(activity, 433, event.exception);
+                                    new ErrorDialog(activity, event.exception);
                                 })
                                 .show();
                     }
@@ -486,7 +467,7 @@ public class MessagesDetailsFragment extends Fragment {
             }
         }
         catch (Exception e) {
-            app.apiEdziennik.guiReportException(activity, 425, e);
+            new ErrorDialog(activity, e);
         }
     }
 

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

@@ -1,8 +1,6 @@
 package pl.szczodrzynski.edziennik.ui.modules.messages
 
 import android.os.Bundle
-import android.text.Html
-import android.text.InputType
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -10,18 +8,14 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentPagerAdapter
 import androidx.viewpager.widget.ViewPager
-import com.afollestad.materialdialogs.MaterialDialog
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.MainActivity
-import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_MESSAGES
 import pl.szczodrzynski.edziennik.R
-import pl.szczodrzynski.edziennik.api.v2.LOGIN_TYPE_LIBRUS
 import pl.szczodrzynski.edziennik.api.v2.events.ApiTaskErrorEvent
 import pl.szczodrzynski.edziennik.api.v2.events.ApiTaskFinishedEvent
-import pl.szczodrzynski.edziennik.api.v2.events.task.EdziennikTask
 import pl.szczodrzynski.edziennik.data.db.modules.messages.Message
 import pl.szczodrzynski.edziennik.databinding.FragmentMessagesBinding
 import pl.szczodrzynski.edziennik.utils.Themes
@@ -92,7 +86,7 @@ class MessagesFragment : Fragment() {
 
         b.tabLayout.setupWithViewPager(b.viewPager)
 
-        if (app.profile.loginStoreType == LOGIN_TYPE_LIBRUS && app.profile.getStudentData("accountPassword", null) == null) {
+        /*if (app.profile.loginStoreType == LOGIN_TYPE_LIBRUS && app.profile.getStudentData("accountPassword", null) == null) {
             MaterialDialog.Builder(activity)
                     .title("Wiadomości w systemie Synergia")
                     .content("Moduł Wiadomości w aplikacji Szkolny.eu jest przeglądarką zasobów szkolnego konta Synergia. Z tego powodu, musisz wpisać swoje hasło do tego konta, aby móc korzystać z tej funkcji.")
@@ -115,7 +109,7 @@ class MessagesFragment : Fragment() {
                                 .show()
                     }
                     .show()
-        }
+        }*/
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN)

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

@@ -1,474 +0,0 @@
-package pl.szczodrzynski.edziennik.ui.modules.messages;
-
-import android.Manifest;
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.app.DownloadManager;
-import android.content.ActivityNotFoundException;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.pm.PackageManager;
-import android.graphics.Bitmap;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.Environment;
-import android.os.Handler;
-import android.provider.MediaStore;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.webkit.CookieManager;
-import android.webkit.MimeTypeMap;
-import android.webkit.ValueCallback;
-import android.webkit.WebChromeClient;
-import android.webkit.WebResourceError;
-import android.webkit.WebResourceRequest;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.FileProvider;
-import androidx.databinding.DataBindingUtil;
-import androidx.fragment.app.Fragment;
-
-import com.afollestad.materialdialogs.MaterialDialog;
-import com.afollestad.materialdialogs.StackingBehavior;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import pl.szczodrzynski.edziennik.App;
-import pl.szczodrzynski.edziennik.R;
-import pl.szczodrzynski.edziennik.databinding.FragmentMessagesWebBinding;
-import pl.szczodrzynski.edziennik.utils.Anim;
-import pl.szczodrzynski.edziennik.utils.Themes;
-
-import static android.app.Activity.RESULT_OK;
-import static android.content.Context.DOWNLOAD_SERVICE;
-import static pl.szczodrzynski.edziennik.utils.Utils.readableFileSize;
-
-public class MessagesWebFragment extends Fragment {
-
-    private static final String TAG = "RegisterMessagesWeb";
-    private App app = null;
-    private Activity activity = null;
-    private FragmentMessagesWebBinding b = null;
-
-    private WebView webView;
-    private ProgressBar progressBar;
-    private TextView error;
-
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        activity = getActivity();
-        if (getActivity() == null || getContext() == null)
-            return null;
-        app = (App) activity.getApplication();
-        getContext().getTheme().applyStyle(Themes.INSTANCE.getAppTheme(), true);
-        if (app.profile == null)
-            return inflater.inflate(R.layout.fragment_loading, container, false);
-        // activity, context and profile is valid
-        b = DataBindingUtil.inflate(inflater, R.layout.fragment_messages_web, container, false);
-        return b.getRoot();
-    }
-
-    private boolean isStoragePermissionGranted(Activity a) {
-        if (Build.VERSION.SDK_INT >= 23) {
-            if (a.checkSelfPermission(android.Manifest.permission.WRITE_EXTERNAL_STORAGE)
-                    == PackageManager.PERMISSION_GRANTED) {
-                Log.v(TAG,"Permission is granted");
-                return true;
-            } else {
-
-                Log.v(TAG,"Permission is revoked");
-                ActivityCompat.requestPermissions(a, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, 1);
-                return false;
-            }
-        }
-        else { //permission is automatically granted on sdk<23 upon installation
-            Log.v(TAG,"Permission is granted");
-            return true;
-        }
-    }
-
-    private String getFileNameFromDisposition(String header)
-    {
-        return header.substring(header.indexOf("\"") + 1, header.lastIndexOf("\""));
-    }
-
-    private File downloadingFile;
-
-    private void enqueueFile(String url, String filename, File downloadingFile, String cookieString) {
-
-        this.downloadingFile = downloadingFile;
-
-        long downloadReference;
-
-        DownloadManager downloadManager;
-        downloadManager = (DownloadManager)app.getSystemService(DOWNLOAD_SERVICE);
-        DownloadManager.Request request = new DownloadManager.Request(Uri.parse(url));
-        request.setTitle(filename);
-        request.setDescription(getString(R.string.downloading));
-        request.addRequestHeader("Cookie", cookieString);
-        try {
-            request.setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, filename);
-        }
-        catch (IllegalStateException e)
-        {
-            e.printStackTrace();
-            Toast.makeText(app, "Failed to get external storage files directory", Toast.LENGTH_SHORT).show();
-        }
-        downloadReference = downloadManager.enqueue(request);
-    }
-
-    private static String getMimeType(String url) {
-        String type = null;
-        String extension = MimeTypeMap.getFileExtensionFromUrl(url);
-        if (extension != null) {
-            type = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension);
-        }
-        return type;
-    }
-
-    private void openFile(File url) {
-        Toast.makeText(app, getString(R.string.opening_file, url.getName()), Toast.LENGTH_SHORT).show();
-        try {
-            Uri uri = FileProvider.getUriForFile(app, app.getApplicationContext().getPackageName() + ".provider", url);
-            //Uri uri = Uri.fromFile(url);
-            Intent intent = new Intent(Intent.ACTION_VIEW);
-            if (url.toString().contains(".doc") || url.toString().contains(".docx")) {
-                // Word document
-                intent.setDataAndType(uri, "application/msword");
-            } else if (url.toString().contains(".pdf")) {
-                // PDF file
-                intent.setDataAndType(uri, "application/pdf");
-            } else if (url.toString().contains(".ppt") || url.toString().contains(".pptx")) {
-                // Powerpoint file
-                intent.setDataAndType(uri, "application/vnd.ms-powerpoint");
-            } else if (url.toString().contains(".xls") || url.toString().contains(".xlsx")) {
-                // Excel file
-                intent.setDataAndType(uri, "application/vnd.ms-excel");
-            } else if (url.toString().contains(".zip") || url.toString().contains(".rar")) {
-                // WAV audio file
-                intent.setDataAndType(uri, "application/x-wav");
-            } else if (url.toString().contains(".rtf")) {
-                // RTF file
-                intent.setDataAndType(uri, "application/rtf");
-            } else if (url.toString().contains(".wav") || url.toString().contains(".mp3")) {
-                // WAV audio file
-                intent.setDataAndType(uri, "audio/x-wav");
-            } else if (url.toString().contains(".gif")) {
-                // GIF file
-                intent.setDataAndType(uri, "image/gif");
-            } else if (url.toString().contains(".jpg") || url.toString().contains(".jpeg") || url.toString().contains(".png")) {
-                // JPG file
-                intent.setDataAndType(uri, "image/jpeg");
-            } else if (url.toString().contains(".txt")) {
-                // Text file
-                intent.setDataAndType(uri, "text/plain");
-            } else if (url.toString().contains(".3gp") || url.toString().contains(".mpg") ||
-                    url.toString().contains(".mpeg") || url.toString().contains(".mpe") || url.toString().contains(".mp4") || url.toString().contains(".avi")) {
-                // Video files
-                intent.setDataAndType(uri, "video/*");
-            } else {
-                intent.setDataAndType(uri, "*/*");
-            }
-
-            intent.setDataAndType(uri, getMimeType(uri.toString()));
-
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-
-            app.startActivity(intent);
-        } catch (ActivityNotFoundException e) {
-            Toast.makeText(app, R.string.opening_file_no_app, Toast.LENGTH_SHORT).show();
-        }
-    }
-
-    private void downloadFile(Activity a, String url, String filename, long contentLength, String cookieString) {
-        if (!isStoragePermissionGranted(a))
-            return;
-        new MaterialDialog.Builder(a)
-                .title(R.string.downloading_file)
-                .content(getString((R.string.download_file_question), filename, readableFileSize(contentLength)))
-                .positiveText(R.string.yes)
-                .negativeText(R.string.no)
-                .onPositive((dialog, which) -> {
-                    File downloadsDir = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS);
-                    File existingFile = new File(downloadsDir, filename);
-                    if (existingFile.exists()) {
-                        new MaterialDialog.Builder(a)
-                                .title(R.string.downloading_file)
-                                .content(getString(R.string.downloading_file_exists_choose, filename))
-                                .stackingBehavior(StackingBehavior.ADAPTIVE)
-                                .positiveText(R.string.downloading_file_exists_overwrite)
-                                .negativeText(R.string.downloading_file_exists_open)
-                                .neutralText(R.string.downloading_file_exists_create_new)
-                                .onPositive(((dialog1, which1) -> {
-                                    if (!existingFile.delete())
-                                    {
-                                        new MaterialDialog.Builder(a)
-                                                .title(R.string.downloading_file)
-                                                .content(R.string.downloading_file_cannot_remove)
-                                                .positiveText(R.string.ok)
-                                                .negativeText(R.string.cancel)
-                                                .onPositive(((dialog2, which2) -> enqueueFile(url, filename, existingFile, cookieString)))
-                                                .show();
-                                        return;
-                                    }
-                                    enqueueFile(url, filename, existingFile, cookieString);
-                                }))
-                                .onNegative(((dialog1, which1) -> openFile(existingFile)))
-                                .onNeutral((dialog1, which1) -> enqueueFile(url, filename, existingFile, cookieString))
-                                .show();
-
-                        return;
-                    }
-                    enqueueFile(url, filename, existingFile, cookieString);
-                })
-                .show();
-    }
-
-    private String photoPath;
-    private ValueCallback<Uri> mUM;
-    private ValueCallback<Uri[]> fileCallback;
-    private final static int REQUEST_FILE_CHOOSER = 1;
-    private boolean justLoaded = false;
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        if(Build.VERSION.SDK_INT >= 21){
-            Uri[] results = null;
-            //Check if response is positive
-            if(resultCode == RESULT_OK){
-                if(requestCode == REQUEST_FILE_CHOOSER){
-                    if(null == fileCallback){
-                        return;
-                    }
-                    if(data == null){
-                        //Capture Photo if no image available
-                        if (photoPath != null) {
-                            results = new Uri[]{Uri.parse(photoPath)};
-                        }
-                    }else{
-                        String dataString = data.getDataString();
-                        if(dataString != null){
-                            results = new Uri[]{Uri.parse(dataString)};
-                        }
-                    }
-                }
-            }
-            fileCallback.onReceiveValue(results);
-            fileCallback = null;
-        } else {
-            if (requestCode == REQUEST_FILE_CHOOSER) {
-                if(null == mUM) return;
-                Uri result = data == null || resultCode != RESULT_OK ? null : data.getData();
-                mUM.onReceiveValue(result);
-                mUM = null;
-            }
-        }
-    }
-
-    private File createImageFile() throws IOException{
-        @SuppressLint("SimpleDateFormat") String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss").format(new Date());
-        String imageFileName = "img_"+timeStamp+"_";
-        File storageDir = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES);
-        return File.createTempFile(imageFileName,".jpg",storageDir);
-    }
-
-    @SuppressLint("SetJavaScriptEnabled")
-    @Override
-    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-        if (app == null || app.profile == null || activity == null || b == null || !isAdded())
-            return;
-
-        webView = b.messagesWebView;
-        progressBar = b.messagesWebProgressBar;
-        error = b.messagesWebError;
-
-        justLoaded = true;
-
-        new Handler().postDelayed(() -> activity.runOnUiThread(() -> {
-            if (app == null || app.profile == null || activity == null || b == null || !isAdded())
-                return;
-
-            BroadcastReceiver onComplete = new BroadcastReceiver() {
-                public void onReceive(Context context, Intent intent) {
-                    if (downloadingFile != null) {
-                        openFile(downloadingFile);
-                        downloadingFile = null;
-                    }
-                }
-            };
-            activity.registerReceiver(onComplete, new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE));
-
-            app.apiEdziennik.initMessagesWebView(webView, app, /*app.profile.messagesWebFullVersion*/false, false);
-            webView.getSettings().setJavaScriptEnabled(true);
-            webView.getSettings().setAllowFileAccess(true);
-            webView.setDownloadListener((url, userAgent, contentDisposition, mimetype, contentLength) -> {
-                String filename = getFileNameFromDisposition(contentDisposition);
-                try {
-                    URL urlObj = new URL(url);
-                    Log.d(TAG, "Host "+urlObj.getProtocol()+"://"+urlObj.getHost());
-                    Log.d(TAG, "Cookies "+CookieManager.getInstance().getCookie(urlObj.getProtocol()+"://"+urlObj.getHost()));
-
-                    downloadFile(getActivity(), url, filename, contentLength, CookieManager.getInstance().getCookie(urlObj.getProtocol()+"://"+urlObj.getHost()));
-                } catch (MalformedURLException e) {
-                    e.printStackTrace();
-                }
-                Anim.fadeOut(progressBar, 400, null);
-            });
-
-            webView.setWebViewClient(new WebViewClient() {
-                boolean loadingFinished = true;
-                boolean redirect = false;
-                @Override
-                public boolean shouldOverrideUrlLoading(WebView view, String request) {
-                    if (!loadingFinished) {
-                        redirect = true;
-                    }
-
-                    loadingFinished = false;
-                    webView.loadUrl(request);
-                    return true;
-                }
-
-                @Override
-                public void onPageStarted(WebView view, String url, Bitmap favicon) {
-                    super.onPageStarted(view, url, favicon);
-                    MessagesWebFragment.this.error.setVisibility(View.GONE);
-                    loadingFinished = false;
-                    //SHOW LOADING IF IT ISNT ALREADY VISIBLE
-                    if (progressBar.getVisibility() != View.VISIBLE)
-                        Anim.fadeIn(progressBar, 400, null);
-                }
-
-                @Override
-                public void onPageFinished(WebView view, String url) {
-                    if (!redirect) {
-                        loadingFinished = true;
-                    }
-
-                    if (loadingFinished && !redirect) {
-                        //HIDE LOADING IT HAS FINISHED
-                        //String cookies = CookieManager.getInstance().getCookie(url);
-                        //Log.d(TAG, "All the cookies in a string:" + cookies);
-                        Anim.fadeOut(progressBar, 400, null);
-                        /*if (app.profile.messagesWebFullVersion && justLoaded && app.profile.loginType == Register.LOGIN_TYPE_MOBIDZIENNIK) {
-                            if (!webView.getUrl().contains("wiadomosci")) {
-                                // redirect to messages view
-                                webView.loadUrl("https://" + app.getLoginData("serverName", "") + ".mobidziennik.pl/mobile/wiadomosci");
-                            }
-                            justLoaded = false;
-                        }*/
-                    } else {
-                        redirect = false;
-                    }
-                }
-
-                @Override
-                public void onReceivedError(WebView view, WebResourceRequest request, WebResourceError error) {
-                    if (app == null || app.profile == null || activity == null || b == null || !isAdded())
-                        return;
-
-                    MessagesWebFragment.this.error.setVisibility(View.VISIBLE);
-                    MessagesWebFragment.this.error.setText(getString(R.string.error_occured_format, error.toString()));
-                    super.onReceivedError(view, request, error);
-                }
-            });
-
-            if(Build.VERSION.SDK_INT >= 21) {
-                webView.getSettings().setMixedContentMode(0);
-                webView.setLayerType(View.LAYER_TYPE_HARDWARE, null);
-            } else if(Build.VERSION.SDK_INT >= 19) {
-                webView.setLayerType(View.LAYER_TYPE_HARDWARE, null);
-            } else {
-                webView.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
-            }
-
-            webView.setWebChromeClient(new WebChromeClient(){
-                //For Android 5.0+
-                public boolean onShowFileChooser(
-                        WebView webView, ValueCallback<Uri[]> filePathCallback,
-                        WebChromeClient.FileChooserParams fileChooserParams){
-                    if(fileCallback != null){
-                        fileCallback.onReceiveValue(null);
-                    }
-                    fileCallback = filePathCallback;
-                    Intent takePictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
-                    if(takePictureIntent.resolveActivity(app.getPackageManager()) != null){
-                        File photoFile = null;
-                        try{
-                            photoFile = createImageFile();
-                            takePictureIntent.putExtra("PhotoPath", photoPath);
-                        }catch(IOException ex){
-                            Log.e(TAG, "Image file creation failed", ex);
-                        }
-                        if(photoFile != null){
-                            photoPath = "file:" + photoFile.getAbsolutePath();
-                            takePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(photoFile));
-                        }else{
-                            takePictureIntent = null;
-                        }
-                    }
-                    Intent contentSelectionIntent = new Intent(Intent.ACTION_GET_CONTENT);
-                    contentSelectionIntent.addCategory(Intent.CATEGORY_OPENABLE);
-                    contentSelectionIntent.setType("*/*");
-                    Intent[] intentArray;
-                    if(takePictureIntent != null){
-                        intentArray = new Intent[]{takePictureIntent};
-                    }else{
-                        intentArray = new Intent[0];
-                    }
-
-                    Intent chooserIntent = new Intent(Intent.ACTION_CHOOSER);
-                    chooserIntent.putExtra(Intent.EXTRA_INTENT, contentSelectionIntent);
-                    chooserIntent.putExtra(Intent.EXTRA_TITLE, R.string.choose_file);
-                    chooserIntent.putExtra(Intent.EXTRA_INITIAL_INTENTS, intentArray);
-                    startActivityForResult(chooserIntent, REQUEST_FILE_CHOOSER);
-                    return true;
-                }
-            });
-
-
-        }), 200);
-    }
-
-    /*public void loadVersion(boolean fullVersion) {
-        if (app.profile.messagesWebFullVersion != fullVersion) {
-            app.profile.messagesWebFullVersion = fullVersion;
-            app.profile.savePending = true;
-            justLoaded = true;
-            app.apiEdziennik.initMessagesWebView(webView, app, fullVersion, true);
-        }
-    }*/
-
-    public void performReload() {
-        webView.reload();
-    }
-
-    public boolean processBackKey()
-    {
-        if (webView.canGoBack())
-        {
-            webView.goBack();
-            return true;
-        }
-        return false;
-    }
-}

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/SettingsNewFragment.java

@@ -50,6 +50,7 @@ import pl.szczodrzynski.edziennik.network.ServerRequest;
 import pl.szczodrzynski.edziennik.receivers.BootReceiver;
 import pl.szczodrzynski.edziennik.sync.SyncWorker;
 import pl.szczodrzynski.edziennik.ui.dialogs.changelog.ChangelogDialog;
+import pl.szczodrzynski.edziennik.ui.dialogs.settings.ProfileRemoveDialog;
 import pl.szczodrzynski.edziennik.ui.modules.home.HomeFragment;
 import pl.szczodrzynski.edziennik.ui.modules.webpush.WebPushConfigActivity;
 import pl.szczodrzynski.edziennik.utils.Themes;
@@ -263,7 +264,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                                     .color(IconicsColor.colorInt(iconColor))
                     )
                     .setOnClickAction(() -> {
-                        app.apiEdziennik.guiRemoveProfile(activity, app.profile.getId(), app.profile.getName());
+                        new ProfileRemoveDialog(activity, app.profile.getId(), app.profile.getName());
                     })
             );
 
@@ -1291,8 +1292,6 @@ public class SettingsNewFragment extends MaterialAboutFragment {
         if (app.profile == null)
             return new MaterialAboutList.Builder().build();
 
-        //configurableEndpoints = Edziennik.getApi(app, app.profile.loginStoreType).getConfigurableEndpoints(app.profile);
-
         MaterialAboutList materialAboutList = new MaterialAboutList();
         materialAboutList.addCard(getCardWithItems(null, getProfileCard(false)));
         materialAboutList.addCard(getCardWithItems(getString(R.string.settings_theme_title_text), getThemeCard(false)));

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/TimetableFragment.java

@@ -51,6 +51,7 @@ import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonFull;
 import pl.szczodrzynski.edziennik.databinding.FragmentTimetableBinding;
 import pl.szczodrzynski.edziennik.ui.dialogs.event.EventManualDialog;
+import pl.szczodrzynski.edziennik.ui.modules.error.ErrorDialog;
 import pl.szczodrzynski.edziennik.ui.modules.home.HomeFragment;
 import pl.szczodrzynski.edziennik.utils.SpannableHtmlTagHandler;
 import pl.szczodrzynski.edziennik.utils.Themes;
@@ -422,7 +423,7 @@ public class TimetableFragment extends Fragment {
                     linearLayout = (LinearLayout) getLayoutInflater().inflate(R.layout.row_timetable_block_item, null);
                 }
                 catch (Exception e) {
-                    app.apiEdziennik.guiReportException(activity, 385, e);
+                    new ErrorDialog(activity, e);
                     return;
                 }
 

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/v2/TimetableFragment.kt

@@ -1,5 +1,9 @@
 package pl.szczodrzynski.edziennik.ui.modules.timetable.v2
 
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -18,12 +22,14 @@ import pl.szczodrzynski.edziennik.utils.models.Date
 class TimetableFragment : Fragment() {
     companion object {
         private const val TAG = "TimetableFragment"
+        const val ACTION_SCROLL_TO_DATE = "pl.szczodrzynski.edziennik.timetable.SCROLL_TO_DATE"
     }
 
     private lateinit var app: App
     private lateinit var activity: MainActivity
     private lateinit var b: FragmentTimetableV2Binding
     private var fabShown = false
+    private val items = mutableListOf<Date>()
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         activity = (getActivity() as MainActivity?) ?: return null
@@ -38,6 +44,24 @@ class TimetableFragment : Fragment() {
         return b.root
     }
 
+    private val broadcastReceiver = object : BroadcastReceiver() {
+        override fun onReceive(context: Context, i: Intent) {
+            if (!isAdded)
+                return
+            val dateStr = i.extras?.getString("date", null) ?: return
+            val date = Date.fromY_m_d(dateStr)
+            b.viewPager.setCurrentItem(items.indexOf(date), true)
+        }
+    }
+    override fun onResume() {
+        super.onResume()
+        activity.registerReceiver(broadcastReceiver, IntentFilter(ACTION_SCROLL_TO_DATE))
+    }
+    override fun onPause() {
+        super.onPause()
+        activity.unregisterReceiver(broadcastReceiver)
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         // TODO check if app, activity, b can be null
         if (app.profile == null || !isAdded)
@@ -51,7 +75,7 @@ class TimetableFragment : Fragment() {
         b.timetableLayout.visibility = View.VISIBLE
         b.timetableNotPublicLayout.visibility = View.GONE
 
-        val items = mutableListOf<Date>()
+        items.clear()
 
         val monthDayCount = listOf(31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31)
 
@@ -99,7 +123,7 @@ class TimetableFragment : Fragment() {
         b.tabLayout.setCurrentItem(items.indexOfFirst { it.value == today }, false)
 
         //activity.navView.bottomBar.fabEnable = true
-        activity.navView.bottomBar.fabExtendedText = getString(R.string.timetable_today)
+        activity.navView.bottomBar.fabExtendedText = getString(pl.szczodrzynski.edziennik.R.string.timetable_today)
         activity.navView.bottomBar.fabIcon = CommunityMaterial.Icon.cmd_calendar_today
         activity.navView.setFabOnClickListener(View.OnClickListener {
             b.tabLayout.setCurrentItem(items.indexOfFirst { it.value == today }, true)

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/v2/TimetablePagerAdapter.kt

@@ -1,8 +1,10 @@
 package pl.szczodrzynski.edziennik.ui.modules.timetable.v2
 
+import android.os.Bundle
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentStatePagerAdapter
+import pl.szczodrzynski.edziennik.ui.modules.timetable.v2.day.TimetableDayFragment
 import pl.szczodrzynski.edziennik.utils.models.Date
 import pl.szczodrzynski.edziennik.utils.models.Week
 
@@ -16,7 +18,11 @@ class TimetablePagerAdapter(val fragmentManager: FragmentManager, val items: Lis
     private val weekEnd by lazy { weekStart.clone().stepForward(0, 0, 6) }
 
     override fun getItem(position: Int): Fragment {
-        return pl.szczodrzynski.edziennik.ui.modules.timetable.v2.day.TimetableDayFragment(items[position])
+        return TimetableDayFragment().apply {
+            arguments = Bundle().apply {
+                putInt("date", items[position].value)
+            }
+        }
         /*return TimetableDayFragment().apply {
             arguments = Bundle().also {
                 it.putLong("date", items[position].value.toLong())

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/v2/day/TimetableDayFragment.kt

@@ -19,12 +19,13 @@ import pl.szczodrzynski.edziennik.data.db.modules.timetable.Lesson
 import pl.szczodrzynski.edziennik.data.db.modules.timetable.LessonFull
 import pl.szczodrzynski.edziennik.databinding.FragmentTimetableV2DayBinding
 import pl.szczodrzynski.edziennik.databinding.TimetableLessonBinding
+import pl.szczodrzynski.edziennik.ui.dialogs.timetable.LessonDetailsDialog
 import pl.szczodrzynski.edziennik.utils.models.Date
 import pl.szczodrzynski.navlib.getColorFromAttr
 import java.util.*
 import kotlin.math.min
 
-class TimetableDayFragment(val date: Date) : Fragment() {
+class TimetableDayFragment() : Fragment() {
     companion object {
         private const val TAG = "TimetableDayFragment"
     }
@@ -32,6 +33,7 @@ class TimetableDayFragment(val date: Date) : Fragment() {
     private lateinit var app: App
     private lateinit var activity: MainActivity
     private lateinit var b: FragmentTimetableV2DayBinding
+    private lateinit var date: Date
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         activity = (getActivity() as MainActivity?) ?: return null
@@ -39,7 +41,7 @@ class TimetableDayFragment(val date: Date) : Fragment() {
             return null
         app = activity.application as App
         b = FragmentTimetableV2DayBinding.inflate(inflater)
-        Log.d(TAG, "onCreateView, date=$date")
+        date = arguments?.getInt("date")?.let { Date.fromValue(it) } ?: Date.getToday()
         return b.root
     }
 
@@ -70,7 +72,8 @@ class TimetableDayFragment(val date: Date) : Fragment() {
             b.noTimetableLayout.visibility = View.VISIBLE
             b.noLessonsLayout.visibility = View.GONE
             val weekStart = date.clone().stepForward(0, 0, -date.weekDay).stringY_m_d
-            b.noTimetableSync.setOnClickListener {
+            b.noTimetableSync.onClick {
+                it.isEnabled = false
                 EdziennikTask.syncProfile(
                         profileId = App.profileId,
                         viewIds = listOf(
@@ -133,6 +136,8 @@ class TimetableDayFragment(val date: Date) : Fragment() {
 
             eventView.setOnClickListener {
                 Log.d(TAG, "Clicked ${it.tag}")
+                if (isAdded && it.tag is LessonFull)
+                    LessonDetailsDialog(activity, it.tag as LessonFull)
             }
 
 
@@ -221,21 +226,17 @@ class TimetableDayFragment(val date: Date) : Fragment() {
                 }
                 Lesson.TYPE_SHIFTED_SOURCE -> {
                     lb.annotationVisible = true
-                    if (lesson.date != lesson.oldDate) {
-                        lb.annotation.setText(
+                    when {
+                        lesson.date != lesson.oldDate -> lb.annotation.setText(
                                 R.string.timetable_lesson_shifted_other_day,
                                 lesson.date?.stringY_m_d ?: "?",
                                 lesson.startTime?.stringHM ?: "?"
                         )
-                    }
-                    else if (lesson.startTime != lesson.oldStartTime) {
-                        lb.annotation.setText(
+                        lesson.startTime != lesson.oldStartTime -> lb.annotation.setText(
                                 R.string.timetable_lesson_shifted_same_day,
                                 lesson.startTime?.stringHM ?: "?"
                         )
-                    }
-                    else {
-                        lb.annotation.setText(R.string.timetable_lesson_shifted)
+                        else -> lb.annotation.setText(R.string.timetable_lesson_shifted)
                     }
 
                     lb.annotation.background.colorFilter = PorterDuffColorFilter(
@@ -245,21 +246,17 @@ class TimetableDayFragment(val date: Date) : Fragment() {
                 }
                 Lesson.TYPE_SHIFTED_TARGET -> {
                     lb.annotationVisible = true
-                    if (lesson.date != lesson.oldDate) {
-                        lb.annotation.setText(
+                    when {
+                        lesson.date != lesson.oldDate -> lb.annotation.setText(
                                 R.string.timetable_lesson_shifted_from_other_day,
                                 lesson.oldDate?.stringY_m_d ?: "?",
                                 lesson.oldStartTime?.stringHM ?: "?"
                         )
-                    }
-                    else if (lesson.startTime != lesson.oldStartTime) {
-                        lb.annotation.setText(
+                        lesson.startTime != lesson.oldStartTime -> lb.annotation.setText(
                                 R.string.timetable_lesson_shifted_from_same_day,
                                 lesson.oldStartTime?.stringHM ?: "?"
                         )
-                    }
-                    else {
-                        lb.annotation.setText(R.string.timetable_lesson_shifted_from)
+                        else -> lb.annotation.setText(R.string.timetable_lesson_shifted_from)
                     }
 
                     lb.annotation.background.colorFilter = PorterDuffColorFilter(

app/src/main/java/pl/szczodrzynski/edziennik/utils/TextInputDropDown.java

@@ -1,55 +0,0 @@
-package pl.szczodrzynski.edziennik.utils;
-
-import android.content.Context;
-import com.google.android.material.textfield.TextInputEditText;
-
-import android.graphics.drawable.Drawable;
-import android.util.AttributeSet;
-
-import androidx.core.graphics.drawable.DrawableCompat;
-
-import pl.szczodrzynski.edziennik.R;
-
-public class TextInputDropDown extends TextInputEditText {
-    public TextInputDropDown(Context context) {
-        super(context);
-        create(context);
-    }
-
-    public TextInputDropDown(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        create(context);
-    }
-
-    public TextInputDropDown(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        create(context);
-    }
-
-    public void create(Context context) {
-        Drawable drawable = context.getResources().getDrawable(R.drawable.dropdown_arrow);
-        Drawable wrappedDrawable = DrawableCompat.wrap(drawable);
-        DrawableCompat.setTint(wrappedDrawable, Themes.INSTANCE.getPrimaryTextColor(context));
-
-        setCompoundDrawablesWithIntrinsicBounds(null, null, wrappedDrawable, null);
-        setFocusableInTouchMode(false);
-        setCursorVisible(false);
-        setLongClickable(false);
-        setMaxLines(1);
-        setInputType(0);
-        setKeyListener(null);
-        setOnFocusChangeListener((v, hasFocus) -> {
-            if (!hasFocus) {
-                v.setFocusableInTouchMode(false);
-            }
-        });
-    }
-
-    public final void setOnClickListener(OnClickListener onClickListener) {
-        super.setOnClickListener(v -> {
-            setFocusableInTouchMode(true);
-            requestFocus();
-            onClickListener.onClick(v);
-        });
-    }
-}

app/src/main/java/pl/szczodrzynski/edziennik/utils/TextInputDropDown.kt

@@ -0,0 +1,142 @@
+package pl.szczodrzynski.edziennik.utils
+
+import android.content.Context
+import android.util.AttributeSet
+import androidx.appcompat.widget.PopupMenu
+import androidx.core.graphics.drawable.DrawableCompat
+import com.google.android.material.textfield.TextInputEditText
+import pl.szczodrzynski.edziennik.R
+
+class TextInputDropDown : TextInputEditText {
+    constructor(context: Context) : super(context) {
+        create(context)
+    }
+
+    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
+        create(context)
+    }
+
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
+        create(context)
+    }
+
+    var items = mutableListOf<Item>()
+    private var onChangeListener: ((item: Item) -> Boolean)? = null
+
+    var selected: Item? = null
+    val selectedId
+        get() = selected?.id
+
+    fun updateText() {
+        setText(selected?.displayText ?: selected?.text)
+    }
+
+    fun create(context: Context) {
+        val drawable = context.resources.getDrawable(R.drawable.dropdown_arrow)
+        val wrappedDrawable = DrawableCompat.wrap(drawable)
+        DrawableCompat.setTint(wrappedDrawable, Themes.getPrimaryTextColor(context))
+
+        setCompoundDrawablesWithIntrinsicBounds(null, null, wrappedDrawable, null)
+        isFocusableInTouchMode = false
+        isCursorVisible = false
+        isLongClickable = false
+        maxLines = 1
+        inputType = 0
+        keyListener = null
+        setOnFocusChangeListener { v, hasFocus ->
+            if (!hasFocus) {
+                v.isFocusableInTouchMode = false
+            }
+        }
+
+        setOnClickListener {
+            isFocusableInTouchMode = true
+            requestFocus()
+            val popup = PopupMenu(context, this)
+
+            items.forEachIndexed { index, item ->
+                popup.menu.add(0, item.id.toInt(), index, item.text)
+            }
+
+            popup.setOnMenuItemClickListener { menuItem ->
+                val item = items[menuItem.order]
+                if (onChangeListener?.invoke(item) != false) {
+                    select(item)
+                }
+                clearFocus()
+                true
+            }
+
+            popup.setOnDismissListener {
+                clearFocus()
+            }
+
+            popup.show()
+        }
+    }
+
+    fun select(item: Item) {
+        selected = item
+        updateText()
+    }
+
+    fun select(id: Long?) {
+        items.singleOrNull { it.id == id }?.let { select(it) }
+    }
+
+    fun select(tag: Any?) {
+        items.singleOrNull { it.tag == tag }?.let { select(it) }
+    }
+
+    fun select(index: Int) {
+        items.getOrNull(index)?.let { select(it) }
+    }
+
+    fun deselect(): TextInputDropDown {
+        selected = null
+        text = null
+        return this
+    }
+
+    fun clear(): TextInputDropDown {
+        items.clear()
+        return this
+    }
+
+    fun append(items: List<Item>): TextInputDropDown {
+        this.items.addAll(items)
+        return this
+    }
+
+    fun prepend(items: List<Item>): TextInputDropDown{
+        this.items.addAll(0, items)
+        return this
+    }
+
+    operator fun plusAssign(items: Item) {
+        this.items.add(items)
+    }
+    operator fun plusAssign(items: List<Item>) {
+        this.items.addAll(items)
+    }
+
+    /**
+     * Set the listener called when other item is selected.
+     *
+     * The listener should return true to allow the item to be selected, false otherwise.
+     */
+    fun setOnChangeListener(onChangeListener: ((item: Item) -> Boolean)? = null): TextInputDropDown {
+        this.onChangeListener = onChangeListener
+        return this
+    }
+
+    override fun setOnClickListener(onClickListener: OnClickListener?) {
+        super.setOnClickListener { v ->
+            isFocusableInTouchMode = true
+            requestFocus()
+            onClickListener!!.onClick(v)
+        }
+    }
+
+    class Item(val id: Long, val text: CharSequence, val displayText: CharSequence? = null, val tag: Any? = null)
+}

app/src/main/java/pl/szczodrzynski/edziennik/utils/models/Date.java

@@ -12,13 +12,11 @@ public class Date implements Comparable<Date> {
     public int month = 0;
     public int day = 0;
 
-    public Date()
-    {
+    public Date() {
         this(2000, 0, 0);
     }
 
-    public Date(int year, int month, int day)
-    {
+    public Date(int year, int month, int day) {
         this.year = year;
         this.month = month;
         this.day = day;
@@ -43,14 +41,8 @@ public class Date implements Comparable<Date> {
         return new Date(this.year, this.month, this.day);
     }
 
-    public long combineWith(Time time) {
-        if (time == null) {
-            return getInMillis();
-        }
-        Calendar c = Calendar.getInstance();
-        c.set(this.year, this.month-1, this.day, time.hour, time.minute, time.second);
-        c.set(Calendar.MILLISECOND, 0);
-        return c.getTimeInMillis();
+    public static Date fromYmd(String dateTime) {
+        return new Date(Integer.parseInt(dateTime.substring(0, 4)), Integer.parseInt(dateTime.substring(4, 6)), Integer.parseInt(dateTime.substring(6, 8)));
     }
 
     public static Date fromMillis(long millis) {
@@ -67,9 +59,8 @@ public class Date implements Comparable<Date> {
         return Calendar.getInstance().getTimeInMillis();
     }
 
-    public int getWeekDay()
-    {
-        return Week.getWeekDayFromDate(this);
+    public static Date fromY_m_d(String dateTime) {
+        return new Date(Integer.parseInt(dateTime.substring(0, 4)), Integer.parseInt(dateTime.substring(5, 7)), Integer.parseInt(dateTime.substring(8, 10)));
     }
 
     public long getInMillis() {
@@ -83,142 +74,167 @@ public class Date implements Comparable<Date> {
         return getInMillis() / 1000;
     }
 
-    public Date stepForward(int years, int months, int days)
-    {
+    public static Date fromd_m_Y(String dateTime) {
+        return new Date(Integer.parseInt(dateTime.substring(6, 10)), Integer.parseInt(dateTime.substring(3, 5)), Integer.parseInt(dateTime.substring(0, 2)));
+    }
+
+    public static long fromIso(String dateTime) {
+        return Date.fromY_m_d(dateTime).combineWith(new Time(Integer.parseInt(dateTime.substring(11, 13)), Integer.parseInt(dateTime.substring(14, 16)), Integer.parseInt(dateTime.substring(17, 19))));
+    }
+
+    public static long fromIsoHm(String dateTime) {
+        return Date.fromY_m_d(dateTime).combineWith(new Time(Integer.parseInt(dateTime.substring(11, 13)), Integer.parseInt(dateTime.substring(14, 16)), 0));
+    }
+
+    public static Date fromValue(int value) {
+        int year = value / 10000;
+        int month = (value - year * 10000) / 100;
+        int day = (value - year * 10000 - month * 100);
+        return new Date(year, month, day);
+    }
+
+    public static Date getToday() {
+        Calendar cal = Calendar.getInstance();
+        return new Date(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH) + 1, cal.get(Calendar.DAY_OF_MONTH));
+    }
+
+    public static int diffDays(Date d1, Date d2) {
+        return (int) ((d1.getInMillis() - d2.getInMillis()) / (24 * 60 * 60 * 1000));
+    }
+
+    public static boolean isToday(Date date) {
+        return equals(date, getToday());
+    }
+
+    public static boolean isToday(String dateStr) {
+        return equals(dateStr, getToday());
+    }
+
+    public static boolean equals(Date first, Date second) {
+        return (first.getValue() == second.getValue());
+    }
+
+    public static boolean equals(String first, Date second) {
+        return equals(new Date().parseFromYmd(first), second);
+    }
+
+    public long combineWith(Time time) {
+        if (time == null) {
+            return getInMillis();
+        }
         Calendar c = Calendar.getInstance();
+        c.set(this.year, this.month - 1, this.day, time.hour, time.minute, time.second);
+        c.set(Calendar.MILLISECOND, 0);
+        return c.getTimeInMillis();
+    }
+
+    public int getWeekDay() {
+        return Week.getWeekDayFromDate(this);
+    }
+
+    public Date stepForward(int years, int months, int days) {
+        this.day += days;
+        if (day > daysInMonth()) {
+            day -= daysInMonth();
+            month++;
+        }
+        this.month += months;
+        if (month > 12) {
+            month -= 12;
+            year++;
+        }
+        this.year += years;
+        /*Calendar c = Calendar.getInstance();
         int newMonth = month + months;
         if (newMonth > 12) {
             newMonth = 1;
             years++;
         }
-        c.set(year+years, newMonth - 1, day);
-        c.setTimeInMillis(c.getTimeInMillis() + days*24*60*60*1000);
+        c.set(year + years, newMonth - 1, day);
+        c.setTimeInMillis(c.getTimeInMillis() + days * 24 * 60 * 60 * 1000);
         this.year = c.get(Calendar.YEAR);
         this.month = c.get(Calendar.MONTH) + 1;
-        this.day = c.get(Calendar.DAY_OF_MONTH);
+        this.day = c.get(Calendar.DAY_OF_MONTH);*/
         return this;
     }
 
-    public Date parseFromYmd(String dateTime)
-    {
+    public Date parseFromYmd(String dateTime) {
         this.year = Integer.parseInt(dateTime.substring(0, 4));
         this.month = Integer.parseInt(dateTime.substring(4, 6));
         this.day = Integer.parseInt(dateTime.substring(6, 8));
         return this;
     }
 
-    public static Date fromYmd(String dateTime)
-    {
-        return new Date(Integer.parseInt(dateTime.substring(0, 4)), Integer.parseInt(dateTime.substring(4, 6)), Integer.parseInt(dateTime.substring(6, 8)));
-    }
-
-    public static Date fromY_m_d(String dateTime)
-    {
-        return new Date(Integer.parseInt(dateTime.substring(0, 4)), Integer.parseInt(dateTime.substring(5, 7)), Integer.parseInt(dateTime.substring(8, 10)));
-    }
-
-    public static long fromIso(String dateTime)
-    {
-        return Date.fromY_m_d(dateTime).combineWith(new Time(Integer.parseInt(dateTime.substring(11, 13)), Integer.parseInt(dateTime.substring(14, 16)), Integer.parseInt(dateTime.substring(17, 19))));
-    }
-
-    public static long fromIsoHm(String dateTime)
-    {
-        return Date.fromY_m_d(dateTime).combineWith(new Time(Integer.parseInt(dateTime.substring(11, 13)), Integer.parseInt(dateTime.substring(14, 16)), 0));
-    }
-
-    public int getValue()
-    {
+    public int getValue() {
         return year * 10000 + month * 100 + day;
     }
 
-    public static Date fromValue(int value) {
-        int year = value / 10000;
-        int month = (value-year*10000) / 100;
-        int day = (value-year*10000-month*100);
-        return new Date(year, month, day);
-    }
-
-    public String getStringValue()
-    {
+    public String getStringValue() {
         return Integer.toString(getValue());
     }
 
-    public String getStringYmd()
-    {
-        return year +(month < 10 ? "0" : "")+ month +(day < 10 ? "0" : "")+ day;
-    }
-
-    /**
-     * @return 2019-06-02
-     */
-    public String getStringY_m_d()
-    {
-        return year +(month < 10 ? "-0" : "-")+ month +(day < 10 ? "-0" : "-")+ day;
-    }
-    public String getStringDm()
-    {
-        return day +"."+(month < 10 ? "0" : "")+ month;
-    }
-    public String getStringDmy()
-    {
-        return day +"."+(month < 10 ? "0" : "")+ month +"."+ year;
-    }
-
-    public String getFormattedString()
-    {
-        java.util.Date date = new java.util.Date();
-        date.setTime(getInMillis());
-        DateFormat format = DateFormat.getDateInstance(DateFormat.LONG, Locale.getDefault());
-        if (year == Date.getToday().year) {
-            return format.format(date).replace(", "+year, "").replace(" "+year, "");
-        }
-        else {
-            return format.format(date);
-        }
-    }
-    public String getFormattedStringShort()
-    {
-        java.util.Date date = new java.util.Date();
-        date.setTime(getInMillis());
-        DateFormat format = DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.getDefault());
-        if (year == Date.getToday().year) {
-            return format.format(date).replace(", "+year, "").replace(" "+year, "");
-        }
-        else {
-            return format.format(date);
-        }
-    }
-
     public boolean isLeap() {
         return ((year & 3) == 0) && ((year % 100) != 0 || (year % 400) == 0);
     }
-
-    public static Date getToday()
-    {
-        Calendar cal = Calendar.getInstance();
-        return new Date(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH)+1, cal.get(Calendar.DAY_OF_MONTH));
+    public int daysInMonth() {
+        switch (month) {
+            case 1:
+            case 3:
+            case 5:
+            case 7:
+            case 8:
+            case 10:
+            case 12:
+                return 31;
+            case 2: return isLeap() ? 29 : 28;
+            case 4:
+            case 6:
+            case 9:
+            case 11:
+                return 30;
+        }
+        return 31;
     }
 
-    public static int diffDays(Date d1, Date d2) {
-        return (int)((d1.getInMillis() - d2.getInMillis()) / (24*60*60*1000));
+    public String getStringYmd() {
+        return year + (month < 10 ? "0" : "") + month + (day < 10 ? "0" : "") + day;
     }
 
-    public static boolean isToday(Date date)
-    {
-        return equals(date, getToday());
+    /**
+     * @return 2019-06-02
+     */
+    public String getStringY_m_d() {
+        return year + (month < 10 ? "-0" : "-") + month + (day < 10 ? "-0" : "-") + day;
     }
-    public static boolean isToday(String dateStr)
-    {
-        return equals(dateStr, getToday());
+
+    public String getStringDm() {
+        return day + "." + (month < 10 ? "0" : "") + month;
     }
-    public static boolean equals(Date first, Date second)
-    {
-        return (first.getValue() == second.getValue());
+
+    public String getStringDmy() {
+        return day + "." + (month < 10 ? "0" : "") + month + "." + year;
     }
-    public static boolean equals(String first, Date second)
-    {
-        return equals(new Date().parseFromYmd(first), second);
+
+    public String getFormattedString() {
+        java.util.Date date = new java.util.Date();
+        date.setTime(getInMillis());
+        DateFormat format = DateFormat.getDateInstance(DateFormat.LONG, Locale.getDefault());
+        if (year == Date.getToday().year) {
+            return format.format(date).replace(", " + year, "").replace(" " + year, "");
+        } else {
+            return format.format(date);
+        }
+    }
+
+    public String getFormattedStringShort() {
+        java.util.Date date = new java.util.Date();
+        date.setTime(getInMillis());
+        DateFormat format = DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.getDefault());
+        if (year == Date.getToday().year) {
+            return format.format(date).replace(", " + year, "").replace(" " + year, "");
+        } else {
+            return format.format(date);
+        }
     }
 
     @Override

app/src/main/java/pl/szczodrzynski/edziennik/utils/models/ItemWidgetTimetableModel.java

@@ -9,6 +9,7 @@ public class ItemWidgetTimetableModel {
     public String separatorProfileName = null;
 
     public int profileId;
+    public long lessonId;
     public Date lessonDate;
     public Time startTime;
     public Time endTime;

app/src/main/java/pl/szczodrzynski/edziennik/utils/models/Time.java

@@ -1,10 +1,11 @@
 package pl.szczodrzynski.edziennik.utils.models;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import java.util.Calendar;
 
-public class Time {
+public class Time implements Comparable<Time> {
     public int hour = 0;
     public int minute = 0;
     public int second = 0;
@@ -175,6 +176,11 @@ public class Time {
         return (currentTime.getValue() >= startTime.getValue() && currentTime.getValue() <= endTime.getValue());
     }
 
+    @Override
+    public int compareTo(@NonNull Time o) {
+        return this.getValue() - o.getValue();
+    }
+
     @Override
     public boolean equals(@Nullable Object obj) {
         return obj instanceof Time && this.getValue() == ((Time) obj).getValue();

app/src/main/java/pl/szczodrzynski/edziennik/widgets/WidgetConfigActivity.java

@@ -21,8 +21,8 @@ import java.util.List;
 import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.WidgetTimetable;
-import pl.szczodrzynski.edziennik.databinding.DialogWidgetConfigBinding;
 import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile;
+import pl.szczodrzynski.edziennik.databinding.DialogWidgetConfigBinding;
 import pl.szczodrzynski.edziennik.widgets.luckynumber.WidgetLuckyNumber;
 import pl.szczodrzynski.edziennik.widgets.notifications.WidgetNotifications;
 
@@ -78,7 +78,7 @@ public class WidgetConfigActivity extends Activity {
 
             AsyncTask.execute(() -> {
                 profileList = app.db.profileDao().getAllNow();
-                filterOutArchived(profileList);
+                profileList = filterOutArchived(profileList);
 
                 if (widgetType == WIDGET_NOTIFICATIONS)
                     this.runOnUiThread(this::configure);

app/src/main/java/pl/szczodrzynski/edziennik/widgets/timetable/LessonDialogActivity.kt

@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-11-14.
+ */
+
+package pl.szczodrzynski.edziennik.widgets.timetable
+
+import android.content.Intent
+import android.content.Intent.FLAG_ACTIVITY_REORDER_TO_FRONT
+import android.graphics.drawable.ColorDrawable
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import kotlinx.coroutines.*
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.MainActivity
+import pl.szczodrzynski.edziennik.ui.dialogs.timetable.LessonDetailsDialog
+import pl.szczodrzynski.edziennik.utils.Themes
+import kotlin.coroutines.CoroutineContext
+
+class LessonDialogActivity : AppCompatActivity(), CoroutineScope {
+    companion object {
+        private const val TAG = "LessonDialogActivity"
+    }
+
+    private lateinit var job: Job
+    override val coroutineContext: CoroutineContext
+        get() = job + Dispatchers.Main
+
+    private val shownDialogs = hashSetOf<String>()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        window.setBackgroundDrawable(ColorDrawable(0))
+
+        job = Job()
+
+        setTheme(Themes.appThemeNoDisplay)
+
+        val app = application as App
+        launch {
+            val deferred = async(Dispatchers.Default) {
+                val extras = intent?.extras
+
+                val profileId = extras?.getInt("profileId") ?: return@async null
+
+                if (extras.getBoolean("separatorItem", false)) {
+                    val i = Intent(app, MainActivity::class.java)
+                            .putExtra("fragmentId", MainActivity.DRAWER_ITEM_TIMETABLE)
+                            .putExtra("profileId", profileId)
+                            .addFlags(FLAG_ACTIVITY_REORDER_TO_FRONT)
+                    app.startActivity(i)
+                    finish()
+                    return@async null
+                }
+
+                val lessonId = extras.getLong("lessonId")
+
+                app.db.timetableDao().getByIdNow(profileId, lessonId)
+            }
+            val lesson = deferred.await()
+            lesson?.let {
+                LessonDetailsDialog(
+                        this@LessonDialogActivity,
+                        lesson,
+                        onShowListener = { tag ->
+                            shownDialogs.add(tag)
+                        },
+                        onDismissListener = { tag ->
+                            shownDialogs.remove(tag)
+                            if (shownDialogs.isEmpty())
+                                finish()
+                        }
+                )
+            }
+        }
+    }
+}

app/src/main/java/pl/szczodrzynski/edziennik/widgets/timetable/WidgetTimetableListProvider.java

@@ -12,13 +12,14 @@ import android.graphics.Paint;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffColorFilter;
 import android.graphics.drawable.Drawable;
-import androidx.annotation.DrawableRes;
 import android.text.Html;
 import android.util.Log;
 import android.view.View;
 import android.widget.RemoteViews;
 import android.widget.RemoteViewsService;
 
+import androidx.annotation.DrawableRes;
+
 import com.mikepenz.iconics.IconicsColor;
 import com.mikepenz.iconics.IconicsDrawable;
 import com.mikepenz.iconics.IconicsSize;
@@ -62,7 +63,7 @@ public class WidgetTimetableListProvider implements RemoteViewsService.RemoteVie
     public void onDataSetChanged() {
         // executed EVERY TIME
         Log.d(TAG, "onDataSetChanged for appWidgetId: "+appWidgetId);
-        lessons = WidgetTimetable.timetables == null ? null : WidgetTimetable.timetables.get(appWidgetId);
+        lessons = WidgetTimetable.Companion.getTimetables() == null ? null : WidgetTimetable.Companion.getTimetables().get(appWidgetId);
     }
 
     @Override
@@ -163,9 +164,13 @@ public class WidgetTimetableListProvider implements RemoteViewsService.RemoteVie
 
             Intent intent = new Intent();
             intent.putExtra("profileId", lesson.profileId);
-            intent.putExtra("date", lesson.lessonDate.getStringValue());
-            intent.putExtra("startTime", lesson.startTime.getStringValue());
-            intent.putExtra("endTime", lesson.endTime.getStringValue());
+            intent.putExtra("lessonId", lesson.lessonId);
+            if (lesson.lessonDate != null)
+                intent.putExtra("date", lesson.lessonDate.getStringValue());
+            if (lesson.startTime != null)
+                intent.putExtra("startTime", lesson.startTime.getStringValue());
+            if (lesson.endTime != null)
+                intent.putExtra("endTime", lesson.endTime.getStringValue());
             views.setOnClickFillInIntent(R.id.widgetTimetableRoot, intent);
 
             views.setTextViewText(R.id.widgetTimetableTime, lesson.startTime.getStringHM() + " - " + lesson.endTime.getStringHM());
@@ -239,30 +244,18 @@ public class WidgetTimetableListProvider implements RemoteViewsService.RemoteVie
                     }
                 }
             }
-            //views.setViewVisibility(R.id.widgetTimetableEvent1, View.VISIBLE);
-            //views.setBitmap(R.id.widgetTimetableEvent1, "setImageBitmap", getColoredBitmap(context, R.drawable.event_color_circle, 0xff4caf50, eventIndicatorSize, eventIndicatorSize));
+
+            if (lesson.subjectName == null) {
+                lesson.subjectName = context.getString(R.string.timetable_no_subject_name);
+            }
+            if (lesson.classroomName == null) {
+                lesson.classroomName = context.getString(R.string.timetable_no_classroom);
+            }
 
             views.setViewVisibility(R.id.widgetTimetableOldSubjectName, View.GONE);
             if (lesson.lessonChange) {
-                if (lesson.newSubjectName == null) {
-                    views.setTextViewText(R.id.widgetTimetableSubjectName, Html.fromHtml("<i>"+lesson.subjectName+"</i>"));
-                }
-                else {
-                    views.setViewVisibility(R.id.widgetTimetableOldSubjectName, View.VISIBLE);
-                    views.setTextViewText(R.id.widgetTimetableOldSubjectName, Html.fromHtml("<del>"+lesson.subjectName+"</del>"));
-                    views.setTextViewText(R.id.widgetTimetableSubjectName, lesson.newSubjectName);
-                }
-
-                if (lesson.newClassroomName == null) {
-                    if (lesson.classroomName == null || lesson.classroomName.equals("")) {
-                        lesson.classroomName = context.getString(R.string.timetable_no_classroom);
-                    }
-                    views.setTextViewText(R.id.widgetTimetableClassroomName, lesson.classroomName);
-                }
-                else {
-                    views.setTextViewText(R.id.widgetTimetableClassroomName, Html.fromHtml("<i>"+lesson.newClassroomName+"</i>"));
-                }
-
+                views.setTextViewText(R.id.widgetTimetableSubjectName, Html.fromHtml("<i>"+lesson.subjectName+"</i>"));
+                views.setTextViewText(R.id.widgetTimetableClassroomName, Html.fromHtml("<i>"+lesson.classroomName+"</i>"));
             }
             else if (lesson.lessonCancelled) {
                 views.setTextViewText(R.id.widgetTimetableSubjectName, Html.fromHtml("<del>"+lesson.subjectName+"</del>"));
@@ -272,7 +265,6 @@ public class WidgetTimetableListProvider implements RemoteViewsService.RemoteVie
                 views.setTextViewText(R.id.widgetTimetableSubjectName, lesson.subjectName);
                 views.setTextViewText(R.id.widgetTimetableClassroomName, lesson.classroomName);
             }
-
         }
         else if (!triedToReload) {
             // try to reload the widget

app/src/main/res/layout/activity_login.xml

@@ -8,16 +8,17 @@
         android:orientation="vertical"
         android:visibility="visible">
 
-        <LinearLayout
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="32dp" />
+
+        <androidx.coordinatorlayout.widget.CoordinatorLayout
+            android:id="@+id/coordinator"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:orientation="vertical"
             android:visibility="visible">
 
-            <Space
-                android:layout_width="0dp"
-                android:layout_height="32dp" />
-
             <fragment
                 android:id="@+id/nav_host_fragment"
                 android:name="androidx.navigation.fragment.NavHostFragment"
@@ -30,7 +31,7 @@
 
                 app:layout_constraintTop_toTopOf="parent"
                 app:navGraph="@navigation/nav_login" />
-        </LinearLayout>
+        </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
         <!--<io.codetail.widget.RevealFrameLayout
             android:layout_width="match_parent"

app/src/main/res/layout/dialog_event_manual.xml

@@ -97,7 +97,8 @@
         android:layout_marginLeft="8dp"
         android:layout_marginRight="8dp"
         android:text="@string/dialog_event_manual_share_first_notice"
-        android:visibility="gone" />
+        android:visibility="gone"
+        tools:visibility="visible" />
 
     <LinearLayout
         android:layout_width="match_parent"