.circleci/config.yml

@@ -7,7 +7,7 @@ references:
 
   container_config: &container_config
     docker:
-      - image: circleci/android:api-26-alpha
+      - image: circleci/android:api-27-alpha
     working_directory: *workspace_root
     environment:
       environment:

.gitignore

@@ -32,8 +32,6 @@ local.properties
 .idea/tasks.xml
 .idea/vcs.xml
 .idea/workspace.xml
-.idea/caches/
-.idea/codeStyles/
 *.iml
 
 # OS-specific files

.gitlab-ci.yml

@@ -12,7 +12,7 @@ build:
   script:
     - ./gradlew --no-daemon --stacktrace dependencies || true
     - ./gradlew --no-daemon --stacktrace assembleDebug
-    - mv app/build/outputs/apk/debug/app-debug.apk .
+    - mv app/build/outputs/apk/app-debug.apk .
   artifacts:
     name: "${CI_PROJECT_NAME}_${CI_BUILD_REF_NAME}-${CI_BUILD_ID}"
     paths:
@@ -26,7 +26,7 @@ tests:
      - .gradle
     policy: pull
   script:
-    - ./gradlew --no-daemon --stacktrace -x fabricGenerateResourcesRelease test
+    - ./gradlew --no-daemon --stacktrace test
   artifacts:
     paths:
     - app/build/reports/tests
@@ -39,7 +39,7 @@ lint:
      - .gradle
     policy: pull
   script:
-    - ./gradlew --no-daemon --stacktrace -x fabricGenerateResourcesRelease lint
+    - ./gradlew --no-daemon --stacktrace lint
   artifacts:
     paths:
     - app/build/reports

README.md

