Add a selection of multiple students to login (#318)

app/build.gradle

@@ -86,7 +86,7 @@ play {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation('com.github.wulkanowy:api:fe4ffeb') { exclude module: "threetenbp" }
+    implementation 'com.github.wulkanowy:api:3335bd6'
 
     implementation "androidx.legacy:legacy-support-v4:1.0.0"
     implementation "androidx.appcompat:appcompat:1.0.2"

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()

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" />
         <activity
             android:name=".ui.modules.main.MainActivity"

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<Student>): List<Long>
 
     @Delete
     fun delete(student: Student)

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<Long> {
+    fun saveStudents(students: List<Student>): Single<List<Long>> {
-        return Single.fromCallable { studentDb.insert(student.copy(password = encrypt(student.password, context))) }
+        return Single.fromCallable { studentDb.insertAll(students.map { it.copy(password = encrypt(it.password, context)) }) }
     }
 
     fun getStudents(decryptPass: Boolean): Maybe<List<Student>> {

app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRepository.kt

@@ -41,8 +41,8 @@ class StudentRepository @Inject constructor(
             .toSingle()
     }
 
-    fun saveStudent(student: Student): Single<Long> {
+    fun saveStudents(students: List<Student>): Single<List<Long>> {
-        return local.saveStudent(student)
+        return local.saveStudents(students)
     }
 
     fun switchStudent(student: Student): Completable {

app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectFragment.kt

@@ -8,7 +8,6 @@ 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 +44,7 @@ class LoginStudentSelectFragment : BaseFragment(), LoginStudentSelectView {
     }
 
     override fun initView() {
+        loginStudentSelectSignIn.setOnClickListener { presenter.onSignIn() }
         loginAdapter.apply { setOnItemClickListener { presenter.onItemSelected(it) } }
 
         loginStudentSelectRecycler.apply {
@@ -54,7 +54,7 @@ class LoginStudentSelectFragment : BaseFragment(), LoginStudentSelectView {
     }
 
     override fun updateData(data: List<LoginStudentSelectItem>) {
-        loginAdapter.updateDataSet(data, true)
+        loginAdapter.updateDataSet(data)
     }
 
     override fun openMainView() {
@@ -69,11 +69,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) {
+    override fun enableSignIn(enable: Boolean) {
-        (activity as? AppCompatActivity)?.supportActionBar?.run { if (show) show() else hide() }
+        loginStudentSelectSignIn.isEnabled = enable
     }
 
     fun onParentInitStudentSelectFragment(students: List<Student>) {

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<LoginStudentSelectItem.ItemViewHolder>() {
 
-    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<IFlexible<*>>): ItemViewHolder {
         return ItemViewHolder(view, adapter)
     }
 
     @SuppressLint("SetTextI18n")
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ItemViewHolder, position: Int, payloads: MutableList<Any>?) {
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ItemViewHolder, position: Int, payloads: MutableList<Any>) {
-        holder.run {
+        holder.apply {
             loginItemName.text = "${student.studentName} ${student.className}"
             loginItemSchool.text = student.schoolName
         }
@@ -43,7 +43,17 @@ class LoginStudentSelectItem(val student: Student) : AbstractFlexibleItem<LoginS
     }
 
     class ItemViewHolder(view: View, adapter: FlexibleAdapter<*>) : 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 }
+        }
     }
 }

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<Student>()
 
+    var selectedStudents = mutableListOf<Student>()
+
     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<Student>) {
         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) {
+    private fun registerStudents(students: List<Student>) {
-        disposable.add(studentRepository.saveStudent(student)
+        disposable.add(studentRepository.saveStudents(students)
-            .map { student.apply { id = it } }
+            .map { students.first().apply { id = it.first() } }
-            .onErrorResumeNext { studentRepository.logoutStudent(student).andThen(Single.error(it)) }
+            .flatMapCompletable { studentRepository.switchStudent(it) }
-            .flatMapCompletable { studentRepository.switchStudent(student) }
             .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()
-            }, {
+            }, { error ->
-                analytics.logEvent("registration_student_select", SUCCESS to false, "endpoint" to student.endpoint, "symbol" to student.symbol, "error" to it.localizedMessage)
+                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)
                 }
             }))
     }

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)
 }

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"
@@ -150,7 +150,7 @@
                 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"

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

