Draft

app/build.gradle

@@ -33,6 +33,7 @@ android {
         }
     }
     compileOptions {
+        coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
     }
@@ -77,7 +78,7 @@ dependencies {
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
 
     //security
-    implementation "androidx.security:security-crypto:1.1.0-alpha05"
+    implementation "androidx.security:security-crypto:1.1.0-alpha06"
 
     // Import the Firebase BoM
     implementation platform('com.google.firebase:firebase-bom:31.3.0')
@@ -89,6 +90,11 @@ dependencies {
     //Hilt
     implementation "com.google.dagger:hilt-android:2.44"
     kapt "com.google.dagger:hilt-compiler:2.44"
+
+    //Time
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
+
+    implementation "ru.tinkoff.decoro:decoro:1.1.1"
 }
 kapt {
     correctErrorTypes true

app/src/main/AndroidManifest.xml

@@ -41,7 +41,7 @@
         </service>
         <meta-data
             android:name="com.google.firebase.messaging.default_notification_icon"
-            android:resource="@drawable/ic_launcher_foreground" />
+            android:resource="@drawable/ic_logo" />
         <meta-data
             android:name="preloaded_fonts"
             android:resource="@array/preloaded_fonts" />

app/src/main/java/ru/nsu/fit/modao/MasterActivity.kt

@@ -30,4 +30,5 @@ class MasterActivity: AppCompatActivity() {
             return@setOnItemSelectedListener true
         }
     }
+
 }

app/src/main/java/ru/nsu/fit/modao/adapter/ExpensesAdapter.kt

@@ -6,33 +6,89 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import ru.nsu.fit.modao.R
+import ru.nsu.fit.modao.databinding.CounterEventItemBinding
+import ru.nsu.fit.modao.databinding.DeletedEventItemBinding
 import ru.nsu.fit.modao.databinding.ExpenseItemBinding
+import ru.nsu.fit.modao.databinding.TransferItemBinding
 import ru.nsu.fit.modao.models.Currency
 import ru.nsu.fit.modao.models.Expense
 import ru.nsu.fit.modao.models.ExpenseListItem
 import ru.nsu.fit.modao.models.LoadItems
 
 class ExpensesAdapter: RecyclerView.Adapter<RecyclerView.ViewHolder>() {
-    private var expensesList: Array<ExpenseListItem> = arrayOf()
+    private var expensesList: MutableList<ExpenseListItem> = mutableListOf()
     private lateinit var listener: AdapterListener<ExpenseListItem>
     companion object {
         const val EXPENSE = 0
-        const val LOAD = 1
+        const val TRANSFER = 1
+        const val DELETED = 2
+        const val DELETING = 3
+        const val LOAD = 4
     }
     fun attachListener(listener: AdapterListener<ExpenseListItem>){
         this.listener = listener
     }
     fun setList(list: Array<ExpenseListItem>){
-        expensesList = list
+        expensesList = list.toMutableList()
         notifyDataSetChanged()
     }
+    fun addItems(list: Array<ExpenseListItem>) {
+        val size = expensesList.size
+        expensesList.addAll(list)
+        notifyItemRangeChanged(size, list.size)
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        val inflater = LayoutInflater.from(parent.context)
+
+        return when (viewType) {
+            EXPENSE -> ExpensesHolder(inflater.inflate(R.layout.expense_item, parent, false))
+            TRANSFER -> TransferHolder(inflater.inflate(R.layout.transfer_item, parent, false))
+            DELETED -> DeletedEventHolder(inflater.inflate(R.layout.deleted_event_item, parent, false))
+            DELETING -> CounterEventHolder(inflater.inflate(R.layout.counter_event_item, parent, false))
+            LOAD -> LoadHolder(inflater.inflate(R.layout.empty_item, parent, false))
+            else -> throw IllegalArgumentException("Illegal view type: $viewType")
+        }
+    }
+
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+        when (holder) {
+            is ExpensesHolder -> holder.bind(expensesList[position] as Expense, listener)
+            is TransferHolder -> holder.bind(expensesList[position] as Expense, listener)
+            is DeletedEventHolder -> holder.bind(expensesList[position] as Expense, listener)
+            is CounterEventHolder -> holder.bind(expensesList[position] as Expense, listener)
+            is LoadHolder -> holder.bind(expensesList[position] as LoadItems, listener)
+        }
+
+    }
+
+    override fun getItemViewType(position: Int): Int {
+        return when (expensesList[position]) {
+            is Expense -> {
+                val expense = expensesList[position] as Expense
+
+                when (expense.status) {
+                    0 -> if (expense.type == 0) EXPENSE else TRANSFER
+                    1 -> if (expense.type == 0) EXPENSE else TRANSFER
+                    -2 -> DELETING
+                    -1 -> DELETED
+                    else -> throw IllegalArgumentException("status ${expense.status}")
+                }
+            }
+            is LoadItems -> LOAD
+        }
+    }
+
+    override fun getItemCount(): Int {
+        return expensesList.size
+    }
     class LoadHolder(item: View): RecyclerView.ViewHolder(item) {
         fun bind(load: LoadItems, listener: AdapterListener<ExpenseListItem>) {
             listener.onClickItem(load)
         }
     }