@@ -4,10 +4,9 @@
 [![Bitrise](https://img.shields.io/bitrise/daeff1893f3c8128/master.svg?token=Hjm1ACamk86JDeVVJHOeqQ&style=flat-square)](https://www.bitrise.io/app/daeff1893f3c8128)
 [![Codecov](https://img.shields.io/codecov/c/github/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://codecov.io/gh/wulkanowy/wulkanowy)
 [![BCH compliance](https://bettercodehub.com/edge/badge/wulkanowy/wulkanowy?branch=master)](https://bettercodehub.com/)
-[![Scrutinizer](https://img.shields.io/scrutinizer/g/wulkanowy/wulkanowy.svg)](https://scrutinizer-ci.com/g/wulkanowy/wulkanowy/?branch=master)
 [![Known Vulnerabilities](https://snyk.io/test/github/wulkanowy/wulkanowy/badge.svg?targetFile=app%2Fbuild.gradle&style=flat-square)](https://snyk.io/test/github/wulkanowy/wulkanowy?targetFile=app%2Fbuild.gradle)
 [![Bintray](https://img.shields.io/bintray/v/wulkanowy/wulkanowy/api.svg?style=flat-square)](https://bintray.com/wulkanowy/wulkanowy/api)
 
 [Pobierz wersję rozwojową](https://bitrise-redirector.herokuapp.com/v0.1/apps/daeff1893f3c8128/builds/master/artifacts/app-debug-bitrise-signed.apk)
 
-Androidowy klient dziennika VULCAN UONET+.
+Wulkanowy to aplikacja na androida polepszająca wygodę używania dziennika UONET+.

android-sonarqube.gradle

@@ -5,7 +5,7 @@ sonarqube {
     //noinspection GroovyAssignabilityCheck
     properties {
         def files = fileTree("${rootProject.projectDir}/api/build/libs/").filter { it.isFile() }.files.name
-        def libraries = project.android.sdkDirectory.getPath() + "/platforms/android-26/android.jar," +
+        def libraries = project.android.sdkDirectory.getPath() + "/platforms/android-27/android.jar," +
                 "${project.rootDir}/api/build/libs/" + files[0]
 
         property "sonar.projectName", GROUP_ID + ":app"

api/build.gradle

@@ -28,12 +28,12 @@ jacocoTestReport {
 }
 
 dependencies {
-    implementation "org.jsoup:jsoup:$jsoup"
+    implementation 'org.jsoup:jsoup:1.10.3'
-    implementation "org.apache.commons:commons-lang3:$apacheLang"
+    implementation 'org.apache.commons:commons-lang3:3.7'
-    implementation "com.google.code.gson:gson:$gson"
+    implementation 'com.google.code.gson:gson:2.8.2'
 
-    testImplementation "junit:junit:$junit"
+    testImplementation 'junit:junit:4.12'
-    testImplementation "org.mockito:mockito-core:$mockito"
+    testImplementation 'org.mockito:mockito-core:2.13.0'
 }
 
 version = PUBLISH_VERSION

api/src/main/java/io/github/wulkanowy/api/Client.java

@@ -108,11 +108,7 @@ public class Client {
 
         this.cookies.addItems(response.cookies());
 
-        Document doc = checkForErrors(response.parse());
+        return checkForErrors(response.parse());
-
-        lastSuccessRequest = new Date();
-
-        return doc;
     }
 
     public Document postPageByUrl(String url, String[][] params) throws IOException, VulcanException {
@@ -169,16 +165,16 @@ public class Client {
     }
 
     Document checkForErrors(Document doc) throws VulcanException {
-        String title = doc.select("title").text();
+        if ("Przerwa techniczna".equals(doc.select("title").text())) {
-        if ("Przerwa techniczna".equals(title)) {
+            throw new VulcanOfflineException();
-            throw new VulcanOfflineException(title);
         }
 
-        String singIn = doc.select(".loginButton").text();
+        if ("Zaloguj się".equals(doc.select(".loginButton").text())) {
-        if ("Zaloguj się".equals(singIn)) {
+            throw new NotLoggedInErrorException();
-            throw new NotLoggedInErrorException(singIn);
         }
 
+        lastSuccessRequest = new Date();
+
         return doc;
     }
 }

api/src/main/java/io/github/wulkanowy/api/NotLoggedInErrorException.java

@@ -1,8 +1,4 @@
 package io.github.wulkanowy.api;
 
 public class NotLoggedInErrorException extends VulcanException {
-
-    public NotLoggedInErrorException(String message) {
-        super(message);
-    }
 }

api/src/main/java/io/github/wulkanowy/api/StudentAndParent.java

@@ -48,7 +48,7 @@ public class StudentAndParent implements SnP {
         Element studentTileLink = startPage.select(".panel.linkownia.pracownik.klient > a").first();
 
         if (null == studentTileLink) {
-            throw new NotLoggedInErrorException("You are probably not logged in. Force login");
+            throw new NotLoggedInErrorException();
         }
 
         String snpPageUrl = studentTileLink.attr("href");
@@ -62,7 +62,7 @@ public class StudentAndParent implements SnP {
         String[] path = snpPageUrl.split(client.getHost())[1].split("/");
 
         if (5 != path.length) {
-            throw new NotLoggedInErrorException("You are probably not logged in");
+            throw new NotLoggedInErrorException();
         }
 
         return path[2];

api/src/main/java/io/github/wulkanowy/api/Vulcan.java

@@ -32,7 +32,7 @@ public class Vulcan {
 
     public Client getClient() throws NotLoggedInErrorException {
         if (null == client) {
-            throw new NotLoggedInErrorException("Use setCredentials() method first");
+            throw new NotLoggedInErrorException();
         }
 
         return client;

api/src/main/java/io/github/wulkanowy/api/VulcanException.java

@@ -1,8 +1,4 @@
 package io.github.wulkanowy.api;
 
 public abstract class VulcanException extends Exception {
-
-    protected VulcanException(String message) {
-        super(message);
-    }
 }

api/src/main/java/io/github/wulkanowy/api/VulcanOfflineException.java

@@ -1,8 +1,4 @@
 package io.github.wulkanowy.api;
 
 public class VulcanOfflineException extends VulcanException {
-
-    VulcanOfflineException(String message) {
-        super(message);
-    }
 }

api/src/main/java/io/github/wulkanowy/api/login/AccountPermissionException.java

@@ -3,8 +3,4 @@ package io.github.wulkanowy.api.login;
 import io.github.wulkanowy.api.VulcanException;
 
 public class AccountPermissionException extends VulcanException {
-
-    AccountPermissionException(String message) {
-        super(message);
-    }
 }

api/src/main/java/io/github/wulkanowy/api/login/BadCredentialsException.java

@@ -3,8 +3,4 @@ package io.github.wulkanowy.api.login;
 import io.github.wulkanowy.api.VulcanException;
 
 public class BadCredentialsException extends VulcanException {
-
-    BadCredentialsException(String message) {
-        super(message);
-    }
 }

api/src/main/java/io/github/wulkanowy/api/login/Login.java

@@ -2,7 +2,6 @@ package io.github.wulkanowy.api.login;
 
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
-import org.jsoup.nodes.Element;
 import org.jsoup.parser.Parser;
 import org.jsoup.select.Elements;
 
@@ -43,9 +42,8 @@ public class Login {
                 {"Password", password}
         });
 
-        Element errorMessage = html.select(".ErrorMessage").first();
+        if (null != html.select(".ErrorMessage").first()) {
-        if (null != errorMessage) {
+            throw new BadCredentialsException();
-            throw new BadCredentialsException(errorMessage.text());
         }
 
         return html.select("input[name=wresult]").attr("value");
@@ -61,11 +59,11 @@ public class Login {
         }).select("title").text();
 
         if ("Logowanie".equals(title)) {
-            throw new AccountPermissionException("No account access. Try another symbol");
+            throw new AccountPermissionException();
         }
 
         if (!"Uonet+".equals(title)) {
-            throw new LoginErrorException("Could not log in, unknown error");
+            throw new LoginErrorException();
         }
 
         return this.symbol;

api/src/main/java/io/github/wulkanowy/api/login/LoginErrorException.java

@@ -2,9 +2,5 @@ package io.github.wulkanowy.api.login;
 
 import io.github.wulkanowy.api.NotLoggedInErrorException;
 
-class LoginErrorException extends NotLoggedInErrorException {
+public class LoginErrorException extends NotLoggedInErrorException {
-
-    LoginErrorException(String message) {
-        super(message);
-    }
 }

api/src/main/java/io/github/wulkanowy/api/messages/BadRequestException.java

@@ -3,8 +3,4 @@ package io.github.wulkanowy.api.messages;
 import io.github.wulkanowy.api.VulcanException;
 
 class BadRequestException extends VulcanException {
-
-    BadRequestException(String message) {
-        super(message);
-    }
 }

api/src/main/java/io/github/wulkanowy/api/messages/Messages.java

@@ -59,10 +59,10 @@ public class Messages {
             messages = new Gson().fromJson(res, MessagesContainer.class).data;
         } catch (JsonParseException e) {
             if (res.contains(ERROR_TITLE)) {
-                throw new BadRequestException(ERROR_TITLE);
+                throw new BadRequestException();
             }
 
-            throw new NotLoggedInErrorException("You are probably not logged in");
+            throw new NotLoggedInErrorException();
         }
 
         return messages;
@@ -80,10 +80,10 @@ public class Messages {
             message = new Gson().fromJson(res, MessageContainer.class).data;
         } catch (JsonParseException e) {
             if (res.contains(ERROR_TITLE)) {
-                throw new BadRequestException(ERROR_TITLE);
+                throw new BadRequestException();
             }
 
-            throw new NotLoggedInErrorException("You are probably not logged in. Force login");
+            throw new NotLoggedInErrorException();
         }
 
         return message;

app/build.gradle

@@ -21,15 +21,15 @@ apply from: '../jacoco.gradle'
 apply from: '../android-sonarqube.gradle'
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    buildToolsVersion "27.0.3"
     defaultConfig {
         applicationId "io.github.wulkanowy"
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 15
-        targetSdkVersion 26
+        targetSdkVersion 27
-        versionCode 6
+        versionCode 4
-        versionName "0.3.0"
+        versionName "0.2.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
         manifestPlaceholders = [
@@ -68,40 +68,42 @@ greendao {
 
 dependencies {
     implementation project(':api')
-    implementation "com.android.support:support-v4:$supportVersion"
+    implementation 'com.android.support:appcompat-v7:27.1.0'
-    implementation "com.android.support:design:$supportVersion"
+    implementation 'com.android.support:design:27.1.0'
-    implementation "com.android.support:cardview-v7:$supportVersion"
+    implementation 'com.android.support:support-v4:27.1.0'
-    implementation "com.android.support:customtabs:$supportVersion"
+    implementation 'com.android.support:recyclerview-v7:27.1.0'
-    implementation "com.android.support:preference-v14:$supportVersion"
+    implementation 'com.android.support:cardview-v7:27.1.0'
-    implementation "com.firebase:firebase-jobdispatcher:$firebaseJob"
+    implementation 'com.android.support:customtabs:27.1.0'
-    implementation "org.apache.commons:commons-lang3:$apacheLang"
+    implementation 'com.firebase:firebase-jobdispatcher:0.8.5'
-    implementation "org.apache.commons:commons-collections4:$apacheCollections"
+    implementation 'org.apache.commons:commons-lang3:3.7'
-    implementation "eu.davidea:flexible-adapter:$flexibleAdapter"
+    implementation 'eu.davidea:flexible-adapter:5.0.0-rc4'
-    implementation "eu.davidea:flexible-adapter-ui:$flexibleUi"
+    implementation 'eu.davidea:flexible-adapter-ui:1.0.0-b1'
-    implementation "org.greenrobot:greendao:$greenDao"
+    implementation 'org.apache.commons:commons-collections4:4.1'
-    implementation "com.github.yuweiguocn:GreenDaoUpgradeHelper:$greenDaoHelper"
+    implementation 'org.greenrobot:greendao:3.2.2'
-    implementation "com.jakewharton:butterknife:$butterknife"
+    implementation 'com.github.yuweiguocn:GreenDaoUpgradeHelper:v2.0.2'
-    implementation "com.google.dagger:dagger-android-support:$dagger2"
+    implementation 'com.jakewharton:butterknife:8.8.1'
-    implementation "com.aurelhubert:ahbottomnavigation:$ahbottom"
+    implementation 'joda-time:joda-time:2.9.9'
-    implementation "com.jakewharton.threetenabp:threetenabp:$threeTenABP"
+    implementation 'com.google.dagger:dagger-android:2.14.1'
+    implementation 'com.google.dagger:dagger-android-support:2.14.1'
+    implementation 'com.aurelhubert:ahbottomnavigation:2.1.0'
 
-    implementation("com.crashlytics.sdk.android:crashlytics:$crashlyticsSdk@aar") {
+    implementation('com.crashlytics.sdk.android:crashlytics:2.8.0@aar') {
         transitive = true
     }
-    implementation("com.crashlytics.sdk.android:answers:$crashlyticsAnswers@aar") {
+    implementation('com.crashlytics.sdk.android:answers:1.4.1@aar') {
         transitive = true
     }
 
-    annotationProcessor "com.google.dagger:dagger-android-processor:$dagger2"
+    annotationProcessor 'com.google.dagger:dagger-android-processor:2.14.1'
-    annotationProcessor "com.google.dagger:dagger-compiler:$dagger2"
+    annotationProcessor 'com.google.dagger:dagger-compiler:2.14.1'
-    annotationProcessor "com.jakewharton:butterknife-compiler:$butterknife"
+    annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
 
-    debugImplementation "com.amitshekhar.android:debug-db:$debugDb"
+    debugImplementation 'com.amitshekhar.android:debug-db:1.0.1'
-    debugImplementation "net.zetetic:android-database-sqlcipher:$sqlcipher"
+    debugImplementation 'net.zetetic:android-database-sqlcipher:3.5.9'
 
-    testImplementation "junit:junit:$junit"
+    testImplementation 'junit:junit:4.12'
-    testImplementation "org.mockito:mockito-core:$mockito"
+    testImplementation 'org.mockito:mockito-core:2.13.0'
 
-    androidTestImplementation "com.android.support.test:runner:$testRunner"
+    androidTestImplementation 'com.android.support.test:runner:1.0.1'
-    androidTestImplementation "org.mockito:mockito-android:$mockito"
+    androidTestImplementation 'org.mockito:mockito-android:2.13.0'
 }

app/src/main/java/io/github/wulkanowy/WulkanowyApp.java

@@ -4,7 +4,6 @@ import android.app.Application;
 
 import com.crashlytics.android.Crashlytics;
 import com.crashlytics.android.core.CrashlyticsCore;
-import com.jakewharton.threetenabp.AndroidThreeTen;
 
 import org.greenrobot.greendao.query.QueryBuilder;
 
@@ -29,8 +28,6 @@ public class WulkanowyApp extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
-        AndroidThreeTen.init(this);
-
         applicationComponent = DaggerApplicationComponent
                 .builder()
                 .applicationModule(new ApplicationModule(this))

app/src/main/java/io/github/wulkanowy/data/Repository.java

@@ -68,31 +68,6 @@ public class Repository implements RepositoryContract {
         return sharedPref.getCurrentUserId();
     }
 
-    @Override
-    public int getStartupTab() {
-        return sharedPref.getStartupTab();
-    }
-
-    @Override
-    public int getServicesInterval() {
-        return sharedPref.getServicesInterval();
-    }
-
-    @Override
-    public boolean isServicesEnable() {
-        return sharedPref.isServicesEnable();
-    }
-
-    @Override
-    public boolean isNotifyEnable() {
-        return sharedPref.isNotifyEnable();
-    }
-
-    @Override
-    public boolean isMobileDisable() {
-        return sharedPref.isMobileDisable();
-    }
-
     @Override
     public String[] getSymbolsKeysArray() {
         return resources.getSymbolsKeysArray();

app/src/main/java/io/github/wulkanowy/data/RepositoryContract.java

@@ -21,16 +21,6 @@ public interface RepositoryContract extends ResourcesContract, AccountSyncContra
 
     long getCurrentUserId();
 
-    int getStartupTab();
-
-    boolean isServicesEnable();
-
-    boolean isNotifyEnable();
-
-    int getServicesInterval();
-
-    boolean isMobileDisable();
-
     void syncGrades() throws VulcanException, IOException, ParseException;
 
     void syncSubjects() throws VulcanException, IOException, ParseException;

app/src/main/java/io/github/wulkanowy/data/db/resources/AppResources.java

@@ -3,8 +3,6 @@ package io.github.wulkanowy.data.db.resources;
 import android.content.Context;
 import android.content.res.Resources;
 
-import com.crashlytics.android.Crashlytics;
-
 import java.io.IOException;
 import java.net.SocketTimeoutException;
 import java.net.UnknownHostException;
@@ -14,6 +12,7 @@ import javax.inject.Singleton;
 
 import io.github.wulkanowy.R;
 import io.github.wulkanowy.api.NotLoggedInErrorException;
+import io.github.wulkanowy.api.VulcanOfflineException;
 import io.github.wulkanowy.data.db.dao.entities.AttendanceLesson;
 import io.github.wulkanowy.di.annotations.ApplicationContext;
 import io.github.wulkanowy.utils.AppConstant;
@@ -43,7 +42,6 @@ public class AppResources implements ResourcesContract {
     @Override
     public String getErrorLoginMessage(Exception exception) {
         LogUtils.error(AppConstant.APP_NAME + " encountered a error", exception);
-        Crashlytics.logException(exception);
 
         if (exception instanceof CryptoException) {
             return resources.getString(R.string.encrypt_failed_text);
@@ -53,6 +51,8 @@ public class AppResources implements ResourcesContract {
             return resources.getString(R.string.generic_timeout_error);
         } else if (exception instanceof NotLoggedInErrorException || exception instanceof IOException) {
             return resources.getString(R.string.login_denied_text);
+        } else if (exception instanceof VulcanOfflineException) {
+            return resources.getString(R.string.error_host_offline);
         } else {
             return exception.getMessage();
         }
@@ -67,23 +67,23 @@ public class AppResources implements ResourcesContract {
         }
 
         if (lesson.getIsAbsenceExcused()) {
-            id = R.string.attendance_absence_excused;
+            id =  R.string.attendance_absence_excused;
         }
 
         if (lesson.getIsAbsenceUnexcused()) {
-            id = R.string.attendance_absence_unexcused;
+            id =  R.string.attendance_absence_unexcused;
         }
 
         if (lesson.getIsExemption()) {
-            id = R.string.attendance_exemption;
+            id =  R.string.attendance_exemption;
         }
 
         if (lesson.getIsExcusedLateness()) {
-            id = R.string.attendance_excused_lateness;
+            id =  R.string.attendance_excused_lateness;
         }
 
         if (lesson.getIsUnexcusedLateness()) {
-            id = R.string.attendance_unexcused_lateness;
+            id =  R.string.attendance_unexcused_lateness;
         }
 
         return resources.getString(id);

app/src/main/java/io/github/wulkanowy/data/db/shared/SharedPref.java

@@ -2,62 +2,32 @@ package io.github.wulkanowy.data.db.shared;
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
 import io.github.wulkanowy.di.annotations.ApplicationContext;
 import io.github.wulkanowy.di.annotations.SharedPreferencesInfo;
-import io.github.wulkanowy.ui.main.settings.SettingsFragment;
 
 @Singleton
 public class SharedPref implements SharedPrefContract {
 
     private static final String SHARED_KEY_USER_ID = "USER_ID";
 
-    private final SharedPreferences appSharedPref;
+    private final SharedPreferences sharedPreferences;
-
-    private final SharedPreferences settingsSharedPref;
 
     @Inject
     SharedPref(@ApplicationContext Context context, @SharedPreferencesInfo String sharedName) {
-        appSharedPref = context.getSharedPreferences(sharedName, Context.MODE_PRIVATE);
+        sharedPreferences = context.getSharedPreferences(sharedName, Context.MODE_PRIVATE);
-        settingsSharedPref = PreferenceManager.getDefaultSharedPreferences(context);
     }
 
     @Override
     public long getCurrentUserId() {
-        return appSharedPref.getLong(SHARED_KEY_USER_ID, 0);
+        return sharedPreferences.getLong(SHARED_KEY_USER_ID, 0);
     }
 
     @Override
     public void setCurrentUserId(long userId) {
-        appSharedPref.edit().putLong(SHARED_KEY_USER_ID, userId).apply();
+        sharedPreferences.edit().putLong(SHARED_KEY_USER_ID, userId).apply();
-    }
-
-    @Override
-    public int getStartupTab() {
-        return Integer.parseInt(settingsSharedPref.getString(SettingsFragment.SHARED_KEY_START_TAB, "2"));
-    }
-
-    @Override
-    public int getServicesInterval() {
-        return Integer.parseInt(settingsSharedPref.getString(SettingsFragment.SHARED_KEY_SERVICES_INTERVAL, "60"));
-    }
-
-    @Override
-    public boolean isServicesEnable() {
-        return settingsSharedPref.getBoolean(SettingsFragment.SHARED_KEY_SERVICES_ENABLE, true);
-    }
-
-    @Override
-    public boolean isNotifyEnable() {
-        return settingsSharedPref.getBoolean(SettingsFragment.SHARED_KEY_NOTIFY_ENABLE, true);
-    }
-
-    @Override
-    public boolean isMobileDisable() {
-        return settingsSharedPref.getBoolean(SettingsFragment.SHARED_KEY_SERVICES_MOBILE_DISABLED, false);
     }
 }

app/src/main/java/io/github/wulkanowy/data/db/shared/SharedPrefContract.java

@@ -5,14 +5,4 @@ public interface SharedPrefContract {
     long getCurrentUserId();
 
     void setCurrentUserId(long userId);
-
-    int getStartupTab();
-
-    int getServicesInterval();
-
-    boolean isMobileDisable();
-
-    boolean isServicesEnable();
-
-    boolean isNotifyEnable();
 }

app/src/main/java/io/github/wulkanowy/services/GradeNotify.java

@@ -1,36 +0,0 @@
-package io.github.wulkanowy.services;
-
-import android.annotation.TargetApi;
-import android.app.Notification;
-import android.app.NotificationChannel;
-import android.app.NotificationManager;
-import android.content.Context;
-
-import io.github.wulkanowy.R;
-
-class GradeNotify extends NotificationService {
-
-    private static final String CHANNEL_ID = "Grade_Notify";
-
-    GradeNotify(Context context) {
-        super(context);
-    }
-
-    @Override
-    @TargetApi(26)
-    void createChannel() {
-        String channelName = getString(R.string.notify_grade_channel);
-
-        NotificationChannel notificationChannel = new NotificationChannel(CHANNEL_ID, channelName,
-                NotificationManager.IMPORTANCE_HIGH);
-        notificationChannel.enableLights(true);
-        notificationChannel.enableVibration(true);
-        notificationChannel.setLockscreenVisibility(Notification.VISIBILITY_PUBLIC);
-        getManager().createNotificationChannel(notificationChannel);
-    }
-
-    @Override
-    String getChannelId() {
-        return CHANNEL_ID;
-    }
-}

app/src/main/java/io/github/wulkanowy/services/NotificationService.java

@@ -3,22 +3,29 @@ package io.github.wulkanowy.services;
 
 import android.annotation.TargetApi;
 import android.app.Notification;
+import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.StringRes;
 import android.support.v4.app.NotificationCompat;
 
 import java.util.Random;
 
-public class NotificationService {
+class NotificationService {
+
+    private static final String CHANNEL_ID = "Wulkanowy_New_Grade_Channel";
+
+    private static final String CHANNEL_NAME = "New Grade Channel";
 
     private NotificationManager manager;
 
     private Context context;
 
-    public NotificationService(Context context) {
+    NotificationService(Context context) {
         this.context = context;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            createChannel();
+        }
     }
 
     void notify(Notification notification) {
@@ -26,32 +33,23 @@ public class NotificationService {
     }
 
     NotificationCompat.Builder notificationBuilder() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+        return new NotificationCompat.Builder(context, CHANNEL_ID);
-            createChannel();
-        }
-        return new NotificationCompat.Builder(context, getChannelId());
     }
 
-    public void cancelAll() {
+    @TargetApi(26)
-        getManager().cancelAll();
+    private void createChannel() {
+        NotificationChannel notificationChannel = new NotificationChannel(CHANNEL_ID, CHANNEL_NAME,
+                NotificationManager.IMPORTANCE_HIGH);
+        notificationChannel.enableLights(true);
+        notificationChannel.enableVibration(true);
+        notificationChannel.setLockscreenVisibility(Notification.VISIBILITY_PUBLIC);
+        getManager().createNotificationChannel(notificationChannel);
     }
 
-    NotificationManager getManager() {
+    private NotificationManager getManager() {
         if (manager == null) {
             manager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
         }
         return manager;
     }
-
+}
-    String getString(@StringRes int stringId) {
-        return context.getString(stringId);
-    }
-
-    @TargetApi(26)
-    void createChannel() {
-    }
-
-    String getChannelId() {
-        return null;
-    }
-}

app/src/main/java/io/github/wulkanowy/services/SyncJob.java

@@ -4,7 +4,6 @@ import android.app.PendingIntent;
 import android.content.Context;
 import android.support.v4.app.NotificationCompat;
 
-import com.crashlytics.android.Crashlytics;
 import com.firebase.jobdispatcher.Constraint;
 import com.firebase.jobdispatcher.FirebaseJobDispatcher;
 import com.firebase.jobdispatcher.GooglePlayDriver;
@@ -15,7 +14,6 @@ import com.firebase.jobdispatcher.RetryStrategy;
 import com.firebase.jobdispatcher.SimpleJobService;
 import com.firebase.jobdispatcher.Trigger;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import javax.inject.Inject;
@@ -29,34 +27,32 @@ import io.github.wulkanowy.utils.LogUtils;
 
 public class SyncJob extends SimpleJobService {
 
+    private static final int DEFAULT_INTERVAL_START = 60 * 50;
+
+    private static final int DEFAULT_INTERVAL_END = DEFAULT_INTERVAL_START + (60 * 40);
+
     public static final String EXTRA_INTENT_KEY = "cardId";
 
-    public static final String JOB_TAG = "SyncJob";
+    private List<Grade> gradeList;
-
-    private List<Grade> gradeList = new ArrayList<>();
 
     @Inject
     RepositoryContract repository;
 
-    public static void start(Context context, int interval, boolean useOnlyWifi) {
+    public static void start(Context context) {
         FirebaseJobDispatcher dispatcher = new FirebaseJobDispatcher(new GooglePlayDriver(context));
 
         dispatcher.mustSchedule(dispatcher.newJobBuilder()
                 .setLifetime(Lifetime.FOREVER)
                 .setService(SyncJob.class)
-                .setTag(JOB_TAG)
+                .setTag("SyncJob")
                 .setRecurring(true)
-                .setTrigger(Trigger.executionWindow(interval * 60, (interval + 10) * 60))
+                .setTrigger(Trigger.executionWindow(DEFAULT_INTERVAL_START, DEFAULT_INTERVAL_END))
-                .setConstraints(useOnlyWifi ? Constraint.ON_UNMETERED_NETWORK : Constraint.ON_ANY_NETWORK)
+                .setConstraints(Constraint.ON_ANY_NETWORK)
                 .setReplaceCurrent(false)
                 .setRetryStrategy(RetryStrategy.DEFAULT_EXPONENTIAL)
                 .build());
     }
 
-    public static void stop(Context context) {
-        new FirebaseJobDispatcher(new GooglePlayDriver(context)).cancel(JOB_TAG);
-    }
-
     @Override
     public void onCreate() {
         super.onCreate();
@@ -71,24 +67,23 @@ public class SyncJob extends SimpleJobService {
 
             gradeList = repository.getNewGrades();
 
-            if (!gradeList.isEmpty() && repository.isNotifyEnable()) {
+            if (!gradeList.isEmpty()) {
                 showNotification();
             }
             return JobService.RESULT_SUCCESS;
         } catch (Exception e) {
-            Crashlytics.logException(e);
             LogUtils.error("During background synchronization an error occurred", e);
             return JobService.RESULT_FAIL_RETRY;
         }
     }
 
     private void showNotification() {
-        GradeNotify gradeNotify = new GradeNotify(getApplicationContext());
+        NotificationService service = new NotificationService(getApplicationContext());
 
-        gradeNotify.notify(gradeNotify.notificationBuilder()
+        service.notify(service.notificationBuilder()
                 .setContentTitle(getStringTitle())
                 .setContentText(getStringContent())
-                .setSmallIcon(R.drawable.ic_notify_grade)
+                .setSmallIcon(R.drawable.ic_stat_notify)
                 .setAutoCancel(true)
                 .setDefaults(NotificationCompat.DEFAULT_ALL)
                 .setPriority(NotificationCompat.PRIORITY_HIGH)

app/src/main/java/io/github/wulkanowy/ui/login/LoginActivity.java

@@ -7,7 +7,6 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.support.design.widget.Snackbar;
 import android.support.design.widget.TextInputLayout;
-import android.support.v7.app.ActionBar;
 import android.view.View;
 import android.view.inputmethod.EditorInfo;
 import android.widget.ArrayAdapter;
@@ -210,18 +209,6 @@ public class LoginActivity extends BaseActivity implements LoginContract.View {
         });
     }
 
-    @Override
-    public void showActionBar(boolean show) {
-        ActionBar actionBar = getSupportActionBar();
-        if (actionBar != null) {
-            if (show) {
-                actionBar.show();
-            } else {
-                actionBar.hide();
-            }
-        }
-    }
-
     @Override
     public void onDestroy() {
         super.onDestroy();

app/src/main/java/io/github/wulkanowy/ui/login/LoginContract.java

@@ -33,8 +33,6 @@ public interface LoginContract {
 
         void hideSoftInput();
 
-        void showActionBar(boolean show);
-
     }
 
     @PerActivity

app/src/main/java/io/github/wulkanowy/ui/login/LoginPresenter.java

@@ -55,7 +55,6 @@ public class LoginPresenter extends BasePresenter<LoginContract.View>
     @Override
     public void onStartAsync() {
         if (isViewAttached()) {
-            getView().showActionBar(false);
             getView().showLoginProgress(true);
         }
     }
@@ -85,25 +84,24 @@ public class LoginPresenter extends BasePresenter<LoginContract.View>
     public void onEndAsync(boolean success, Exception exception) {
         if (success) {
             getView().openMainActivity();
-            return;
         } else if (exception instanceof BadCredentialsException) {
             getView().setErrorPassIncorrect();
             getView().showSoftInput();
+            getView().showLoginProgress(false);
         } else if (exception instanceof AccountPermissionException) {
             getView().setErrorSymbolRequired();
             getView().showSoftInput();
+            getView().showLoginProgress(false);
         } else {
             getView().onError(getRepository().getErrorLoginMessage(exception));
+            getView().showLoginProgress(false);
         }
 
-        getView().showActionBar(true);
-        getView().showLoginProgress(false);
     }
 
     @Override
     public void onCanceledAsync() {
         if (isViewAttached()) {
-            getView().showActionBar(true);
             getView().showLoginProgress(false);
         }
     }

app/src/main/java/io/github/wulkanowy/ui/main/MainActivity.java

@@ -21,12 +21,13 @@ import io.github.wulkanowy.ui.base.BaseActivity;
 import io.github.wulkanowy.ui.main.attendance.AttendanceFragment;
 import io.github.wulkanowy.ui.main.dashboard.DashboardFragment;
 import io.github.wulkanowy.ui.main.grades.GradesFragment;
-import io.github.wulkanowy.ui.main.settings.SettingsFragment;
 import io.github.wulkanowy.ui.main.timetable.TimetableFragment;
 
 public class MainActivity extends BaseActivity implements MainContract.View,
         AHBottomNavigation.OnTabSelectedListener, OnFragmentIsReadyListener {
 
+    private int initTabPosition = 0;
+
     @BindView(R.id.main_activity_nav)
     AHBottomNavigation bottomNavigation;
 
@@ -51,10 +52,15 @@ public class MainActivity extends BaseActivity implements MainContract.View,
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
+        initTabPosition = getIntent().getIntExtra(SyncJob.EXTRA_INTENT_KEY, initTabPosition);
+
         getActivityComponent().inject(this);
         setButterKnife(ButterKnife.bind(this));
 
-        presenter.onStart(this, getIntent().getIntExtra(SyncJob.EXTRA_INTENT_KEY, -1));
+        presenter.onStart(this);
+
+        initiationViewPager();
+        initiationBottomNav();
     }
 
     @Override
@@ -96,44 +102,48 @@ public class MainActivity extends BaseActivity implements MainContract.View,
         presenter.onFragmentIsReady();
     }
 
-    @Override
+    private void initiationBottomNav() {
-    public void initiationBottomNav(int tabPosition) {
+        bottomNavigation.addItem(new AHBottomNavigationItem(
-        bottomNavigation.addItem(new AHBottomNavigationItem(getString(R.string.grades_text),
+                getString(R.string.grades_text),
-                R.drawable.ic_menu_grade_26dp));
+                getResources().getDrawable(R.drawable.ic_menu_grade_26dp)
-
+        ));
-        bottomNavigation.addItem(new AHBottomNavigationItem(getString(R.string.attendance_text),
+        bottomNavigation.addItem(new AHBottomNavigationItem(
-                R.drawable.ic_menu_attendance_24dp));
+                getString(R.string.attendance_text),
-
+                getResources().getDrawable(R.drawable.ic_menu_attendance_24dp)
-        bottomNavigation.addItem(new AHBottomNavigationItem(getString(R.string.dashboard_text),
+        ));
-                R.drawable.ic_menu_dashboard_24dp));
+        bottomNavigation.addItem(new AHBottomNavigationItem(
-
+                getString(R.string.dashboard_text),
-        bottomNavigation.addItem(new AHBottomNavigationItem(getString(R.string.timetable_text),
+                getResources().getDrawable(R.drawable.ic_menu_dashboard_24dp)
-                R.drawable.ic_menu_timetable_24dp));
+        ));
-
+        bottomNavigation.addItem(new AHBottomNavigationItem(
-        bottomNavigation.addItem(new AHBottomNavigationItem(getString(R.string.settings_text),
+                getString(R.string.lessonplan_text),
-                R.drawable.ic_menu_other_24dp));
+                getResources().getDrawable(R.drawable.ic_menu_timetable_24dp)
+        ));
+        bottomNavigation.addItem(new AHBottomNavigationItem(
+                getString(R.string.settings_text),
+                getResources().getDrawable(R.drawable.ic_menu_other_24dp)
+        ));
 
         bottomNavigation.setAccentColor(getResources().getColor(R.color.colorPrimary));
         bottomNavigation.setInactiveColor(Color.BLACK);
         bottomNavigation.setBackgroundColor(getResources().getColor(R.color.colorBackgroundBottomNav));
         bottomNavigation.setTitleState(AHBottomNavigation.TitleState.ALWAYS_SHOW);
         bottomNavigation.setOnTabSelectedListener(this);
-        bottomNavigation.setCurrentItem(tabPosition);
+        bottomNavigation.setCurrentItem(initTabPosition);
         bottomNavigation.setBehaviorTranslationEnabled(false);
     }
 
-    @Override
+    private void initiationViewPager() {
-    public void initiationViewPager(int tabPosition) {
         pagerAdapter.addFragment(new GradesFragment());
         pagerAdapter.addFragment(new AttendanceFragment());
         pagerAdapter.addFragment(new DashboardFragment());
         pagerAdapter.addFragment(new TimetableFragment());
-        pagerAdapter.addFragment(new SettingsFragment());
+        pagerAdapter.addFragment(new DashboardFragment());
 
         viewPager.setPagingEnabled(false);
         viewPager.setAdapter(pagerAdapter);
         viewPager.setOffscreenPageLimit(4);
-        viewPager.setCurrentItem(tabPosition, false);
+        viewPager.setCurrentItem(initTabPosition, false);
     }
 
     @Override

app/src/main/java/io/github/wulkanowy/ui/main/MainContract.java

@@ -14,17 +14,11 @@ public interface MainContract {
         void showActionBar();
 
         void hideActionBar();
-
-        void initiationViewPager(int tabPosition);
-
-        void initiationBottomNav(int tabPosition);
     }
 
     @PerActivity
     interface Presenter extends BaseContract.Presenter<View> {
 
-        void onStart(View view, int tabPositionIntent);
-
         void onTabSelected(int position, boolean wasSelected);
 
         void onFragmentIsReady();

app/src/main/java/io/github/wulkanowy/ui/main/MainPresenter.java

@@ -17,21 +17,10 @@ public class MainPresenter extends BasePresenter<MainContract.View>
     }
 
     @Override
-    public void onStart(MainContract.View view, int tabPositionIntent) {
+    public void onStart(MainContract.View view) {
         super.onStart(view);
         getView().showProgressBar(true);
         getView().hideActionBar();
-
-        int tabPosition;
-
-        if (tabPositionIntent != -1) {
-            tabPosition = tabPositionIntent;
-        } else {
-            tabPosition = getRepository().getStartupTab();
-        }
-
-        getView().initiationBottomNav(tabPosition);
-        getView().initiationViewPager(tabPosition);
     }
 
     @Override
@@ -43,11 +32,11 @@ public class MainPresenter extends BasePresenter<MainContract.View>
 
     @Override
     public void onFragmentIsReady() {
-        if (fragmentCount < 4) {
+        if (fragmentCount < 5) {
             fragmentCount++;
         }
 
-        if (fragmentCount == 4) {
+        if (fragmentCount == 5) {
             getView().showActionBar();
             getView().showProgressBar(false);
         }

app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceContract.java

@@ -17,16 +17,20 @@ public interface AttendanceContract {
 
         void setAdapterWithTabLayout();
 
+        void setChildFragmentSelected(int position, boolean selected);
+
         boolean isMenuVisible();
     }
 
     @PerActivity
     interface Presenter extends BaseContract.Presenter<View> {
 
-        void onFragmentActivated(boolean isVisible);
+        void onFragmentVisible(boolean isVisible);
+
+        void onTabSelected(int position);
+
+        void onTabUnselected(int position);
 
         void onStart(View view, OnFragmentIsReadyListener listener);
-
-        void setRestoredPosition(int position);
     }
 }

app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceFragment.java

@@ -20,9 +20,7 @@ import io.github.wulkanowy.ui.base.BaseFragment;
 import io.github.wulkanowy.ui.main.OnFragmentIsReadyListener;
 import io.github.wulkanowy.ui.main.TabsData;
 
-public class AttendanceFragment extends BaseFragment implements AttendanceContract.View {
+public class AttendanceFragment extends BaseFragment implements AttendanceContract.View, TabLayout.OnTabSelectedListener {
-
-    private static final String CURRENT_ITEM_KEY = "CurrentItem";
 
     @BindView(R.id.attendance_fragment_viewpager)
     ViewPager viewPager;
@@ -47,10 +45,6 @@ public class AttendanceFragment extends BaseFragment implements AttendanceContra
             component.inject(this);
             setButterKnife(ButterKnife.bind(this, view));
             presenter.onStart(this, (OnFragmentIsReadyListener) getActivity());
-
-            if (savedInstanceState != null) {
-                presenter.setRestoredPosition(savedInstanceState.getInt(CURRENT_ITEM_KEY));
-            }
         }
 
         return view;
@@ -60,10 +54,25 @@ public class AttendanceFragment extends BaseFragment implements AttendanceContra
     public void setMenuVisibility(boolean menuVisible) {
         super.setMenuVisibility(menuVisible);
         if (presenter != null) {
-            presenter.onFragmentActivated(menuVisible);
+            presenter.onFragmentVisible(menuVisible);
         }
     }
 
+    @Override
+    public void onTabSelected(TabLayout.Tab tab) {
+        presenter.onTabSelected(tab.getPosition());
+    }
+
+    @Override
+    public void onTabUnselected(TabLayout.Tab tab) {
+        presenter.onTabUnselected(tab.getPosition());
+    }
+
+    @Override
+    public void onTabReselected(TabLayout.Tab tab) {
+        //do nothing
+    }
+
     @Override
     public void setTabDataToAdapter(TabsData tabsData) {
         pagerAdapter.setTabsData(tabsData);
@@ -72,7 +81,14 @@ public class AttendanceFragment extends BaseFragment implements AttendanceContra
     @Override
     public void setAdapterWithTabLayout() {
         viewPager.setAdapter(pagerAdapter);
+
         tabLayout.setupWithViewPager(viewPager);
+        tabLayout.addOnTabSelectedListener(this);
+    }
+
+    @Override
+    public void setChildFragmentSelected(int position, boolean selected) {
+        ((AttendanceTabFragment) pagerAdapter.getItem(position)).setSelected(selected);
     }
 
     @Override
@@ -93,12 +109,6 @@ public class AttendanceFragment extends BaseFragment implements AttendanceContra
         }
     }
 
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        outState.putInt(CURRENT_ITEM_KEY, viewPager.getCurrentItem());
-        super.onSaveInstanceState(outState);
-    }
-
     @Override
     public void onDestroyView() {
         presenter.onDestroy();

app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceHeaderItem.java

@@ -19,7 +19,6 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import eu.davidea.flexibleadapter.FlexibleAdapter;
 import eu.davidea.flexibleadapter.items.AbstractExpandableHeaderItem;
-import eu.davidea.flexibleadapter.items.IFlexible;
 import eu.davidea.viewholders.ExpandableViewHolder;
 import io.github.wulkanowy.R;
 import io.github.wulkanowy.data.db.dao.entities.Day;
@@ -59,13 +58,12 @@ public class AttendanceHeaderItem
     }
 
     @Override
-    public HeaderViewHolder createViewHolder(View view, FlexibleAdapter<IFlexible> adapter) {
+    public HeaderViewHolder createViewHolder(View view, FlexibleAdapter adapter) {
         return new HeaderViewHolder(view, adapter);
     }
 
     @Override
-    public void bindViewHolder(FlexibleAdapter<IFlexible> adapter, HeaderViewHolder holder,
+    public void bindViewHolder(FlexibleAdapter adapter, HeaderViewHolder holder, int position, List payloads) {
-                               int position, List<Object> payloads) {
         holder.onBind(day, getSubItems());
     }
 

app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendancePresenter.java

@@ -24,7 +24,7 @@ public class AttendancePresenter extends BasePresenter<AttendanceContract.View>
 
     private OnFragmentIsReadyListener listener;
 
-    private int positionToScroll = 0;
+    private int positionToScroll;
 
     private boolean isFirstSight = false;
 
@@ -45,10 +45,7 @@ public class AttendancePresenter extends BasePresenter<AttendanceContract.View>
         if (dates.isEmpty()) {
             dates = TimeUtils.getMondaysFromCurrentSchoolYear();
         }
-
+        positionToScroll = dates.indexOf(TimeUtils.getDateOfCurrentMonday(true));
-        if (positionToScroll == 0) {
-            positionToScroll = dates.indexOf(TimeUtils.getDateOfCurrentMonday(true));
-        }
 
         if (!isFirstSight) {
             isFirstSight = true;
@@ -60,12 +57,22 @@ public class AttendancePresenter extends BasePresenter<AttendanceContract.View>
     }
 
     @Override
-    public void onFragmentActivated(boolean isVisible) {
+    public void onFragmentVisible(boolean isVisible) {
         if (isVisible) {
             getView().setActivityTitle();
         }
     }
 
+    @Override
+    public void onTabSelected(int position) {
+        getView().setChildFragmentSelected(position, true);
+    }
+
+    @Override
+    public void onTabUnselected(int position) {
+        getView().setChildFragmentSelected(position, false);
+    }
+
     @Override
     public void onDoInBackgroundLoading() throws Exception {
         for (String date : dates) {
@@ -90,11 +97,6 @@ public class AttendancePresenter extends BasePresenter<AttendanceContract.View>
         }
     }
 
-    @Override
-    public void setRestoredPosition(int position) {
-        this.positionToScroll = position;
-    }
-
     @Override
     public void onDestroy() {
         isFirstSight = false;

app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceSubItem.java

@@ -16,7 +16,6 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import eu.davidea.flexibleadapter.FlexibleAdapter;
 import eu.davidea.flexibleadapter.items.AbstractSectionableItem;
-import eu.davidea.flexibleadapter.items.IFlexible;
 import eu.davidea.viewholders.FlexibleViewHolder;
 import io.github.wulkanowy.R;
 import io.github.wulkanowy.data.db.dao.entities.AttendanceLesson;
@@ -61,13 +60,12 @@ class AttendanceSubItem
     }
 
     @Override
-    public SubItemViewHolder createViewHolder(View view, FlexibleAdapter<IFlexible> adapter) {
+    public AttendanceSubItem.SubItemViewHolder createViewHolder(View view, FlexibleAdapter adapter) {
-        return new SubItemViewHolder(view, adapter);
+        return new AttendanceSubItem.SubItemViewHolder(view, adapter);
     }
 
     @Override
-    public void bindViewHolder(FlexibleAdapter<IFlexible> adapter, SubItemViewHolder holder,
+    public void bindViewHolder(FlexibleAdapter adapter, AttendanceSubItem.SubItemViewHolder holder, int position, List payloads) {
-                               int position, List<Object> payloads) {
         holder.onBind(lesson);
     }
 

app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceTabContract.java

@@ -21,10 +21,12 @@ public interface AttendanceTabContract {
 
     interface Presenter extends BaseContract.Presenter<AttendanceTabContract.View> {
 
-        void onFragmentActivated(boolean isSelected);
+        void onFragmentSelected(boolean isSelected);
 
         void setArgumentDate(String date);
 
+        void onStart(AttendanceTabContract.View view, boolean isPrimary);
+
         void onRefresh();
     }
 }

app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceTabFragment.java

@@ -27,6 +27,12 @@ public class AttendanceTabFragment extends BaseFragment implements AttendanceTab
 
     private static final String ARGUMENT_KEY = "date";
 
+    private static final String SAVED_KEY = "isSelected";
+
+    private boolean isPrimary = false;
+
+    private boolean isSelected = false;
+
     @BindView(R.id.attendance_tab_fragment_recycler)
     RecyclerView recyclerView;
 
@@ -45,8 +51,6 @@ public class AttendanceTabFragment extends BaseFragment implements AttendanceTab
     @Inject
     FlexibleAdapter<AttendanceHeaderItem> adapter;
 
-    private boolean isFragmentVisible = false;
-
     public static AttendanceTabFragment newInstance(String date) {
         AttendanceTabFragment fragmentTab = new AttendanceTabFragment();
 
@@ -57,6 +61,15 @@ public class AttendanceTabFragment extends BaseFragment implements AttendanceTab
         return fragmentTab;
     }
 
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        if (savedInstanceState != null) {
+            isSelected = savedInstanceState.getBoolean(SAVED_KEY, isSelected);
+        }
+    }
+
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
@@ -71,8 +84,7 @@ public class AttendanceTabFragment extends BaseFragment implements AttendanceTab
                 presenter.setArgumentDate(getArguments().getString(ARGUMENT_KEY));
             }
 
-            presenter.onStart(this);
+            presenter.onStart(this, isPrimary);
-            presenter.onFragmentActivated(isFragmentVisible);
         }
         return view;
     }
@@ -99,9 +111,10 @@ public class AttendanceTabFragment extends BaseFragment implements AttendanceTab
     @Override
     public void setMenuVisibility(boolean menuVisible) {
         super.setMenuVisibility(menuVisible);
-        isFragmentVisible = menuVisible;
+        if (presenter != null && getView() != null) {
-        if (presenter != null) {
+            presenter.onFragmentSelected(isSelected);
-            presenter.onFragmentActivated(menuVisible);
+        } else if (isSelected) {
+            isPrimary = true;
         }
     }
 
@@ -130,6 +143,10 @@ public class AttendanceTabFragment extends BaseFragment implements AttendanceTab
         noItemView.setVisibility(show ? View.VISIBLE : View.INVISIBLE);
     }
 
+    public void setSelected(boolean selected) {
+        isSelected = selected;
+    }
+
     @Override
     public void onError(String message) {
         if (getActivity() != null) {
@@ -138,8 +155,15 @@ public class AttendanceTabFragment extends BaseFragment implements AttendanceTab
         }
     }
 
+    @Override
+    public void onSaveInstanceState(@NonNull Bundle outState) {
+        outState.putBoolean(SAVED_KEY, isSelected);
+        super.onSaveInstanceState(outState);
+    }
+
     @Override
     public void onDestroyView() {
+        isPrimary = false;
         presenter.onDestroy();
         super.onDestroyView();
     }

app/src/main/java/io/github/wulkanowy/ui/main/attendance/AttendanceTabPresenter.java

@@ -33,22 +33,21 @@ public class AttendanceTabPresenter extends BasePresenter<AttendanceTabContract.
     }
 
     @Override
-    public void onStart(AttendanceTabContract.View view) {
+    public void onStart(AttendanceTabContract.View view, boolean isPrimary) {
         super.onStart(view);
         getView().showProgressBar(true);
         getView().showNoItem(false);
+        onFragmentSelected(isPrimary);
     }
 
     @Override
-    public void onFragmentActivated(boolean isSelected) {
+    public void onFragmentSelected(boolean isSelected) {
-        if (!isFirstSight && isSelected && isViewAttached()) {
+        if (!isFirstSight && isSelected) {
             isFirstSight = true;
 
             loadingTask = new AbstractTask();
             loadingTask.setOnFirstLoadingListener(this);
             loadingTask.execute();
-        } else if (!isSelected) {
-            cancelAsyncTasks();
         }
     }
 
@@ -158,7 +157,10 @@ public class AttendanceTabPresenter extends BasePresenter<AttendanceTabContract.
         getRepository().syncAttendance(date);
     }
 
-    private void cancelAsyncTasks() {
+    @Override
+    public void onDestroy() {
+        isFirstSight = false;
+
         if (refreshTask != null) {
             refreshTask.cancel(true);
             refreshTask = null;
@@ -167,12 +169,6 @@ public class AttendanceTabPresenter extends BasePresenter<AttendanceTabContract.
             loadingTask.cancel(true);
             loadingTask = null;
         }
-    }
-
-    @Override
-    public void onDestroy() {
-        cancelAsyncTasks();
-        isFirstSight = false;
         super.onDestroy();
     }
 }

app/src/main/java/io/github/wulkanowy/ui/main/grades/GradeHeaderItem.java

@@ -95,16 +95,6 @@ public class GradeHeaderItem
                     ? View.INVISIBLE : View.VISIBLE);
         }
 
-        @Override
-        public void onClick(View view) {
-            super.onClick(view);
-            if (subjectName.getLineCount() == 1) {
-                subjectName.setMaxLines(3);
-            } else {
-                subjectName.setMaxLines(1);
-            }
-        }
-
         private boolean isSubItemsReadAndSaveAlertView(List<GradesSubItem> subItems) {
             boolean isRead = true;
 

app/src/main/java/io/github/wulkanowy/ui/main/settings/SettingsFragment.java

@@ -1,70 +0,0 @@
-package io.github.wulkanowy.ui.main.settings;
-
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.support.v7.preference.PreferenceFragmentCompat;
-
-import io.github.wulkanowy.R;
-import io.github.wulkanowy.services.SyncJob;
-
-public class SettingsFragment extends PreferenceFragmentCompat
-        implements SharedPreferences.OnSharedPreferenceChangeListener {
-
-    public static final String SHARED_KEY_START_TAB = "startup_tab";
-
-    public static final String SHARED_KEY_SERVICES_ENABLE = "services_enable";
-
-    public static final String SHARED_KEY_NOTIFY_ENABLE = "notify_enable";
-
-    public static final String SHARED_KEY_SERVICES_INTERVAL = "services_interval";
-
-    public static final String SHARED_KEY_SERVICES_MOBILE_DISABLED = "services_disable_mobile";
-
-    @Override
-    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-        addPreferencesFromResource(R.xml.preferences);
-    }
-
-    @Override
-    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-        if (key.equals(SHARED_KEY_SERVICES_ENABLE) || key.equals(SHARED_KEY_SERVICES_INTERVAL)
-                || key.equals(SHARED_KEY_SERVICES_MOBILE_DISABLED)) {
-            launchServices(sharedPreferences.getBoolean(SHARED_KEY_SERVICES_ENABLE, true),
-                    sharedPreferences);
-        }
-    }
-
-    private void launchServices(boolean start, SharedPreferences sharedPref) {
-        if (start) {
-            int newInterval = Integer.parseInt(sharedPref.getString(SHARED_KEY_SERVICES_INTERVAL, "60"));
-            boolean useOnlyWifi = sharedPref.getBoolean(SHARED_KEY_SERVICES_MOBILE_DISABLED, false);
-
-            SyncJob.stop(getContext());
-            SyncJob.start(getContext(), newInterval, useOnlyWifi);
-        } else {
-            SyncJob.stop(getContext());
-        }
-    }
-
-    @Override
-    public void setMenuVisibility(boolean menuVisible) {
-        super.setMenuVisibility(menuVisible);
-        if (menuVisible) {
-            getActivity().setTitle(R.string.settings_text);
-        }
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        getPreferenceScreen().getSharedPreferences()
-                .registerOnSharedPreferenceChangeListener(this);
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        getPreferenceScreen().getSharedPreferences()
-                .unregisterOnSharedPreferenceChangeListener(this);
-    }
-}

app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableContract.java

@@ -17,16 +17,20 @@ public interface TimetableContract {
 
         void setAdapterWithTabLayout();
 
+        void setChildFragmentSelected(int position, boolean selected);
+
         boolean isMenuVisible();
     }
 
     @PerActivity
     interface Presenter extends BaseContract.Presenter<View> {
 
-        void onFragmentActivated(boolean isVisible);
+        void onFragmentVisible(boolean isVisible);
+
+        void onTabSelected(int position);
+
+        void onTabUnselected(int position);
 
         void onStart(View view, OnFragmentIsReadyListener listener);
-
-        void setRestoredPosition(int position);
     }
 }

app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableFragment.java

@@ -20,9 +20,7 @@ import io.github.wulkanowy.ui.base.BaseFragment;
 import io.github.wulkanowy.ui.main.OnFragmentIsReadyListener;
 import io.github.wulkanowy.ui.main.TabsData;
 
-public class TimetableFragment extends BaseFragment implements TimetableContract.View {
+public class TimetableFragment extends BaseFragment implements TimetableContract.View, TabLayout.OnTabSelectedListener {
-
-    private static final String CURRENT_ITEM_KEY = "CurrentItem";
 
     @BindView(R.id.timetable_fragment_viewpager)
     ViewPager viewPager;
@@ -46,10 +44,6 @@ public class TimetableFragment extends BaseFragment implements TimetableContract
             component.inject(this);
             setButterKnife(ButterKnife.bind(this, view));
             presenter.onStart(this, (OnFragmentIsReadyListener) getActivity());
-
-            if (savedInstanceState != null) {
-                presenter.setRestoredPosition(savedInstanceState.getInt(CURRENT_ITEM_KEY));
-            }
         }
         return view;
     }
@@ -58,10 +52,25 @@ public class TimetableFragment extends BaseFragment implements TimetableContract
     public void setMenuVisibility(boolean menuVisible) {
         super.setMenuVisibility(menuVisible);
         if (presenter != null) {
-            presenter.onFragmentActivated(menuVisible);
+            presenter.onFragmentVisible(menuVisible);
         }
     }
 
+    @Override
+    public void onTabSelected(TabLayout.Tab tab) {
+        presenter.onTabSelected(tab.getPosition());
+    }
+
+    @Override
+    public void onTabUnselected(TabLayout.Tab tab) {
+        presenter.onTabUnselected(tab.getPosition());
+    }
+
+    @Override
+    public void onTabReselected(TabLayout.Tab tab) {
+        //do nothing
+    }
+
     @Override
     public void setTabDataToAdapter(TabsData tabsData) {
         pagerAdapter.setTabsData(tabsData);
@@ -70,7 +79,14 @@ public class TimetableFragment extends BaseFragment implements TimetableContract
     @Override
     public void setAdapterWithTabLayout() {
         viewPager.setAdapter(pagerAdapter);
+
         tabLayout.setupWithViewPager(viewPager);
+        tabLayout.addOnTabSelectedListener(this);
+    }
+
+    @Override
+    public void setChildFragmentSelected(int position, boolean selected) {
+        ((TimetableTabFragment) pagerAdapter.getItem(position)).setSelected(selected);
     }
 
     @Override
@@ -80,7 +96,7 @@ public class TimetableFragment extends BaseFragment implements TimetableContract
 
     @Override
     public void setActivityTitle() {
-        setTitle(getString(R.string.timetable_text));
+        setTitle(getString(R.string.lessonplan_text));
     }
 
     @Override
@@ -91,12 +107,6 @@ public class TimetableFragment extends BaseFragment implements TimetableContract
         }
     }
 
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        outState.putInt(CURRENT_ITEM_KEY, viewPager.getCurrentItem());
-        super.onSaveInstanceState(outState);
-    }
-
     @Override
     public void onDestroyView() {
         presenter.onDestroy();

app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableHeaderItem.java

@@ -19,7 +19,6 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import eu.davidea.flexibleadapter.FlexibleAdapter;
 import eu.davidea.flexibleadapter.items.AbstractExpandableHeaderItem;
-import eu.davidea.flexibleadapter.items.IFlexible;
 import eu.davidea.viewholders.ExpandableViewHolder;
 import io.github.wulkanowy.R;
 import io.github.wulkanowy.data.db.dao.entities.Day;
@@ -59,13 +58,12 @@ public class TimetableHeaderItem
     }
 
     @Override
-    public HeaderViewHolder createViewHolder(View view, FlexibleAdapter<IFlexible> adapter) {
+    public HeaderViewHolder createViewHolder(View view, FlexibleAdapter adapter) {
         return new HeaderViewHolder(view, adapter);
     }
 
     @Override
-    public void bindViewHolder(FlexibleAdapter<IFlexible> adapter, HeaderViewHolder holder,
+    public void bindViewHolder(FlexibleAdapter adapter, HeaderViewHolder holder, int position, List payloads) {
-                               int position, List<Object> payloads) {
         holder.onBind(day, getSubItems());
     }
 

app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetablePresenter.java

@@ -24,7 +24,7 @@ public class TimetablePresenter extends BasePresenter<TimetableContract.View>
 
     private OnFragmentIsReadyListener listener;
 
-    private int positionToScroll = 0;
+    private int positionToScroll;
 
     private boolean isFirstSight = false;
 
@@ -45,10 +45,7 @@ public class TimetablePresenter extends BasePresenter<TimetableContract.View>
         if (dates.isEmpty()) {
             dates = TimeUtils.getMondaysFromCurrentSchoolYear();
         }
-
+        positionToScroll = dates.indexOf(TimeUtils.getDateOfCurrentMonday(true));
-        if (positionToScroll == 0) {
-            positionToScroll = dates.indexOf(TimeUtils.getDateOfCurrentMonday(true));
-        }
 
         if (!isFirstSight) {
             isFirstSight = true;
@@ -60,12 +57,22 @@ public class TimetablePresenter extends BasePresenter<TimetableContract.View>
     }
 
     @Override
-    public void onFragmentActivated(boolean isVisible) {
+    public void onFragmentVisible(boolean isVisible) {
         if (isVisible) {
             getView().setActivityTitle();
         }
     }
 
+    @Override
+    public void onTabSelected(int position) {
+        getView().setChildFragmentSelected(position, true);
+    }
+
+    @Override
+    public void onTabUnselected(int position) {
+        getView().setChildFragmentSelected(position, false);
+    }
+
     @Override
     public void onDoInBackgroundLoading() throws Exception {
         for (String date : dates) {
@@ -77,6 +84,7 @@ public class TimetablePresenter extends BasePresenter<TimetableContract.View>
     @Override
     public void onCanceledLoadingAsync() {
         //do nothing
+
     }
 
     @Override
@@ -89,11 +97,6 @@ public class TimetablePresenter extends BasePresenter<TimetableContract.View>
         }
     }
 
-    @Override
-    public void setRestoredPosition(int position) {
-        this.positionToScroll = position;
-    }
-
     @Override
     public void onDestroy() {
         isFirstSight = false;

app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableSubItem.java

@@ -17,7 +17,6 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import eu.davidea.flexibleadapter.FlexibleAdapter;
 import eu.davidea.flexibleadapter.items.AbstractSectionableItem;
-import eu.davidea.flexibleadapter.items.IFlexible;
 import eu.davidea.viewholders.FlexibleViewHolder;
 import io.github.wulkanowy.R;
 import io.github.wulkanowy.data.db.dao.entities.TimetableLesson;
@@ -28,7 +27,7 @@ public class TimetableSubItem
 
     private TimetableLesson lesson;
 
-    TimetableSubItem(TimetableHeaderItem header, TimetableLesson lesson) {
+    public TimetableSubItem(TimetableHeaderItem header, TimetableLesson lesson) {
         super(header);
         this.lesson = lesson;
     }
@@ -63,13 +62,12 @@ public class TimetableSubItem
     }
 
     @Override
-    public SubItemViewHolder createViewHolder(View view, FlexibleAdapter<IFlexible> adapter) {
+    public SubItemViewHolder createViewHolder(View view, FlexibleAdapter adapter) {
         return new SubItemViewHolder(view, adapter);
     }
 
     @Override
-    public void bindViewHolder(FlexibleAdapter<IFlexible> adapter, SubItemViewHolder holder,
+    public void bindViewHolder(FlexibleAdapter adapter, SubItemViewHolder holder, int position, List payloads) {
-                               int position, List<Object> payloads) {
         holder.onBind(lesson);
     }
 

app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableTabContract.java

@@ -23,10 +23,12 @@ public interface TimetableTabContract {
 
     interface Presenter extends BaseContract.Presenter<View> {
 
-        void onFragmentActivated(boolean isSelected);
+        void onFragmentSelected(boolean isSelected);
 
         void setArgumentDate(String date);
 
+        void onStart(View view, boolean isPrimary);
+
         void onRefresh();
     }
 }

app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableTabFragment.java

@@ -28,6 +28,12 @@ public class TimetableTabFragment extends BaseFragment implements TimetableTabCo
 
     private static final String ARGUMENT_KEY = "date";
 
+    private static final String SAVED_KEY = "isSelected";
+
+    private boolean isPrimary = false;
+
+    private boolean isSelected = false;
+
     @BindView(R.id.timetable_tab_fragment_recycler)
     RecyclerView recyclerView;
 
@@ -49,8 +55,6 @@ public class TimetableTabFragment extends BaseFragment implements TimetableTabCo
     @Inject
     FlexibleAdapter<TimetableHeaderItem> adapter;
 
-    private boolean isFragmentVisible = false;
-
     public static TimetableTabFragment newInstance(String date) {
         TimetableTabFragment fragmentTab = new TimetableTabFragment();
 
@@ -61,6 +65,14 @@ public class TimetableTabFragment extends BaseFragment implements TimetableTabCo
         return fragmentTab;
     }
 
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (savedInstanceState != null) {
+            isSelected = savedInstanceState.getBoolean(SAVED_KEY, isSelected);
+        }
+    }
+
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
@@ -74,8 +86,8 @@ public class TimetableTabFragment extends BaseFragment implements TimetableTabCo
             if (getArguments() != null) {
                 presenter.setArgumentDate(getArguments().getString(ARGUMENT_KEY));
             }
-            presenter.onStart(this);
+
-            presenter.onFragmentActivated(isFragmentVisible);
+            presenter.onStart(this, isPrimary);
         }
         return view;
     }
@@ -102,9 +114,10 @@ public class TimetableTabFragment extends BaseFragment implements TimetableTabCo
     @Override
     public void setMenuVisibility(boolean menuVisible) {
         super.setMenuVisibility(menuVisible);
-        isFragmentVisible = menuVisible;
+        if (presenter != null && getView() != null) {
-        if (presenter != null) {
+            presenter.onFragmentSelected(isSelected);
-            presenter.onFragmentActivated(menuVisible);
+        } else if (isSelected) {
+            isPrimary = true;
         }
     }
 
@@ -138,6 +151,10 @@ public class TimetableTabFragment extends BaseFragment implements TimetableTabCo
         noItemView.setVisibility(show ? View.VISIBLE : View.INVISIBLE);
     }
 
+    public void setSelected(boolean selected) {
+        isSelected = selected;
+    }
+
     @Override
     public void onError(String message) {
         if (getActivity() != null) {
@@ -146,8 +163,15 @@ public class TimetableTabFragment extends BaseFragment implements TimetableTabCo
         }
     }
 
+    @Override
+    public void onSaveInstanceState(@NonNull Bundle outState) {
+        outState.putBoolean(SAVED_KEY, isSelected);
+        super.onSaveInstanceState(outState);
+    }
+
     @Override
     public void onDestroyView() {
+        isPrimary = false;
         presenter.onDestroy();
         super.onDestroyView();
     }

app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableTabPresenter.java

@@ -36,22 +36,21 @@ public class TimetableTabPresenter extends BasePresenter<TimetableTabContract.Vi
     }
 
     @Override
-    public void onStart(TimetableTabContract.View view) {
+    public void onStart(TimetableTabContract.View view, boolean isPrimary) {
         super.onStart(view);
         getView().showProgressBar(true);
         getView().showNoItem(false);
+        onFragmentSelected(isPrimary);
     }
 
     @Override
-    public void onFragmentActivated(boolean isSelected) {
+    public void onFragmentSelected(boolean isSelected) {
-        if (!isFirstSight && isSelected && isViewAttached()) {
+        if (!isFirstSight && isSelected) {
             isFirstSight = true;
 
             loadingTask = new AbstractTask();
             loadingTask.setOnFirstLoadingListener(this);
             loadingTask.execute();
-        } else if (!isSelected) {
-            cancelAsyncTasks();
         }
     }
 
@@ -162,7 +161,10 @@ public class TimetableTabPresenter extends BasePresenter<TimetableTabContract.Vi
         getRepository().syncTimetable(date);
     }
 
-    private void cancelAsyncTasks() {
+    @Override
+    public void onDestroy() {
+        isFirstSight = false;
+
         if (refreshTask != null) {
             refreshTask.cancel(true);
             refreshTask = null;
@@ -171,12 +173,6 @@ public class TimetableTabPresenter extends BasePresenter<TimetableTabContract.Vi
             loadingTask.cancel(true);
             loadingTask = null;
         }
-    }
-
-    @Override
-    public void onDestroy() {
-        isFirstSight = false;
-        cancelAsyncTasks();
         super.onDestroy();
     }
 }

app/src/main/java/io/github/wulkanowy/ui/splash/SplashActivity.java

@@ -5,7 +5,6 @@ import android.os.Bundle;
 import javax.inject.Inject;
 
 import butterknife.ButterKnife;
-import io.github.wulkanowy.services.NotificationService;
 import io.github.wulkanowy.services.SyncJob;
 import io.github.wulkanowy.ui.base.BaseActivity;
 import io.github.wulkanowy.ui.login.LoginActivity;
@@ -45,12 +44,7 @@ public class SplashActivity extends BaseActivity implements SplashContract.View
     }
 
     @Override
-    public void startSyncService(int interval, boolean useOnlyWifi) {
+    public void startSyncService() {
-        SyncJob.start(getApplicationContext(), interval, useOnlyWifi);
+        SyncJob.start(getApplicationContext());
-    }
-
-    @Override
-    public void cancelNotifications() {
-        new NotificationService(getApplicationContext()).cancelAll();
     }
 }

app/src/main/java/io/github/wulkanowy/ui/splash/SplashContract.java

@@ -12,9 +12,7 @@ public interface SplashContract {
 
         void openMainActivity();
 
-        void startSyncService(int interval, boolean useOnlyWifi);
+        void startSyncService();
-
-        void cancelNotifications();
     }
 
     @PerActivity

app/src/main/java/io/github/wulkanowy/ui/splash/SplashPresenter.java

@@ -18,12 +18,7 @@ public class SplashPresenter extends BasePresenter<SplashContract.View>
     @Override
     public void onStart(@NonNull SplashContract.View activity) {
         super.onStart(activity);
-        getView().cancelNotifications();
+        getView().startSyncService();
-
-        if (getRepository().isServicesEnable()) {
-            getView().startSyncService(getRepository().getServicesInterval(),
-                    getRepository().isMobileDisable());
-        }
 
         if (getRepository().getCurrentUserId() == 0) {
             getView().openLoginActivity();

app/src/main/java/io/github/wulkanowy/utils/TimeUtils.java

@@ -1,8 +1,8 @@
 package io.github.wulkanowy.utils;
 
-import org.threeten.bp.DayOfWeek;
+import org.joda.time.DateTime;
-import org.threeten.bp.LocalDate;
+import org.joda.time.DateTimeConstants;
-import org.threeten.bp.format.DateTimeFormatter;
+import org.joda.time.LocalDate;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -13,14 +13,14 @@ import java.util.List;
 import java.util.Locale;
 import java.util.TimeZone;
 
+import static io.github.wulkanowy.utils.AppConstant.DATE_PATTERN;
+
 public final class TimeUtils {
 
     private static final long TICKS_AT_EPOCH = 621355968000000000L;
 
     private static final long TICKS_PER_MILLISECOND = 10000;
 
-    private static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern(AppConstant.DATE_PATTERN);
-
     private TimeUtils() {
         throw new IllegalStateException("Utility class");
     }
@@ -33,7 +33,7 @@ public final class TimeUtils {
     }
 
     public static long getNetTicks(String dateString) throws ParseException {
-        return getNetTicks(dateString, AppConstant.DATE_PATTERN);
+        return getNetTicks(dateString, DATE_PATTERN);
     }
 
     public static long getNetTicks(String dateString, String dateFormat) throws ParseException {
@@ -49,12 +49,12 @@ public final class TimeUtils {
     }
 
     public static List<String> getMondaysFromCurrentSchoolYear() {
-        LocalDate startDate = LocalDate.of(getCurrentSchoolYear(), 9, 1);
+        LocalDate startDate = new LocalDate(getCurrentSchoolYear(), 9, 1);
-        LocalDate endDate = LocalDate.of(getCurrentSchoolYear() + 1, 8, 31);
+        LocalDate endDate = new LocalDate(getCurrentSchoolYear() + 1, 8, 31);
 
         List<String> dateList = new ArrayList<>();
 
-        LocalDate thisMonday = startDate.with(DayOfWeek.MONDAY);
+        LocalDate thisMonday = startDate.withDayOfWeek(DateTimeConstants.MONDAY);
 
         if (startDate.isAfter(thisMonday)) {
             startDate = thisMonday.plusWeeks(1);
@@ -63,27 +63,27 @@ public final class TimeUtils {
         }
 
         while (startDate.isBefore(endDate)) {
-            dateList.add(startDate.format(formatter));
+            dateList.add(startDate.toString(DATE_PATTERN));
             startDate = startDate.plusWeeks(1);
         }
         return dateList;
     }
 
     public static int getCurrentSchoolYear() {
-        LocalDate localDate = LocalDate.now();
+        DateTime dateTime = new DateTime();
-        return localDate.getMonthValue() <= 8 ? localDate.getYear() - 1 : localDate.getYear();
+        return dateTime.getMonthOfYear() <= 8 ? dateTime.getYear() - 1 : dateTime.getYear();
     }
 
     public static String getDateOfCurrentMonday(boolean normalize) {
-        LocalDate currentDate = LocalDate.now();
+        DateTime currentDate = new DateTime();
 
-        if (currentDate.getDayOfWeek() == DayOfWeek.SATURDAY && normalize) {
+        if (currentDate.getDayOfWeek() == DateTimeConstants.SATURDAY && normalize) {
             currentDate = currentDate.plusDays(2);
-        } else if (currentDate.getDayOfWeek() == DayOfWeek.SUNDAY && normalize) {
+        } else if (currentDate.getDayOfWeek() == DateTimeConstants.SUNDAY && normalize) {
             currentDate = currentDate.plusDays(1);
         } else {
-            currentDate = currentDate.with(DayOfWeek.MONDAY);
+            currentDate = currentDate.withDayOfWeek(DateTimeConstants.MONDAY);
         }
-        return currentDate.format(formatter);
+        return currentDate.toString(DATE_PATTERN);
     }
 }

app/src/main/res/values-pl/prefernces_array.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string-array name="services_interval_entries">
-        <item>10 minut</item>
-        <item>30 minut</item>
-        <item>1 godzinę</item>
-        <item>2 godziny</item>
-        <item>6 godzin</item>
-        <item>12 godzin</item>
-        <item>24 godzin</item>
-    </string-array>
-</resources>

app/src/main/res/values-pl/strings.xml

@@ -33,12 +33,13 @@
     <string name="dashboard_text">Dashboard</string>
     <string name="grades_text">Oceny</string>
     <string name="attendance_text">Frekwencja</string>
-    <string name="timetable_text">Plan lekcji</string>
+    <string name="lessonplan_text">Plan lekcji</string>
     <string name="settings_text">Ustawienia</string>
     <string name="activity_under_construction">Ta część aplikacji jest w budowie</string>
     <string name="fragment_no_grades">Brak ocen</string>
 
     <string name="noInternet_text">Brak połączenia z internetem</string>
+    <string name="error_host_offline">Przerwa techniczna. Spróbuj ponownie później</string>
     <string name="encrypt_failed_text">Szyfrowanie nie powiodło się. Automatyczne logowanie zostało wyłączone</string>
     <string name="version_text">Wersja %1$s</string>
     <string name="refresh_error_text">"Podczas odświeżania zawartości wystąpił błąd. "</string>
@@ -113,15 +114,4 @@
         <item quantity="few">%1$d nieobecności</item>
         <item quantity="many">%1$d nieobecności</item>
     </plurals>
-
-    <string name="pref_view">Widok</string>
-    <string name="pref_tab_list">Domyślny widok</string>
-    <string name="pref_notify">Powiadomienia</string>
-    <string name="pref_notify_switch">Pokazuj powiadomienia</string>
-    <string name="pref_services">Usługi</string>
-    <string name="pref_services_switch">Włącz odświeżanie danych w tle</string>
-    <string name="pref_services_interval">Interwał między odświeżaniem danych</string>
-    <string name="pref_services_mobile_data">Synchronizacja tylko przez WiFi</string>
-
-    <string name="notify_grade_channel">Nowe oceny</string>
 </resources>

app/src/main/res/values/prefernces_array.xml

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string-array name="startup_tab_entries" translatable="false">
-        <item>@string/grades_text</item>
-        <item>@string/attendance_text</item>
-        <item>@string/dashboard_text</item>
-        <item>@string/timetable_text</item>
-    </string-array>
-    <string-array name="startup_tab_value" translatable="false">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-    </string-array>
-    <string-array name="services_interval_entries">
-        <item>10 minutes</item>
-        <item>30 minutes</item>
-        <item>1 hour</item>
-        <item>2 hours</item>
-        <item>6 hours</item>
-        <item>12 hours</item>
-        <item>24 hours</item>
-    </string-array>
-    <string-array name="services_interval_value" translatable="false">
-        <item>10</item>
-        <item>30</item>
-        <item>60</item>
-        <item>120</item>
-        <item>360</item>
-        <item>720</item>
-        <item>1440</item>
-    </string-array>
-</resources>

app/src/main/res/values/strings.xml

@@ -33,7 +33,7 @@
     <string name="dashboard_text">Dashboard</string>
     <string name="grades_text">Grades</string>
     <string name="attendance_text">Attendance</string>
-    <string name="timetable_text">Timetable</string>
+    <string name="lessonplan_text">Timetable</string>
     <string name="settings_text">Settings</string>
     <string name="activity_under_construction">This section of app is under construction.</string>
     <string name="fragment_no_grades">No grades</string>
@@ -73,6 +73,7 @@
     <string name="info_average_grades">Average: %1$.2f</string>
     <string name="info_no_average">No average</string>
     <string name="info_free_week">No lesson in this week</string>
+    <string name="error_host_offline">Technical break</string>
 
     <string name="timetable_subitem_room">Room %s</string>
 
@@ -109,15 +110,4 @@
         <item quantity="many">%1$d absences</item>
         <item quantity="other">%1$d absences</item>
     </plurals>
-
-    <string name="pref_tab_list">Default view after startup</string>
-    <string name="pref_view">View</string>
-    <string name="pref_notify">Notifications</string>
-    <string name="pref_notify_switch">Show the notifications</string>
-    <string name="pref_services">Services</string>
-    <string name="pref_services_switch">Enable background data refreshing</string>
-    <string name="pref_services_interval">Interval between data refreshing</string>
-    <string name="pref_services_mobile_data">Synchronization via WiFi only</string>
-
-    <string name="notify_grade_channel">New grades</string>
 </resources>

app/src/main/res/values/styles.xml

@@ -13,7 +13,6 @@
         <item name="titleTextColor">@android:color/primary_text_dark</item>
         <item name="subtitleTextColor">@android:color/primary_text_dark</item>
         <item name="android:colorBackground">@android:color/white</item>
-        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
     </style>
 
     <style name="WulkanowyTheme.SplashTheme" parent="WulkanowyTheme">

app/src/main/res/xml/preferences.xml

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <PreferenceCategory android:title="@string/pref_view">
-        <ListPreference
-            android:defaultValue="2"
-            android:entries="@array/startup_tab_entries"
-            android:entryValues="@array/startup_tab_value"
-            android:key="startup_tab"
-            android:summary="%s"
-            android:title="@string/pref_tab_list" />
-    </PreferenceCategory>
-    <PreferenceCategory android:title="@string/pref_services">
-        <SwitchPreference
-            android:defaultValue="true"
-            android:key="services_enable"
-            android:title="@string/pref_services_switch" />
-        <ListPreference
-            android:defaultValue="60"
-            android:dependency="services_enable"
-            android:entries="@array/services_interval_entries"
-            android:entryValues="@array/services_interval_value"
-            android:key="services_interval"
-            android:summary="%s"
-            android:title="@string/pref_services_interval" />
-        <SwitchPreference
-            android:defaultValue="false"
-            android:key="services_disable_mobile"
-            android:title="@string/pref_services_mobile_data"
-            android:dependency="services_enable" />
-    </PreferenceCategory>
-    <PreferenceCategory android:title="@string/pref_notify">
-        <SwitchPreference
-            android:defaultValue="true"
-            android:dependency="services_enable"
-            android:key="notify_enable"
-            android:title="@string/pref_notify_switch" />
-    </PreferenceCategory>
-</PreferenceScreen>

build.gradle

@@ -6,7 +6,10 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.0'
+        classpath 'com.android.tools.build:gradle:3.0.1'
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
         classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.6.1"
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
@@ -26,31 +29,6 @@ subprojects {
 
 ext {
     GROUP_ID = "io.github.wulkanowy"
-
-    supportVersion = "26.1.0"
-    firebaseJob = "0.8.5"
-    apacheLang = "3.7"
-    apacheCollections = "4.1"
-    flexibleAdapter = "5.0.2"
-    flexibleUi = "1.0.0-b2"
-    greenDao = "3.2.2"
-    greenDaoHelper = "v2.0.2"
-    butterknife = "8.8.1"
-    threeTenABP = "1.0.5"
-    dagger2 = "2.15"
-    ahbottom = "2.1.0"
-    jsoup = "1.10.3"
-    gson = "2.8.2"
-
-    debugDb = "1.0.3"
-    sqlcipher = "3.5.9"
-
-    junit = "4.12"
-    mockito = "2.16.0"
-    testRunner = "1.0.1"
-
-    crashlyticsSdk = "2.9.1"
-    crashlyticsAnswers = "1.4.1"
 }
 
 allprojects {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Mar 27 02:10:44 CEST 2018
+#Thu Oct 27 17:19:04 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

jacoco.gradle

@@ -1,11 +1,7 @@
 apply plugin: "jacoco"
 
 jacoco {
-    toolVersion "0.8.1"
+    toolVersion "0.7.4.201502262128"
-}
-
-tasks.withType(Test) {
-    jacoco.includeNoLocationClasses = true
 }
 
 // run ./gradlew clean createDebugCoverageReport jacocoTestReport