@@ -1,4 +1,5 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -12,10 +13,60 @@
         android:indeterminate="true"
         android:visibility="gone" />
 
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/loginStudentSelectContent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <TextView
+            android:id="@+id/loginStudentSelectHeader"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="32dp"
+            android:layout_marginLeft="32dp"
+            android:layout_marginTop="32dp"
+            android:layout_marginEnd="32dp"
+            android:layout_marginRight="32dp"
+            android:layout_marginBottom="32dp"
+            android:gravity="center_horizontal"
+            android:text="@string/login_select_student"
+            android:textSize="16sp"
+            app:fontFamily="sans-serif-light"
+            app:layout_constraintBottom_toTopOf="@id/loginStudentSelectRecycler"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_chainStyle="packed" />
+
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/loginStudentSelectRecycler"
             android:layout_width="match_parent"
-        android:layout_height="match_parent"
+            android:layout_height="wrap_content"
-        tools:itemCount="5"
+            android:minHeight="144dp"
+            app:layout_constrainedHeight="true"
+            app:layout_constraintBottom_toTopOf="@id/loginStudentSelectSignIn"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHeight_max="432dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/loginStudentSelectHeader"
+            tools:itemCount="6"
             tools:listitem="@layout/item_login_student_select" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/loginStudentSelectSignIn"
+            style="@style/Widget.MaterialComponents.Button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="32dp"
+            android:layout_marginEnd="24dp"
+            android:layout_marginRight="24dp"
+            android:layout_marginBottom="32dp"
+            android:text="@string/login_sign_in"
+            android:textAppearance="?android:textAppearanceSmall"
+            android:textColor="@android:color/white"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/loginStudentSelectRecycler" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </FrameLayout>

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_constraintTop_toBottomOf="@+id/loginSymbolNameLayout" />
-                app:layout_constraintVertical_bias="1" />
         </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.core.widget.NestedScrollView>
 </FrameLayout>

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

@@ -1,46 +1,42 @@
-<?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/loginItemContainer"
     android:layout_width="match_parent"
     android:layout_height="72dp"
-    android:background="?attr/selectableItemBackground"
+    android:background="?selectableItemBackground"
-    android:clickable="true"
+    android:orientation="horizontal">
-    android:focusable="true"
-    android:padding="16dp"
-    tools:context=".ui.modules.login.studentselect.LoginStudentSelectItem">
 
-    <androidx.appcompat.widget.AppCompatImageView
+    <CheckBox
-        android:id="@+id/loginItemImage"
+        android:id="@+id/loginItemCheck"
-        android:layout_width="40dp"
+        android:layout_width="26dp"
-        android:layout_height="40dp"
+        android:layout_height="24dp"
-        android:layout_marginEnd="16dp"
+        android:layout_marginStart="16dp"
-        android:layout_marginRight="16dp"
+        android:layout_marginLeft="16dp"
-        app:srcCompat="@drawable/ic_all_account_24dp"
+        android:layout_marginTop="16dp"
-        app:tint="?android:textColorPrimary" />
+        android:layout_marginEnd="32dp"
+        android:layout_marginRight="32dp"
+        tools:text=" " />
 
     <TextView
         android:id="@+id/loginItemName"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_toEndOf="@id/loginItemImage"
+        android:layout_toEndOf="@id/loginItemCheck"
-        android:layout_toRightOf="@id/loginItemImage"
+        android:layout_toRightOf="@id/loginItemCheck"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:text="@string/app_name"
         android:textSize="16sp"
