diff --git a/.circleci/config.yml b/.circleci/config.yml
index d4e59be19..b07c9638c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -7,11 +7,11 @@ references:
container_config: &container_config
docker:
- - image: circleci/android:api-28-alpha
+ - image: circleci/android:api-28
working_directory: *workspace_root
environment:
environment:
- JVM_OPTS: -Xmx3200m
+ _JAVA_OPTS: -Xmx3072m
attach_workspace: &attach_workspace
attach_workspace:
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index a8407c848..43e9b544a 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -21,31 +21,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/.travis.yml b/.travis.yml
index 56c648589..10824e32f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,8 +13,8 @@ cache:
#branches:
# only:
-# - master
-# - 0.7.x
+# - master
+# - 0.8.x
android:
licenses:
diff --git a/app/build.gradle b/app/build.gradle
index c58c1e337..3043bc651 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,13 +16,13 @@ android {
testApplicationId "io.github.tests.wulkanowy"
minSdkVersion 15
targetSdkVersion 28
- versionCode 31
- versionName "0.7.5"
+ versionCode 36
+ versionName "0.8.3"
multiDexEnabled true
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true
manifestPlaceholders = [
- fabric_api_key: System.getenv("FABRIC_API_KEY") ?: "null",
+ fabric_api_key : System.getenv("FABRIC_API_KEY") ?: "null",
crashlytics_enabled: project.hasProperty("enableCrashlytics")
]
javaCompileOptions {
@@ -80,53 +80,54 @@ androidExtensions {
play {
serviceAccountEmail = System.getenv("PLAY_SERVICE_ACCOUNT_EMAIL") ?: "jan@fakelog.cf"
serviceAccountCredentials = file('key.p12')
- defaultToAppBundles = true
+ defaultToAppBundles = false
track = 'alpha'
}
dependencies {
- implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
- implementation('io.github.wulkanowy:api:0.7.5') { exclude module: "threetenbp" }
+ implementation 'io.github.wulkanowy:api:0.8.3'
+ implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
implementation "androidx.legacy:legacy-support-v4:1.0.0"
implementation "androidx.appcompat:appcompat:1.0.2"
- implementation "androidx.cardview:cardview:1.0.0"
- implementation "com.google.android.material:material:1.0.0"
- implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'androidx.multidex:multidex:2.0.1'
- implementation "android.arch.work:work-runtime:1.0.0"
- implementation "android.arch.work:work-rxjava2:1.0.0"
+ implementation "androidx.cardview:cardview:1.0.0"
+ implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+ implementation "com.google.android.material:material:1.1.0-alpha05"
+ implementation 'com.github.wulkanowy:MaterialChipsInput:b72fd0ee6f'
+ implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'
- implementation "androidx.room:room-runtime:2.1.0-alpha06"
- implementation "androidx.room:room-rxjava2:2.1.0-alpha06"
- kapt "androidx.room:room-compiler:2.1.0-alpha06"
+ implementation "androidx.work:work-runtime:2.0.1"
+ implementation "androidx.work:work-rxjava2:2.0.1"
- implementation 'com.takisoft.preferencex:preferencex:1.0.0'
+ implementation "androidx.room:room-runtime:2.1.0-alpha07"
+ implementation "androidx.room:room-rxjava2:2.1.0-alpha07"
+ kapt "androidx.room:room-compiler:2.1.0-alpha07"
- implementation 'com.squareup.inject:assisted-inject-annotations-dagger2:0.3.3'
- kapt 'com.squareup.inject:assisted-inject-processor-dagger2:0.3.3'
-
- implementation "com.google.dagger:dagger-android-support:2.21"
- kapt "com.google.dagger:dagger-compiler:2.21"
- kapt "com.google.dagger:dagger-android-processor:2.21"
+ implementation "com.google.dagger:dagger-android-support:2.22.1"
+ kapt "com.google.dagger:dagger-compiler:2.22.1"
+ kapt "com.google.dagger:dagger-android-processor:2.22.1"
+ implementation 'com.squareup.inject:assisted-inject-annotations-dagger2:0.4.0'
+ kapt 'com.squareup.inject:assisted-inject-processor-dagger2:0.4.0'
implementation "eu.davidea:flexible-adapter:5.1.0"
implementation "eu.davidea:flexible-adapter-ui:1.0.0"
implementation "com.aurelhubert:ahbottomnavigation:2.3.4"
implementation 'com.ncapdevi:frag-nav:3.2.0'
- implementation 'com.github.wulkanowy:MaterialChipsInput:b72fd0ee6f'
- implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'
-
implementation 'com.github.pwittchen:reactivenetwork-rx2:3.0.2'
implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
- implementation "io.reactivex.rxjava2:rxjava:2.2.7"
+ implementation "io.reactivex.rxjava2:rxjava:2.2.8"
+ implementation 'com.google.code.gson:gson:2.8.5'
implementation "com.jakewharton.threetenabp:threetenabp:1.2.0"
implementation "com.jakewharton.timber:timber:4.7.1"
implementation "at.favre.lib:slf4j-timber:1.0.1"
+ implementation "com.squareup.okhttp3:logging-interceptor:3.12.1"
+
implementation "com.mikepenz:aboutlibraries:6.2.3"
+ implementation 'com.takisoft.preferencex:preferencex:1.0.0'
implementation 'com.google.firebase:firebase-core:16.0.8'
implementation 'com.crashlytics.sdk.android:crashlytics:2.9.9'
@@ -138,15 +139,15 @@ dependencies {
testImplementation "junit:junit:4.12"
testImplementation "io.mockk:mockk:1.9.2"
- testImplementation "org.mockito:mockito-inline:2.25.1"
+ testImplementation "org.mockito:mockito-inline:2.27.0"
testImplementation 'org.threeten:threetenbp:1.3.8'
androidTestImplementation 'androidx.test:core:1.1.0'
androidTestImplementation 'androidx.test:runner:1.1.1'
androidTestImplementation 'androidx.test.ext:junit:1.1.0'
androidTestImplementation "io.mockk:mockk-android:1.9.2"
- androidTestImplementation 'org.mockito:mockito-android:2.25.1'
- androidTestImplementation "androidx.room:room-testing:2.1.0-alpha06"
+ androidTestImplementation 'org.mockito:mockito-android:2.27.0'
+ androidTestImplementation "androidx.room:room-testing:2.1.0-alpha07"
androidTestImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
}
diff --git a/app/jacoco.gradle b/app/jacoco.gradle
index f2b01b483..f22c33598 100644
--- a/app/jacoco.gradle
+++ b/app/jacoco.gradle
@@ -31,17 +31,17 @@ task jacocoTestReport(type: JacocoReport) {
'**/*_Provide*Factory*.*',
'**/*_Factory.*']
- classDirectories = fileTree(
+ classDirectories.setFrom(fileTree(
dir: "$buildDir/intermediates/classes/debug",
excludes: excludes
) + fileTree(
dir: "$buildDir/tmp/kotlin-classes/debug",
excludes: excludes
- )
+ ))
- sourceDirectories = files("$project.projectDir/src/main/java")
- executionData = fileTree(
+ sourceDirectories.setFrom(files("$project.projectDir/src/main/java"))
+ executionData.setFrom(fileTree(
dir: project.projectDir,
includes: ["**/*.exec", "**/*.ec"]
- )
+ ))
}
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeRepositoryTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeRepositoryTest.kt
index 17e788fc0..a0acb5a76 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeRepositoryTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeRepositoryTest.kt
@@ -22,6 +22,7 @@ import org.junit.Test
import org.junit.runner.RunWith
import org.threeten.bp.LocalDate.of
import org.threeten.bp.LocalDateTime
+import kotlin.test.assertEquals
import kotlin.test.assertFalse
import kotlin.test.assertTrue
import io.github.wulkanowy.api.grades.Grade as GradeApi
@@ -109,4 +110,73 @@ class GradeRepositoryTest {
assertTrue { grades[2].isRead }
assertTrue { grades[3].isRead }
}
+
+ @Test
+ fun subtractLocaleDuplicateGrades() {
+ gradeLocal.saveGrades(listOf(
+ createGradeLocal(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
+ createGradeLocal(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
+ createGradeLocal(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
+ ))
+
+ every { mockApi.getGrades(1) } returns Single.just(listOf(
+ createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
+ createGradeApi(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
+ ))
+
+ val grades = GradeRepository(settings, gradeLocal, gradeRemote)
+ .getGrades(studentMock, semesterMock, true).blockingGet()
+
+ assertEquals(2, grades.size)
+ }
+
+ @Test
+ fun subtractRemoteDuplicateGrades() {
+ gradeLocal.saveGrades(listOf(
+ createGradeLocal(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
+ createGradeLocal(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
+ ))
+
+ every { mockApi.getGrades(1) } returns Single.just(listOf(
+ createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
+ createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
+ createGradeApi(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
+ ))
+
+ val grades = GradeRepository(settings, gradeLocal, gradeRemote)
+ .getGrades(studentMock, semesterMock, true).blockingGet()
+
+ assertEquals(3, grades.size)
+ }
+
+ @Test
+ fun emptyLocal() {
+ gradeLocal.saveGrades(listOf())
+
+ every { mockApi.getGrades(1) } returns Single.just(listOf(
+ createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
+ createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
+ createGradeApi(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
+ ))
+
+ val grades = GradeRepository(settings, gradeLocal, gradeRemote)
+ .getGrades(studentMock, semesterMock, true).blockingGet()
+
+ assertEquals(3, grades.size)
+ }
+
+ @Test
+ fun emptyRemote() {
+ gradeLocal.saveGrades(listOf(
+ createGradeLocal(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
+ createGradeLocal(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
+ ))
+
+ every { mockApi.getGrades(1) } returns Single.just(listOf())
+
+ val grades = GradeRepository(settings, gradeLocal, gradeRemote)
+ .getGrades(studentMock, semesterMock, true).blockingGet()
+
+ assertEquals(0, grades.size)
+ }
}
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/student/StudentLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/student/StudentLocalTest.kt
index b27446faf..cecd80992 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/student/StudentLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/student/StudentLocalTest.kt
@@ -39,7 +39,7 @@ class StudentLocalTest {
@Test
fun saveAndReadTest() {
- studentLocal.saveStudent(Student(email = "test", password = "test123", schoolSymbol = "23", endpoint = "fakelog.cf", loginType = "AUTO", isCurrent = true, studentName = "", schoolName = "", studentId = 0, classId = 1, symbol = "", registrationDate = now(), className = ""))
+ studentLocal.saveStudents(listOf(Student(email = "test", password = "test123", schoolSymbol = "23", endpoint = "fakelog.cf", loginType = "AUTO", isCurrent = true, studentName = "", schoolName = "", studentId = 0, classId = 1, symbol = "", registrationDate = now(), className = "")))
.blockingGet()
val student = studentLocal.getCurrentStudent(true).blockingGet()
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TestTimetableEntityCreator.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TestTimetableEntityCreator.kt
index 438e95f48..eea5463d1 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TestTimetableEntityCreator.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TestTimetableEntityCreator.kt
@@ -7,7 +7,7 @@ import org.threeten.bp.LocalDateTime.now
import io.github.wulkanowy.api.timetable.Timetable as TimetableRemote
import io.github.wulkanowy.data.db.entities.Timetable as TimetableLocal
-fun createTimetableLocal(number: Int, start: LocalDateTime, room: String = "", subject: String = ""): TimetableLocal {
+fun createTimetableLocal(number: Int, start: LocalDateTime, room: String = "", subject: String = "", teacher: String = ""): TimetableLocal {
return TimetableLocal(
studentId = 1,
diaryId = 2,
@@ -20,7 +20,7 @@ fun createTimetableLocal(number: Int, start: LocalDateTime, room: String = "", s
group = "",
room = room,
roomOld = "",
- teacher = "",
+ teacher = teacher,
teacherOld = "",
info = "",
changes = false,
@@ -28,7 +28,7 @@ fun createTimetableLocal(number: Int, start: LocalDateTime, room: String = "", s
)
}
-fun createTimetableRemote(number: Int, start: LocalDateTime, room: String, subject: String = ""): TimetableRemote {
+fun createTimetableRemote(number: Int, start: LocalDateTime, room: String, subject: String = "", teacher: String = ""): TimetableRemote {
return TimetableRemote(
number = number,
start = start.toDate(),
@@ -37,7 +37,7 @@ fun createTimetableRemote(number: Int, start: LocalDateTime, room: String, subje
subject = subject,
group = "",
room = room,
- teacher = "",
+ teacher = teacher,
info = "",
changes = false,
canceled = false
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepositoryTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepositoryTest.kt
index 1c0802637..79216d552 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepositoryTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepositoryTest.kt
@@ -63,23 +63,27 @@ class TimetableRepositoryTest {
fun copyDetailsToCompletedFromPrevious() {
timetableLocal.saveTimetable(listOf(
createTimetableLocal(1, of(2019, 3, 5, 8, 0), "123", "Przyroda"),
- createTimetableLocal(1, of(2019, 3, 5, 8, 50), "321", "Religia"),
- createTimetableLocal(1, of(2019, 3, 5, 9, 40), "213", "W-F")
+ createTimetableLocal(2, of(2019, 3, 5, 8, 50), "321", "Religia"),
+ createTimetableLocal(3, of(2019, 3, 5, 9, 40), "213", "W-F"),
+ createTimetableLocal(4, of(2019, 3, 5, 10, 30), "213", "W-F", "Jan Kowalski")
))
every { mockApi.getTimetable(any(), any()) } returns Single.just(listOf(
createTimetableRemote(1, of(2019, 3, 5, 8, 0), "", "Przyroda"),
- createTimetableRemote(1, of(2019, 3, 5, 8, 50), "", "Religia"),
- createTimetableRemote(1, of(2019, 3, 5, 9, 40), "", "W-F")
+ createTimetableRemote(2, of(2019, 3, 5, 8, 50), "", "Religia"),
+ createTimetableRemote(3, of(2019, 3, 5, 9, 40), "", "W-F"),
+ createTimetableRemote(4, of(2019, 3, 5, 10, 30), "", "W-F")
))
val lessons = TimetableRepository(settings, timetableLocal, timetableRemote)
.getTimetable(semesterMock, LocalDate.of(2019, 3, 5), LocalDate.of(2019, 3, 5), true)
.blockingGet()
- assertEquals(3, lessons.size)
+ assertEquals(4, lessons.size)
assertEquals("123", lessons[0].room)
assertEquals("321", lessons[1].room)
assertEquals("213", lessons[2].room)
+
+ assertEquals("", lessons[3].teacher)
}
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0c6edab46..2a214b8b2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -34,6 +34,7 @@
android:name=".ui.modules.login.LoginActivity"
android:configChanges="orientation|screenSize"
android:label="@string/login_title"
+ android:theme="@style/WulkanowyTheme.NoActionBar"
android:windowSoftInputMode="adjustResize" />
+
+
+
+
+
+
+
+
+
+
@@ -62,6 +81,17 @@
android:resource="@xml/provider_widget_timetable" />
+
+
+
+
+
+
+
{
- return DaggerAppComponent.builder().create(this)
+ return DaggerAppComponent.factory().create(this)
}
}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/SharedPrefHelper.kt b/app/src/main/java/io/github/wulkanowy/data/db/SharedPrefHelper.kt
index b3b6f5e3e..74f9fa654 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/SharedPrefHelper.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/SharedPrefHelper.kt
@@ -6,18 +6,16 @@ import javax.inject.Inject
import javax.inject.Singleton
@Singleton
+@SuppressLint("ApplySharedPref")
class SharedPrefHelper @Inject constructor(private val sharedPref: SharedPreferences) {
- @SuppressLint("ApplySharedPref")
fun putLong(key: String, value: Long, sync: Boolean = false) {
sharedPref.edit().putLong(key, value).apply {
if (sync) commit() else apply()
}
}
- fun getLong(key: String, defaultValue: Long): Long {
- return sharedPref.getLong(key, defaultValue)
- }
+ fun getLong(key: String, defaultValue: Long) = sharedPref.getLong(key, defaultValue)
fun delete(key: String) {
sharedPref.edit().remove(key).apply()
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/MessagesDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/MessagesDao.kt
index 3ef5d6905..4f72c6c91 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/MessagesDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/MessagesDao.kt
@@ -23,8 +23,8 @@ interface MessagesDao {
@Query("SELECT * FROM Messages WHERE student_id = :studentId AND folder_id = :folder AND removed = 0 ORDER BY date DESC")
fun loadAll(studentId: Int, folder: Int): Maybe>
- @Query("SELECT * FROM Messages WHERE student_id = :studentId AND real_id = :id")
- fun load(studentId: Int, id: Int): Maybe
+ @Query("SELECT * FROM Messages WHERE id = :id")
+ fun load(id: Long): Maybe
@Query("SELECT * FROM Messages WHERE student_id = :studentId AND removed = 1 ORDER BY date DESC")
fun loadDeleted(studentId: Int): Maybe>
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/StudentDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/StudentDao.kt
index 8110bb696..57bf25fb8 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/StudentDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/StudentDao.kt
@@ -14,7 +14,7 @@ import javax.inject.Singleton
interface StudentDao {
@Insert(onConflict = ABORT)
- fun insert(student: Student): Long
+ fun insertAll(student: List): List
@Delete
fun delete(student: Student)
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration11.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration11.kt
index cb437c0ee..6d129bca0 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration11.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration11.kt
@@ -8,7 +8,7 @@ class Migration11 : Migration(10, 11) {
override fun migrate(database: SupportSQLiteDatabase) {
database.execSQL("""
CREATE TABLE IF NOT EXISTS Grades_temp (
- id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+ id INTEGER PRIMARY KEY NOT NULL,
is_read INTEGER NOT NULL,
is_notified INTEGER NOT NULL,
semester_id INTEGER NOT NULL,
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRepository.kt
index f6eb07dae..85102b3c5 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRepository.kt
@@ -6,6 +6,7 @@ import io.github.wulkanowy.data.db.entities.Attendance
import io.github.wulkanowy.data.db.entities.Semester
import io.github.wulkanowy.utils.friday
import io.github.wulkanowy.utils.monday
+import io.github.wulkanowy.utils.uniqueSubtract
import io.reactivex.Single
import org.threeten.bp.LocalDate
import java.net.UnknownHostException
@@ -31,8 +32,8 @@ class AttendanceRepository @Inject constructor(
local.getAttendance(semester, dates.first, dates.second)
.toSingle(emptyList())
.doOnSuccess { oldAttendance ->
- local.deleteAttendance(oldAttendance - newAttendance)
- local.saveAttendance(newAttendance - oldAttendance)
+ local.deleteAttendance(oldAttendance.uniqueSubtract(newAttendance))
+ local.saveAttendance(newAttendance.uniqueSubtract(oldAttendance))
}
}.flatMap {
local.getAttendance(semester, dates.first, dates.second)
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRepository.kt
index 90d39aab2..c65870508 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRepository.kt
@@ -4,6 +4,7 @@ import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
import io.github.wulkanowy.data.db.entities.AttendanceSummary
import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.utils.uniqueSubtract
import io.reactivex.Single
import java.net.UnknownHostException
import javax.inject.Inject
@@ -25,8 +26,8 @@ class AttendanceSummaryRepository @Inject constructor(
}.flatMap { new ->
local.getAttendanceSummary(semester, subjectId).toSingle(emptyList())
.doOnSuccess { old ->
- local.deleteAttendanceSummary(old - new)
- local.saveAttendanceSummary(new - old)
+ local.deleteAttendanceSummary(old.uniqueSubtract(new))
+ local.saveAttendanceSummary(new.uniqueSubtract(old))
}
}.flatMap { local.getAttendanceSummary(semester, subjectId).toSingle(emptyList()) })
}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRepository.kt
index 5b5941076..c22fabc39 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRepository.kt
@@ -6,6 +6,7 @@ import io.github.wulkanowy.data.db.entities.CompletedLesson
import io.github.wulkanowy.data.db.entities.Semester
import io.github.wulkanowy.utils.friday
import io.github.wulkanowy.utils.monday
+import io.github.wulkanowy.utils.uniqueSubtract
import io.reactivex.Single
import org.threeten.bp.LocalDate
import java.net.UnknownHostException
@@ -31,8 +32,8 @@ class CompletedLessonsRepository @Inject constructor(
local.getCompletedLessons(semester, dates.first, dates.second)
.toSingle(emptyList())
.doOnSuccess { old ->
- local.deleteCompleteLessons(old - new)
- local.saveCompletedLessons(new - old)
+ local.deleteCompleteLessons(old.uniqueSubtract(new))
+ local.saveCompletedLessons(new.uniqueSubtract(old))
}
}.flatMap {
local.getCompletedLessons(semester, dates.first, dates.second)
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRepository.kt
index a0cb5ba11..be60eaecd 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRepository.kt
@@ -6,6 +6,7 @@ import io.github.wulkanowy.data.db.entities.Exam
import io.github.wulkanowy.data.db.entities.Semester
import io.github.wulkanowy.utils.friday
import io.github.wulkanowy.utils.monday
+import io.github.wulkanowy.utils.uniqueSubtract
import io.reactivex.Single
import org.threeten.bp.LocalDate
import java.net.UnknownHostException
@@ -27,12 +28,12 @@ class ExamRepository @Inject constructor(
.flatMap {
if (it) remote.getExams(semester, dates.first, dates.second)
else Single.error(UnknownHostException())
- }.flatMap { newExams ->
+ }.flatMap { new ->
local.getExams(semester, dates.first, dates.second)
.toSingle(emptyList())
- .doOnSuccess { oldExams ->
- local.deleteExams(oldExams - newExams)
- local.saveExams(newExams - oldExams)
+ .doOnSuccess { old ->
+ local.deleteExams(old.uniqueSubtract(new))
+ local.saveExams(new.uniqueSubtract(old))
}
}.flatMap {
local.getExams(semester, dates.first, dates.second)
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRepository.kt
index 3dd456bff..7f8e92a2e 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRepository.kt
@@ -5,6 +5,7 @@ import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.Inter
import io.github.wulkanowy.data.db.entities.Grade
import io.github.wulkanowy.data.db.entities.Semester
import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.utils.uniqueSubtract
import io.reactivex.Completable
import io.reactivex.Single
import java.net.UnknownHostException
@@ -24,13 +25,12 @@ class GradeRepository @Inject constructor(
.flatMap {
if (it) remote.getGrades(semester)
else Single.error(UnknownHostException())
- }.flatMap { newGrades ->
+ }.flatMap { new ->
local.getGrades(semester).toSingle(emptyList())
- .doOnSuccess { oldGrades ->
- val notifyBreakDate = oldGrades.maxBy { it.date }?.date
- ?: student.registrationDate.toLocalDate()
- local.deleteGrades(oldGrades - newGrades)
- local.saveGrades((newGrades - oldGrades)
+ .doOnSuccess { old ->
+ val notifyBreakDate = old.maxBy { it.date }?.date ?: student.registrationDate.toLocalDate()
+ local.deleteGrades(old.uniqueSubtract(new))
+ local.saveGrades(new.uniqueSubtract(old)
.onEach {
if (it.date >= notifyBreakDate) it.apply {
isRead = false
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryRepository.kt
index b19e07f00..660a032c2 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryRepository.kt
@@ -4,6 +4,7 @@ import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
import io.github.wulkanowy.data.db.entities.GradeSummary
import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.utils.uniqueSubtract
import io.reactivex.Single
import java.net.UnknownHostException
import javax.inject.Inject
@@ -22,11 +23,11 @@ class GradeSummaryRepository @Inject constructor(
.flatMap {
if (it) remote.getGradeSummary(semester)
else Single.error(UnknownHostException())
- }.flatMap { newGradesSummary ->
+ }.flatMap { new ->
local.getGradesSummary(semester).toSingle(emptyList())
- .doOnSuccess { oldGradesSummary ->
- local.deleteGradesSummary(oldGradesSummary - newGradesSummary)
- local.saveGradesSummary(newGradesSummary - oldGradesSummary)
+ .doOnSuccess { old ->
+ local.deleteGradesSummary(old.uniqueSubtract(new))
+ local.saveGradesSummary(new.uniqueSubtract(old))
}
}.flatMap { local.getGradesSummary(semester).toSingle(emptyList()) })
}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRepository.kt
index 870bd1e93..9617cdd64 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRepository.kt
@@ -4,6 +4,7 @@ import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
import io.github.wulkanowy.data.db.entities.GradeStatistics
import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.utils.uniqueSubtract
import io.reactivex.Single
import java.net.UnknownHostException
import javax.inject.Inject
@@ -22,11 +23,11 @@ class GradeStatisticsRepository @Inject constructor(
.flatMap {
if (it) remote.getGradeStatistics(semester, isSemester)
else Single.error(UnknownHostException())
- }.flatMap { newGradesStats ->
+ }.flatMap { new ->
local.getGradesStatistics(semester, isSemester).toSingle(emptyList())
- .doOnSuccess { oldGradesStats ->
- local.deleteGradesStatistics(oldGradesStats - newGradesStats)
- local.saveGradesStatistics(newGradesStats - oldGradesStats)
+ .doOnSuccess { old ->
+ local.deleteGradesStatistics(old.uniqueSubtract(new))
+ local.saveGradesStatistics(new.uniqueSubtract(old))
}
}.flatMap { local.getGradesStatistics(semester, isSemester, subjectName).toSingle(emptyList()) })
}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRepository.kt
index 0447c86fe..3f924944d 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRepository.kt
@@ -6,6 +6,7 @@ import io.github.wulkanowy.data.db.entities.Homework
import io.github.wulkanowy.data.db.entities.Semester
import io.github.wulkanowy.utils.friday
import io.github.wulkanowy.utils.monday
+import io.github.wulkanowy.utils.uniqueSubtract
import io.reactivex.Single
import org.threeten.bp.LocalDate
import java.net.UnknownHostException
@@ -26,11 +27,11 @@ class HomeworkRepository @Inject constructor(
.flatMap {
if (it) remote.getHomework(semester, monday, friday)
else Single.error(UnknownHostException())
- }.flatMap { newGrades ->
+ }.flatMap { new ->
local.getHomework(semester, monday, friday).toSingle(emptyList())
- .doOnSuccess { oldGrades ->
- local.deleteHomework(oldGrades - newGrades)
- local.saveHomework(newGrades - oldGrades)
+ .doOnSuccess { old ->
+ local.deleteHomework(old.uniqueSubtract(new))
+ local.saveHomework(new.uniqueSubtract(old))
}
}.flatMap { local.getHomework(semester, monday, friday).toSingle(emptyList()) })
}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageLocal.kt
index 411cca395..ce08d13ec 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageLocal.kt
@@ -23,8 +23,8 @@ class MessageLocal @Inject constructor(private val messagesDb: MessagesDao) {
messagesDb.deleteAll(messages)
}
- fun getMessage(student: Student, id: Int): Maybe {
- return messagesDb.load(student.id.toInt(), id)
+ fun getMessage(id: Long): Maybe {
+ return messagesDb.load(id)
}
fun getMessages(student: Student, folder: MessageFolder): Maybe> {
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRemote.kt
index d50c40f37..b2bff1e77 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRemote.kt
@@ -59,4 +59,8 @@ class MessageRemote @Inject constructor(private val api: Api) {
}
)
}
+
+ fun deleteMessage(message: Message): Single {
+ return api.deleteMessages(listOf(Pair(message.realId, message.folderId)))
+ }
}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRepository.kt
index 3b4f9582f..c10cd5181 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRepository.kt
@@ -8,7 +8,9 @@ import io.github.wulkanowy.data.db.entities.Message
import io.github.wulkanowy.data.db.entities.Recipient
import io.github.wulkanowy.data.db.entities.Student
import io.github.wulkanowy.data.repositories.message.MessageFolder.RECEIVED
+import io.github.wulkanowy.utils.uniqueSubtract
import io.reactivex.Completable
+import io.reactivex.Maybe
import io.reactivex.Single
import java.net.UnknownHostException
import javax.inject.Inject
@@ -33,8 +35,8 @@ class MessageRepository @Inject constructor(
}.flatMap { new ->
local.getMessages(student, folder).toSingle(emptyList())
.doOnSuccess { old ->
- local.deleteMessages(old - new)
- local.saveMessages((new - old)
+ local.deleteMessages(old.uniqueSubtract(new))
+ local.saveMessages(new.uniqueSubtract(old)
.onEach {
it.isNotified = !notify
})
@@ -44,14 +46,14 @@ class MessageRepository @Inject constructor(
}
}
- fun getMessage(student: Student, messageId: Int, markAsRead: Boolean = false): Single {
+ fun getMessage(student: Student, messageDbId: Long, markAsRead: Boolean = false): Single {
return Single.just(apiHelper.initApi(student))
.flatMap { _ ->
- local.getMessage(student, messageId)
+ local.getMessage(messageDbId)
.filter { !it.content.isNullOrEmpty() }
.switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
.flatMap {
- if (it) local.getMessage(student, messageId).toSingle()
+ if (it) local.getMessage(messageDbId).toSingle()
else Single.error(UnknownHostException())
}
.flatMap { dbMessage ->
@@ -62,7 +64,7 @@ class MessageRepository @Inject constructor(
}))
}
}.flatMap {
- local.getMessage(student, messageId).toSingle()
+ local.getMessage(messageDbId).toSingle()
}
)
}
@@ -89,4 +91,20 @@ class MessageRepository @Inject constructor(
else Single.error(UnknownHostException())
}
}
+
+ fun deleteMessage(message: Message): Maybe {
+ return ReactiveNetwork.checkInternetConnectivity(settings)
+ .flatMap {
+ if (it) remote.deleteMessage(message)
+ else Single.error(UnknownHostException())
+ }
+ .filter { it }
+ .doOnSuccess {
+ if (!message.removed) local.updateMessages(listOf(message.copy(removed = true).apply {
+ id = message.id
+ content = message.content
+ }))
+ else local.deleteMessages(listOf(message))
+ }
+ }
}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRepository.kt
index d74bc7eaf..52cb2d0f5 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRepository.kt
@@ -5,6 +5,7 @@ import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.Inter
import io.github.wulkanowy.data.db.entities.Note
import io.github.wulkanowy.data.db.entities.Semester
import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.utils.uniqueSubtract
import io.reactivex.Completable
import io.reactivex.Single
import java.net.UnknownHostException
@@ -27,8 +28,8 @@ class NoteRepository @Inject constructor(
}.flatMap { new ->
local.getNotes(student).toSingle(emptyList())
.doOnSuccess { old ->
- local.deleteNotes(old - new)
- local.saveNotes((new - old)
+ local.deleteNotes(old.uniqueSubtract(new))
+ local.saveNotes(new.uniqueSubtract(old)
.onEach {
if (it.date >= student.registrationDate.toLocalDate()) it.apply {
isRead = false
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/preferences/PreferencesRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/preferences/PreferencesRepository.kt
index d51fc4957..91717ed77 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/preferences/PreferencesRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/preferences/PreferencesRepository.kt
@@ -17,12 +17,15 @@ class PreferencesRepository @Inject constructor(
val isShowPresent: Boolean
get() = sharedPref.getBoolean(context.getString(R.string.pref_key_attendance_present), true)
+ val gradeAverageMode: String
+ get() = sharedPref.getString(context.getString(R.string.pref_key_grade_average_mode), "only_one_semester") ?: "only_one_semester"
+
val isGradeExpandable: Boolean
get() = !sharedPref.getBoolean(context.getString(R.string.pref_key_expand_grade), false)
- val currentThemeKey: String = context.getString(R.string.pref_key_theme)
- val currentTheme: Int
- get() = sharedPref.getString(currentThemeKey, "1")?.toIntOrNull() ?: 1
+ val appThemeKey: String = context.getString(R.string.pref_key_app_theme)
+ val appTheme: String
+ get() = sharedPref.getString(appThemeKey, "light") ?: "light"
val gradeColorTheme: String
get() = sharedPref.getString(context.getString(R.string.pref_key_grade_color_scheme), "vulcan") ?: "vulcan"
@@ -50,8 +53,7 @@ class PreferencesRepository @Inject constructor(
get() = sharedPref.getString(context.getString(R.string.pref_key_grade_modifier_plus), "0.0")?.toDouble() ?: 0.0
val gradeMinusModifier: Double
- get() = sharedPref.getString(context.getString(R.string.pref_key_grade_modifier_minus), "0.0")?.toDouble()
- ?: 0.0
+ get() = sharedPref.getString(context.getString(R.string.pref_key_grade_modifier_minus), "0.0")?.toDouble() ?: 0.0
val fillMessageContent: Boolean
get() = sharedPref.getBoolean(context.getString(R.string.pref_key_fill_message_content), true)
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRepository.kt
index 0b02721f1..cde75ea8b 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRepository.kt
@@ -7,6 +7,7 @@ import io.github.wulkanowy.data.db.entities.Message
import io.github.wulkanowy.data.db.entities.Recipient
import io.github.wulkanowy.data.db.entities.ReportingUnit
import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.utils.uniqueSubtract
import io.reactivex.Single
import java.net.UnknownHostException
import javax.inject.Inject
@@ -31,8 +32,8 @@ class RecipientRepository @Inject constructor(
}.flatMap { new ->
local.getRecipients(student, role, unit).toSingle(emptyList())
.doOnSuccess { old ->
- local.deleteRecipients(old - new)
- local.saveRecipients(new - old)
+ local.deleteRecipients(old.uniqueSubtract(new))
+ local.saveRecipients(new.uniqueSubtract(old))
}
}.flatMap {
local.getRecipients(student, role, unit).toSingle(emptyList())
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRepository.kt
index 9184b4bb1..6758898e2 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRepository.kt
@@ -5,6 +5,7 @@ import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.Inter
import io.github.wulkanowy.data.ApiHelper
import io.github.wulkanowy.data.db.entities.ReportingUnit
import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.utils.uniqueSubtract
import io.reactivex.Maybe
import io.reactivex.Single
import java.net.UnknownHostException
@@ -30,8 +31,8 @@ class ReportingUnitRepository @Inject constructor(
}.flatMap { new ->
local.getReportingUnits(student).toSingle(emptyList())
.doOnSuccess { old ->
- local.deleteReportingUnits(old - new)
- local.saveReportingUnits(new - old)
+ local.deleteReportingUnits(old.uniqueSubtract(new))
+ local.saveReportingUnits(new.uniqueSubtract(old))
}
}.flatMap { local.getReportingUnits(student).toSingle(emptyList()) }
)
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRepository.kt
index 9735f0290..593014032 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRepository.kt
@@ -5,6 +5,7 @@ import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.Inter
import io.github.wulkanowy.data.ApiHelper
import io.github.wulkanowy.data.db.entities.Semester
import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.utils.uniqueSubtract
import io.reactivex.Maybe
import io.reactivex.Single
import timber.log.Timber
@@ -31,8 +32,8 @@ class SemesterRepository @Inject constructor(
if (currentSemesters.size == 1) {
local.getSemesters(student).toSingle(emptyList())
.doOnSuccess { old ->
- local.deleteSemesters(old - new)
- local.saveSemesters(new - old)
+ local.deleteSemesters(old.uniqueSubtract(new))
+ local.saveSemesters(new.uniqueSubtract(old))
}
} else {
Timber.i("Current semesters list:\n${currentSemesters.joinToString(separator = "\n")}")
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentLocal.kt
index 7bbd283fb..e6d744213 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentLocal.kt
@@ -17,8 +17,8 @@ class StudentLocal @Inject constructor(
private val context: Context
) {
- fun saveStudent(student: Student): Single {
- return Single.fromCallable { studentDb.insert(student.copy(password = encrypt(student.password, context))) }
+ fun saveStudents(students: List): Single> {
+ return Single.fromCallable { studentDb.insertAll(students.map { it.copy(password = encrypt(it.password, context)) }) }
}
fun getStudents(decryptPass: Boolean): Maybe> {
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRepository.kt
index b4b7c8289..5c4a60558 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRepository.kt
@@ -22,6 +22,8 @@ class StudentRepository @Inject constructor(
fun isStudentSaved(): Single = local.getStudents(false).isEmpty.map { !it }
+ fun isCurrentStudentSet(): Single = local.getCurrentStudent(false).isEmpty.map { !it }
+
fun getStudents(email: String, password: String, endpoint: String, symbol: String = ""): Single> {
return ReactiveNetwork.checkInternetConnectivity(settings)
.flatMap {
@@ -41,8 +43,8 @@ class StudentRepository @Inject constructor(
.toSingle()
}
- fun saveStudent(student: Student): Single {
- return local.saveStudent(student)
+ fun saveStudents(students: List): Single> {
+ return local.saveStudents(students)
}
fun switchStudent(student: Student): Completable {
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRepository.kt
index 6167251b9..0c5f386b6 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRepository.kt
@@ -4,6 +4,7 @@ import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
import io.github.wulkanowy.data.db.entities.Semester
import io.github.wulkanowy.data.db.entities.Subject
+import io.github.wulkanowy.utils.uniqueSubtract
import io.reactivex.Single
import java.net.UnknownHostException
import javax.inject.Inject
@@ -26,8 +27,8 @@ class SubjectRepository @Inject constructor(
local.getSubjects(semester)
.toSingle(emptyList())
.doOnSuccess { old ->
- local.deleteSubjects(old - new)
- local.saveSubjects(new - old)
+ local.deleteSubjects(old.uniqueSubtract(new))
+ local.saveSubjects(new.uniqueSubtract(old))
}
}.flatMap {
local.getSubjects(semester).toSingle(emptyList())
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepository.kt
index 460d55fd7..0e6331f91 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepository.kt
@@ -6,6 +6,7 @@ import io.github.wulkanowy.data.db.entities.Semester
import io.github.wulkanowy.data.db.entities.Timetable
import io.github.wulkanowy.utils.friday
import io.github.wulkanowy.utils.monday
+import io.github.wulkanowy.utils.uniqueSubtract
import io.reactivex.Single
import org.threeten.bp.LocalDate
import java.net.UnknownHostException
@@ -25,17 +26,16 @@ class TimetableRepository @Inject constructor(
.switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
if (it) remote.getTimetable(semester, monday, friday)
else Single.error(UnknownHostException())
- }.flatMap { newTimetable ->
+ }.flatMap { new ->
local.getTimetable(semester, monday, friday)
.toSingle(emptyList())
- .doOnSuccess { oldTimetable ->
- local.deleteTimetable(oldTimetable - newTimetable)
- local.saveTimetable((newTimetable - oldTimetable).map { item ->
+ .doOnSuccess { old ->
+ local.deleteTimetable(old.uniqueSubtract(new))
+ local.saveTimetable(new.uniqueSubtract(old).map { item ->
item.apply {
- oldTimetable.singleOrNull { this.start == it.start }?.let {
+ old.singleOrNull { this.start == it.start }?.let {
return@map copy(
- room = if (room.isEmpty()) it.room else room,
- teacher = if (teacher.isEmpty()) it.teacher else teacher
+ room = if (room.isEmpty()) it.room else room
)
}
}
diff --git a/app/src/main/java/io/github/wulkanowy/di/AppComponent.kt b/app/src/main/java/io/github/wulkanowy/di/AppComponent.kt
index 9e8b24ab8..3ac3a525b 100644
--- a/app/src/main/java/io/github/wulkanowy/di/AppComponent.kt
+++ b/app/src/main/java/io/github/wulkanowy/di/AppComponent.kt
@@ -17,6 +17,6 @@ import javax.inject.Singleton
BuilderModule::class])
interface AppComponent : AndroidInjector {
- @Component.Builder
- abstract class Builder : AndroidInjector.Builder()
+ @Component.Factory
+ interface Factory : AndroidInjector.Factory
}
diff --git a/app/src/main/java/io/github/wulkanowy/di/AppModule.kt b/app/src/main/java/io/github/wulkanowy/di/AppModule.kt
index eb3b18f99..da1d8f7a8 100644
--- a/app/src/main/java/io/github/wulkanowy/di/AppModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/di/AppModule.kt
@@ -9,7 +9,6 @@ import eu.davidea.flexibleadapter.FlexibleAdapter
import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
import io.github.wulkanowy.BuildConfig.DEBUG
import io.github.wulkanowy.WulkanowyApp
-import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
import io.github.wulkanowy.utils.SchedulersProvider
import javax.inject.Named
import javax.inject.Singleton
@@ -30,11 +29,11 @@ internal class AppModule {
@Singleton
@Provides
- fun provideFirebaseAnalyticsHelper(context: Context) = FirebaseAnalyticsHelper(FirebaseAnalytics.getInstance(context))
+ fun provideFirebaseAnalytics(context: Context) = FirebaseAnalytics.getInstance(context)
@Singleton
@Provides
- fun provideAppWidgetManager(context: Context) = AppWidgetManager.getInstance(context)
+ fun provideAppWidgetManager(context: Context): AppWidgetManager = AppWidgetManager.getInstance(context)
@Singleton
@Named("isDebug")
diff --git a/app/src/main/java/io/github/wulkanowy/di/BuilderModule.kt b/app/src/main/java/io/github/wulkanowy/di/BuilderModule.kt
index 7f4776304..a963e9a96 100644
--- a/app/src/main/java/io/github/wulkanowy/di/BuilderModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/di/BuilderModule.kt
@@ -5,11 +5,14 @@ import dagger.android.ContributesAndroidInjector
import io.github.wulkanowy.di.scopes.PerActivity
import io.github.wulkanowy.ui.modules.login.LoginActivity
import io.github.wulkanowy.ui.modules.login.LoginModule
+import io.github.wulkanowy.ui.modules.luckynumberwidget.LuckyNumberWidgetConfigureActivity
import io.github.wulkanowy.ui.modules.main.MainActivity
import io.github.wulkanowy.ui.modules.main.MainModule
import io.github.wulkanowy.ui.modules.message.send.SendMessageActivity
import io.github.wulkanowy.ui.modules.splash.SplashActivity
-import io.github.wulkanowy.ui.widgets.timetable.TimetableWidgetProvider
+import io.github.wulkanowy.ui.modules.luckynumberwidget.LuckyNumberWidgetProvider
+import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetConfigureActivity
+import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider
@Module
internal abstract class BuilderModule {
@@ -29,6 +32,15 @@ internal abstract class BuilderModule {
@ContributesAndroidInjector
abstract fun bindMessageSendActivity(): SendMessageActivity
+ @ContributesAndroidInjector
+ abstract fun bindTimetableWidgetAccountActivity(): TimetableWidgetConfigureActivity
+
@ContributesAndroidInjector
abstract fun bindTimetableWidgetProvider(): TimetableWidgetProvider
+
+ @ContributesAndroidInjector
+ abstract fun bindLuckyNumberWidgetAccountActivity(): LuckyNumberWidgetConfigureActivity
+
+ @ContributesAndroidInjector
+ abstract fun bindLuckyNumberWidgetProvider(): LuckyNumberWidgetProvider
}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorker.kt b/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorker.kt
index 134fb0344..6a4c4ca6d 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorker.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorker.kt
@@ -35,7 +35,7 @@ class SyncWorker @AssistedInject constructor(
override fun createWork(): Single {
Timber.i("SyncWorker is starting")
- return studentRepository.isStudentSaved()
+ return studentRepository.isCurrentStudentSet()
.filter { true }
.flatMap { studentRepository.getCurrentStudent().toMaybe() }
.flatMapCompletable { student ->
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeWork.kt
index 66316934a..0c70b476f 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeWork.kt
@@ -15,7 +15,7 @@ import io.github.wulkanowy.data.repositories.grade.GradeRepository
import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
import io.github.wulkanowy.services.sync.channels.NewEntriesChannel
import io.github.wulkanowy.ui.modules.main.MainActivity
-import io.github.wulkanowy.ui.modules.main.MainActivity.Companion.EXTRA_START_MENU_INDEX
+import io.github.wulkanowy.ui.modules.main.MainView.MenuView
import io.github.wulkanowy.utils.getCompatColor
import io.reactivex.Completable
import javax.inject.Inject
@@ -47,8 +47,8 @@ class GradeWork @Inject constructor(
.setDefaults(DEFAULT_ALL)
.setColor(context.getCompatColor(R.color.colorPrimary))
.setContentIntent(
- PendingIntent.getActivity(context, 0,
- MainActivity.getStartIntent(context).putExtra(EXTRA_START_MENU_INDEX, 0), FLAG_UPDATE_CURRENT))
+ PendingIntent.getActivity(context, MenuView.GRADE.id,
+ MainActivity.getStartIntent(context, MenuView.GRADE, true), FLAG_UPDATE_CURRENT))
.setStyle(NotificationCompat.InboxStyle().run {
setSummaryText(context.resources.getQuantityString(R.plurals.grade_number_item, grades.size, grades.size))
grades.forEach { addLine("${it.subject}: ${it.entry}") }
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/LuckyNumberWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/LuckyNumberWork.kt
index ca7aaac60..ebd536b75 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/LuckyNumberWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/LuckyNumberWork.kt
@@ -15,7 +15,7 @@ import io.github.wulkanowy.data.repositories.luckynumber.LuckyNumberRepository
import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
import io.github.wulkanowy.services.sync.channels.NewEntriesChannel
import io.github.wulkanowy.ui.modules.main.MainActivity
-import io.github.wulkanowy.ui.modules.main.MainActivity.Companion.EXTRA_START_MENU_INDEX
+import io.github.wulkanowy.ui.modules.main.MainView.MenuView
import io.github.wulkanowy.utils.getCompatColor
import io.reactivex.Completable
import javax.inject.Inject
@@ -47,9 +47,8 @@ class LuckyNumberWork @Inject constructor(
.setPriority(PRIORITY_HIGH)
.setColor(context.getCompatColor(R.color.colorPrimary))
.setContentIntent(
- PendingIntent.getActivity(context, 0,
- MainActivity.getStartIntent(context).putExtra(EXTRA_START_MENU_INDEX, 4), FLAG_UPDATE_CURRENT)
- )
+ PendingIntent.getActivity(context, MenuView.MESSAGE.id,
+ MainActivity.getStartIntent(context, MenuView.LUCKY_NUMBER, true), FLAG_UPDATE_CURRENT))
.build())
}
}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/MessageWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/MessageWork.kt
index 7ab2c8d4b..d5016aeed 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/MessageWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/MessageWork.kt
@@ -16,7 +16,7 @@ import io.github.wulkanowy.data.repositories.message.MessageRepository
import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
import io.github.wulkanowy.services.sync.channels.NewEntriesChannel
import io.github.wulkanowy.ui.modules.main.MainActivity
-import io.github.wulkanowy.ui.modules.main.MainActivity.Companion.EXTRA_START_MENU_INDEX
+import io.github.wulkanowy.ui.modules.main.MainView.MenuView
import io.github.wulkanowy.utils.getCompatColor
import io.reactivex.Completable
import javax.inject.Inject
@@ -48,8 +48,8 @@ class MessageWork @Inject constructor(
.setPriority(PRIORITY_HIGH)
.setColor(context.getCompatColor(R.color.colorPrimary))
.setContentIntent(
- PendingIntent.getActivity(context, 0,
- MainActivity.getStartIntent(context).putExtra(EXTRA_START_MENU_INDEX, 4), FLAG_UPDATE_CURRENT)
+ PendingIntent.getActivity(context, MenuView.MESSAGE.id,
+ MainActivity.getStartIntent(context, MenuView.MESSAGE, true), FLAG_UPDATE_CURRENT)
)
.setStyle(NotificationCompat.InboxStyle().run {
setSummaryText(context.resources.getQuantityString(R.plurals.message_number_item, messages.size, messages.size))
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/NoteWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/NoteWork.kt
index d0e8fe21c..86e540c43 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/NoteWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/NoteWork.kt
@@ -15,7 +15,7 @@ import io.github.wulkanowy.data.repositories.note.NoteRepository
import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
import io.github.wulkanowy.services.sync.channels.NewEntriesChannel
import io.github.wulkanowy.ui.modules.main.MainActivity
-import io.github.wulkanowy.ui.modules.main.MainActivity.Companion.EXTRA_START_MENU_INDEX
+import io.github.wulkanowy.ui.modules.main.MainView.MenuView
import io.github.wulkanowy.utils.getCompatColor
import io.reactivex.Completable
import javax.inject.Inject
@@ -47,9 +47,8 @@ class NoteWork @Inject constructor(
.setPriority(PRIORITY_HIGH)
.setColor(context.getCompatColor(R.color.colorPrimary))
.setContentIntent(
- PendingIntent.getActivity(context, 0,
- MainActivity.getStartIntent(context).putExtra(EXTRA_START_MENU_INDEX, 4), FLAG_UPDATE_CURRENT)
- )
+ PendingIntent.getActivity(context, MenuView.NOTE.id,
+ MainActivity.getStartIntent(context, MenuView.NOTE, true), FLAG_UPDATE_CURRENT))
.setStyle(NotificationCompat.InboxStyle().run {
setSummaryText(context.resources.getQuantityString(R.plurals.note_number_item, notes.size, notes.size))
notes.forEach { addLine("${it.teacher}: ${it.category}") }
diff --git a/app/src/main/java/io/github/wulkanowy/services/widgets/TimetableWidgetService.kt b/app/src/main/java/io/github/wulkanowy/services/widgets/TimetableWidgetService.kt
index 0432ee146..f3429457b 100644
--- a/app/src/main/java/io/github/wulkanowy/services/widgets/TimetableWidgetService.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/widgets/TimetableWidgetService.kt
@@ -7,7 +7,7 @@ import io.github.wulkanowy.data.db.SharedPrefHelper
import io.github.wulkanowy.data.repositories.semester.SemesterRepository
import io.github.wulkanowy.data.repositories.student.StudentRepository
import io.github.wulkanowy.data.repositories.timetable.TimetableRepository
-import io.github.wulkanowy.ui.widgets.timetable.TimetableWidgetFactory
+import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetFactory
import io.github.wulkanowy.utils.SchedulersProvider
import javax.inject.Inject
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/BaseActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/base/BaseActivity.kt
index f227dc19a..d8b53607b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/BaseActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/BaseActivity.kt
@@ -2,33 +2,59 @@ package io.github.wulkanowy.ui.base
import android.os.Bundle
import android.view.View
+import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
import androidx.appcompat.app.AppCompatDelegate
+import androidx.fragment.app.Fragment
import com.google.android.material.snackbar.Snackbar
import com.google.android.material.snackbar.Snackbar.LENGTH_LONG
-import dagger.android.support.DaggerAppCompatActivity
+import dagger.android.AndroidInjection
+import dagger.android.DispatchingAndroidInjector
+import dagger.android.support.HasSupportFragmentInjector
import io.github.wulkanowy.R
+import io.github.wulkanowy.utils.FragmentLifecycleLogger
+import javax.inject.Inject
-abstract class BaseActivity : DaggerAppCompatActivity(), BaseView {
+abstract class BaseActivity : AppCompatActivity(), BaseView, HasSupportFragmentInjector {
- protected lateinit var messageContainer: View
+ @Inject
+ lateinit var supportFragmentInjector: DispatchingAndroidInjector
+
+ @Inject
+ lateinit var fragmentLifecycleLogger: FragmentLifecycleLogger
+
+ @Inject
+ lateinit var themeManager: ThemeManager
+
+ protected var messageContainer: View? = null
public override fun onCreate(savedInstanceState: Bundle?) {
+ AndroidInjection.inject(this)
+ themeManager.applyTheme(this)
super.onCreate(savedInstanceState)
+ supportFragmentManager.registerFragmentLifecycleCallbacks(fragmentLifecycleLogger, true)
AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
}
override fun showError(text: String, error: Throwable) {
- Snackbar.make(messageContainer, text, LENGTH_LONG).setAction(R.string.all_details) {
- ErrorDialog.newInstance(error).show(supportFragmentManager, error.toString())
- }.show()
+ if (messageContainer != null) {
+ Snackbar.make(messageContainer!!, text, LENGTH_LONG)
+ .setAction(R.string.all_details) {
+ ErrorDialog.newInstance(error).show(supportFragmentManager, error.toString())
+ }
+ .show()
+ } else showMessage(text)
}
override fun showMessage(text: String) {
- Snackbar.make(messageContainer, text, LENGTH_LONG).show()
+ if (messageContainer != null) Snackbar.make(messageContainer!!, text, LENGTH_LONG).show()
+ else Toast.makeText(this, text, Toast.LENGTH_LONG).show()
}
override fun onDestroy() {
super.onDestroy()
invalidateOptionsMenu()
}
+
+ override fun supportFragmentInjector() = supportFragmentInjector
}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragment.kt
index 6e863c511..4beb0ac4f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragment.kt
@@ -2,6 +2,7 @@ package io.github.wulkanowy.ui.base
import android.view.View
import com.google.android.material.snackbar.Snackbar
+import com.google.android.material.snackbar.Snackbar.LENGTH_LONG
import dagger.android.support.DaggerFragment
import io.github.wulkanowy.R
@@ -10,16 +11,22 @@ abstract class BaseFragment : DaggerFragment(), BaseView {
protected var messageContainer: View? = null
override fun showError(text: String, error: Throwable) {
- if (messageContainer == null) (activity as? BaseActivity)?.showError(text, error)
- else messageContainer?.also {
- Snackbar.make(it, text, Snackbar.LENGTH_LONG).setAction(R.string.all_details) {
- ErrorDialog.newInstance(error).show(childFragmentManager, error.toString())
- }.show()
+ if (messageContainer != null) {
+ Snackbar.make(messageContainer!!, text, LENGTH_LONG)
+ .setAction(R.string.all_details) {
+ if (isAdded) ErrorDialog.newInstance(error).show(childFragmentManager, error.toString())
+ }
+ .show()
+ } else {
+ (activity as? BaseActivity)?.showError(text, error)
}
}
override fun showMessage(text: String) {
- if (messageContainer == null) (activity as? BaseActivity)?.showMessage(text)
- else messageContainer?.also { Snackbar.make(it, text, Snackbar.LENGTH_LONG).show() }
+ if (messageContainer != null) {
+ Snackbar.make(messageContainer!!, text, LENGTH_LONG).show()
+ } else {
+ (activity as? BaseActivity)?.showMessage(text)
+ }
}
}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/ThemeManager.kt b/app/src/main/java/io/github/wulkanowy/ui/base/ThemeManager.kt
new file mode 100644
index 000000000..449f451be
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/ThemeManager.kt
@@ -0,0 +1,33 @@
+package io.github.wulkanowy.ui.base
+
+import android.content.pm.PackageManager.GET_ACTIVITIES
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_NO
+import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_YES
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
+import javax.inject.Inject
+
+class ThemeManager @Inject constructor(private val preferencesRepository: PreferencesRepository) {
+
+ fun applyTheme(activity: AppCompatActivity) {
+ if (isThemeApplicable(activity)) {
+ activity.delegate.apply {
+ when (preferencesRepository.appTheme) {
+ "light" -> setLocalNightMode(MODE_NIGHT_NO)
+ "dark" -> setLocalNightMode(MODE_NIGHT_YES)
+ "black" -> {
+ setLocalNightMode(MODE_NIGHT_YES)
+ activity.setTheme(R.style.WulkanowyTheme_Black)
+ }
+ }
+ }
+ }
+ }
+
+ private fun isThemeApplicable(activity: AppCompatActivity): Boolean {
+ return activity.packageManager.getPackageInfo(activity.packageName, GET_ACTIVITIES)
+ .activities.singleOrNull { it.name == activity::class.java.canonicalName }?.theme
+ .let { it == R.style.WulkanowyTheme_Black || it == R.style.WulkanowyTheme_NoActionBar }
+ }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutFragment.kt
index 52caf731e..8d07566f7 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutFragment.kt
@@ -12,6 +12,7 @@ import io.github.wulkanowy.BuildConfig
import io.github.wulkanowy.R
import io.github.wulkanowy.ui.base.BaseFragment
import io.github.wulkanowy.ui.modules.main.MainView
+import io.github.wulkanowy.utils.openInternetBrowser
import io.github.wulkanowy.utils.withOnExtraListener
import javax.inject.Inject
@@ -44,7 +45,7 @@ class AboutFragment : BaseFragment(), AboutView, MainView.TitledView {
.withFields(R.string::class.java.fields)
.withCheckCachedDetection(false)
.withExcludedLibraries("fastadapter", "AndroidIconics", "Jsoup", "Retrofit", "okio",
- "OkHttp", "Butterknife", "CircleImageView")
+ "Butterknife", "CircleImageView")
.withOnExtraListener { presenter.onExtraSelect(it) })
}.let {
fragmentCompat.onCreateView(inflater.context, inflater, container, savedInstanceState, it)
@@ -57,11 +58,11 @@ class AboutFragment : BaseFragment(), AboutView, MainView.TitledView {
}
override fun openDiscordInviteView() {
- startActivity(Intent.parseUri("https://discord.gg/vccAQBr", 0))
+ context?.openInternetBrowser("https://discord.gg/vccAQBr", ::showMessage)
}
override fun openHomepageWebView() {
- startActivity(Intent.parseUri("https://wulkanowy.github.io/", 0))
+ context?.openInternetBrowser("https://wulkanowy.github.io/", ::showMessage)
}
override fun openEmailClientView() {
@@ -80,7 +81,7 @@ class AboutFragment : BaseFragment(), AboutView, MainView.TitledView {
if (intent.resolveActivity(it.packageManager) != null) {
startActivity(Intent.createChooser(intent, getString(R.string.about_feedback)))
} else {
- startActivity(Intent.parseUri("https://github.com/wulkanowy/wulkanowy/issues", 0))
+ it.openInternetBrowser("https://github.com/wulkanowy/wulkanowy/issues", ::showMessage)
}
}
}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutPresenter.kt
index 116dbef35..0b6db107c 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutPresenter.kt
@@ -17,7 +17,7 @@ class AboutPresenter @Inject constructor(
override fun onAttachView(view: AboutView) {
super.onAttachView(view)
- Timber.i("About view is attached")
+ Timber.i("About view was initialized")
}
fun onExtraSelect(type: Libs.SpecialButton?) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountDialog.kt
index 32458f276..1eaa07c16 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountDialog.kt
@@ -15,7 +15,6 @@ import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
import io.github.wulkanowy.R
import io.github.wulkanowy.ui.modules.login.LoginActivity
-import io.github.wulkanowy.ui.modules.main.MainActivity
import io.github.wulkanowy.utils.setOnItemClickListener
import kotlinx.android.synthetic.main.dialog_account.*
import javax.inject.Inject
@@ -97,11 +96,8 @@ class AccountDialog : DaggerAppCompatDialogFragment(), AccountView {
}
}
- override fun recreateView() {
- activity?.also {
- startActivity(MainActivity.getStartIntent(it))
- it.finish()
- }
+ override fun recreateMainView() {
+ activity?.recreate()
}
override fun onDestroy() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountPresenter.kt
index 0fc6cc45c..a16c544a8 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountPresenter.kt
@@ -19,8 +19,8 @@ class AccountPresenter @Inject constructor(
override fun onAttachView(view: AccountView) {
super.onAttachView(view)
- Timber.i("Account dialog is attached")
view.initView()
+ Timber.i("Account dialog view was initialized")
loadData()
}
@@ -54,7 +54,7 @@ class AccountPresenter @Inject constructor(
openClearLoginView()
} else {
Timber.i("Logout result: Switch to another student")
- recreateView()
+ recreateMainView()
}
}
}, {
@@ -73,9 +73,10 @@ class AccountPresenter @Inject constructor(
disposable.add(studentRepository.switchStudent(item.student)
.subscribeOn(schedulers.backgroundThread)
.observeOn(schedulers.mainThread)
+ .doFinally { view?.dismissView() }
.subscribe({
Timber.i("Change a student result: Success")
- view?.recreateView()
+ view?.recreateMainView()
}, {
Timber.i("Change a student result: An exception occurred")
errorHandler.dispatch(it)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountView.kt
index ca74998a1..74662cf4e 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountView.kt
@@ -16,6 +16,6 @@ interface AccountView : BaseView {
fun openClearLoginView()
- fun recreateView()
+ fun recreateMainView()
}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt
index f0cab7f11..e5d8150d3 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt
@@ -77,12 +77,12 @@ class AttendanceFragment : BaseSessionFragment(), AttendanceView, MainView.MainC
attendanceNextButton.setOnClickListener { presenter.onNextDay() }
}
- override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater?) {
- inflater?.inflate(R.menu.action_menu_attendance, menu)
+ override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+ inflater.inflate(R.menu.action_menu_attendance, menu)
}
- override fun onOptionsItemSelected(item: MenuItem?): Boolean {
- return if (item?.itemId == R.id.attendanceMenuSummary) presenter.onSummarySwitchSelected()
+ override fun onOptionsItemSelected(item: MenuItem): Boolean {
+ return if (item.itemId == R.id.attendanceMenuSummary) presenter.onSummarySwitchSelected()
else false
}
@@ -103,7 +103,7 @@ class AttendanceFragment : BaseSessionFragment(), AttendanceView, MainView.MainC
}
override fun onFragmentReselected() {
- presenter.onViewReselected()
+ if (::presenter.isInitialized) presenter.onViewReselected()
}
override fun popView() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt
index ec471c16a..ec3d57e34 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt
@@ -37,8 +37,8 @@ class AttendancePresenter @Inject constructor(
fun onAttachView(view: AttendanceView, date: Long?) {
super.onAttachView(view)
- Timber.i("Attendance view is attached")
view.initView()
+ Timber.i("Attendance view was initialized")
loadData(ofEpochDay(date ?: now().previousOrSameSchoolDay.toEpochDay()))
reloadView()
}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryPresenter.kt
index 8b17f7437..09ad8980f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryPresenter.kt
@@ -35,8 +35,8 @@ class AttendanceSummaryPresenter @Inject constructor(
fun onAttachView(view: AttendanceSummaryView, subjectId: Int?) {
super.onAttachView(view)
- Timber.i("Attendance summary view is attached with subject id ${subjectId ?: -1}")
view.initView()
+ Timber.i("Attendance summary view was initialized with subject id ${subjectId ?: -1}")
loadData(subjectId ?: -1)
loadSubjects()
}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamFragment.kt
index 97e97727f..8f9576f2a 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamFragment.kt
@@ -88,7 +88,7 @@ class ExamFragment : BaseSessionFragment(), ExamView, MainView.MainChildView, Ma
}
override fun onFragmentReselected() {
- presenter.onViewReselected()
+ if (::presenter.isInitialized) presenter.onViewReselected()
}
override fun showEmpty(show: Boolean) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamPresenter.kt
index 4b6ef298b..a18f7b2a4 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamPresenter.kt
@@ -36,8 +36,8 @@ class ExamPresenter @Inject constructor(
fun onAttachView(view: ExamView, date: Long?) {
super.onAttachView(view)
- Timber.i("Exam view is attached")
view.initView()
+ Timber.i("Exam view was initialized")
loadData(ofEpochDay(date ?: now().nextOrSameSchoolDay.toEpochDay()))
reloadView()
}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProvider.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProvider.kt
new file mode 100644
index 000000000..a76f3d5ac
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProvider.kt
@@ -0,0 +1,54 @@
+package io.github.wulkanowy.ui.modules.grade
+
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.repositories.grade.GradeRepository
+import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
+import io.github.wulkanowy.utils.calcAverage
+import io.github.wulkanowy.utils.changeModifier
+import io.reactivex.Single
+import javax.inject.Inject
+
+class GradeAverageProvider @Inject constructor(
+ private val preferencesRepository: PreferencesRepository,
+ private val gradeRepository: GradeRepository
+) {
+ fun getGradeAverage(student: Student, semesters: List, selectedSemesterId: Int, forceRefresh: Boolean): Single> {
+ return when (preferencesRepository.gradeAverageMode) {
+ "all_year" -> getAllYearAverage(student, semesters, selectedSemesterId, forceRefresh)
+ "only_one_semester" -> getOnlyOneSemesterAverage(student, semesters, selectedSemesterId, forceRefresh)
+ else -> throw IllegalArgumentException("Incorrect grade average mode: ${preferencesRepository.gradeAverageMode} ")
+ }
+ }
+
+ private fun getAllYearAverage(student: Student, semesters: List, semesterId: Int, forceRefresh: Boolean): Single> {
+ val selectedSemester = semesters.single { it.semesterId == semesterId }
+ val firstSemester = semesters.single { it.diaryId == selectedSemester.diaryId && it.semesterName == 1 }
+ val plusModifier = preferencesRepository.gradePlusModifier
+ val minusModifier = preferencesRepository.gradeMinusModifier
+
+ return gradeRepository.getGrades(student, selectedSemester, forceRefresh)
+ .flatMap { firstGrades ->
+ if (selectedSemester == firstSemester) Single.just(firstGrades)
+ else gradeRepository.getGrades(student, firstSemester)
+ .map { secondGrades -> secondGrades + firstGrades }
+ }.map { grades ->
+ grades.map { it.changeModifier(plusModifier, minusModifier) }
+ .groupBy { it.subject }
+ .mapValues { it.value.calcAverage() }
+ }
+ }
+
+ private fun getOnlyOneSemesterAverage(student: Student, semesters: List, semesterId: Int, forceRefresh: Boolean): Single> {
+ val selectedSemester = semesters.single { it.semesterId == semesterId }
+ val plusModifier = preferencesRepository.gradePlusModifier
+ val minusModifier = preferencesRepository.gradeMinusModifier
+
+ return gradeRepository.getGrades(student, selectedSemester, forceRefresh)
+ .map { grades ->
+ grades.map { it.changeModifier(plusModifier, minusModifier) }
+ .groupBy { it.subject }
+ .mapValues { it.value.calcAverage() }
+ }
+ }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeFragment.kt
index 20d3fad70..182258d14 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeFragment.kt
@@ -57,9 +57,9 @@ class GradeFragment : BaseSessionFragment(), GradeView, MainView.MainChildView,
presenter.onAttachView(this, savedInstanceState?.getInt(SAVED_SEMESTER_KEY))
}
- override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater?) {
- inflater?.inflate(R.menu.action_menu_grade, menu)
- semesterSwitchMenu = menu?.findItem(R.id.gradeMenuSemester)
+ override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+ inflater.inflate(R.menu.action_menu_grade, menu)
+ semesterSwitchMenu = menu.findItem(R.id.gradeMenuSemester)
presenter.onCreateMenu()
}
@@ -82,13 +82,13 @@ class GradeFragment : BaseSessionFragment(), GradeView, MainView.MainChildView,
gradeSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
}
- override fun onOptionsItemSelected(item: MenuItem?): Boolean {
- return if (item?.itemId == R.id.gradeMenuSemester) presenter.onSemesterSwitch()
+ override fun onOptionsItemSelected(item: MenuItem): Boolean {
+ return if (item.itemId == R.id.gradeMenuSemester) presenter.onSemesterSwitch()
else false
}
override fun onFragmentReselected() {
- presenter.onViewReselected()
+ if (::presenter.isInitialized) presenter.onViewReselected()
}
override fun showContent(show: Boolean) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradePresenter.kt
index 2357e0637..6a8d4d580 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradePresenter.kt
@@ -27,12 +27,12 @@ class GradePresenter @Inject constructor(
fun onAttachView(view: GradeView, savedIndex: Int?) {
super.onAttachView(view)
- Timber.i("Grade view is attached")
selectedIndex = savedIndex ?: 0
view.run {
initView()
enableSwipe(false)
}
+ Timber.i("Grade view was initialized with $selectedIndex index")
loadData()
}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsFragment.kt
index 205cde771..65cd9262d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsFragment.kt
@@ -67,8 +67,8 @@ class GradeDetailsFragment : BaseSessionFragment(), GradeDetailsView, GradeView.
presenter.onAttachView(this)
}
- override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater?) {
- inflater?.inflate(R.menu.action_menu_grade_details, menu)
+ override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+ inflater.inflate(R.menu.action_menu_grade_details, menu)
}
override fun initView() {
@@ -88,8 +88,8 @@ class GradeDetailsFragment : BaseSessionFragment(), GradeDetailsView, GradeView.
gradeDetailsSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
}
- override fun onOptionsItemSelected(item: MenuItem?): Boolean {
- return if (item?.itemId == R.id.gradeDetailsMenuRead) presenter.onMarkAsReadSelected()
+ override fun onOptionsItemSelected(item: MenuItem): Boolean {
+ return if (item.itemId == R.id.gradeDetailsMenuRead) presenter.onMarkAsReadSelected()
else false
}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsPresenter.kt
index 1be0b36f9..12e606873 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsPresenter.kt
@@ -8,10 +8,9 @@ import io.github.wulkanowy.data.repositories.semester.SemesterRepository
import io.github.wulkanowy.data.repositories.student.StudentRepository
import io.github.wulkanowy.ui.base.session.BaseSessionPresenter
import io.github.wulkanowy.ui.base.session.SessionErrorHandler
+import io.github.wulkanowy.ui.modules.grade.GradeAverageProvider
import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
import io.github.wulkanowy.utils.SchedulersProvider
-import io.github.wulkanowy.utils.calcAverage
-import io.github.wulkanowy.utils.changeModifier
import io.github.wulkanowy.utils.getBackgroundColor
import timber.log.Timber
import javax.inject.Inject
@@ -23,6 +22,7 @@ class GradeDetailsPresenter @Inject constructor(
private val studentRepository: StudentRepository,
private val semesterRepository: SemesterRepository,
private val preferencesRepository: PreferencesRepository,
+ private val averageProvider: GradeAverageProvider,
private val analytics: FirebaseAnalyticsHelper
) : BaseSessionPresenter(errorHandler) {
@@ -109,11 +109,16 @@ class GradeDetailsPresenter @Inject constructor(
private fun loadData(semesterId: Int, forceRefresh: Boolean) {
Timber.i("Loading grade details data started")
disposable.add(studentRepository.getCurrentStudent()
- .flatMap { semesterRepository.getSemesters(it).map { semester -> semester to it } }
- .flatMap { gradeRepository.getGrades(it.second, it.first.first { item -> item.semesterId == semesterId }, forceRefresh) }
- .map { it.sortedByDescending { grade -> grade.date } }
- .map { it.map { item -> item.changeModifier(preferencesRepository.gradePlusModifier, preferencesRepository.gradeMinusModifier) } }
- .map { createGradeItems(it.groupBy { grade -> grade.subject }.toSortedMap()) }
+ .flatMap { semesterRepository.getSemesters(it).map { semester -> it to semester } }
+ .flatMap { (student, semesters) ->
+ averageProvider.getGradeAverage(student, semesters, semesterId, forceRefresh)
+ .flatMap { averages ->
+ gradeRepository.getGrades(student, semesters.first { semester -> semester.semesterId == semesterId })
+ .map { it.sortedByDescending { grade -> grade.date } }
+ .map { it.groupBy { grade -> grade.subject }.toSortedMap() }
+ .map { createGradeItems(it, averages) }
+ }
+ }
.subscribeOn(schedulers.backgroundThread)
.observeOn(schedulers.mainThread)
.doFinally {
@@ -139,32 +144,36 @@ class GradeDetailsPresenter @Inject constructor(
})
}
- private fun createGradeItems(items: Map>): List {
+ private fun createGradeItems(items: Map>, averages: Map): List {
+ val isGradeExpandable = preferencesRepository.isGradeExpandable
+ val gradeColorTheme = preferencesRepository.gradeColorTheme
+
+ val noDescriptionString = view?.noDescriptionString.orEmpty()
+ val weightString = view?.weightString.orEmpty()
+
return items.map {
- it.value.calcAverage().let { average ->
- GradeDetailsHeader(
- subject = it.key,
- average = formatAverage(average),
- number = view?.getGradeNumberString(it.value.size).orEmpty(),
- newGrades = it.value.filter { grade -> !grade.isRead }.size,
- isExpandable = preferencesRepository.isGradeExpandable
- ).apply {
- subItems = it.value.map { item ->
- GradeDetailsItem(
- grade = item,
- valueBgColor = item.getBackgroundColor(preferencesRepository.gradeColorTheme),
- weightString = view?.weightString.orEmpty(),
- noDescriptionString = view?.noDescriptionString.orEmpty()
- )
- }
+ GradeDetailsHeader(
+ subject = it.key,
+ average = formatAverage(averages[it.key]),
+ number = view?.getGradeNumberString(it.value.size).orEmpty(),
+ newGrades = it.value.filter { grade -> !grade.isRead }.size,
+ isExpandable = isGradeExpandable
+ ).apply {
+ subItems = it.value.map { item ->
+ GradeDetailsItem(
+ grade = item,
+ valueBgColor = item.getBackgroundColor(gradeColorTheme),
+ weightString = weightString,
+ noDescriptionString = noDescriptionString
+ )
}
}
}
}
- private fun formatAverage(average: Double): String {
+ private fun formatAverage(average: Double?): String {
return view?.run {
- if (average == 0.0) emptyAverageString
+ if (average == null || average == .0) emptyAverageString
else averageString.format(average)
}.orEmpty()
}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryPresenter.kt
index 5dbf75134..bab646326 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryPresenter.kt
@@ -1,17 +1,15 @@
package io.github.wulkanowy.ui.modules.grade.summary
import io.github.wulkanowy.data.db.entities.GradeSummary
-import io.github.wulkanowy.data.repositories.grade.GradeRepository
import io.github.wulkanowy.data.repositories.gradessummary.GradeSummaryRepository
-import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
import io.github.wulkanowy.data.repositories.semester.SemesterRepository
import io.github.wulkanowy.data.repositories.student.StudentRepository
import io.github.wulkanowy.ui.base.session.BaseSessionPresenter
import io.github.wulkanowy.ui.base.session.SessionErrorHandler
+import io.github.wulkanowy.ui.modules.grade.GradeAverageProvider
import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
import io.github.wulkanowy.utils.SchedulersProvider
import io.github.wulkanowy.utils.calcAverage
-import io.github.wulkanowy.utils.changeModifier
import timber.log.Timber
import java.lang.String.format
import java.util.Locale.FRANCE
@@ -20,10 +18,9 @@ import javax.inject.Inject
class GradeSummaryPresenter @Inject constructor(
private val errorHandler: SessionErrorHandler,
private val gradeSummaryRepository: GradeSummaryRepository,
- private val gradeRepository: GradeRepository,
private val studentRepository: StudentRepository,
private val semesterRepository: SemesterRepository,
- private val preferencesRepository: PreferencesRepository,
+ private val averageProvider: GradeAverageProvider,
private val schedulers: SchedulersProvider,
private val analytics: FirebaseAnalyticsHelper
) : BaseSessionPresenter(errorHandler) {
@@ -36,25 +33,13 @@ class GradeSummaryPresenter @Inject constructor(
fun onParentViewLoadData(semesterId: Int, forceRefresh: Boolean) {
Timber.i("Loading grade summary data started")
disposable.add(studentRepository.getCurrentStudent()
- .flatMap { semesterRepository.getSemesters(it).map { semester -> semester to it } }
- .map { pair -> pair.first.first { it.semesterId == semesterId } to pair.second }
- .flatMap {
- gradeSummaryRepository.getGradesSummary(it.first, forceRefresh)
+ .flatMap { semesterRepository.getSemesters(it).map { semesters -> it to semesters } }
+ .flatMap { (student, semesters) ->
+ gradeSummaryRepository.getGradesSummary(semesters.first { it.semesterId == semesterId }, forceRefresh)
+ .map { it.sortedBy { subject -> subject.subject } }
.flatMap { gradesSummary ->
- gradeRepository.getGrades(it.second, it.first, forceRefresh)
- .map { grades ->
- grades.map { item -> item.changeModifier(preferencesRepository.gradePlusModifier, preferencesRepository.gradeMinusModifier) }
- .groupBy { grade -> grade.subject }
- .mapValues { entry -> entry.value.calcAverage() }
- .filterValues { value -> value != 0.0 }
- .let { averages ->
- createGradeSummaryItems(gradesSummary, averages) to
- GradeSummaryScrollableHeader(
- formatAverage(gradesSummary.calcAverage()),
- formatAverage(averages.values.average())
- )
- }
- }
+ averageProvider.getGradeAverage(student, semesters, semesterId, forceRefresh)
+ .map { averages -> createGradeSummaryItemsAndHeader(gradesSummary, averages) }
}
}
.subscribeOn(schedulers.backgroundThread)
@@ -66,14 +51,14 @@ class GradeSummaryPresenter @Inject constructor(
enableSwipe(true)
notifyParentDataLoaded(semesterId)
}
- }.subscribe({
+ }.subscribe({ (gradeSummaryItems, gradeSummaryHeader) ->
Timber.i("Loading grade summary result: Success")
view?.run {
- showEmpty(it.first.isEmpty())
- showContent(it.first.isNotEmpty())
- updateData(it.first, it.second)
+ showEmpty(gradeSummaryItems.isEmpty())
+ showContent(gradeSummaryItems.isNotEmpty())
+ updateData(gradeSummaryItems, gradeSummaryHeader)
}
- analytics.logEvent("load_grade_summary", "items" to it.first.size, "force_refresh" to forceRefresh)
+ analytics.logEvent("load_grade_summary", "items" to gradeSummaryItems.size, "force_refresh" to forceRefresh)
}) {
Timber.i("Loading grade summary result: An exception occurred")
view?.run { showEmpty(isViewEmpty) }
@@ -104,16 +89,24 @@ class GradeSummaryPresenter @Inject constructor(
disposable.clear()
}
- private fun createGradeSummaryItems(gradesSummary: List, averages: Map)
- : List {
- return gradesSummary.filter { !checkEmpty(it, averages) }.map { it ->
- GradeSummaryItem(
- title = it.subject,
- average = formatAverage(averages.getOrElse(it.subject) { 0.0 }, ""),
- predictedGrade = it.predictedGrade,
- finalGrade = it.finalGrade
- )
- }
+ private fun createGradeSummaryItemsAndHeader(gradesSummary: List, averages: Map)
+ : Pair, GradeSummaryScrollableHeader> {
+ return averages.filterValues { value -> value != 0.0 }
+ .let { filteredAverages ->
+ gradesSummary.filter { !checkEmpty(it, filteredAverages) }
+ .map {
+ GradeSummaryItem(
+ title = it.subject,
+ average = formatAverage(filteredAverages.getOrElse(it.subject) { 0.0 }, ""),
+ predictedGrade = it.predictedGrade,
+ finalGrade = it.finalGrade
+ )
+ }.let {
+ it to GradeSummaryScrollableHeader(
+ formatAverage(gradesSummary.calcAverage()),
+ formatAverage(filteredAverages.values.average()))
+ }
+ }
}
private fun checkEmpty(gradeSummary: GradeSummary, averages: Map): Boolean {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkPresenter.kt
index 739d44947..de85d8d11 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkPresenter.kt
@@ -34,8 +34,8 @@ class HomeworkPresenter @Inject constructor(
fun onAttachView(view: HomeworkView, date: Long?) {
super.onAttachView(view)
- Timber.i("Homework view is attached")
view.initView()
+ Timber.i("Homework view was initialized")
loadData(LocalDate.ofEpochDay(date ?: LocalDate.now().nextOrSameSchoolDay.toEpochDay()))
reloadView()
}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginPresenter.kt
index fb025beea..00242a7dc 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginPresenter.kt
@@ -14,7 +14,7 @@ class LoginPresenter @Inject constructor(errorHandler: ErrorHandler) : BasePrese
initAdapter()
showActionBar(false)
}
- Timber.i("Login view is attached")
+ Timber.i("Login view was initialized")
}
fun onFormViewAccountLogged(students: List, loginData: Triple) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
index 54fd0704b..b17a1205c 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
@@ -16,6 +16,7 @@ import io.github.wulkanowy.data.db.entities.Student
import io.github.wulkanowy.ui.base.BaseFragment
import io.github.wulkanowy.ui.modules.login.LoginActivity
import io.github.wulkanowy.utils.hideSoftInput
+import io.github.wulkanowy.utils.openInternetBrowser
import io.github.wulkanowy.utils.setOnItemSelectedListener
import io.github.wulkanowy.utils.setOnTextChangedListener
import io.github.wulkanowy.utils.showSoftInput
@@ -53,7 +54,8 @@ class LoginFormFragment : BaseFragment(), LoginFormView {
loginFormName.setOnTextChangedListener { presenter.onNameTextChanged() }
loginFormPass.setOnTextChangedListener { presenter.onPassTextChanged() }
loginFormHost.setOnItemSelectedListener { presenter.onHostSelected() }
- loginFormSignIn.setOnClickListener { presenter.attemptLogin() }
+ loginFormSignIn.setOnClickListener { presenter.onSignInClick() }
+ loginFormPrivacyLink.setOnClickListener { presenter.onPrivacyLinkClick() }
loginFormPass.setOnEditorActionListener { _, id, _ ->
if (id == IME_ACTION_DONE || id == IME_NULL) loginFormSignIn.callOnClick() else false
@@ -130,6 +132,10 @@ class LoginFormFragment : BaseFragment(), LoginFormView {
}
}
+ override fun showPrivacyPolicy() {
+ loginFormPrivacyLink.visibility = VISIBLE
+ }
+
override fun notifyParentAccountLogged(students: List) {
(activity as? LoginActivity)?.onFormFragmentAccountLogged(students, Triple(
loginFormName.text.toString(),
@@ -138,6 +144,10 @@ class LoginFormFragment : BaseFragment(), LoginFormView {
))
}
+ override fun openPrivacyPolicyPage() {
+ context?.openInternetBrowser("https://wulkanowy.github.io/polityka-prywatnosci.html", ::showMessage)
+ }
+
override fun onDestroyView() {
super.onDestroyView()
presenter.onDetachView()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt
index a0717649a..3ab47c29b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt
@@ -22,7 +22,8 @@ class LoginFormPresenter @Inject constructor(
super.onAttachView(view)
view.run {
initView()
- if (isDebug) showVersion()
+ if (isDebug) showVersion() else showPrivacyPolicy()
+
errorHandler.onBadCredentials = {
setErrorPassIncorrect()
showSoftKeyboard()
@@ -31,6 +32,10 @@ class LoginFormPresenter @Inject constructor(
}
}
+ fun onPrivacyLinkClick() {
+ view?.openPrivacyPolicyPage()
+ }
+
fun onHostSelected() {
view?.apply {
clearPassError()
@@ -47,7 +52,7 @@ class LoginFormPresenter @Inject constructor(
view?.clearNameError()
}
- fun attemptLogin() {
+ fun onSignInClick() {
val email = view?.formNameValue.orEmpty()
val password = view?.formPassValue.orEmpty()
val endpoint = view?.formHostValue.orEmpty()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt
index 69672780d..80a7b5e9c 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt
@@ -37,5 +37,9 @@ interface LoginFormView : BaseView {
fun showVersion()
+ fun showPrivacyPolicy()
+
fun notifyParentAccountLogged(students: List)
+
+ fun openPrivacyPolicyPage()
}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectFragment.kt
index 2bcb6b4e9..5c48cf2fb 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectFragment.kt
@@ -1,14 +1,11 @@
package io.github.wulkanowy.ui.modules.login.studentselect
-import android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK
-import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.View.GONE
import android.view.View.VISIBLE
import android.view.ViewGroup
-import androidx.appcompat.app.AppCompatActivity
import eu.davidea.flexibleadapter.FlexibleAdapter
import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
@@ -45,6 +42,7 @@ class LoginStudentSelectFragment : BaseFragment(), LoginStudentSelectView {
}
override fun initView() {
+ loginStudentSelectSignIn.setOnClickListener { presenter.onSignIn() }
loginAdapter.apply { setOnItemClickListener { presenter.onItemSelected(it) } }
loginStudentSelectRecycler.apply {
@@ -54,14 +52,11 @@ class LoginStudentSelectFragment : BaseFragment(), LoginStudentSelectView {
}
override fun updateData(data: List) {
- loginAdapter.updateDataSet(data, true)
+ loginAdapter.updateDataSet(data)
}
override fun openMainView() {
- activity?.let {
- startActivity(MainActivity.getStartIntent(it)
- .apply { addFlags(FLAG_ACTIVITY_CLEAR_TASK or FLAG_ACTIVITY_NEW_TASK) })
- }
+ activity?.let { startActivity(MainActivity.getStartIntent(context = it, clear = true)) }
}
override fun showProgress(show: Boolean) {
@@ -69,11 +64,11 @@ class LoginStudentSelectFragment : BaseFragment(), LoginStudentSelectView {
}
override fun showContent(show: Boolean) {
- loginStudentSelectRecycler.visibility = if (show) VISIBLE else GONE
+ loginStudentSelectContent.visibility = if (show) VISIBLE else GONE
}
- override fun showActionBar(show: Boolean) {
- (activity as? AppCompatActivity)?.supportActionBar?.run { if (show) show() else hide() }
+ override fun enableSignIn(enable: Boolean) {
+ loginStudentSelectSignIn.isEnabled = enable
}
fun onParentInitStudentSelectFragment(students: List) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectItem.kt
index 65940a980..27723c538 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectItem.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectItem.kt
@@ -13,15 +13,15 @@ import kotlinx.android.synthetic.main.item_login_student_select.*
class LoginStudentSelectItem(val student: Student) : AbstractFlexibleItem() {
- override fun getLayoutRes(): Int = R.layout.item_login_student_select
+ override fun getLayoutRes() = R.layout.item_login_student_select
override fun createViewHolder(view: View, adapter: FlexibleAdapter>): ItemViewHolder {
return ItemViewHolder(view, adapter)
}
@SuppressLint("SetTextI18n")
- override fun bindViewHolder(adapter: FlexibleAdapter>, holder: ItemViewHolder, position: Int, payloads: MutableList?) {
- holder.run {
+ override fun bindViewHolder(adapter: FlexibleAdapter>, holder: ItemViewHolder, position: Int, payloads: MutableList) {
+ holder.apply {
loginItemName.text = "${student.studentName} ${student.className}"
loginItemSchool.text = student.schoolName
}
@@ -43,7 +43,17 @@ class LoginStudentSelectItem(val student: Student) : AbstractFlexibleItem) : FlexibleViewHolder(view, adapter), LayoutContainer {
+
override val containerView: View
get() = itemView
+
+ init {
+ loginItemCheck.setOnClickListener { super.onClick(loginItemContainer) }
+ }
+
+ override fun onClick(view: View?) {
+ super.onClick(view)
+ loginItemCheck.apply { isChecked = !isChecked }
+ }
}
}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenter.kt
index 6c2acb3bd..21dde7b86 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenter.kt
@@ -8,7 +8,6 @@ import io.github.wulkanowy.ui.base.BasePresenter
import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
import io.github.wulkanowy.utils.SchedulersProvider
-import io.reactivex.Single
import timber.log.Timber
import java.io.Serializable
import javax.inject.Inject
@@ -22,10 +21,13 @@ class LoginStudentSelectPresenter @Inject constructor(
var students = emptyList()
+ var selectedStudents = mutableListOf()
+
fun onAttachView(view: LoginStudentSelectView, students: Serializable?) {
super.onAttachView(view)
view.run {
initView()
+ enableSignIn(false)
errorHandler.onStudentDuplicate = {
showMessage(it)
Timber.i("The student already registered in the app was selected")
@@ -37,13 +39,21 @@ class LoginStudentSelectPresenter @Inject constructor(
}
}
+ fun onSignIn() {
+ registerStudents(selectedStudents)
+ }
+
fun onParentInitStudentSelectView(students: List) {
loadData(students)
+ if (students.size == 1) registerStudents(students)
}
fun onItemSelected(item: AbstractFlexibleItem<*>?) {
if (item is LoginStudentSelectItem) {
- registerStudent(item.student)
+ selectedStudents.removeAll { it == item.student }
+ .let { if (!it) selectedStudents.add(item.student) }
+
+ view?.enableSignIn(selectedStudents.isNotEmpty())
}
}
@@ -54,33 +64,30 @@ class LoginStudentSelectPresenter @Inject constructor(
}
}
- private fun registerStudent(student: Student) {
- disposable.add(studentRepository.saveStudent(student)
- .map { student.apply { id = it } }
- .onErrorResumeNext { studentRepository.logoutStudent(student).andThen(Single.error(it)) }
- .flatMapCompletable { studentRepository.switchStudent(student) }
+ private fun registerStudents(students: List) {
+ disposable.add(studentRepository.saveStudents(students)
+ .map { students.first().apply { id = it.first() } }
+ .flatMapCompletable { studentRepository.switchStudent(it) }
.subscribeOn(schedulers.backgroundThread)
.observeOn(schedulers.mainThread)
.doOnSubscribe {
view?.apply {
showProgress(true)
showContent(false)
- showActionBar(false)
}
Timber.i("Registration started")
}
.subscribe({
- analytics.logEvent("registration_student_select", SUCCESS to true, "endpoint" to student.endpoint, "symbol" to student.symbol, "error" to "No error")
+ students.forEach { analytics.logEvent("registration_student_select", SUCCESS to true, "endpoint" to it.endpoint, "symbol" to it.symbol, "error" to "No error") }
Timber.i("Registration result: Success")
view?.openMainView()
- }, {
- analytics.logEvent("registration_student_select", SUCCESS to false, "endpoint" to student.endpoint, "symbol" to student.symbol, "error" to it.localizedMessage)
+ }, { error ->
+ students.forEach { analytics.logEvent("registration_student_select", SUCCESS to false, "endpoint" to it.endpoint, "symbol" to it.symbol, "error" to error.localizedMessage) }
Timber.i("Registration result: An exception occurred ")
- errorHandler.dispatch(it)
+ errorHandler.dispatch(error)
view?.apply {
showProgress(false)
showContent(true)
- showActionBar(true)
}
}))
}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectView.kt
index 824f421fe..3967313c3 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectView.kt
@@ -14,5 +14,5 @@ interface LoginStudentSelectView : BaseView {
fun showContent(show: Boolean)
- fun showActionBar(show: Boolean)
+ fun enableSignIn(enable: Boolean)
}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberPresenter.kt
index 74ab0d1fe..8ef638db7 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberPresenter.kt
@@ -21,12 +21,12 @@ class LuckyNumberPresenter @Inject constructor(
override fun onAttachView(view: LuckyNumberView) {
super.onAttachView(view)
- Timber.i("Lucky number view is attached")
view.run {
initView()
showContent(false)
enableSwipe(false)
}
+ Timber.i("Lucky number view was initialized")
loadData()
}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureActivity.kt
new file mode 100644
index 000000000..7e3eeb56b
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureActivity.kt
@@ -0,0 +1,77 @@
+package io.github.wulkanowy.ui.modules.luckynumberwidget
+
+import android.appwidget.AppWidgetManager.ACTION_APPWIDGET_UPDATE
+import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_ID
+import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_IDS
+import android.content.Intent
+import android.os.Bundle
+import android.widget.Toast
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import io.github.wulkanowy.R
+import io.github.wulkanowy.ui.base.BaseActivity
+import io.github.wulkanowy.ui.modules.login.LoginActivity
+import io.github.wulkanowy.utils.setOnItemClickListener
+import kotlinx.android.synthetic.main.activity_widget_configure.*
+import javax.inject.Inject
+
+class LuckyNumberWidgetConfigureActivity : BaseActivity(), LuckyNumberWidgetConfigureView {
+
+ @Inject
+ lateinit var configureAdapter: FlexibleAdapter>
+
+ @Inject
+ lateinit var presenter: LuckyNumberWidgetConfigurePresenter
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ setResult(RESULT_CANCELED)
+ setContentView(R.layout.activity_widget_configure)
+
+ intent.extras.let {
+ presenter.onAttachView(this, it?.getInt(EXTRA_APPWIDGET_ID))
+ }
+ }
+
+ override fun initView() {
+ widgetConfigureRecycler.apply {
+ adapter = configureAdapter
+ layoutManager = SmoothScrollLinearLayoutManager(context)
+ }
+ configureAdapter.setOnItemClickListener { presenter.onItemSelect(it) }
+ }
+
+ override fun updateData(data: List) {
+ configureAdapter.updateDataSet(data)
+ }
+
+ override fun updateLuckyNumberWidget(widgetId: Int) {
+ sendBroadcast(Intent(this, LuckyNumberWidgetProvider::class.java)
+ .apply {
+ action = ACTION_APPWIDGET_UPDATE
+ putExtra(EXTRA_APPWIDGET_IDS, intArrayOf(widgetId))
+ })
+ }
+
+ override fun setSuccessResult(widgetId: Int) {
+ setResult(RESULT_OK, Intent().apply { putExtra(EXTRA_APPWIDGET_ID, widgetId) })
+ }
+
+ override fun showError(text: String, error: Throwable) {
+ Toast.makeText(this, text, Toast.LENGTH_LONG).show()
+ }
+
+ override fun finishView() {
+ finish()
+ }
+
+ override fun openLoginView() {
+ startActivity(LoginActivity.getStartIntent(this))
+ }
+
+ override fun onDestroy() {
+ super.onDestroy()
+ presenter.onDetachView()
+ }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureItem.kt
new file mode 100644
index 000000000..bba0974b6
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureItem.kt
@@ -0,0 +1,54 @@
+package io.github.wulkanowy.ui.modules.luckynumberwidget
+
+import android.annotation.SuppressLint
+import android.view.View
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetConfigureItem
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.item_account.*
+
+class LuckyNumberWidgetConfigureItem(var student: Student, val isCurrent: Boolean) :
+ AbstractFlexibleItem() {
+
+ override fun getLayoutRes() = R.layout.item_account
+
+ override fun createViewHolder(view: View, adapter: FlexibleAdapter>): ViewHolder {
+ return ViewHolder(view, adapter)
+ }
+
+ @SuppressLint("SetTextI18n")
+ override fun bindViewHolder(adapter: FlexibleAdapter>, holder: ViewHolder, position: Int, payloads: MutableList) {
+ holder.apply {
+ accountItemName.text = "${student.studentName} ${student.className}"
+ accountItemSchool.text = student.schoolName
+ accountItemImage.setBackgroundResource(if (isCurrent) R.drawable.ic_account_circular_border else 0)
+ }
+ }
+
+ override fun equals(other: Any?): Boolean {
+ if (this === other) return true
+ if (javaClass != other?.javaClass) return false
+
+ other as TimetableWidgetConfigureItem
+
+ if (student != other.student) return false
+
+ return true
+ }
+
+ override fun hashCode(): Int {
+ var result = student.hashCode()
+ result = 31 * result + student.id.toInt()
+ return result
+ }
+
+ class ViewHolder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
+ override val containerView: View
+ get() = contentView
+ }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigurePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigurePresenter.kt
new file mode 100644
index 000000000..4fd81e960
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigurePresenter.kt
@@ -0,0 +1,62 @@
+package io.github.wulkanowy.ui.modules.luckynumberwidget
+
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import io.github.wulkanowy.data.db.SharedPrefHelper
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.repositories.student.StudentRepository
+import io.github.wulkanowy.ui.base.BasePresenter
+import io.github.wulkanowy.ui.base.ErrorHandler
+import io.github.wulkanowy.ui.modules.luckynumberwidget.LuckyNumberWidgetProvider.Companion.getStudentWidgetKey
+import io.github.wulkanowy.utils.SchedulersProvider
+import javax.inject.Inject
+
+class LuckyNumberWidgetConfigurePresenter @Inject constructor(
+ private val errorHandler: ErrorHandler,
+ private val schedulers: SchedulersProvider,
+ private val studentRepository: StudentRepository,
+ private val sharedPref: SharedPrefHelper
+) : BasePresenter(errorHandler) {
+
+ private var appWidgetId: Int? = null
+
+ fun onAttachView(view: LuckyNumberWidgetConfigureView, appWidgetId: Int?) {
+ super.onAttachView(view)
+ this.appWidgetId = appWidgetId
+ view.initView()
+ loadData()
+ }
+
+ fun onItemSelect(item: AbstractFlexibleItem<*>) {
+ if (item is LuckyNumberWidgetConfigureItem) {
+ registerStudent(item.student)
+ }
+ }
+
+ private fun loadData() {
+ disposable.add(studentRepository.getSavedStudents(false)
+ .map { it to appWidgetId?.let { id -> sharedPref.getLong(getStudentWidgetKey(id), 0) } }
+ .map { (students, currentStudentId) ->
+ students.map { student -> LuckyNumberWidgetConfigureItem(student, student.id == currentStudentId) }
+ }
+ .subscribeOn(schedulers.backgroundThread)
+ .observeOn(schedulers.mainThread)
+ .subscribe({
+ when {
+ it.isEmpty() -> view?.openLoginView()
+ it.size == 1 -> registerStudent(it.single().student)
+ else -> view?.updateData(it)
+ }
+ }, { errorHandler.dispatch(it) }))
+ }
+
+ private fun registerStudent(student: Student) {
+ appWidgetId?.also {
+ sharedPref.putLong(getStudentWidgetKey(it), student.id)
+ view?.apply {
+ updateLuckyNumberWidget(it)
+ setSuccessResult(it)
+ }
+ }
+ view?.finishView()
+ }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureView.kt
new file mode 100644
index 000000000..49c3f1dcd
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureView.kt
@@ -0,0 +1,19 @@
+package io.github.wulkanowy.ui.modules.luckynumberwidget
+
+import io.github.wulkanowy.ui.base.BaseView
+import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetConfigureItem
+
+interface LuckyNumberWidgetConfigureView : BaseView {
+
+ fun initView()
+
+ fun updateData(data: List)
+
+ fun updateLuckyNumberWidget(widgetId: Int)
+
+ fun setSuccessResult(widgetId: Int)
+
+ fun finishView()
+
+ fun openLoginView()
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetProvider.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetProvider.kt
new file mode 100644
index 000000000..66141c913
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetProvider.kt
@@ -0,0 +1,183 @@
+package io.github.wulkanowy.ui.modules.luckynumberwidget
+
+import android.annotation.TargetApi
+import android.app.PendingIntent
+import android.app.PendingIntent.FLAG_UPDATE_CURRENT
+import android.appwidget.AppWidgetManager
+import android.appwidget.AppWidgetManager.ACTION_APPWIDGET_DELETED
+import android.appwidget.AppWidgetManager.ACTION_APPWIDGET_OPTIONS_CHANGED
+import android.appwidget.AppWidgetManager.ACTION_APPWIDGET_UPDATE
+import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_ID
+import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_IDS
+import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_OPTIONS
+import android.appwidget.AppWidgetManager.OPTION_APPWIDGET_MAX_HEIGHT
+import android.appwidget.AppWidgetManager.OPTION_APPWIDGET_MAX_WIDTH
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import android.view.View.GONE
+import android.view.View.VISIBLE
+import android.widget.RemoteViews
+import dagger.android.AndroidInjection
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.SharedPrefHelper
+import io.github.wulkanowy.data.db.entities.LuckyNumber
+import io.github.wulkanowy.data.repositories.luckynumber.LuckyNumberRepository
+import io.github.wulkanowy.data.repositories.semester.SemesterRepository
+import io.github.wulkanowy.data.repositories.student.StudentRepository
+import io.github.wulkanowy.ui.modules.main.MainActivity
+import io.github.wulkanowy.ui.modules.main.MainView.MenuView
+import io.github.wulkanowy.utils.SchedulersProvider
+import io.reactivex.Maybe
+import timber.log.Timber
+import javax.inject.Inject
+
+class LuckyNumberWidgetProvider : BroadcastReceiver() {
+
+ @Inject
+ lateinit var studentRepository: StudentRepository
+
+ @Inject
+ lateinit var semesterRepository: SemesterRepository
+
+ @Inject
+ lateinit var luckyNumberRepository: LuckyNumberRepository
+
+ @Inject
+ lateinit var schedulers: SchedulersProvider
+
+ @Inject
+ lateinit var appWidgetManager: AppWidgetManager
+
+ @Inject
+ lateinit var sharedPref: SharedPrefHelper
+
+ companion object {
+ fun getStudentWidgetKey(appWidgetId: Int) = "lucky_number_widget_student_$appWidgetId"
+ }
+
+ @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
+ override fun onReceive(context: Context, intent: Intent) {
+ AndroidInjection.inject(this, context)
+ when (intent.action) {
+ ACTION_APPWIDGET_UPDATE -> onUpdate(context, intent)
+ ACTION_APPWIDGET_DELETED -> onDelete(intent)
+ ACTION_APPWIDGET_OPTIONS_CHANGED -> onOptionsChange(context, intent)
+ }
+ }
+
+ private fun onUpdate(context: Context, intent: Intent) {
+ intent.getIntArrayExtra(EXTRA_APPWIDGET_IDS)?.forEach { appWidgetId ->
+ RemoteViews(context.packageName, R.layout.widget_luckynumber).apply {
+ setTextViewText(R.id.luckyNumberWidgetNumber,
+ getLuckyNumber(sharedPref.getLong(getStudentWidgetKey(appWidgetId), 0), appWidgetId)?.luckyNumber?.toString() ?: "#"
+ )
+ setOnClickPendingIntent(R.id.luckyNumberWidgetContainer,
+ PendingIntent.getActivity(context, MenuView.LUCKY_NUMBER.id,
+ MainActivity.getStartIntent(context, MenuView.LUCKY_NUMBER, true), FLAG_UPDATE_CURRENT))
+ }.also {
+ setStyles(it, intent)
+ appWidgetManager.updateAppWidget(appWidgetId, it)
+ }
+ }
+ }
+
+ private fun onDelete(intent: Intent) {
+ intent.getIntExtra(EXTRA_APPWIDGET_ID, 0).let {
+ if (it != 0) sharedPref.delete(getStudentWidgetKey(it))
+ }
+ }
+
+ private fun getLuckyNumber(studentId: Long, appWidgetId: Int): LuckyNumber? {
+ return try {
+ studentRepository.isStudentSaved()
+ .filter { true }
+ .flatMap { studentRepository.getSavedStudents().toMaybe() }
+ .flatMap { students ->
+ students.singleOrNull { student -> student.id == studentId }
+ .let { student ->
+ when {
+ student != null -> Maybe.just(student)
+ studentId != 0L -> {
+ studentRepository.isCurrentStudentSet()
+ .filter { true }
+ .flatMap { studentRepository.getCurrentStudent(false).toMaybe() }
+ .doOnSuccess { sharedPref.putLong(getStudentWidgetKey(appWidgetId), it.id) }
+ }
+ else -> Maybe.empty()
+ }
+ }
+ }
+ .flatMap { semesterRepository.getCurrentSemester(it).toMaybe() }
+ .flatMap { luckyNumberRepository.getLuckyNumber(it) }
+ .subscribeOn(schedulers.backgroundThread)
+ .blockingGet()
+ } catch (e: Exception) {
+ Timber.e(e, "An error has occurred in lucky number provider")
+ null
+ }
+ }
+
+ private fun onOptionsChange(context: Context, intent: Intent) {
+ intent.extras?.let { extras ->
+ RemoteViews(context.packageName, R.layout.widget_luckynumber).apply {
+ setStyles(this, intent)
+ appWidgetManager.updateAppWidget(extras.getInt(EXTRA_APPWIDGET_ID), this)
+ }
+ }
+ }
+
+ @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
+ private fun setStyles(views: RemoteViews, intent: Intent) {
+ val options = intent.extras?.getBundle(EXTRA_APPWIDGET_OPTIONS)
+
+ val maxWidth = options?.getInt(OPTION_APPWIDGET_MAX_WIDTH) ?: 150
+ val maxHeight = options?.getInt(OPTION_APPWIDGET_MAX_HEIGHT) ?: 40
+
+ Timber.d("New lucky number widget measurement: %dx%d", maxWidth, maxHeight)
+
+ when {
+ // 1x1
+ maxWidth < 150 && maxHeight < 110 -> {
+ Timber.d("Lucky number widget size: 1x1")
+ views.run {
+ setViewVisibility(R.id.luckyNumberWidgetImageTop, GONE)
+ setViewVisibility(R.id.luckyNumberWidgetImageLeft, GONE)
+ setViewVisibility(R.id.luckyNumberWidgetTitle, GONE)
+ setViewVisibility(R.id.luckyNumberWidgetNumber, VISIBLE)
+ }
+ }
+ // 1x2
+ maxWidth < 150 && maxHeight > 110 -> {
+ Timber.d("Lucky number widget size: 1x2")
+ views.run {
+ setViewVisibility(R.id.luckyNumberWidgetImageTop, VISIBLE)
+ setViewVisibility(R.id.luckyNumberWidgetImageLeft, GONE)
+ setViewVisibility(R.id.luckyNumberWidgetTitle, GONE)
+ setViewVisibility(R.id.luckyNumberWidgetNumber, VISIBLE)
+ }
+ }
+ // 2x1
+ maxWidth >= 150 && maxHeight <= 110 -> {
+ Timber.d("Lucky number widget size: 2x1")
+ views.run {
+ setViewVisibility(R.id.luckyNumberWidgetImageTop, GONE)
+ setViewVisibility(R.id.luckyNumberWidgetImageLeft, VISIBLE)
+ setViewVisibility(R.id.luckyNumberWidgetTitle, GONE)
+ setViewVisibility(R.id.luckyNumberWidgetNumber, VISIBLE)
+ }
+ }
+ // 2x2 and bigger
+ else -> {
+ Timber.d("Lucky number widget size: 2x2 and bigger")
+ views.run {
+ setViewVisibility(R.id.luckyNumberWidgetImageTop, GONE)
+ setViewVisibility(R.id.luckyNumberWidgetImageLeft, GONE)
+ setViewVisibility(R.id.luckyNumberWidgetTitle, VISIBLE)
+ setViewVisibility(R.id.luckyNumberWidgetNumber, VISIBLE)
+ }
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt
index 4448e556b..5ca41b711 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt
@@ -5,7 +5,6 @@ import android.content.Intent
import android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK
import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
import android.os.Bundle
-import android.os.Handler
import android.view.Menu
import android.view.MenuItem
import androidx.appcompat.app.AlertDialog
@@ -22,8 +21,12 @@ import io.github.wulkanowy.ui.modules.account.AccountDialog
import io.github.wulkanowy.ui.modules.attendance.AttendanceFragment
import io.github.wulkanowy.ui.modules.exam.ExamFragment
import io.github.wulkanowy.ui.modules.grade.GradeFragment
+import io.github.wulkanowy.ui.modules.homework.HomeworkFragment
import io.github.wulkanowy.ui.modules.login.LoginActivity
+import io.github.wulkanowy.ui.modules.luckynumber.LuckyNumberFragment
+import io.github.wulkanowy.ui.modules.message.MessageFragment
import io.github.wulkanowy.ui.modules.more.MoreFragment
+import io.github.wulkanowy.ui.modules.note.NoteFragment
import io.github.wulkanowy.ui.modules.timetable.TimetableFragment
import io.github.wulkanowy.utils.getThemeAttrColor
import io.github.wulkanowy.utils.safelyPopFragment
@@ -40,9 +43,15 @@ class MainActivity : BaseActivity(), MainView {
lateinit var navController: FragNavController
companion object {
- const val EXTRA_START_MENU_INDEX = "extraStartMenuIndex"
+ const val EXTRA_START_MENU = "extraStartMenu"
- fun getStartIntent(context: Context) = Intent(context, MainActivity::class.java)
+ fun getStartIntent(context: Context, startMenu: MainView.MenuView? = null, clear: Boolean = false): Intent {
+ return Intent(context, MainActivity::class.java)
+ .apply {
+ if (clear) flags = FLAG_ACTIVITY_NEW_TASK or FLAG_ACTIVITY_CLEAR_TASK
+ startMenu?.let { putExtra(EXTRA_START_MENU, it) }
+ }
+ }
}
override val isRootView: Boolean
@@ -56,14 +65,27 @@ class MainActivity : BaseActivity(), MainView {
override var startMenuIndex = 0
+ override var startMenuMoreIndex = -1
+
+ private val moreMenuFragments = listOf(
+ MessageFragment.newInstance(),
+ HomeworkFragment.newInstance(),
+ NoteFragment.newInstance(),
+ LuckyNumberFragment.newInstance()
+ )
+
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_main)
setSupportActionBar(mainToolbar)
messageContainer = mainFragmentContainer
- presenter.onAttachView(this, intent.getIntExtra(EXTRA_START_MENU_INDEX, -1))
- navController.initialize(startMenuIndex, savedInstanceState)
+ presenter.onAttachView(this, intent.getSerializableExtra(EXTRA_START_MENU) as? MainView.MenuView)
+
+ navController.run {
+ initialize(startMenuIndex, savedInstanceState)
+ pushFragment(moreMenuFragments.getOrNull(startMenuMoreIndex))
+ }
}
override fun onCreateOptionsMenu(menu: Menu?): Boolean {
@@ -74,7 +96,7 @@ class MainActivity : BaseActivity(), MainView {
override fun initView() {
mainBottomNav.run {
addItems(
- mutableListOf(
+ listOf(
AHBottomNavigationItem(R.string.grade_title, R.drawable.ic_menu_main_grade_26dp, 0),
AHBottomNavigationItem(R.string.attendance_title, R.drawable.ic_menu_main_attendance_24dp, 0),
AHBottomNavigationItem(R.string.exam_title, R.drawable.ic_menu_main_exam_24dp, 0),
@@ -142,9 +164,7 @@ class MainActivity : BaseActivity(), MainView {
}
override fun notifyMenuViewReselected() {
- Handler().postDelayed({
- (navController.currentStack?.get(0) as? MainView.MainChildView)?.onFragmentReselected()
- }, 250)
+ (navController.currentStack?.getOrNull(0) as? MainView.MainChildView)?.onFragmentReselected()
}
fun showDialogFragment(dialog: DialogFragment) {
@@ -168,9 +188,10 @@ class MainActivity : BaseActivity(), MainView {
.apply { addFlags(FLAG_ACTIVITY_CLEAR_TASK or FLAG_ACTIVITY_NEW_TASK) })
}
- override fun onSaveInstanceState(outState: Bundle?) {
+ override fun onSaveInstanceState(outState: Bundle) {
super.onSaveInstanceState(outState)
navController.onSaveInstanceState(outState)
+ intent.removeExtra(EXTRA_START_MENU)
}
override fun onDestroy() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt
index 30f3b920f..12f2bb048 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt
@@ -22,22 +22,19 @@ class MainPresenter @Inject constructor(
private val analytics: FirebaseAnalyticsHelper
) : BasePresenter(errorHandler) {
- fun onAttachView(view: MainView, initMenuIndex: Int) {
+ fun onAttachView(view: MainView, initMenu: MainView.MenuView?) {
super.onAttachView(view)
- view.run {
- startMenuIndex = if (initMenuIndex != -1) initMenuIndex else prefRepository.startMenuIndex
- Timber.i("Main view is attached with $startMenuIndex menu index")
+ view.apply {
+ getProperViewIndexes(initMenu).let { (main, more) ->
+ startMenuIndex = main
+ startMenuMoreIndex = more
+ }
initView()
+ Timber.i("Main view was initialized with $startMenuIndex menu index and $startMenuMoreIndex more index")
}
syncManager.startSyncWorker()
-
- analytics.logEvent(APP_OPEN, DESTINATION to when (initMenuIndex) {
- 1 -> "Grades"
- 3 -> "Timetable"
- 4 -> "More"
- else -> "User action"
- })
+ analytics.logEvent(APP_OPEN, DESTINATION to initMenu?.name)
}
fun onViewChange() {
@@ -104,4 +101,12 @@ class MainPresenter @Inject constructor(
errorHandler.dispatch(it)
}))
}
+
+ private fun getProperViewIndexes(initMenu: MainView.MenuView?): Pair {
+ return when {
+ initMenu?.id in 0..3 -> initMenu!!.id to -1
+ (initMenu?.id ?: 0) > 3 -> 4 to initMenu!!.id - 4
+ else -> prefRepository.startMenuIndex to -1
+ }
+ }
}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainView.kt
index d3d7e342f..a786a3c33 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainView.kt
@@ -6,6 +6,8 @@ interface MainView : BaseView {
var startMenuIndex: Int
+ var startMenuMoreIndex: Int
+
val isRootView: Boolean
val currentViewTitle: String?
@@ -37,4 +39,15 @@ interface MainView : BaseView {
val titleStringId: Int
}
+
+ enum class MenuView(val id: Int) {
+ GRADE(0),
+ ATTENDANCE(1),
+ EXAM(2),
+ TIMETABLE(3),
+ MESSAGE(4),
+ HOMEWORK(5),
+ NOTE(6),
+ LUCKY_NUMBER(7),
+ }
}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageFragment.kt
index d8a6bc84c..7bd35f2d2 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageFragment.kt
@@ -7,6 +7,7 @@ import android.view.View.INVISIBLE
import android.view.View.VISIBLE
import android.view.ViewGroup
import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Message
import io.github.wulkanowy.data.repositories.message.MessageFolder.RECEIVED
import io.github.wulkanowy.data.repositories.message.MessageFolder.SENT
import io.github.wulkanowy.data.repositories.message.MessageFolder.TRASHED
@@ -75,12 +76,20 @@ class MessageFragment : BaseFragment(), MessageView, MainView.TitledView {
messageProgress.visibility = if (show) VISIBLE else INVISIBLE
}
+ fun onDeleteMessage(message: Message) {
+ presenter.onDeleteMessage(message)
+ }
+
fun onChildFragmentLoaded() {
presenter.onChildViewLoaded()
}
+ override fun notifyChildMessageDeleted(tabId: Int) {
+ (pagerAdapter.getFragmentInstance(tabId) as? MessageTabFragment)?.onParentDeleteMessage()
+ }
+
override fun notifyChildLoadData(index: Int, forceRefresh: Boolean) {
- (pagerAdapter.getFragmentInstance(index) as? MessageView.MessageChildView)?.onParentLoadData(forceRefresh)
+ (pagerAdapter.getFragmentInstance(index) as? MessageTabFragment)?.onParentLoadData(forceRefresh)
}
override fun openSendMessage() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessagePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessagePresenter.kt
index 332d5b74f..888df0400 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessagePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessagePresenter.kt
@@ -1,5 +1,6 @@
package io.github.wulkanowy.ui.modules.message
+import io.github.wulkanowy.data.db.entities.Message
import io.github.wulkanowy.ui.base.BasePresenter
import io.github.wulkanowy.ui.base.ErrorHandler
import io.github.wulkanowy.utils.SchedulersProvider
@@ -15,10 +16,10 @@ class MessagePresenter @Inject constructor(
override fun onAttachView(view: MessageView) {
super.onAttachView(view)
- Timber.i("Message view is attached")
disposable.add(Completable.timer(150, MILLISECONDS, schedulers.mainThread)
.subscribe {
view.initView()
+ Timber.i("Message view was initialized")
loadData()
})
}
@@ -43,6 +44,15 @@ class MessagePresenter @Inject constructor(
}
}
+ fun onDeleteMessage(message: Message) {
+ view?.notifyChildMessageDeleted(
+ when (message.removed) {
+ true -> 2
+ else -> message.folderId - 1
+ }
+ )
+ }
+
fun onSendMessageButtonClicked() {
view?.openSendMessage()
}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageView.kt
index 41257ecc7..2aa4d78ec 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageView.kt
@@ -14,10 +14,7 @@ interface MessageView : BaseView {
fun notifyChildLoadData(index: Int, forceRefresh: Boolean)
+ fun notifyChildMessageDeleted(tabId: Int)
+
fun openSendMessage()
-
- interface MessageChildView {
-
- fun onParentLoadData(forceRefresh: Boolean)
- }
}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewFragment.kt
index 102567eda..057d81dc6 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewFragment.kt
@@ -13,7 +13,9 @@ import android.view.ViewGroup
import io.github.wulkanowy.R
import io.github.wulkanowy.data.db.entities.Message
import io.github.wulkanowy.ui.base.session.BaseSessionFragment
+import io.github.wulkanowy.ui.modules.main.MainActivity
import io.github.wulkanowy.ui.modules.main.MainView
+import io.github.wulkanowy.ui.modules.message.MessageFragment
import io.github.wulkanowy.ui.modules.message.send.SendMessageActivity
import kotlinx.android.synthetic.main.fragment_message_preview.*
import javax.inject.Inject
@@ -26,18 +28,25 @@ class MessagePreviewFragment : BaseSessionFragment(), MessagePreviewView, MainVi
private var menuReplyButton: MenuItem? = null
+ private var menuForwardButton: MenuItem? = null
+
+ private var menuDeleteButton: MenuItem? = null
+
override val titleStringId: Int
get() = R.string.message_title
override val noSubjectString: String
get() = getString(R.string.message_no_subject)
+ override val deleteMessageSuccessString: String
+ get() = getString(R.string.message_delete_success)
+
companion object {
const val MESSAGE_ID_KEY = "message_id"
- fun newInstance(messageId: Int?): MessagePreviewFragment {
+ fun newInstance(messageId: Long): MessagePreviewFragment {
return MessagePreviewFragment().apply {
- arguments = Bundle().apply { putInt(MESSAGE_ID_KEY, messageId ?: 0) }
+ arguments = Bundle().apply { putLong(MESSAGE_ID_KEY, messageId) }
}
}
}
@@ -54,18 +63,24 @@ class MessagePreviewFragment : BaseSessionFragment(), MessagePreviewView, MainVi
override fun onActivityCreated(savedInstanceState: Bundle?) {
super.onActivityCreated(savedInstanceState)
messageContainer = messagePreviewContainer
- presenter.onAttachView(this, (savedInstanceState ?: arguments)?.getInt(MESSAGE_ID_KEY) ?: 0)
+ presenter.onAttachView(this, (savedInstanceState ?: arguments)?.getLong(MESSAGE_ID_KEY) ?: 0L)
}
- override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater?) {
- inflater?.inflate(R.menu.action_menu_message_preview, menu)
- menuReplyButton = menu?.findItem(R.id.messagePreviewMenuReply)
+ override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+ inflater.inflate(R.menu.action_menu_message_preview, menu)
+ menuReplyButton = menu.findItem(R.id.messagePreviewMenuReply)
+ menuForwardButton = menu.findItem(R.id.messagePreviewMenuForward)
+ menuDeleteButton = menu.findItem(R.id.messagePreviewMenuDelete)
presenter.onCreateOptionsMenu()
}
- override fun onOptionsItemSelected(item: MenuItem?): Boolean {
- return if (item?.itemId == R.id.messagePreviewMenuReply) presenter.onReply()
- else false
+ override fun onOptionsItemSelected(item: MenuItem): Boolean {
+ return when (item.itemId) {
+ R.id.messagePreviewMenuReply -> presenter.onReply()
+ R.id.messagePreviewMenuForward -> presenter.onForward()
+ R.id.messagePreviewMenuDelete -> presenter.onMessageDelete()
+ else -> false
+ }
}
override fun setSubject(subject: String) {
@@ -92,8 +107,22 @@ class MessagePreviewFragment : BaseSessionFragment(), MessagePreviewView, MainVi
messagePreviewProgress.visibility = if (show) VISIBLE else GONE
}
- override fun showReplyButton(show: Boolean) {
+ override fun showContent(show: Boolean) {
+ messagePreviewContentContainer.visibility = if (show) VISIBLE else GONE
+ }
+
+ override fun showOptions(show: Boolean) {
menuReplyButton?.isVisible = show
+ menuForwardButton?.isVisible = show
+ menuDeleteButton?.isVisible = show
+ }
+
+ override fun setDeletedOptionsLabels() {
+ menuDeleteButton?.setTitle(R.string.message_delete_forever)
+ }
+
+ override fun setNotDeletedOptionsLabels() {
+ menuDeleteButton?.setTitle(R.string.message_move_to_bin)
}
override fun showMessageError() {
@@ -101,12 +130,24 @@ class MessagePreviewFragment : BaseSessionFragment(), MessagePreviewView, MainVi
}
override fun openMessageReply(message: Message?) {
+ context?.let { it.startActivity(SendMessageActivity.getStartIntent(it, message, true)) }
+ }
+
+ override fun openMessageForward(message: Message?) {
context?.let { it.startActivity(SendMessageActivity.getStartIntent(it, message)) }
}
+ override fun popView() {
+ (activity as MainActivity).popView()
+ }
+
+ override fun notifyParentMessageDeleted(message: Message) {
+ fragmentManager?.fragments?.forEach { if (it is MessageFragment) it.onDeleteMessage(message) }
+ }
+
override fun onSaveInstanceState(outState: Bundle) {
super.onSaveInstanceState(outState)
- outState.putInt(MESSAGE_ID_KEY, presenter.messageId)
+ outState.putLong(MESSAGE_ID_KEY, presenter.messageId)
}
override fun onDestroyView() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewPresenter.kt
index a5ed9f28c..31641d754 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewPresenter.kt
@@ -20,16 +20,16 @@ class MessagePreviewPresenter @Inject constructor(
private val analytics: FirebaseAnalyticsHelper
) : BaseSessionPresenter(errorHandler) {
- var messageId: Int = 0
+ var messageId = 0L
- private var replyMessage: Message? = null
+ private var message: Message? = null
- fun onAttachView(view: MessagePreviewView, id: Int) {
+ fun onAttachView(view: MessagePreviewView, id: Long) {
super.onAttachView(view)
loadData(id)
}
- private fun loadData(id: Int) {
+ private fun loadData(id: Long) {
Timber.i("Loading message $id preview started")
messageId = id
disposable.apply {
@@ -41,13 +41,13 @@ class MessagePreviewPresenter @Inject constructor(
.doFinally { view?.showProgress(false) }
.subscribe({ message ->
Timber.i("Loading message $id preview result: Success ")
- replyMessage = message
+ this@MessagePreviewPresenter.message = message
view?.run {
message.let {
setSubject(if (it.subject.isNotBlank()) it.subject else noSubjectString)
setDate(it.date.toFormattedString("yyyy-MM-dd HH:mm:ss"))
setContent(it.content.orEmpty())
- showReplyButton(true)
+ initOptions()
if (it.recipient.isNotBlank()) setRecipient(it.recipient)
else setSender(it.sender)
@@ -63,13 +63,69 @@ class MessagePreviewPresenter @Inject constructor(
}
fun onReply(): Boolean {
- return if (replyMessage != null) {
- view?.openMessageReply(replyMessage)
+ return if (message != null) {
+ view?.openMessageReply(message)
true
} else false
}
+ fun onForward(): Boolean {
+ return if (message != null) {
+ view?.openMessageForward(message)
+ true
+ } else false
+ }
+
+ private fun deleteMessage() {
+ message?.let { message ->
+ disposable.add(messageRepository.deleteMessage(message)
+ .subscribeOn(schedulers.backgroundThread)
+ .observeOn(schedulers.mainThread)
+ .doOnSubscribe {
+ view?.run {
+ showContent(false)
+ showProgress(true)
+ showOptions(false)
+ }
+ }
+ .doFinally {
+ view?.showProgress(false)
+ }
+ .subscribe({
+ view?.run {
+ notifyParentMessageDeleted(message)
+ showMessage(deleteMessageSuccessString)
+ popView()
+ }
+ }, { error ->
+ view?.showMessageError()
+ errorHandler.dispatch(error)
+ }, {
+ view?.showMessageError()
+ })
+ )
+ }
+ }
+
+ fun onMessageDelete(): Boolean {
+ deleteMessage()
+ return true
+ }
+
+ private fun initOptions() {
+ view?.apply {
+ showOptions(message != null)
+ message?.let {
+ when (it.removed) {
+ true -> setDeletedOptionsLabels()
+ false -> setNotDeletedOptionsLabels()
+ }
+ }
+
+ }
+ }
+
fun onCreateOptionsMenu() {
- view?.showReplyButton(replyMessage != null)
+ initOptions()
}
}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewView.kt
index 464ea168c..8bc528a3d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewView.kt
@@ -7,6 +7,8 @@ interface MessagePreviewView : BaseSessionView {
val noSubjectString: String
+ val deleteMessageSuccessString: String
+
fun setSubject(subject: String)
fun setRecipient(recipient: String)
@@ -19,9 +21,21 @@ interface MessagePreviewView : BaseSessionView {
fun showProgress(show: Boolean)
- fun showReplyButton(show: Boolean)
+ fun showContent(show: Boolean)
+
+ fun showOptions(show: Boolean)
+
+ fun setDeletedOptionsLabels()
+
+ fun setNotDeletedOptionsLabels()
fun showMessageError()
fun openMessageReply(message: Message?)
+
+ fun openMessageForward(message: Message?)
+
+ fun popView()
+
+ fun notifyParentMessageDeleted(message: Message)
}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt
index edf14dd64..3a44ea86f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt
@@ -26,11 +26,14 @@ class SendMessageActivity : BaseActivity(), SendMessageView {
companion object {
private const val EXTRA_MESSAGE = "EXTRA_MESSAGE"
+ private const val EXTRA_REPLY = "EXTRA_REPLY"
fun getStartIntent(context: Context) = Intent(context, SendMessageActivity::class.java)
- fun getStartIntent(context: Context, message: Message?): Intent {
- return getStartIntent(context).putExtra(EXTRA_MESSAGE, message)
+ fun getStartIntent(context: Context, message: Message?, reply: Boolean = false): Intent {
+ return getStartIntent(context)
+ .putExtra(EXTRA_MESSAGE, message)
+ .putExtra(EXTRA_REPLY, reply)
}
}
@@ -59,7 +62,7 @@ class SendMessageActivity : BaseActivity(), SendMessageView {
supportActionBar?.setDisplayHomeAsUpEnabled(true)
messageContainer = sendMessageContainer
- presenter.onAttachView(this, intent.getSerializableExtra(EXTRA_MESSAGE) as? Message)
+ presenter.onAttachView(this, intent.getSerializableExtra(EXTRA_MESSAGE) as? Message, intent.getSerializableExtra(EXTRA_REPLY) as? Boolean)
}
override fun onCreateOptionsMenu(menu: Menu?): Boolean {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt
index a3715aaa6..8dedaba01 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt
@@ -30,18 +30,25 @@ class SendMessagePresenter @Inject constructor(
private val analytics: FirebaseAnalyticsHelper
) : BasePresenter(errorHandler) {
- fun onAttachView(view: SendMessageView, message: Message?) {
+ fun onAttachView(view: SendMessageView, message: Message?, reply: Boolean?) {
super.onAttachView(view)
- Timber.i("Send message view is attached")
- loadData(message)
+ Timber.i("Send message view was initialized")
+ loadData(message, reply)
view.apply {
message?.let {
- setSubject("RE: ${message.subject}")
- if (preferencesRepository.fillMessageContent) {
- setContent(when (message.sender.isNotEmpty()) {
- true -> "\n\nOd: ${message.sender}\n"
- false -> "\n\nDo: ${message.recipient}\n"
- } + "Data: ${message.date.toFormattedString("yyyy-MM-dd HH:mm:ss")}\n\n${message.content}")
+ setSubject(when (reply) {
+ true -> "RE: "
+ else -> "FW: "
+ } + message.subject)
+ if (preferencesRepository.fillMessageContent || reply != true) {
+ setContent(
+ when (reply) {
+ true -> "\n\n"
+ else -> ""
+ } + when (message.sender.isNotEmpty()) {
+ true -> "Od: ${message.sender}\n"
+ false -> "Do: ${message.recipient}\n"
+ } + "Data: ${message.date.toFormattedString("yyyy-MM-dd HH:mm:ss")}\n\n${message.content}")
}
}
}
@@ -52,7 +59,7 @@ class SendMessagePresenter @Inject constructor(
return true
}
- private fun loadData(message: Message?) {
+ private fun loadData(message: Message?, reply: Boolean?) {
var reportingUnit: ReportingUnit? = null
var recipients: List = emptyList()
var selectedRecipient: List = emptyList()
@@ -69,7 +76,7 @@ class SendMessagePresenter @Inject constructor(
recipients = it
}
.flatMapCompletable {
- if (message == null) Completable.complete()
+ if (message == null || reply != true) Completable.complete()
else recipientRepository.getMessageRecipients(student, message)
.doOnSuccess {
Timber.i("Loaded message recipients to reply result: Success, fetched %d recipients", it.size)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt
index 047f2a34c..3859853fc 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt
@@ -17,13 +17,12 @@ import io.github.wulkanowy.ui.base.session.BaseSessionFragment
import io.github.wulkanowy.ui.modules.main.MainActivity
import io.github.wulkanowy.ui.modules.message.MessageFragment
import io.github.wulkanowy.ui.modules.message.MessageItem
-import io.github.wulkanowy.ui.modules.message.MessageView
import io.github.wulkanowy.ui.modules.message.preview.MessagePreviewFragment
import io.github.wulkanowy.utils.setOnItemClickListener
import kotlinx.android.synthetic.main.fragment_message_tab.*
import javax.inject.Inject
-class MessageTabFragment : BaseSessionFragment(), MessageTabView, MessageView.MessageChildView {
+class MessageTabFragment : BaseSessionFragment(), MessageTabView {
@Inject
lateinit var presenter: MessageTabPresenter
@@ -57,7 +56,7 @@ class MessageTabFragment : BaseSessionFragment(), MessageTabView, MessageView.Me
super.onActivityCreated(savedInstanceState)
messageContainer = messageTabRecycler
presenter.onAttachView(this, MessageFolder.valueOf(
- (savedInstanceState ?: arguments)?.getString(MessageTabFragment.MESSAGE_TAB_FOLDER_ID).orEmpty()
+ (savedInstanceState ?: arguments)?.getString(MESSAGE_TAB_FOLDER_ID).orEmpty()
))
}
@@ -76,7 +75,7 @@ class MessageTabFragment : BaseSessionFragment(), MessageTabView, MessageView.Me
}
override fun updateData(data: List) {
- tabAdapter.updateDataSet(data, true)
+ tabAdapter.updateDataSet(data)
}
override fun updateItem(item: AbstractFlexibleItem<*>) {
@@ -107,7 +106,7 @@ class MessageTabFragment : BaseSessionFragment(), MessageTabView, MessageView.Me
messageTabSwipe.isRefreshing = show
}
- override fun openMessage(messageId: Int?) {
+ override fun openMessage(messageId: Long) {
(activity as? MainActivity)?.pushView(MessagePreviewFragment.newInstance(messageId))
}
@@ -115,13 +114,17 @@ class MessageTabFragment : BaseSessionFragment(), MessageTabView, MessageView.Me
(parentFragment as? MessageFragment)?.onChildFragmentLoaded()
}
- override fun onParentLoadData(forceRefresh: Boolean) {
+ fun onParentLoadData(forceRefresh: Boolean) {
presenter.onParentViewLoadData(forceRefresh)
}
+ fun onParentDeleteMessage() {
+ presenter.onDeleteMessage()
+ }
+
override fun onSaveInstanceState(outState: Bundle) {
super.onSaveInstanceState(outState)
- outState.putString(MessageTabFragment.MESSAGE_TAB_FOLDER_ID, presenter.folder.name)
+ outState.putString(MESSAGE_TAB_FOLDER_ID, presenter.folder.name)
}
override fun onDestroyView() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt
index 7d9fda0d3..2173c951d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt
@@ -34,7 +34,29 @@ class MessageTabPresenter @Inject constructor(
onParentViewLoadData(true)
}
+ fun onDeleteMessage() {
+ loadData(false)
+ }
+
fun onParentViewLoadData(forceRefresh: Boolean) {
+ loadData(forceRefresh)
+ }
+
+ fun onMessageItemSelected(item: AbstractFlexibleItem<*>) {
+ if (item is MessageItem) {
+ Timber.i("Select message ${item.message.id} item")
+ view?.run {
+ openMessage(item.message.id)
+ if (item.message.unread) {
+ item.message.unread = false
+ updateItem(item)
+ updateMessage(item.message)
+ }
+ }
+ }
+ }
+
+ private fun loadData(forceRefresh: Boolean) {
Timber.i("Loading $folder message data started")
disposable.apply {
clear()
@@ -67,28 +89,14 @@ class MessageTabPresenter @Inject constructor(
}
}
- fun onMessageItemSelected(item: AbstractFlexibleItem<*>) {
- if (item is MessageItem) {
- Timber.i("Select message ${item.message.realId} item")
- view?.run {
- openMessage(item.message.realId)
- if (item.message.unread) {
- item.message.unread = false
- updateItem(item)
- updateMessage(item.message)
- }
- }
- }
- }
-
private fun updateMessage(message: Message) {
- Timber.i("Attempt to update message ${message.realId}")
+ Timber.i("Attempt to update message ${message.id}")
disposable.add(messageRepository.updateMessage(message)
.subscribeOn(schedulers.backgroundThread)
.observeOn(schedulers.mainThread)
- .subscribe({ Timber.d("Update message ${message.realId} result: Success") })
+ .subscribe({ Timber.d("Update message ${message.id} result: Success") })
{ error ->
- Timber.i("Update message ${message.realId} result: An exception occurred")
+ Timber.i("Update message ${message.id} result: An exception occurred")
errorHandler.dispatch(error)
})
}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabView.kt
index bcda52b56..01a188e75 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabView.kt
@@ -28,7 +28,7 @@ interface MessageTabView : BaseSessionView {
fun showRefresh(show: Boolean)
- fun openMessage(messageId: Int?)
+ fun openMessage(messageId: Long)
fun notifyParentDataLoaded()
}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreFragment.kt
index 5bbf6247a..4823dedf3 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreFragment.kt
@@ -104,7 +104,7 @@ class MoreFragment : BaseFragment(), MoreView, MainView.TitledView, MainView.Mai
}
override fun onFragmentReselected() {
- presenter.onViewReselected()
+ if (::presenter.isInitialized) presenter.onViewReselected()
}
override fun updateData(data: List) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MorePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MorePresenter.kt
index 5fea241c7..a7626ec0d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MorePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MorePresenter.kt
@@ -10,8 +10,8 @@ class MorePresenter @Inject constructor(errorHandler: ErrorHandler) : BasePresen
override fun onAttachView(view: MoreView) {
super.onAttachView(view)
- Timber.i("More view is attached")
view.initView()
+ Timber.i("More view was initialized")
loadData()
}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NotePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NotePresenter.kt
index 32e2a4adf..136a44135 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NotePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NotePresenter.kt
@@ -23,8 +23,8 @@ class NotePresenter @Inject constructor(
override fun onAttachView(view: NoteView) {
super.onAttachView(view)
- Timber.i("Note view is attached")
view.initView()
+ Timber.i("Note view was initialized")
loadData()
}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsFragment.kt
index d82eaba7e..2baad0eb7 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsFragment.kt
@@ -3,7 +3,6 @@ package io.github.wulkanowy.ui.modules.settings
import android.content.Context
import android.content.SharedPreferences
import android.os.Bundle
-import androidx.appcompat.app.AppCompatDelegate
import com.takisoft.preferencex.PreferenceFragmentCompat
import dagger.android.support.AndroidSupportInjection
import io.github.wulkanowy.BuildConfig.DEBUG
@@ -44,8 +43,7 @@ class SettingsFragment : PreferenceFragmentCompat(), SharedPreferences.OnSharedP
presenter.onSharedPreferenceChanged(key)
}
- override fun setTheme(theme: Int) {
- AppCompatDelegate.setDefaultNightMode(theme)
+ override fun recreateView() {
activity?.recreate()
}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsPresenter.kt
index 65e871ea3..c25198d56 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsPresenter.kt
@@ -21,7 +21,7 @@ class SettingsPresenter @Inject constructor(
override fun onAttachView(view: SettingsView) {
super.onAttachView(view)
- Timber.i("Settings view is attached")
+ Timber.i("Settings view was initialized")
view.setServicesSuspended(preferencesRepository.serviceEnableKey, now().isHolidays)
}
@@ -31,8 +31,8 @@ class SettingsPresenter @Inject constructor(
when (key) {
serviceEnableKey -> syncManager.run { if (isServiceEnabled) startSyncWorker() else stopSyncWorker() }
servicesIntervalKey, servicesOnlyWifiKey -> syncManager.startSyncWorker(true)
- currentThemeKey -> view?.setTheme(currentTheme)
isDebugNotificationEnableKey -> chuckCollector.showNotification(isDebugNotificationEnable)
+ appThemeKey -> view?.recreateView()
}
}
analytics.logEvent("setting_changed", "name" to key)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsView.kt
index 0b3c2f70c..1c4bf3b0b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsView.kt
@@ -4,7 +4,7 @@ import io.github.wulkanowy.ui.base.BaseView
interface SettingsView : BaseView {
- fun setTheme(theme: Int)
+ fun recreateView()
fun setServicesSuspended(serviceEnablesKey: String, isHolidays: Boolean)
}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashPresenter.kt
index b6bf0e2a3..e6a9d7b3e 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashPresenter.kt
@@ -14,7 +14,7 @@ class SplashPresenter @Inject constructor(
override fun onAttachView(view: SplashView) {
super.onAttachView(view)
- disposable.add(studentRepository.isStudentSaved()
+ disposable.add(studentRepository.isCurrentStudentSet()
.subscribeOn(schedulers.backgroundThread)
.observeOn(schedulers.mainThread)
.subscribe({
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt
index 3b1259f76..26eaef271 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt
@@ -80,12 +80,12 @@ class TimetableFragment : BaseSessionFragment(), TimetableView, MainView.MainChi
timetableNextButton.setOnClickListener { presenter.onNextDay() }
}
- override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater?) {
- inflater?.inflate(R.menu.action_menu_timetable, menu)
+ override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+ inflater.inflate(R.menu.action_menu_timetable, menu)
}
- override fun onOptionsItemSelected(item: MenuItem?): Boolean {
- return if (item?.itemId == R.id.timetableMenuCompletedLessons) presenter.onCompletedLessonsSwitchSelected()
+ override fun onOptionsItemSelected(item: MenuItem): Boolean {
+ return if (item.itemId == R.id.timetableMenuCompletedLessons) presenter.onCompletedLessonsSwitchSelected()
else false
}
@@ -110,7 +110,7 @@ class TimetableFragment : BaseSessionFragment(), TimetableView, MainView.MainChi
}
override fun onFragmentReselected() {
- presenter.onViewReselected()
+ if (::presenter.isInitialized) presenter.onViewReselected()
}
override fun popView() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt
index ebda3931a..5b837f076 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt
@@ -35,8 +35,8 @@ class TimetablePresenter @Inject constructor(
fun onAttachView(view: TimetableView, date: Long?) {
super.onAttachView(view)
- Timber.i("Timetable is attached")
view.initView()
+ Timber.i("Timetable was initialized")
loadData(ofEpochDay(date ?: now().nextOrSameSchoolDay.toEpochDay()))
reloadView()
}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureActivity.kt
new file mode 100644
index 000000000..468567f18
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureActivity.kt
@@ -0,0 +1,79 @@
+package io.github.wulkanowy.ui.modules.timetablewidget
+
+import android.appwidget.AppWidgetManager.ACTION_APPWIDGET_UPDATE
+import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_ID
+import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_IDS
+import android.content.Intent
+import android.os.Bundle
+import android.widget.Toast
+import android.widget.Toast.LENGTH_LONG
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import io.github.wulkanowy.R
+import io.github.wulkanowy.ui.base.BaseActivity
+import io.github.wulkanowy.ui.modules.login.LoginActivity
+import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider.Companion.EXTRA_FROM_PROVIDER
+import io.github.wulkanowy.utils.setOnItemClickListener
+import kotlinx.android.synthetic.main.activity_widget_configure.*
+import javax.inject.Inject
+
+class TimetableWidgetConfigureActivity : BaseActivity(), TimetableWidgetConfigureView {
+
+ @Inject
+ lateinit var configureAdapter: FlexibleAdapter>
+
+ @Inject
+ lateinit var presenter: TimetableWidgetConfigurePresenter
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ setResult(RESULT_CANCELED)
+ setContentView(R.layout.activity_widget_configure)
+
+ intent.extras.let {
+ presenter.onAttachView(this, it?.getInt(EXTRA_APPWIDGET_ID), it?.getBoolean(EXTRA_FROM_PROVIDER))
+ }
+ }
+
+ override fun initView() {
+ widgetConfigureRecycler.apply {
+ adapter = configureAdapter
+ layoutManager = SmoothScrollLinearLayoutManager(context)
+ }
+ configureAdapter.setOnItemClickListener { presenter.onItemSelect(it) }
+ }
+
+ override fun updateData(data: List) {
+ configureAdapter.updateDataSet(data)
+ }
+
+ override fun updateTimetableWidget(widgetId: Int) {
+ sendBroadcast(Intent(this, TimetableWidgetProvider::class.java)
+ .apply {
+ action = ACTION_APPWIDGET_UPDATE
+ putExtra(EXTRA_APPWIDGET_IDS, intArrayOf(widgetId))
+ })
+ }
+
+ override fun setSuccessResult(widgetId: Int) {
+ setResult(RESULT_OK, Intent().apply { putExtra(EXTRA_APPWIDGET_ID, widgetId) })
+ }
+
+ override fun showError(text: String, error: Throwable) {
+ Toast.makeText(this, text, LENGTH_LONG).show()
+ }
+
+ override fun finishView() {
+ finish()
+ }
+
+ override fun openLoginView() {
+ startActivity(LoginActivity.getStartIntent(this))
+ }
+
+ override fun onDestroy() {
+ super.onDestroy()
+ presenter.onDetachView()
+ }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureItem.kt
new file mode 100644
index 000000000..f6ec1519f
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureItem.kt
@@ -0,0 +1,53 @@
+package io.github.wulkanowy.ui.modules.timetablewidget
+
+import android.annotation.SuppressLint
+import android.view.View
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Student
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.item_account.*
+
+class TimetableWidgetConfigureItem(val student: Student, private val isCurrent: Boolean) :
+ AbstractFlexibleItem() {
+
+ override fun getLayoutRes() = R.layout.item_account
+
+ override fun createViewHolder(view: View, adapter: FlexibleAdapter>): ViewHolder {
+ return ViewHolder(view, adapter)
+ }
+
+ @SuppressLint("SetTextI18n")
+ override fun bindViewHolder(adapter: FlexibleAdapter>, holder: ViewHolder, position: Int, payloads: MutableList) {
+ holder.apply {
+ accountItemName.text = "${student.studentName} ${student.className}"
+ accountItemSchool.text = student.schoolName
+ accountItemImage.setBackgroundResource(if (isCurrent) R.drawable.ic_account_circular_border else 0)
+ }
+ }
+
+ override fun equals(other: Any?): Boolean {
+ if (this === other) return true
+ if (javaClass != other?.javaClass) return false
+
+ other as TimetableWidgetConfigureItem
+
+ if (student != other.student) return false
+
+ return true
+ }
+
+ override fun hashCode(): Int {
+ var result = student.hashCode()
+ result = 31 * result + student.id.toInt()
+ return result
+ }
+
+ class ViewHolder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
+ override val containerView: View
+ get() = contentView
+ }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigurePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigurePresenter.kt
new file mode 100644
index 000000000..5a7bdd7c0
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigurePresenter.kt
@@ -0,0 +1,65 @@
+package io.github.wulkanowy.ui.modules.timetablewidget
+
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import io.github.wulkanowy.data.db.SharedPrefHelper
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.repositories.student.StudentRepository
+import io.github.wulkanowy.ui.base.BasePresenter
+import io.github.wulkanowy.ui.base.ErrorHandler
+import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider.Companion.getStudentWidgetKey
+import io.github.wulkanowy.utils.SchedulersProvider
+import javax.inject.Inject
+
+class TimetableWidgetConfigurePresenter @Inject constructor(
+ private val errorHandler: ErrorHandler,
+ private val schedulers: SchedulersProvider,
+ private val studentRepository: StudentRepository,
+ private val sharedPref: SharedPrefHelper
+) : BasePresenter(errorHandler) {
+
+ private var appWidgetId: Int? = null
+
+ private var isFromProvider = false
+
+ fun onAttachView(view: TimetableWidgetConfigureView, appWidgetId: Int?, isFromProvider: Boolean?) {
+ super.onAttachView(view)
+ this.appWidgetId = appWidgetId
+ this.isFromProvider = isFromProvider ?: false
+ view.initView()
+ loadData()
+ }
+
+ fun onItemSelect(item: AbstractFlexibleItem<*>) {
+ if (item is TimetableWidgetConfigureItem) {
+ registerStudent(item.student)
+ }
+ }
+
+ private fun loadData() {
+ disposable.add(studentRepository.getSavedStudents(false)
+ .map { it to appWidgetId?.let { id -> sharedPref.getLong(getStudentWidgetKey(id), 0) } }
+ .map { (students, currentStudentId) ->
+ students.map { student -> TimetableWidgetConfigureItem(student, student.id == currentStudentId) }
+ }
+ .subscribeOn(schedulers.backgroundThread)
+ .observeOn(schedulers.mainThread)
+ .subscribe({
+ when {
+ it.isEmpty() -> view?.openLoginView()
+ it.size == 1 && !isFromProvider -> registerStudent(it.single().student)
+ else -> view?.updateData(it)
+ }
+ }, { errorHandler.dispatch(it) }))
+ }
+
+ private fun registerStudent(student: Student) {
+ appWidgetId?.also {
+ sharedPref.putLong(getStudentWidgetKey(it), student.id)
+ view?.apply {
+ updateTimetableWidget(it)
+ setSuccessResult(it)
+ }
+ }
+ view?.finishView()
+ }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureView.kt
new file mode 100644
index 000000000..98c800d4c
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureView.kt
@@ -0,0 +1,18 @@
+package io.github.wulkanowy.ui.modules.timetablewidget
+
+import io.github.wulkanowy.ui.base.BaseView
+
+interface TimetableWidgetConfigureView : BaseView {
+
+ fun initView()
+
+ fun updateData(data: List)
+
+ fun updateTimetableWidget(widgetId: Int)
+
+ fun setSuccessResult(widgetId: Int)
+
+ fun finishView()
+
+ fun openLoginView()
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/widgets/timetable/TimetableWidgetFactory.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetFactory.kt
similarity index 67%
rename from app/src/main/java/io/github/wulkanowy/ui/widgets/timetable/TimetableWidgetFactory.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetFactory.kt
index f2d40ba7e..b288f7b79 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/widgets/timetable/TimetableWidgetFactory.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetFactory.kt
@@ -1,5 +1,6 @@
-package io.github.wulkanowy.ui.widgets.timetable
+package io.github.wulkanowy.ui.modules.timetablewidget
+import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_ID
import android.content.Context
import android.content.Intent
import android.graphics.Paint.ANTI_ALIAS_FLAG
@@ -15,9 +16,11 @@ import io.github.wulkanowy.data.db.entities.Timetable
import io.github.wulkanowy.data.repositories.semester.SemesterRepository
import io.github.wulkanowy.data.repositories.student.StudentRepository
import io.github.wulkanowy.data.repositories.timetable.TimetableRepository
+import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider.Companion.getDateWidgetKey
+import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider.Companion.getStudentWidgetKey
import io.github.wulkanowy.utils.SchedulersProvider
import io.github.wulkanowy.utils.toFormattedString
-import io.reactivex.Single
+import io.reactivex.Maybe
import org.threeten.bp.LocalDate
import timber.log.Timber
@@ -48,28 +51,37 @@ class TimetableWidgetFactory(
override fun onDestroy() {}
override fun onDataSetChanged() {
- intent?.action?.let { LocalDate.ofEpochDay(sharedPref.getLong(it, 0)) }
- ?.let { date ->
- try {
- lessons = studentRepository.isStudentSaved()
- .flatMap { isSaved ->
- if (isSaved) {
- studentRepository.getCurrentStudent()
- .flatMap { semesterRepository.getCurrentSemester(it) }
- .flatMap { timetableRepository.getTimetable(it, date, date) }
- } else Single.just(emptyList())
- }
- .map { item -> item.sortedBy { it.number } }
- .subscribeOn(schedulers.backgroundThread)
- .blockingGet()
- } catch (e: Exception) {
- Timber.e(e, "An error has occurred while downloading data for the widget")
- }
+ intent?.extras?.getInt(EXTRA_APPWIDGET_ID)?.let { appWidgetId ->
+ val date = LocalDate.ofEpochDay(sharedPref.getLong(getDateWidgetKey(appWidgetId), 0))
+ val studentId = sharedPref.getLong(getStudentWidgetKey(appWidgetId), 0)
+
+ lessons = try {
+ studentRepository.isStudentSaved()
+ .filter { true }
+ .flatMap { studentRepository.getSavedStudents().toMaybe() }
+ .flatMap {
+ if (studentId == 0L) throw IllegalArgumentException("Student id is 0")
+
+ it.singleOrNull { student -> student.id == studentId }
+ .let { student ->
+ if (student != null) Maybe.just(student)
+ else Maybe.empty()
+ }
+ }
+ .flatMap { semesterRepository.getCurrentSemester(it).toMaybe() }
+ .flatMap { timetableRepository.getTimetable(it, date, date).toMaybe() }
+ .map { item -> item.sortedBy { it.number } }
+ .subscribeOn(schedulers.backgroundThread)
+ .blockingGet(emptyList())
+ } catch (e: Exception) {
+ Timber.e(e, "An error has occurred in timetable widget factory")
+ emptyList()
}
+ }
}
override fun getViewAt(position: Int): RemoteViews? {
- if (position == INVALID_POSITION || lessons.getOrNull(position) === null) return null
+ if (position == INVALID_POSITION || lessons.getOrNull(position) == null) return null
return RemoteViews(context.packageName, R.layout.item_widget_timetable).apply {
lessons[position].let {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/widgets/timetable/TimetableWidgetProvider.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetProvider.kt
similarity index 53%
rename from app/src/main/java/io/github/wulkanowy/ui/widgets/timetable/TimetableWidgetProvider.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetProvider.kt
index 402366ecf..a462ca7b5 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/widgets/timetable/TimetableWidgetProvider.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetProvider.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.widgets.timetable
+package io.github.wulkanowy.ui.modules.timetablewidget
import android.app.PendingIntent
import android.app.PendingIntent.FLAG_UPDATE_CURRENT
@@ -10,21 +10,28 @@ import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_IDS
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
+import android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK
+import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
import android.widget.RemoteViews
import dagger.android.AndroidInjection
import io.github.wulkanowy.R
import io.github.wulkanowy.data.db.SharedPrefHelper
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.repositories.student.StudentRepository
import io.github.wulkanowy.services.widgets.TimetableWidgetService
import io.github.wulkanowy.ui.modules.main.MainActivity
-import io.github.wulkanowy.ui.modules.main.MainActivity.Companion.EXTRA_START_MENU_INDEX
+import io.github.wulkanowy.ui.modules.main.MainView.MenuView
import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.SchedulersProvider
import io.github.wulkanowy.utils.nextOrSameSchoolDay
import io.github.wulkanowy.utils.nextSchoolDay
import io.github.wulkanowy.utils.previousSchoolDay
+import io.github.wulkanowy.utils.shortcutWeekDayName
import io.github.wulkanowy.utils.toFormattedString
-import io.github.wulkanowy.utils.weekDayName
+import io.reactivex.Maybe
import org.threeten.bp.LocalDate
import org.threeten.bp.LocalDate.now
+import timber.log.Timber
import javax.inject.Inject
class TimetableWidgetProvider : BroadcastReceiver() {
@@ -32,13 +39,21 @@ class TimetableWidgetProvider : BroadcastReceiver() {
@Inject
lateinit var appWidgetManager: AppWidgetManager
+ @Inject
+ lateinit var studentRepository: StudentRepository
+
@Inject
lateinit var sharedPref: SharedPrefHelper
+ @Inject
+ lateinit var schedulers: SchedulersProvider
+
@Inject
lateinit var analytics: FirebaseAnalyticsHelper
companion object {
+ const val EXTRA_FROM_PROVIDER = "extraFromProvider"
+
const val EXTRA_TOGGLED_WIDGET_ID = "extraToggledWidget"
const val EXTRA_BUTTON_TYPE = "extraButtonType"
@@ -49,7 +64,9 @@ class TimetableWidgetProvider : BroadcastReceiver() {
const val BUTTON_RESET = "buttonReset"
- fun createWidgetKey(appWidgetId: Int) = "timetable_widget_$appWidgetId"
+ fun getDateWidgetKey(appWidgetId: Int) = "timetable_widget_date_$appWidgetId"
+
+ fun getStudentWidgetKey(appWidgetId: Int) = "timetable_widget_student_$appWidgetId"
}
override fun onReceive(context: Context, intent: Intent) {
@@ -63,12 +80,14 @@ class TimetableWidgetProvider : BroadcastReceiver() {
private fun onUpdate(context: Context, intent: Intent) {
if (intent.getStringExtra(EXTRA_BUTTON_TYPE) === null) {
intent.getIntArrayExtra(EXTRA_APPWIDGET_IDS)?.forEach { appWidgetId ->
- updateWidget(context, appWidgetId, now().nextOrSameSchoolDay)
+ val student = getStudent(sharedPref.getLong(getStudentWidgetKey(appWidgetId), 0), appWidgetId)
+ updateWidget(context, appWidgetId, now().nextOrSameSchoolDay, student)
}
} else {
val buttonType = intent.getStringExtra(EXTRA_BUTTON_TYPE)
val toggledWidgetId = intent.getIntExtra(EXTRA_TOGGLED_WIDGET_ID, 0)
- val savedDate = LocalDate.ofEpochDay(sharedPref.getLong(createWidgetKey(toggledWidgetId), 0))
+ val student = getStudent(sharedPref.getLong(getStudentWidgetKey(toggledWidgetId), 0), toggledWidgetId)
+ val savedDate = LocalDate.ofEpochDay(sharedPref.getLong(getDateWidgetKey(toggledWidgetId), 0))
val date = when (buttonType) {
BUTTON_RESET -> now().nextOrSameSchoolDay
BUTTON_NEXT -> savedDate.nextSchoolDay
@@ -76,35 +95,45 @@ class TimetableWidgetProvider : BroadcastReceiver() {
else -> now().nextOrSameSchoolDay
}
if (!buttonType.isNullOrBlank()) analytics.logEvent("changed_timetable_widget_day", "button" to buttonType)
- updateWidget(context, toggledWidgetId, date)
+ updateWidget(context, toggledWidgetId, date, student)
}
}
private fun onDelete(intent: Intent) {
intent.getIntExtra(EXTRA_APPWIDGET_ID, 0).let {
- if (it != 0) sharedPref.delete(createWidgetKey(it))
+ if (it != 0) {
+ sharedPref.apply {
+ delete(getStudentWidgetKey(it))
+ delete(getDateWidgetKey(it))
+ }
+ }
}
}
- private fun updateWidget(context: Context, appWidgetId: Int, date: LocalDate) {
+ private fun updateWidget(context: Context, appWidgetId: Int, date: LocalDate, student: Student?) {
RemoteViews(context.packageName, R.layout.widget_timetable).apply {
setEmptyView(R.id.timetableWidgetList, R.id.timetableWidgetEmpty)
- setTextViewText(R.id.timetableWidgetDay, date.weekDayName.capitalize())
- setTextViewText(R.id.timetableWidgetDate, date.toFormattedString())
+ setTextViewText(R.id.timetableWidgetDate, "${date.shortcutWeekDayName.capitalize()} ${date.toFormattedString()}")
+ setTextViewText(R.id.timetableWidgetName, student?.studentName ?: context.getString(R.string.all_no_data))
setRemoteAdapter(R.id.timetableWidgetList, Intent(context, TimetableWidgetService::class.java)
- .apply { action = createWidgetKey(appWidgetId) })
+ .apply { putExtra(EXTRA_APPWIDGET_ID, appWidgetId) })
setOnClickPendingIntent(R.id.timetableWidgetNext, createNavIntent(context, appWidgetId, appWidgetId, BUTTON_NEXT))
setOnClickPendingIntent(R.id.timetableWidgetPrev, createNavIntent(context, -appWidgetId, appWidgetId, BUTTON_PREV))
- createNavIntent(context, Int.MAX_VALUE - appWidgetId, appWidgetId, BUTTON_RESET).also {
+ createNavIntent(context, Int.MAX_VALUE - appWidgetId, appWidgetId, BUTTON_RESET).let {
setOnClickPendingIntent(R.id.timetableWidgetDate, it)
- setOnClickPendingIntent(R.id.timetableWidgetDay, it)
+ setOnClickPendingIntent(R.id.timetableWidgetName, it)
}
- setPendingIntentTemplate(R.id.timetableWidgetList,
- PendingIntent.getActivity(context, 1, MainActivity.getStartIntent(context).apply {
- putExtra(EXTRA_START_MENU_INDEX, 3)
+ setOnClickPendingIntent(R.id.timetableWidgetAccount, PendingIntent.getActivity(context, -Int.MAX_VALUE + appWidgetId,
+ Intent(context, TimetableWidgetConfigureActivity::class.java).apply {
+ addFlags(FLAG_ACTIVITY_NEW_TASK or FLAG_ACTIVITY_CLEAR_TASK)
+ putExtra(EXTRA_APPWIDGET_ID, appWidgetId)
+ putExtra(EXTRA_FROM_PROVIDER, true)
}, FLAG_UPDATE_CURRENT))
+ setPendingIntentTemplate(R.id.timetableWidgetList,
+ PendingIntent.getActivity(context, MenuView.TIMETABLE.id,
+ MainActivity.getStartIntent(context, MenuView.TIMETABLE, true), FLAG_UPDATE_CURRENT))
}.also {
- sharedPref.putLong(createWidgetKey(appWidgetId), date.toEpochDay(), true)
+ sharedPref.putLong(getDateWidgetKey(appWidgetId), date.toEpochDay(), true)
appWidgetManager.apply {
notifyAppWidgetViewDataChanged(appWidgetId, R.id.timetableWidgetList)
updateAppWidget(appWidgetId, it)
@@ -120,4 +149,32 @@ class TimetableWidgetProvider : BroadcastReceiver() {
putExtra(EXTRA_TOGGLED_WIDGET_ID, appWidgetId)
}, FLAG_UPDATE_CURRENT)
}
+
+ private fun getStudent(studentId: Long, appWidgetId: Int): Student? {
+ return try {
+ studentRepository.isStudentSaved()
+ .filter { true }
+ .flatMap { studentRepository.getSavedStudents(false).toMaybe() }
+ .flatMap { students ->
+ students.singleOrNull { student -> student.id == studentId }
+ .let { student ->
+ when {
+ student != null -> Maybe.just(student)
+ studentId != 0L -> {
+ studentRepository.isCurrentStudentSet()
+ .filter { true }
+ .flatMap { studentRepository.getCurrentStudent(false).toMaybe() }
+ .doOnSuccess { sharedPref.putLong(getStudentWidgetKey(appWidgetId), it.id) }
+ }
+ else -> Maybe.empty()
+ }
+ }
+ }
+ .subscribeOn(schedulers.backgroundThread)
+ .blockingGet()
+ } catch (e: Exception) {
+ Timber.e(e, "An error has occurred in timetable widget provider")
+ null
+ }
+ }
}
diff --git a/app/src/main/java/io/github/wulkanowy/utils/ActivityExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/ActivityExtension.kt
index c0314d02e..93781a9fe 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/ActivityExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/ActivityExtension.kt
@@ -4,7 +4,6 @@ import android.app.Activity
import android.content.Context.INPUT_METHOD_SERVICE
import android.view.inputmethod.InputMethodManager
-
fun Activity.showSoftInput() {
(getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager?)?.run {
if (currentFocus != null) showSoftInput(currentFocus, 0)
diff --git a/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt
index 70368badd..c367ecd07 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt
@@ -1,6 +1,7 @@
package io.github.wulkanowy.utils
import android.content.Context
+import android.content.Intent
import androidx.annotation.AttrRes
import androidx.annotation.ColorInt
import androidx.annotation.ColorRes
@@ -18,3 +19,10 @@ fun Context.getThemeAttrColor(@AttrRes colorAttr: Int): Int {
@ColorInt
fun Context.getCompatColor(@ColorRes colorRes: Int) = ContextCompat.getColor(this, colorRes)
+
+fun Context.openInternetBrowser(uri: String, onActivityNotFound: (uri: String) -> Unit) {
+ Intent.parseUri(uri, 0).let {
+ if (it.resolveActivity(packageManager) != null) startActivity(it)
+ else onActivityNotFound(uri)
+ }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt b/app/src/main/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt
index feb33e5d7..e7ac9c99f 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt
@@ -2,10 +2,11 @@ package io.github.wulkanowy.utils
import android.os.Bundle
import com.google.firebase.analytics.FirebaseAnalytics
+import javax.inject.Inject
import javax.inject.Singleton
@Singleton
-class FirebaseAnalyticsHelper(private val analytics: FirebaseAnalytics) {
+class FirebaseAnalyticsHelper @Inject constructor(private val analytics: FirebaseAnalytics) {
fun logEvent(name: String, vararg params: Pair) {
Bundle().apply {
diff --git a/app/src/main/java/io/github/wulkanowy/utils/ListExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/ListExtension.kt
new file mode 100644
index 000000000..4374aeb41
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/utils/ListExtension.kt
@@ -0,0 +1,9 @@
+package io.github.wulkanowy.utils
+
+infix fun List.uniqueSubtract(other: List): List {
+ val list = toMutableList()
+ other.forEach {
+ list.remove(it)
+ }
+ return list.toList()
+}
diff --git a/app/src/main/java/io/github/wulkanowy/utils/LoggerUtils.kt b/app/src/main/java/io/github/wulkanowy/utils/LoggerUtils.kt
index 565374130..5a6cc2bfd 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/LoggerUtils.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/LoggerUtils.kt
@@ -1,7 +1,16 @@
package io.github.wulkanowy.utils
+import android.app.Activity
+import android.app.Application
+import android.content.Context
+import android.os.Bundle
+import android.view.View
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
import com.crashlytics.android.Crashlytics
import timber.log.Timber
+import javax.inject.Inject
+import javax.inject.Singleton
class DebugLogTree : Timber.DebugTree() {
@@ -20,3 +29,88 @@ class CrashlyticsTree : Timber.Tree() {
else Crashlytics.logException(t)
}
}
+
+class ActivityLifecycleLogger : Application.ActivityLifecycleCallbacks {
+
+ override fun onActivityPaused(activity: Activity?) {
+ activity?.let { Timber.d("${it::class.java.simpleName} PAUSED") }
+ }
+
+ override fun onActivityResumed(activity: Activity?) {
+ activity?.let { Timber.d("${it::class.java.simpleName} RESUMED") }
+ }
+
+ override fun onActivityStarted(activity: Activity?) {
+ activity?.let { Timber.d("${it::class.java.simpleName} STARTED") }
+ }
+
+ override fun onActivityDestroyed(activity: Activity?) {
+ activity?.let { Timber.d("${it::class.java.simpleName} DESTROYED") }
+ }
+
+ override fun onActivitySaveInstanceState(activity: Activity?, outState: Bundle?) {
+ activity?.let { Timber.d("${it::class.java.simpleName} SAVED INSTANCE STATE") }
+ }
+
+ override fun onActivityStopped(activity: Activity?) {
+ activity?.let { Timber.d("${it::class.java.simpleName} STOPPED") }
+ }
+
+ override fun onActivityCreated(activity: Activity?, savedInstanceState: Bundle?) {
+ activity?.let { Timber.d("${it::class.java.simpleName} CREATED ${checkSavedState(savedInstanceState)}") }
+ }
+}
+
+@Singleton
+class FragmentLifecycleLogger @Inject constructor() : FragmentManager.FragmentLifecycleCallbacks() {
+
+ override fun onFragmentViewCreated(fm: FragmentManager, f: Fragment, v: View, savedInstanceState: Bundle?) {
+ Timber.d("${f::class.java.simpleName} VIEW CREATED ${checkSavedState(savedInstanceState)}")
+ }
+
+ override fun onFragmentStopped(fm: FragmentManager, f: Fragment) {
+ Timber.d("${f::class.java.simpleName} STOPPED")
+ }
+
+ override fun onFragmentCreated(fm: FragmentManager, f: Fragment, savedInstanceState: Bundle?) {
+ Timber.d("${f::class.java.simpleName} CREATED ${checkSavedState(savedInstanceState)}")
+ }
+
+ override fun onFragmentResumed(fm: FragmentManager, f: Fragment) {
+ Timber.d("${f::class.java.simpleName} RESUMED")
+ }
+
+ override fun onFragmentAttached(fm: FragmentManager, f: Fragment, context: Context) {
+ Timber.d("${f::class.java.simpleName} ATTACHED")
+ }
+
+ override fun onFragmentDestroyed(fm: FragmentManager, f: Fragment) {
+ Timber.d("${f::class.java.simpleName} DESTROYED")
+ }
+
+ override fun onFragmentSaveInstanceState(fm: FragmentManager, f: Fragment, outState: Bundle) {
+ Timber.d("${f::class.java.simpleName} SAVED INSTANCE STATE")
+ }
+
+ override fun onFragmentStarted(fm: FragmentManager, f: Fragment) {
+ Timber.d("${f::class.java.simpleName} STARTED")
+ }
+
+ override fun onFragmentViewDestroyed(fm: FragmentManager, f: Fragment) {
+ Timber.d("${f::class.java.simpleName} VIEW DESTROYED")
+ }
+
+ override fun onFragmentActivityCreated(fm: FragmentManager, f: Fragment, savedInstanceState: Bundle?) {
+ Timber.d("${f::class.java.simpleName} ACTIVITY CREATED ${checkSavedState(savedInstanceState)}")
+ }
+
+ override fun onFragmentPaused(fm: FragmentManager, f: Fragment) {
+ Timber.d("${f::class.java.simpleName} PAUSED")
+ }
+
+ override fun onFragmentDetached(fm: FragmentManager, f: Fragment) {
+ Timber.d("${f::class.java.simpleName} DETACHED")
+ }
+}
+
+private fun checkSavedState(savedInstanceState: Bundle?) = if (savedInstanceState == null) "(STATE IS NULL)" else ""
diff --git a/app/src/main/java/io/github/wulkanowy/utils/TimeExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/TimeExtension.kt
index 886b3d4da..426816f44 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/TimeExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/TimeExtension.kt
@@ -99,6 +99,9 @@ inline val LocalDate.previousOrSameSchoolDay: LocalDate
inline val LocalDate.weekDayName: String
get() = this.format(ofPattern("EEEE", Locale.getDefault()))
+inline val LocalDate.shortcutWeekDayName: String
+ get() = this.format(ofPattern("EEE", Locale.getDefault()))
+
inline val LocalDate.monday: LocalDate
get() = this.with(MONDAY)
diff --git a/app/src/main/play/release-notes/pl-PL/default.txt b/app/src/main/play/release-notes/pl-PL/default.txt
index 785769037..d1f8f1e7f 100644
--- a/app/src/main/play/release-notes/pl-PL/default.txt
+++ b/app/src/main/play/release-notes/pl-PL/default.txt
@@ -1,9 +1,10 @@
-Wersja 0.7.5
+Wersja 0.8.3
Naprawiliśmy:
-- problem z brakiem aktywnego semestru (jeśli doświadczysz jakichś problemów - wyloguj i zaloguj się ponownie)
-- logowanie w niestandardowych dziennikach na vulcan.net.pl
-- oznaczanie lekcji w planie jako odwołanej, jeśli brak opisu tej zmiany
-- ładowanie wiadomości, jeśli byli zalogowani jednocześnie uczeń i rodzic
+- rzadkie problemy z wczytywaniem treści wiadomości
+- rzadkie problemy z wyświetlaniem poprawnego nauczyciela przy zastępstwach
-Pełna lista zmian: https://github.com/wulkanowy/wulkanowy/releases/tag/0.7.5
+Zmieniliśmy:
+- tekst wskazówki przy wprowadzaniu symbolu w formularzu logowania
+
+Pełna lista zmian: https://github.com/wulkanowy/wulkanowy/releases
diff --git a/app/src/main/res/drawable-hdpi/ic_widget_account.png b/app/src/main/res/drawable-hdpi/ic_widget_account.png
new file mode 100644
index 000000000..4cb5ac89e
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_widget_account.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_widget_account.png b/app/src/main/res/drawable-mdpi/ic_widget_account.png
new file mode 100644
index 000000000..237a6b6c2
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_widget_account.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_widget_account.png b/app/src/main/res/drawable-xhdpi/ic_widget_account.png
new file mode 100644
index 000000000..0ea798a8a
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_widget_account.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_widget_account.png b/app/src/main/res/drawable-xxhdpi/ic_widget_account.png
new file mode 100644
index 000000000..0f8933b17
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_widget_account.png differ
diff --git a/app/src/main/res/drawable/background_rounded_corner.xml b/app/src/main/res/drawable/background_rounded_corner.xml
new file mode 100644
index 000000000..116973b54
--- /dev/null
+++ b/app/src/main/res/drawable/background_rounded_corner.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_login_outlined_border.xml b/app/src/main/res/drawable/ic_login_outlined_border.xml
index 359bea5e4..c5d3c6867 100644
--- a/app/src/main/res/drawable/ic_login_outlined_border.xml
+++ b/app/src/main/res/drawable/ic_login_outlined_border.xml
@@ -2,7 +2,7 @@
+ android:color="@color/spinner_stroke" />
+
+
diff --git a/app/src/main/res/drawable/ic_message_forward_24dp.xml b/app/src/main/res/drawable/ic_message_forward_24dp.xml
new file mode 100644
index 000000000..2b7c32c75
--- /dev/null
+++ b/app/src/main/res/drawable/ic_message_forward_24dp.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_widget_clover_24dp.png b/app/src/main/res/drawable/ic_widget_clover_24dp.png
new file mode 100644
index 000000000..b1a7832a2
Binary files /dev/null and b/app/src/main/res/drawable/ic_widget_clover_24dp.png differ
diff --git a/app/src/main/res/drawable/img_luckynumber_widget_preview.png b/app/src/main/res/drawable/img_luckynumber_widget_preview.png
new file mode 100644
index 000000000..539b0a598
Binary files /dev/null and b/app/src/main/res/drawable/img_luckynumber_widget_preview.png differ
diff --git a/app/src/main/res/drawable/img_timetable_widget_preview.png b/app/src/main/res/drawable/img_timetable_widget_preview.png
index 60a35ab6a..550260258 100644
Binary files a/app/src/main/res/drawable/img_timetable_widget_preview.png and b/app/src/main/res/drawable/img_timetable_widget_preview.png differ
diff --git a/app/src/main/res/layout/activity_widget_configure.xml b/app/src/main/res/layout/activity_widget_configure.xml
new file mode 100644
index 000000000..192776e63
--- /dev/null
+++ b/app/src/main/res/layout/activity_widget_configure.xml
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/fragment_login_form.xml b/app/src/main/res/layout/fragment_login_form.xml
index 81baf4afc..553c87260 100644
--- a/app/src/main/res/layout/fragment_login_form.xml
+++ b/app/src/main/res/layout/fragment_login_form.xml
@@ -30,7 +30,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="32dp"
android:layout_marginLeft="32dp"
- android:layout_marginTop="48dp"
+ android:layout_marginTop="32dp"
android:layout_marginEnd="32dp"
android:layout_marginRight="32dp"
android:gravity="center_horizontal"
@@ -39,7 +39,6 @@
app:fontFamily="sans-serif-light"
app:layout_constraintBottom_toTopOf="@+id/loginFormNameLayout"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="packed" />
@@ -59,7 +58,6 @@
app:errorEnabled="true"
app:layout_constraintBottom_toTopOf="@+id/loginFormPassLayout"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/loginFormHeader">
@@ -87,7 +85,6 @@
app:errorEnabled="true"
app:layout_constraintBottom_toTopOf="@+id/loginFormHostLayout"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/loginFormNameLayout"
app:passwordToggleEnabled="true">
@@ -117,14 +114,14 @@
android:orientation="vertical"
app:layout_constraintBottom_toTopOf="@+id/loginFormSignIn"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/loginFormPassLayout">
+ android:layout_height="56dp"
+ android:entries="@array/endpoints_keys" />
+ app:layout_constraintTop_toBottomOf="@+id/loginFormHostLayout" />
+
+
diff --git a/app/src/main/res/layout/fragment_login_student_select.xml b/app/src/main/res/layout/fragment_login_student_select.xml
index 72af7293a..a94978bbf 100644
--- a/app/src/main/res/layout/fragment_login_student_select.xml
+++ b/app/src/main/res/layout/fragment_login_student_select.xml
@@ -1,4 +1,5 @@
-
+ android:layout_height="match_parent">
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/fragment_login_symbol.xml b/app/src/main/res/layout/fragment_login_symbol.xml
index 6cdf7ef03..6c820889f 100644
--- a/app/src/main/res/layout/fragment_login_symbol.xml
+++ b/app/src/main/res/layout/fragment_login_symbol.xml
@@ -29,7 +29,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="32dp"
android:layout_marginLeft="32dp"
- android:layout_marginTop="48dp"
+ android:layout_marginTop="32dp"
android:layout_marginEnd="32dp"
android:layout_marginRight="32dp"
android:gravity="center_horizontal"
@@ -79,11 +79,10 @@
style="@style/Widget.MaterialComponents.Button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
android:layout_marginTop="48dp"
android:layout_marginEnd="24dp"
android:layout_marginRight="24dp"
- android:layout_marginBottom="48dp"
+ android:layout_marginBottom="16dp"
android:text="@string/login_sign_in"
android:textAppearance="?android:textAppearanceSmall"
android:textColor="@android:color/white"
@@ -91,8 +90,7 @@
app:backgroundTint="@color/colorPrimary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/loginSymbolNameLayout"
- app:layout_constraintVertical_bias="1" />
+ app:layout_constraintTop_toBottomOf="@+id/loginSymbolNameLayout" />
diff --git a/app/src/main/res/layout/fragment_message_preview.xml b/app/src/main/res/layout/fragment_message_preview.xml
index 7150c03aa..962d94ac2 100644
--- a/app/src/main/res/layout/fragment_message_preview.xml
+++ b/app/src/main/res/layout/fragment_message_preview.xml
@@ -10,6 +10,7 @@
android:layout_height="match_parent">
+ tools:text="@tools:sample/lorem/random"
+ android:textColor="?android:textColorSecondary"/>
diff --git a/app/src/main/res/layout/item_grade_summary.xml b/app/src/main/res/layout/item_grade_summary.xml
index a650e9dc5..726a4d9c2 100644
--- a/app/src/main/res/layout/item_grade_summary.xml
+++ b/app/src/main/res/layout/item_grade_summary.xml
@@ -3,7 +3,8 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical">
+ android:orientation="vertical"
+ tools:context=".ui.modules.grade.summary.GradeSummaryItem">
+ android:background="?selectableItemBackground"
+ android:orientation="horizontal">
-
+
+ tools:text="@tools:sample/full_names" />
-
+ tools:text="@tools:sample/lorem/random" />
diff --git a/app/src/main/res/layout/item_widget_timetable.xml b/app/src/main/res/layout/item_widget_timetable.xml
index af0552807..aa8088640 100644
--- a/app/src/main/res/layout/item_widget_timetable.xml
+++ b/app/src/main/res/layout/item_widget_timetable.xml
@@ -7,7 +7,7 @@
android:background="@drawable/ic_all_divider"
android:minHeight="45dp"
android:orientation="horizontal"
- tools:context=".ui.widgets.timetable.TimetableWidgetFactory">
+ tools:context=".ui.modules.timetablewidget.TimetableWidgetFactory">
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/widget_timetable.xml b/app/src/main/res/layout/widget_timetable.xml
index 3edcc2763..52469699d 100644
--- a/app/src/main/res/layout/widget_timetable.xml
+++ b/app/src/main/res/layout/widget_timetable.xml
@@ -4,80 +4,87 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/white"
- tools:context=".ui.widgets.timetable.TimetableWidgetProvider">
+ tools:context=".ui.modules.timetablewidget.TimetableWidgetProvider">
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+ - 24 godzin
-
- - Wyłączony
- - Włączony
- - Automatyczny
- - Używaj ustawień systemowych
+
+ - Jasny
+ - Ciemny
+ - Czarny (AMOLED)
@@ -30,4 +29,9 @@
- Wulkanowy
- Kolory ocen w dzienniku
+
+
+ - Średnia ocen z 2 semestru
+ - Średnia ocen z całego roku
+
diff --git a/app/src/main/res/values/api_endpoints.xml b/app/src/main/res/values/api_endpoints.xml
index ff8cd23ca..e07f2b4b5 100644
--- a/app/src/main/res/values/api_endpoints.xml
+++ b/app/src/main/res/values/api_endpoints.xml
@@ -14,6 +14,6 @@
- https://edu.gdansk.pl
- https://umt.tarnow.pl
- https://resman.pl
- - https://fakelog.cf
+ - http://fakelog.cf
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 498549553..1b1fc7a06 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -40,4 +40,6 @@
#cccccc
#777777
+
+ #61000000
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index e0708095e..a4bf80ed6 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -2,7 +2,4 @@
8dp
8dp
-
-
- 60dp
diff --git a/app/src/main/res/values/preferences_keys.xml b/app/src/main/res/values/preferences_keys.xml
index 427cca56b..b09ee51bc 100644
--- a/app/src/main/res/values/preferences_keys.xml
+++ b/app/src/main/res/values/preferences_keys.xml
@@ -2,9 +2,10 @@
start_menu
attendance_present
- theme
+ app_theme
grade_color_scheme
expand_grade
+ grade_average_mode
services_enable
services_interval
services_disable_wifi_only
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1debed7b3..0cdd71beb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,7 +3,7 @@
- Select student
+ Login
Wulkanowy
Grades
Attendance
@@ -21,7 +21,7 @@
Sign in with the student or parent account
- Enter the VULCAN diary symbol
+ Enter the symbol
Email or nick
Password
Register
@@ -31,8 +31,10 @@
Login details are incorrect
Student not found. Check the symbol
This field is required
- This student has already been logged in
- The symbol is located on the register page in the Mobile Access tab
+ The selected student is already logged in
+ The symbol can be found on the register page in Uczeń -> Dostęp Mobilny -> Zarejestruj urządzenie mobilne
+ Select students to log in to the application
+ Privacy policy
@@ -134,6 +136,11 @@
To:
Date: %s
Reply
+ Forward
+ Delete
+ Move to trash
+ Delete permanently
+ Message deleted successfully
Subject
Content
Message sent successfully
@@ -213,18 +220,16 @@
No lessons
- Today
- Tomorrow
Appearance
Default view
- Show the summary in the grades
+ Calculation of the end-of-year average
Show presence in attendance
- Dark theme (Beta)
+ Application theme
Expand grades
- Grades color scheme
+ Grades color scheme
Notifications
Show notifications
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 4bbe3bc1b..58699c9e3 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,6 +1,6 @@
-
+
+
diff --git a/app/src/main/res/values/value_prefernces.xml b/app/src/main/res/values/value_prefernces.xml
index 661615e14..97396baad 100644
--- a/app/src/main/res/values/value_prefernces.xml
+++ b/app/src/main/res/values/value_prefernces.xml
@@ -13,17 +13,15 @@
- 3
-
- - Off
- - On
- - Auto
- - Follow system settings
+
+ - Light
+ - Dark
+ - Black (AMOLED)
-
- - 1
- - 2
- - 0
- - -1
+
+ - light
+ - dark
+ - black
@@ -70,4 +68,13 @@
- material
- grade_color
+
+
+ - Average grades from the 2nd semester
+ - Average of grades from the whole year
+
+
+ - only_one_semester
+ - all_year
+
diff --git a/app/src/main/res/xml/provider_widget_lucky_number.xml b/app/src/main/res/xml/provider_widget_lucky_number.xml
new file mode 100644
index 000000000..064f20570
--- /dev/null
+++ b/app/src/main/res/xml/provider_widget_lucky_number.xml
@@ -0,0 +1,14 @@
+
+
diff --git a/app/src/main/res/xml/provider_widget_timetable.xml b/app/src/main/res/xml/provider_widget_timetable.xml
index 48c6ba395..5392dd50b 100644
--- a/app/src/main/res/xml/provider_widget_timetable.xml
+++ b/app/src/main/res/xml/provider_widget_timetable.xml
@@ -1,9 +1,14 @@
+ android:widgetCategory="home_screen"
+ tools:targetApi="jelly_bean_mr1" />
diff --git a/app/src/main/res/xml/scheme_preferences.xml b/app/src/main/res/xml/scheme_preferences.xml
index 08c241246..149024c03 100644
--- a/app/src/main/res/xml/scheme_preferences.xml
+++ b/app/src/main/res/xml/scheme_preferences.xml
@@ -13,12 +13,12 @@
android:title="@string/pref_view_list"
app:iconSpaceReserved="false" />
+
(testException)).`when`(studentRepository).saveStudent(testStudent)
+ doReturn(Single.error(testException)).`when`(studentRepository).saveStudents(listOf(testStudent))
doReturn(Completable.complete()).`when`(studentRepository).logoutStudent(testStudent)
presenter.onItemSelected(LoginStudentSelectItem(testStudent))
+ presenter.onSignIn()
verify(loginStudentSelectView).showContent(false)
verify(loginStudentSelectView).showProgress(true)
verify(errorHandler).dispatch(testException)
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/main/MainPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/main/MainPresenterTest.kt
index f7c5559dd..1f5dc8de0 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/main/MainPresenterTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/main/MainPresenterTest.kt
@@ -41,7 +41,7 @@ class MainPresenterTest {
clearInvocations(mainView)
presenter = MainPresenter(errorHandler, studentRepository, prefRepository, syncManager, TestSchedulersProvider(), analytics)
- presenter.onAttachView(mainView, -1)
+ presenter.onAttachView(mainView, null)
}
@Test
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/splash/SplashPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/splash/SplashPresenterTest.kt
index fc25c0953..bc530a2bc 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/splash/SplashPresenterTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/splash/SplashPresenterTest.kt
@@ -32,14 +32,14 @@ class SplashPresenterTest {
@Test
fun testOpenLoginView() {
- doReturn(Single.just(false)).`when`(studentRepository).isStudentSaved()
+ doReturn(Single.just(false)).`when`(studentRepository).isCurrentStudentSet()
presenter.onAttachView(splashView)
verify(splashView).openLoginView()
}
@Test
fun testMainMainView() {
- doReturn(Single.just(true)).`when`(studentRepository).isStudentSaved()
+ doReturn(Single.just(true)).`when`(studentRepository).isCurrentStudentSet()
presenter.onAttachView(splashView)
verify(splashView).openMainView()
}
diff --git a/build.gradle b/build.gradle
index caeca70f2..1321c5f4c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
buildscript {
- ext.kotlin_version = '1.3.21'
+ ext.kotlin_version = '1.3.31'
repositories {
mavenCentral()
google()
@@ -9,10 +9,10 @@ buildscript {
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
- classpath 'com.android.tools.build:gradle:3.3.2'
+ classpath 'com.android.tools.build:gradle:3.4.1'
classpath 'com.google.gms:google-services:4.2.0'
- classpath "io.fabric.tools:gradle:1.27.1"
- classpath "com.github.triplet.gradle:play-publisher:2.1.0"
+ classpath "io.fabric.tools:gradle:1.28.1"
+ classpath "com.github.triplet.gradle:play-publisher:2.2.0"
classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7"
}
}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f95599f57..791ac7a45 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Jan 20 13:58:58 CET 2019
+#Thu Apr 18 00:26:43 CEST 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip