Add account headers in student picker (#871)

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

@@ -14,7 +14,7 @@ class StudentRemote @Inject constructor(private val sdk: Sdk) {
     private fun mapStudents(students: List<SdkStudent>, email: String, password: String): List<Student> {
         return students.map { student ->
             Student(
-                email = email,
+                email = email.ifBlank { student.email },
                 password = password,
                 isParent = student.isParent,
                 symbol = student.symbol,

app/src/main/java/io/github/wulkanowy/ui/modules/account/Account.kt

@@ -0,0 +1,3 @@
+package io.github.wulkanowy.ui.modules.account
+
+data class Account(val email: String, val isParent: Boolean)

app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountAdapter.kt

@@ -3,33 +3,72 @@ package io.github.wulkanowy.ui.modules.account
 import android.annotation.SuppressLint
 import android.graphics.PorterDuff
 import android.view.LayoutInflater
+import android.view.View.GONE
+import android.view.View.VISIBLE
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.databinding.HeaderAccountBinding
 import io.github.wulkanowy.databinding.ItemAccountBinding
+import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.getThemeAttrColor
 import javax.inject.Inject
 
-class AccountAdapter @Inject constructor() : RecyclerView.Adapter<AccountAdapter.ItemViewHolder>() {
+class AccountAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
-    var items = emptyList<Student>()
+    var items = emptyList<AccountItem<*>>()
 
     var onClickListener: (Student) -> Unit = {}
 
     override fun getItemCount() = items.size
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
+    override fun getItemViewType(position: Int) = items[position].viewType.id
-        ItemAccountBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+
-    )
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        val inflater = LayoutInflater.from(parent.context)
+
+        return when (viewType) {
+            AccountItem.ViewType.HEADER.id -> HeaderViewHolder(HeaderAccountBinding.inflate(inflater, parent, false))
+            AccountItem.ViewType.ITEM.id -> ItemViewHolder(ItemAccountBinding.inflate(inflater, parent, false))
+            else -> throw IllegalStateException()
+        }
+    }
+
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+        when (holder) {
+            is HeaderViewHolder -> bindHeaderViewHolder(holder.binding, items[position].value as Account)
+            is ItemViewHolder -> bindItemViewHolder(holder.binding, items[position].value as Student)
+        }
+    }
+
+    private fun bindHeaderViewHolder(binding: HeaderAccountBinding, account: Account) {
+        with(binding) {
+            accountHeaderEmail.text = account.email
+            accountHeaderType.setText(if (account.isParent) R.string.account_type_parent else R.string.account_type_student)
+        }
+    }
 
     @SuppressLint("SetTextI18n")
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+    private fun bindItemViewHolder(binding: ItemAccountBinding, student: Student) {
-        val student = items[position]
+        with(binding) {
-
-        with(holder.binding) {
             accountItemName.text = "${student.studentName} ${student.className}"
             accountItemSchool.text = student.schoolName
+            with(accountItemLoginMode) {
+                visibility = when (Sdk.Mode.valueOf(student.loginMode)) {
+                    Sdk.Mode.API -> {
+                        setText(R.string.account_login_mobile_api)
+                        VISIBLE
+                    }
+                    Sdk.Mode.HYBRID -> {
+                        setText(R.string.account_login_hybrid)
+                        VISIBLE
+                    }
+                    Sdk.Mode.SCRAPPER -> {
+                        GONE
+                    }
+                }
+            }
 
             with(accountItemImage) {
                 val colorImage = if (student.isCurrent) context.getThemeAttrColor(R.attr.colorPrimary)
@@ -42,5 +81,8 @@ class AccountAdapter @Inject constructor() : RecyclerView.Adapter<AccountAdapter
         }
     }
 
+    class HeaderViewHolder(val binding: HeaderAccountBinding) :
+        RecyclerView.ViewHolder(binding.root)
+
     class ItemViewHolder(val binding: ItemAccountBinding) : RecyclerView.ViewHolder(binding.root)
 }

app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountDialog.kt

@@ -9,7 +9,6 @@ import android.widget.Toast.LENGTH_LONG
 import androidx.appcompat.app.AlertDialog
 import androidx.recyclerview.widget.LinearLayoutManager
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.databinding.DialogAccountBinding
 import io.github.wulkanowy.ui.base.BaseDialogFragment
 import io.github.wulkanowy.ui.modules.login.LoginActivity
@@ -54,7 +53,7 @@ class AccountDialog : BaseDialogFragment<DialogAccountBinding>(), AccountView {
         }
     }
 
-    override fun updateData(data: List<Student>) {
+    override fun updateData(data: List<AccountItem<*>>) {
         with(accountAdapter) {
             items = data
             notifyDataSetChanged()

app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountItem.kt

@@ -0,0 +1,9 @@
+package io.github.wulkanowy.ui.modules.account
+
+data class AccountItem<out T>(val value: T, val viewType: ViewType) {
+
+    enum class ViewType(val id: Int) {
+        HEADER(1),
+        ITEM(2)
+    }
+}

app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountPresenter.kt

@@ -83,11 +83,20 @@ class AccountPresenter @Inject constructor(
         }
     }
 
+    private fun createAccountItems(items: List<Student>): List<AccountItem<*>> {
+        return items.groupBy { Account(it.email, it.isParent) }.map { (account, students) ->
+            listOf(AccountItem(account, AccountItem.ViewType.HEADER)) + students.map { student ->
+                AccountItem(student, AccountItem.ViewType.ITEM)
+            }
+        }.flatten()
+    }
+
     private fun loadData() {
         Timber.i("Loading account data started")
         disposable.add(studentRepository.getSavedStudents(false)
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)
+            .map { createAccountItems(it) }
             .subscribe({
                 Timber.i("Loading account result: Success")
                 view?.updateData(it)

app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountView.kt

@@ -1,13 +1,12 @@
 package io.github.wulkanowy.ui.modules.account
 
-import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.ui.base.BaseView
 
 interface AccountView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<Student>)
+    fun updateData(data: List<AccountItem<*>>)
 
     fun dismissView()
 

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

@@ -5,45 +5,60 @@
     android:layout_width="300dp"
     android:layout_height="wrap_content">
 
-    <TextView
+    <LinearLayout
-        android:id="@+id/accountDialogTitle"
-        android:layout_width="match_parent"
-        android:layout_height="64dp"
-        android:paddingStart="24dp"
-        android:paddingLeft="24dp"
-        android:paddingEnd="24dp"
-        android:paddingRight="24dp"
-        android:text="@string/account_title"
-        android:textSize="20sp"
-        android:textStyle="bold"
-        app:firstBaselineToTopHeight="40dp" />
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/accountDialogRecycler"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@id/accountDialogTitle"
+        android:orientation="vertical">
-        android:overScrollMode="never"
-        tools:itemCount="3"
-        tools:listitem="@layout/item_account" />
 
-    <com.google.android.material.button.MaterialButton
+        <TextView
-        android:id="@+id/accountDialogAdd"
+            android:id="@+id/accountDialogTitle"
-        style="@style/Widget.MaterialComponents.Button.TextButton"
+            android:layout_width="match_parent"
-        android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
-        android:layout_height="wrap_content"
+            android:paddingStart="24dp"
-        android:layout_below="@id/accountDialogRecycler"
+            android:paddingLeft="24dp"
-        android:layout_margin="8dp"
+            android:paddingEnd="24dp"
-        android:text="@string/account_add_new"
+            android:paddingRight="24dp"
-        android:textColor="?android:textColorPrimary" />
+            android:text="@string/account_title"
+            android:textSize="20sp"
+            android:textStyle="bold"
+            app:firstBaselineToTopHeight="40dp" />
 
-    <com.google.android.material.button.MaterialButton
+        <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/accountDialogRemove"
+            android:id="@+id/accountDialogRecycler"
-        style="@style/Widget.MaterialComponents.Button.TextButton"
+            android:layout_width="match_parent"
-        android:layout_width="wrap_content"
+            android:layout_height="0dp"
-        android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
-        android:layout_below="@id/accountDialogRecycler"
+            android:layout_weight="1"
-        android:layout_alignParentEnd="true"
+            android:overScrollMode="never"
-        android:layout_margin="8dp"
+            tools:itemCount="3"
-        android:text="@string/account_logout" />
+            tools:listitem="@layout/item_account" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/accountDialogAdd"
+                style="@style/Widget.MaterialComponents.Button.TextButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="8dp"
+                android:text="@string/account_add_new"
+                android:textColor="?android:textColorPrimary" />
+
+            <Space
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/accountDialogRemove"
+                style="@style/Widget.MaterialComponents.Button.TextButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="8dp"
+                android:text="@string/account_logout" />
+        </LinearLayout>
+    </LinearLayout>
 </RelativeLayout>

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

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:paddingHorizontal="24dp"
+    android:paddingTop="8dp"
+    android:paddingBottom="8dp"
+    tools:context=".ui.modules.account.AccountAdapter">
+
+    <TextView
+        android:id="@+id/accountHeaderEmail"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textColor="?android:textColorPrimary"
+        android:textSize="14sp"
+        tools:text="jan@fakelog.cf" />
+
+    <TextView
+        android:id="@+id/accountHeaderType"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="2dp"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="12sp"
+        tools:text="Konto ucznia" />
+</LinearLayout>

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

@@ -3,20 +3,17 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="56dp"
+    android:layout_height="wrap_content"
     android:background="?selectableItemBackground"
     android:orientation="horizontal"
-    android:paddingStart="24dp"
+    android:paddingVertical="8dp"
-    android:paddingLeft="24dp"
+    android:paddingHorizontal="16dp"
-    android:paddingEnd="24dp"
-    android:paddingRight="24dp"
     tools:context=".ui.modules.account.AccountAdapter">
 
     <ImageView
         android:id="@+id/accountItemImage"
         android:layout_width="40dp"
         android:layout_height="40dp"
-        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/ic_all_account"
@@ -27,7 +24,7 @@
         android:id="@+id/accountItemName"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="20dp"
+        android:layout_marginStart="16dp"
         android:ellipsize="end"
         android:maxLines="1"
         android:textSize="16sp"
@@ -40,7 +37,7 @@
         android:id="@+id/accountItemSchool"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="20dp"
+        android:layout_marginStart="16dp"
         android:layout_marginTop="3dp"
         android:ellipsize="end"
         android:maxLines="1"
@@ -50,4 +47,21 @@
         app:layout_constraintStart_toEndOf="@id/accountItemImage"
         app:layout_constraintTop_toBottomOf="@id/accountItemName"
         tools:text="@tools:sample/lorem/random" />
+
+    <TextView
+        android:id="@+id/accountItemLoginMode"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="3dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="12sp"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/accountItemImage"
+        app:layout_constraintTop_toBottomOf="@id/accountItemSchool"
+        tools:text="Tryb API mobilne"
+        tools:visibility="visible" />
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -265,6 +265,10 @@
     <string name="account_logout">Wyloguj</string>
     <string name="account_confirm">Czy chcesz wylogować aktualnego ucznia?</string>
     <string name="account_logout_student">Wylogowanie ucznia</string>
+    <string name="account_type_student">Konto ucznia</string>
+    <string name="account_type_parent">Konto rodzica</string>
+    <string name="account_login_mobile_api">Tryb API mobilne</string>
+    <string name="account_login_hybrid">Tryb hybrydowy</string>
     <!--About-->
     <string name="about_version">Wersja aplikacji</string>
     <string name="about_contributor">Twórcy</string>

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

@@ -282,6 +282,10 @@
     <string name="account_logout">Logout</string>
     <string name="account_confirm">Do you want to log out of an active student?</string>
     <string name="account_logout_student">Student logout</string>
+    <string name="account_type_student">Student account</string>
+    <string name="account_type_parent">Parent account</string>
+    <string name="account_login_mobile_api">Mobile API mode</string>
+    <string name="account_login_hybrid">Hybrid mode</string>
 
 
     <!--About-->