Skip to content

Commit

Permalink
var remove and model name change
Browse files Browse the repository at this point in the history
  • Loading branch information
@rchtgpt
rchtgpt committed Jan 23, 2020
1 parent 65afec5 commit dc560e5
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 36 deletions.
2 changes: 1 addition & 1 deletion app/src/main/kotlin/org/mifos/mobile/cn/data/models/beneficiaries/listBeneficiaries.kt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
package org.mifos.mobile.cn.data.models.beneficiaries

data class ListBeneficiaries(val name: String, val description: String, val price: String)
data class ListBeneficiary(val name: String, val description: String, val price: String)
6 changes: 3 additions & 3 deletions app/src/main/kotlin/org/mifos/mobile/cn/ui/adapter/BeneficiariesAdapter.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import android.view.ViewGroup
import android.widget.TextView
import androidx.recyclerview.widget.RecyclerView
import org.mifos.mobile.cn.R
import org.mifos.mobile.cn.data.models.beneficiaries.ListBeneficiaries
import org.mifos.mobile.cn.data.models.beneficiaries.ListBeneficiary

class BeneficiariesAdapter(val beneficiariesList: ArrayList<ListBeneficiaries>) : RecyclerView.Adapter<BeneficiariesAdapter.ViewHolder>() {
class BeneficiariesAdapter(val beneficiariesList: ArrayList<ListBeneficiary>) : RecyclerView.Adapter<BeneficiariesAdapter.ViewHolder>() {
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
val v = LayoutInflater.from(parent.context).inflate(R.layout.item_beneficiaries, parent, false)
return ViewHolder(v)
Expand All @@ -19,7 +19,7 @@ class BeneficiariesAdapter(val beneficiariesList: ArrayList<ListBeneficiaries>)
}

override fun onBindViewHolder(holder: ViewHolder, position: Int) {
val list: ListBeneficiaries = beneficiariesList[position]
val list: ListBeneficiary = beneficiariesList[position]
holder.textViewName?.text = list.name
holder.textViewDescription?.text = list.description
holder.textViewPrice?.text = list.price
Expand Down
59 changes: 27 additions & 32 deletions app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/beneficiaries/BeneficiariesActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ package org.mifos.mobile.cn.ui.mifos.beneficiaries
import android.annotation.SuppressLint
import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import android.widget.Button
import android.widget.LinearLayout
import androidx.core.content.ContextCompat
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import kotlinx.android.synthetic.main.activity_beneficiaries.*
import org.mifos.mobile.cn.R
import org.mifos.mobile.cn.data.models.beneficiaries.ListBeneficiaries
import org.mifos.mobile.cn.data.models.beneficiaries.ListBeneficiary
import org.mifos.mobile.cn.ui.adapter.BeneficiariesAdapter

class BeneficiariesActivity : AppCompatActivity() {
Expand All @@ -19,48 +19,43 @@ class BeneficiariesActivity : AppCompatActivity() {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_beneficiaries)

val layoutListBeneficiaries = findViewById<LinearLayout>(R.id.mBtnListFocused)
val layoutAddBeneficiaries = findViewById<LinearLayout>(R.id.mBtnAddFocused)
val btnAddBeneficiaries = findViewById<Button>(R.id.btnAddBeneficiary)
val btnListBeneficiaries = findViewById<Button>(R.id.btnListBeneficiary)
val beneficiariesRecyclerView = findViewById<RecyclerView>(R.id.beneficiariesRecyclerView)
val name: String = getString(R.string.name)
val description: String = getString(R.string.description)
val price: String = getString(R.string.dummy_price)

beneficiariesRecyclerView.layoutManager = LinearLayoutManager(this, RecyclerView.VERTICAL, false)

val items = ArrayList<ListBeneficiaries>()
items.add(ListBeneficiaries(name, description, price))
items.add(ListBeneficiaries(name, description, price))
items.add(ListBeneficiaries(name, description, price))
items.add(ListBeneficiaries(name, description, price))
items.add(ListBeneficiaries(name, description, price))
val items = ArrayList<ListBeneficiary>()
items.add(ListBeneficiary(name, description, price))
items.add(ListBeneficiary(name, description, price))
items.add(ListBeneficiary(name, description, price))
items.add(ListBeneficiary(name, description, price))
items.add(ListBeneficiary(name, description, price))

val adapter = BeneficiariesAdapter(items)
beneficiariesRecyclerView.adapter = adapter

btnListBeneficiaries.setTextColor(ContextCompat.getColorStateList(getApplicationContext(), R.color.white))
btnAddBeneficiaries.setTextColor(ContextCompat.getColorStateList(getApplicationContext(), R.color.violet))
btnAddBeneficiaries.setBackgroundTintList(ContextCompat.getColorStateList(getApplicationContext(), R.color.white))
btnListBeneficiaries.setBackgroundTintList(ContextCompat.getColorStateList(getApplicationContext(), R.color.violet))

btnAddBeneficiaries.setOnClickListener {
layoutAddBeneficiaries.visibility = LinearLayout.VISIBLE
layoutListBeneficiaries.visibility = LinearLayout.INVISIBLE
btnListBeneficiaries.setTextColor(ContextCompat.getColorStateList(getApplicationContext(), R.color.violet))
btnAddBeneficiaries.setTextColor(ContextCompat.getColorStateList(getApplicationContext(), R.color.white))
btnListBeneficiaries.setBackgroundTintList(ContextCompat.getColorStateList(getApplicationContext(), R.color.white))
btnAddBeneficiaries.setBackgroundTintList(ContextCompat.getColorStateList(getApplicationContext(), R.color.violet))
btnListBeneficiary.setTextColor(ContextCompat.getColorStateList(getApplicationContext(), R.color.white))
btnAddBeneficiary.setTextColor(ContextCompat.getColorStateList(getApplicationContext(), R.color.violet))
btnAddBeneficiary.setBackgroundTintList(ContextCompat.getColorStateList(getApplicationContext(), R.color.white))
btnListBeneficiary.setBackgroundTintList(ContextCompat.getColorStateList(getApplicationContext(), R.color.violet))

btnAddBeneficiary.setOnClickListener {
mBtnAddFocused.visibility = LinearLayout.VISIBLE
mBtnListFocused.visibility = LinearLayout.INVISIBLE
btnListBeneficiary.setTextColor(ContextCompat.getColorStateList(getApplicationContext(), R.color.violet))
btnAddBeneficiary.setTextColor(ContextCompat.getColorStateList(getApplicationContext(), R.color.white))
btnListBeneficiary.setBackgroundTintList(ContextCompat.getColorStateList(getApplicationContext(), R.color.white))
btnAddBeneficiary.setBackgroundTintList(ContextCompat.getColorStateList(getApplicationContext(), R.color.violet))
}

btnListBeneficiaries.setOnClickListener {
layoutAddBeneficiaries.visibility = LinearLayout.INVISIBLE
layoutListBeneficiaries.visibility = LinearLayout.VISIBLE
btnAddBeneficiaries.setTextColor(ContextCompat.getColorStateList(getApplicationContext(), R.color.violet))
btnListBeneficiaries.setTextColor(ContextCompat.getColorStateList(getApplicationContext(), R.color.white))
btnListBeneficiaries.setBackgroundTintList(ContextCompat.getColorStateList(getApplicationContext(), R.color.violet))
btnAddBeneficiaries.setBackgroundTintList(ContextCompat.getColorStateList(getApplicationContext(), R.color.white))
btnListBeneficiary.setOnClickListener {
mBtnAddFocused.visibility = LinearLayout.INVISIBLE
mBtnListFocused.visibility = LinearLayout.VISIBLE
btnAddBeneficiary.setTextColor(ContextCompat.getColorStateList(getApplicationContext(), R.color.violet))
btnListBeneficiary.setTextColor(ContextCompat.getColorStateList(getApplicationContext(), R.color.white))
btnListBeneficiary.setBackgroundTintList(ContextCompat.getColorStateList(getApplicationContext(), R.color.violet))
btnAddBeneficiary.setBackgroundTintList(ContextCompat.getColorStateList(getApplicationContext(), R.color.white))
}
}
}

0 comments on commit dc560e5

Please sign in to comment.