-        app:firstBaselineToTopHeight="16dp" />
+        app:firstBaselineToTopHeight="32dp"
+        tools:text="Jan Kowalski" />
 
     <TextView
         android:id="@+id/loginItemSchool"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_toEndOf="@id/loginItemImage"
+        android:layout_below="@id/loginItemName"
-        android:layout_toRightOf="@id/loginItemImage"
+        android:layout_toEndOf="@id/loginItemCheck"
-        android:ellipsize="end"
+        android:layout_toRightOf="@id/loginItemCheck"
-        android:maxLines="1"
+        android:textColor="?android:textColorSecondary"
-        android:text="@string/app_name"
         android:textSize="12sp"
-        app:firstBaselineToTopHeight="36dp" />
+        app:firstBaselineToTopHeight="20dp"
-
+        tools:text="Szkoła Wulkanowego nr 1" />
 </RelativeLayout>

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

@@ -3,7 +3,7 @@
 
 
     <!--Activity/Fragment title-->
-    <string name="login_title">Wybierz ucznia</string>
+    <string name="login_title">Logowanie</string>
     <string name="main_title">Wulkanowy</string>
     <string name="grade_title">Oceny</string>
     <string name="attendance_title">Frekwencja</string>
@@ -31,8 +31,9 @@
     <string name="login_incorrect_password">Dane logowania są niepoprawne</string>
     <string name="login_incorrect_symbol">Nie znaleziono ucznia. Sprawdź symbol</string>
     <string name="login_field_required">To pole jest wymagane</string>
-    <string name="login_duplicate_student">Ten student jest już zalogowany</string>
+    <string name="login_duplicate_student">Wybrany uczeń jest już zalogowany</string>
     <string name="login_symbol_helper">Symbol znajduje się na stronie dziennika w zakładce Dostęp Mobilny</string>
+    <string name="login_select_student">Wybierz uczniów do zalogowania w aplikacji</string>
     <string name="login_privacy_policy">Polityka prywatności</string>
 
 

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

@@ -3,7 +3,7 @@
 
 
     <!--Activity/Fragment title-->
-    <string name="login_title">Select student</string>
+    <string name="login_title">Login</string>
     <string name="main_title">Wulkanowy</string>
     <string name="grade_title">Grades</string>
     <string name="attendance_title">Attendance</string>
@@ -31,8 +31,9 @@
     <string name="login_incorrect_password">Login details are incorrect</string>
     <string name="login_incorrect_symbol">Student not found. Check the symbol</string>
     <string name="login_field_required">This field is required</string>
-    <string name="login_duplicate_student">This student has already been logged in</string>
+    <string name="login_duplicate_student">The selected student is already logged in</string>
     <string name="login_symbol_helper">The symbol is located on the register page in the Mobile Access tab</string>
+    <string name="login_select_student">Select students to log in to the application</string>
     <string name="login_privacy_policy">Privacy policy</string>
 
 

app/src/test/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenterTest.kt

@@ -51,9 +51,10 @@ class LoginStudentSelectPresenterTest {
 
     @Test
     fun onSelectedStudentTest() {
-        doReturn(Single.just(1L)).`when`(studentRepository).saveStudent(testStudent)
+        doReturn(Single.just(listOf(1L))).`when`(studentRepository).saveStudents(listOf(testStudent))
         doReturn(Completable.complete()).`when`(studentRepository).switchStudent(testStudent)
         presenter.onItemSelected(LoginStudentSelectItem(testStudent))
+        presenter.onSignIn()
         verify(loginStudentSelectView).showContent(false)
         verify(loginStudentSelectView).showProgress(true)
         verify(loginStudentSelectView).openMainView()
@@ -61,9 +62,10 @@ class LoginStudentSelectPresenterTest {
 
     @Test
     fun onSelectedStudentErrorTest() {
-        doReturn(Single.error<Student>(testException)).`when`(studentRepository).saveStudent(testStudent)
+        doReturn(Single.error<Student>(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)