-    class ExpensesHolder(item: View): RecyclerView.ViewHolder(item){
-        val binding = ExpenseItemBinding.bind(item)
+    class DeletedEventHolder(item: View): RecyclerView.ViewHolder(item) {
+        val binding = DeletedEventItemBinding.bind(item)
         fun bind(expense: Expense, listener: AdapterListener<ExpenseListItem>) = with(binding){
             shortInfo.text = expense.name
             amountExpense.text = expense.price.toString()
@@ -51,33 +107,65 @@ class ExpensesAdapter: RecyclerView.Adapter<RecyclerView.ViewHolder>() {
             }
         }
     }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        val inflater = LayoutInflater.from(parent.context)
-        return when (viewType) {
-            EXPENSE -> ExpensesHolder(inflater.inflate(R.layout.expense_item, parent, false))
-            LOAD -> LoadHolder(inflater.inflate(R.layout.empty_item, parent, false))
-            else -> throw IllegalArgumentException("Illegal view type: $viewType")
+    class CounterEventHolder(item: View): RecyclerView.ViewHolder(item) {
+        val binding = CounterEventItemBinding.bind(item)
+        fun bind(expense: Expense, listener: AdapterListener<ExpenseListItem>) = with(binding){
+            shortInfo.text = expense.name
+            amountExpense.text = expense.price.toString()
+            if (expense.price!! > 0){
+                if (expense.currency == Currency.RUB){
+                    currencyImage.setImageResource(R.drawable.ic_profit_rub)
+                }
+            } else {
+                if (expense.currency == Currency.RUB) {
+                    currencyImage.setImageResource(R.drawable.ic_loss_rub)
+                    amountExpense.setTextColor(Color.parseColor("#D46E6E"))
+                }
+            }
+            root.setOnClickListener {
+                listener.onClickItem(expense)
+            }
         }
     }
-
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        when (holder) {
-            is ExpensesHolder -> holder.bind(expensesList[position] as Expense, listener)
-            is LoadHolder -> holder.bind(expensesList[position] as LoadItems, listener)
+    class TransferHolder(item: View): RecyclerView.ViewHolder(item) {
+        val binding = TransferItemBinding.bind(item)
+        fun bind(expense: Expense, listener: AdapterListener<ExpenseListItem>) = with(binding){
+            shortInfo.text = expense.name
+            amountExpense.text = expense.price.toString()
+            if (expense.price!! > 0){
+                if (expense.currency == Currency.RUB){
+                    currencyImage.setImageResource(R.drawable.ic_profit_rub)
+                }
+            } else {
+                if (expense.currency == Currency.RUB) {
+                    currencyImage.setImageResource(R.drawable.ic_loss_rub)
+                    amountExpense.setTextColor(Color.parseColor("#D46E6E"))
+                }
+            }
+            root.setOnClickListener {
+                listener.onClickItem(expense)
+            }
         }
-
     }
-
-    override fun getItemViewType(position: Int): Int {
-        return when (expensesList[position]) {
-            is Expense -> EXPENSE
-            is LoadItems -> LOAD
+    class ExpensesHolder(item: View): RecyclerView.ViewHolder(item){
+        val binding = ExpenseItemBinding.bind(item)
+        fun bind(expense: Expense, listener: AdapterListener<ExpenseListItem>) = with(binding){
+            shortInfo.text = expense.name
+            amountExpense.text = expense.price.toString()
+            if (expense.price!! > 0){
+                if (expense.currency == Currency.RUB){
+                    currencyImage.setImageResource(R.drawable.ic_profit_rub)
+                }
+            } else {
+                if (expense.currency == Currency.RUB) {
+                    currencyImage.setImageResource(R.drawable.ic_loss_rub)
+                    amountExpense.setTextColor(Color.parseColor("#D46E6E"))
+                }
+            }
+            root.setOnClickListener {
+                listener.onClickItem(expense)
+            }
         }
     }
 
-    override fun getItemCount(): Int {
-        return expensesList.size
-    }
-
 }

app/src/main/java/ru/nsu/fit/modao/adapter/FriendsAdapter.java

@@ -3,12 +3,12 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.google.android.material.button.MaterialButton;
+
 import ru.nsu.fit.modao.R;
 import ru.nsu.fit.modao.models.User;
 
@@ -46,10 +46,9 @@ public static final class FriendsHolder extends RecyclerView.ViewHolder {
         View itemView;
 
         public void bind(User friend, AdapterListener<User> listener) {
-            ImageView imageView = itemView.findViewById(R.id.friendItem);
-            imageView.setOnClickListener(v -> listener.onClickItem(friend));
-            TextView textView = itemView.findViewById(R.id.nameFriends);
-            textView.setText(friend.getUsername());
+            MaterialButton cell = itemView.findViewById(R.id.friendItem);
+            cell.setOnClickListener(v -> listener.onClickItem(friend));
+            cell.setText(friend.getUsername());
         }
 
         public FriendsHolder(@NonNull View itemView) {

app/src/main/java/ru/nsu/fit/modao/adapter/GroupAdapter.kt

@@ -1,46 +1,78 @@
 package ru.nsu.fit.modao.adapter
 
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import ru.nsu.fit.modao.R
+import ru.nsu.fit.modao.databinding.GroupItemArchiveBinding
 import ru.nsu.fit.modao.databinding.GroupItemBinding
 import ru.nsu.fit.modao.models.Group
 
-class GroupAdapter: RecyclerView.Adapter<GroupAdapter.GroupHolder>() {
+class GroupAdapter: RecyclerView.Adapter<RecyclerView.ViewHolder>() {
     private var listener: AdapterListener<Group>? = null
     private var groupsList: Array<Group> = arrayOf()
 
+    companion object {
+        const val ACTIVE = 0
+        const val ARCHIVE = 1
+    }
     fun attachListener(listener: AdapterListener<Group>){
         this.listener = listener
     }
     fun setGroups(groupsList: Array<Group>){
         this.groupsList = groupsList
         notifyDataSetChanged()
     }
+
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        val inflater = LayoutInflater.from(parent.context)
+        return when (viewType) {
+            ACTIVE -> GroupHolder(inflater.inflate(R.layout.group_item, parent, false))
+            ARCHIVE -> ArchiveGroupHolder(inflater.inflate(R.layout.group_item_archive, parent, false))
+            else -> throw IllegalArgumentException("Unknown type $viewType")
+        }
+    }
+
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+        when (holder) {
+            is GroupHolder -> holder.bind(groupsList[position], listener!!)
+            is ArchiveGroupHolder -> holder.bind(groupsList[position], listener!!)
+        }
+
+    }
+
+    override fun getItemCount(): Int {
+        return groupsList.size
+    }
+
+    override fun getItemViewType(position: Int): Int {
+        return when (groupsList[position].typeGroup) {
+            0 -> ACTIVE
+            1 -> ARCHIVE
+            else -> throw IllegalArgumentException("Unknown type ${groupsList[position].typeGroup}")
+        }
+    }
+
     class GroupHolder(item: View): RecyclerView.ViewHolder(item){
         val binding = GroupItemBinding.bind(item)
         val view = item
         fun bind(group: Group, listener: AdapterListener<Group>){
             binding.nameGroup.text = group.groupName
-            view.setOnClickListener(){
+            binding.nameGroup.setOnClickListener {
                 listener.onClickItem(group)
             }
         }
     }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): GroupHolder {
-        val view = LayoutInflater.from(parent.context).inflate(R.layout.group_item, parent, false)
-        return GroupHolder(view)
-    }
-
-    override fun onBindViewHolder(holder: GroupHolder, position: Int) {
-        holder.bind(groupsList[position], listener!!)
-    }
-
-    override fun getItemCount(): Int {
-        return groupsList.size
+    class ArchiveGroupHolder(item: View): RecyclerView.ViewHolder(item) {
+        val binding = GroupItemArchiveBinding.bind(item)
+        val view = item
+        fun bind(group: Group, listener: AdapterListener<Group>){
+            binding.nameGroup.text = group.groupName
+            binding.nameGroup.setOnClickListener {
+                listener.onClickItem(group)
+            }
+        }
     }
 }

app/src/main/java/ru/nsu/fit/modao/adapter/NotificationFriendsAdapter.kt

@@ -1,6 +1,5 @@
 package ru.nsu.fit.modao.adapter
 
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -39,20 +38,17 @@ class NotificationFriendsAdapter: RecyclerView.Adapter<NotificationFriendsAdapte
         fun bind(elem: Notification, listenerFriend: AdapterListener<Notification>,
                  listenerGroup: AdapterListener<Notification>){
             if (elem.nameGroup != null){
-                binding.frameNewGroup.visibility = View.VISIBLE
                 binding.nameNewGroup.visibility = View.VISIBLE
                 binding.nameNewGroup.text = elem.nameGroup
                 binding.newGroup.visibility = View.VISIBLE
-                binding.root.setOnClickListener {
-                    Log.d("MyTag", "Notification adapter group")
+                binding.nameNewGroup.setOnClickListener {
                     listenerGroup.onClickItem(elem)
                 }
             } else {
-                binding.frameNewFriend.visibility = View.VISIBLE
                 binding.nameNewFriend.visibility = View.VISIBLE
                 binding.newFriend.visibility = View.VISIBLE
                 binding.nameNewFriend.text = elem.username
-                binding.root.setOnClickListener {
+                binding.nameNewFriend.setOnClickListener {
                     listenerFriend.onClickItem(elem)
                 }
             }