From 65afec5972f752e4d404fccc37697fb342baa9bd Mon Sep 17 00:00:00 2001
From: Rachit Gupta <guptarachit2004@gmail.com>
Date: Tue, 21 Jan 2020 23:51:58 +0530
Subject: [PATCH] Redesign: Add Beneficiaries and Show Beneficiaries Screen

---
 app/src/main/AndroidManifest.xml              |   1 +
 .../models/beneficiaries/listBeneficiaries.kt |   3 +
 .../cn/ui/adapter/BeneficiariesAdapter.kt     |  33 +++
 .../beneficiaries/BeneficiariesActivity.kt    |  66 ++++++
 .../res/layout/activity_beneficiaries.xml     | 203 ++++++++++++++++++
 .../main/res/layout/item_beneficiaries.xml    |  74 +++++++
 app/src/main/res/values/colors.xml            |   7 +-
 app/src/main/res/values/dimens.xml            |  14 ++
 app/src/main/res/values/strings.xml           |  12 ++
 app/src/main/res/values/styles.xml            |   2 +-
 10 files changed, 413 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/kotlin/org/mifos/mobile/cn/data/models/beneficiaries/listBeneficiaries.kt
 create mode 100644 app/src/main/kotlin/org/mifos/mobile/cn/ui/adapter/BeneficiariesAdapter.kt
 create mode 100644 app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/beneficiaries/BeneficiariesActivity.kt
 create mode 100644 app/src/main/res/layout/activity_beneficiaries.xml
 create mode 100644 app/src/main/res/layout/item_beneficiaries.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index db3b07b5..48b7fd4d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -36,6 +36,7 @@
         <activity android:name=".ui.mifos.debtincomereport.DebtIncomeReportActivity"/>
         <activity android:name=".ui.mifos.aboutus.AboutUsActivity"/>
         <activity android:name=".ui.mifos.privacypolicy.PrivacyPolicyActivity"/>
+        <activity android:name=".ui.mifos.beneficiaries.BeneficiariesActivity" />
         <activity
             android:name="com.google.android.gms.oss.licenses.OssLicensesMenuActivity"
             android:theme="@style/Theme.AppCompat.Light.DarkActionBar" />
diff --git a/app/src/main/kotlin/org/mifos/mobile/cn/data/models/beneficiaries/listBeneficiaries.kt b/app/src/main/kotlin/org/mifos/mobile/cn/data/models/beneficiaries/listBeneficiaries.kt
new file mode 100644
index 00000000..2f70e9cd
--- /dev/null
+++ b/app/src/main/kotlin/org/mifos/mobile/cn/data/models/beneficiaries/listBeneficiaries.kt
@@ -0,0 +1,3 @@
+package org.mifos.mobile.cn.data.models.beneficiaries
+
+data class ListBeneficiaries(val name: String, val description: String, val price: String)
diff --git a/app/src/main/kotlin/org/mifos/mobile/cn/ui/adapter/BeneficiariesAdapter.kt b/app/src/main/kotlin/org/mifos/mobile/cn/ui/adapter/BeneficiariesAdapter.kt
new file mode 100644
index 00000000..d04bc740
--- /dev/null
+++ b/app/src/main/kotlin/org/mifos/mobile/cn/ui/adapter/BeneficiariesAdapter.kt
@@ -0,0 +1,33 @@
+package org.mifos.mobile.cn.ui.adapter
+
+import android.view.LayoutInflater
+import android.view.View
+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
+
+class BeneficiariesAdapter(val beneficiariesList: ArrayList<ListBeneficiaries>) : 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)
+    }
+
+    override fun getItemCount(): Int {
+        return beneficiariesList.size
+    }
+
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        val list: ListBeneficiaries = beneficiariesList[position]
+        holder.textViewName?.text = list.name
+        holder.textViewDescription?.text = list.description
+        holder.textViewPrice?.text = list.price
+    }
+
+    class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+        val textViewName = itemView.findViewById<TextView>(R.id.tv_name)
+        val textViewDescription = itemView.findViewById<TextView>(R.id.tv_beneficiaries_decription)
+        val textViewPrice = itemView.findViewById<TextView>(R.id.tv_price)
+    }
+}
diff --git a/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/beneficiaries/BeneficiariesActivity.kt b/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/beneficiaries/BeneficiariesActivity.kt
new file mode 100644
index 00000000..58ed5014
--- /dev/null
+++ b/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/beneficiaries/BeneficiariesActivity.kt
@@ -0,0 +1,66 @@
+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 org.mifos.mobile.cn.R
+import org.mifos.mobile.cn.data.models.beneficiaries.ListBeneficiaries
+import org.mifos.mobile.cn.ui.adapter.BeneficiariesAdapter
+
+class BeneficiariesActivity : AppCompatActivity() {
+
+    @SuppressLint("ResourceAsColor")
+    override fun onCreate(savedInstanceState: Bundle?) {
+        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 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))
+        }
+
+        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))
+        }
+    }
+}
diff --git a/app/src/main/res/layout/activity_beneficiaries.xml b/app/src/main/res/layout/activity_beneficiaries.xml
new file mode 100644
index 00000000..4a0588cc
--- /dev/null
+++ b/app/src/main/res/layout/activity_beneficiaries.xml
@@ -0,0 +1,203 @@
+<?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"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/violet"
+    android:orientation="vertical">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginStart="@dimen/layout_padding_30dp"
+        android:layout_marginLeft="@dimen/layout_padding_30dp"
+        android:layout_marginTop="@dimen/text_size_38sp"
+        android:text="@string/beneficiaries"
+        android:textColor="@color/white"
+        android:textSize="@dimen/text_size_30sp"
+        android:textStyle="bold" />
+
+    <com.google.android.material.card.MaterialCardView
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/layout_padding_620dp"
+        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="@dimen/layout_padding_negative20dp"
+        android:backgroundTint="@color/offwhite"
+        app:cardCornerRadius="@dimen/layout_padding_30dp">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/layout_padding_80dp"
+            android:layout_marginLeft="@dimen/layout_padding_40dp"
+            android:layout_marginTop="@dimen/layout_padding_20dp"
+            android:layout_marginRight="@dimen/layout_padding_40dp"
+            android:orientation="horizontal"
+            android:padding="@dimen/layout_padding_5dp">
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/btnListBeneficiary"
+                android:layout_width="@dimen/layout_padding_120dp"
+                android:layout_height="@dimen/layout_padding_50dp"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentBottom="true"
+                android:layout_marginBottom="@dimen/layout_padding_10dp"
+                android:clickable="true"
+                android:focusable="true"
+                android:text="@string/list"
+                android:textAlignment="center"
+                android:textAllCaps="false"
+                app:cornerRadius="@dimen/layout_padding_20dp" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/btnAddBeneficiary"
+                android:layout_width="@dimen/layout_padding_120dp"
+                android:layout_height="@dimen/layout_padding_50dp"
+                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
+                android:layout_alignParentBottom="true"
+                android:layout_marginBottom="@dimen/layout_padding_10dp"
+                android:clickable="true"
+                android:focusable="true"
+                android:text="@string/add"
+                android:textAlignment="center"
+                android:textAllCaps="false"
+                app:cornerRadius="@dimen/layout_padding_20dp" />
+
+        </RelativeLayout>
+
+        <LinearLayout
+            android:id="@+id/mBtnListFocused"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="@dimen/layout_padding_100dp"
+            android:layout_marginBottom="@dimen/layout_padding_20dp"
+            android:orientation="vertical"
+            android:visibility="visible">
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/beneficiariesRecyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/mBtnAddFocused"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="@dimen/layout_padding_100dp"
+            android:layout_marginBottom="@dimen/layout_padding_18dp"
+            android:orientation="vertical"
+            android:visibility="gone">
+
+            <com.google.android.material.textfield.TextInputLayout
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/layout_padding_64dp"
+                android:layout_marginStart="@dimen/layout_padding_50dp"
+                android:layout_marginLeft="@dimen/layout_padding_50dp"
+                android:layout_marginTop="@dimen/layout_padding_10dp"
+                android:layout_marginEnd="@dimen/layout_padding_40dp"
+                android:layout_marginRight="@dimen/layout_padding_40dp"
+                android:layout_marginBottom="@dimen/layout_padding_15dp"
+                android:textColorHint="@color/violet"
+                app:boxStrokeColor="@color/violet"
+                app:helperText="@string/savings_account_type">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/layout_padding_40dp"
+                    android:hint="@string/savings_account" />
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/layout_padding_64dp"
+                android:layout_marginStart="@dimen/layout_padding_50dp"
+                android:layout_marginLeft="@dimen/layout_padding_50dp"
+                android:layout_marginEnd="@dimen/layout_padding_40dp"
+                android:layout_marginRight="@dimen/layout_padding_40dp"
+                android:layout_marginBottom="@dimen/layout_padding_15dp"
+                app:boxStrokeColor="@color/violet"
+                app:helperText="@string/account_number">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/layout_padding_40dp" />
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/layout_padding_64dp"
+                android:layout_marginStart="@dimen/layout_padding_50dp"
+                android:layout_marginLeft="@dimen/layout_padding_50dp"
+                android:layout_marginEnd="@dimen/layout_padding_40dp"
+                android:layout_marginRight="@dimen/layout_padding_40dp"
+                android:layout_marginBottom="@dimen/layout_padding_15dp"
+                app:boxStrokeColor="@color/violet"
+                app:helperText="@string/office_name">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/layout_padding_40dp" />
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/layout_padding_64dp"
+                android:layout_marginStart="@dimen/layout_padding_50dp"
+                android:layout_marginLeft="@dimen/layout_padding_50dp"
+                android:layout_marginEnd="@dimen/layout_padding_40dp"
+                android:layout_marginRight="@dimen/layout_padding_40dp"
+                android:layout_marginBottom="18dp"
+                app:boxStrokeColor="@color/violet"
+                app:helperText="@string/transfer_limit">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/layout_padding_40dp" />
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/layout_padding_64dp"
+                android:layout_marginStart="@dimen/layout_padding_50dp"
+                android:layout_marginLeft="@dimen/layout_padding_50dp"
+                android:layout_marginEnd="@dimen/layout_padding_40dp"
+                android:layout_marginRight="@dimen/layout_padding_40dp"
+                android:layout_marginBottom="@dimen/layout_padding_20dp"
+                app:boxStrokeColor="@color/violet"
+                app:helperText="@string/beneficiary_name">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/layout_padding_40dp" />
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.button.MaterialButton
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/layout_padding_50dp"
+                android:layout_marginLeft="@dimen/layout_padding_50dp"
+                android:layout_marginRight="@dimen/layout_padding_50dp"
+                android:layout_marginBottom="@dimen/layout_padding_32dp"
+                android:backgroundTint="@color/violet"
+                android:text="@string/submit_beneficiary"
+                android:textSize="@dimen/text_size_16sp"
+                app:cornerRadius="@dimen/layout_padding_8dp" />
+
+        </LinearLayout>
+
+    </com.google.android.material.card.MaterialCardView>
+
+</RelativeLayout>
diff --git a/app/src/main/res/layout/item_beneficiaries.xml b/app/src/main/res/layout/item_beneficiaries.xml
new file mode 100644
index 00000000..b5557033
--- /dev/null
+++ b/app/src/main/res/layout/item_beneficiaries.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout 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:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <com.google.android.material.card.MaterialCardView
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/layout_padding_64dp"
+        android:backgroundTint="@color/white"
+        android:layout_marginStart="@dimen/layout_padding_30dp"
+        android:layout_marginLeft="@dimen/layout_padding_30dp"
+        android:layout_marginRight="@dimen/layout_padding_30dp"
+        android:layout_marginEnd="@dimen/layout_padding_30dp"
+        app:cardCornerRadius="@dimen/layout_padding_10dp"
+        android:layout_marginTop="@dimen/layout_padding_30dp">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:baselineAligned="false"
+            android:orientation="horizontal"
+            android:padding="@dimen/layout_padding_10dp">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="2"
+                android:gravity="center_vertical"
+                android:orientation="vertical"
+                android:layout_marginStart="@dimen/layout_padding_15dp"
+                android:layout_marginLeft="@dimen/layout_padding_15dp">
+
+                <TextView
+                    android:id="@+id/tv_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    tools:text="@string/name"
+                    android:textSize="@dimen/text_size_20sp"/>
+
+                <TextView
+                    android:id="@+id/tv_beneficiaries_decription"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    tools:text="@string/description"
+                    android:textColor="@color/light_gray"
+                    android:textSize="@dimen/text_size_14sp"/>
+
+            </LinearLayout>
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="7">
+
+                <TextView
+                    android:id="@+id/tv_price"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    tools:text="@string/dummy_price"
+                    android:textColor="@color/violet"
+                    android:textStyle="bold"
+                    android:textSize="@dimen/text_size_22sp"
+                    android:gravity="center"/>
+
+            </RelativeLayout>
+
+        </LinearLayout>
+
+    </com.google.android.material.card.MaterialCardView>
+
+</LinearLayout>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 6f612736..288c7e3e 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 
 
     <color name="dashboard_gray_background">#B2C1C8</color>
@@ -9,6 +9,10 @@
     <color name="colorSecondaryText">#757575</color>
     <color name="colorThirdText">#9F8E8E</color>
     <color name="colorAccent">#FF4081</color>
+    
+    <color name="violet">#4C56C0</color>
+    <color name="offwhite">#EBECF0</color>
+    <color name="light_gray">#AFADB5</color>
 
     <color name="white">#ffffff</color>
     <!-- A light Holo shade of blue -->
@@ -59,6 +63,7 @@
     <color name="base10">#eaeaea</color>
     <color name="base30">#c1c1c1</color>
 
+    <color name="mtrl_textinput_default_box_stroke_color" tools:override="true">#4C56C0</color>
 
     <!--Swipe Refresh Colors-->
     <array name="swipeRefreshColors">
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index bf778ce8..be7aab9e 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <dimen name="layout_padding_negative20dp">-20dp</dimen>
     <dimen name="layout_padding_2dp">2dp</dimen>
     <dimen name="layout_padding_4dp">4dp</dimen>
     <dimen name="layout_padding_8dp">8dp</dimen>
@@ -8,11 +9,21 @@
     <dimen name="layout_padding_10dp">10dp</dimen>
     <dimen name="layout_padding_15dp">15dp</dimen>
     <dimen name="layout_padding_16dp">16dp</dimen>
+    <dimen name="layout_padding_18dp">18dp</dimen>
+    <dimen name="layout_padding_20dp">20dp</dimen>
     <dimen name="layout_padding_24dp">24dp</dimen>
     <dimen name="layout_padding_30dp">30dp</dimen>
+    <dimen name="layout_padding_32dp">32dp</dimen>
+    <dimen name="layout_padding_40dp">40dp</dimen>
     <dimen name="layout_padding_50dp">50dp</dimen>
+    <dimen name="layout_padding_60dp">60dp</dimen>
     <dimen name="layout_padding_64dp">64dp</dimen>
+    <dimen name="layout_padding_70dp">70dp</dimen>
     <dimen name="layout_padding_75dp">75dp</dimen>
+    <dimen name="layout_padding_80dp">80dp</dimen>
+    <dimen name="layout_padding_100dp">100dp</dimen>
+    <dimen name="layout_padding_120dp">120dp</dimen>
+    <dimen name="layout_padding_620dp">620dp</dimen>
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">16dp</dimen>
@@ -28,6 +39,9 @@
     <dimen name="text_size_16sp">16sp</dimen>
     <dimen name="text_size_18sp">18sp</dimen>
     <dimen name="text_size_20sp">20sp</dimen>
+    <dimen name="text_size_22sp">22sp</dimen>
+    <dimen name="text_size_30sp">30sp</dimen>
+    <dimen name="text_size_38sp">38sp</dimen>
     <!-- Dimen values for text size -->
     <dimen name="text_headline">24sp</dimen>
     <dimen name="text_large">20sp</dimen>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6c055bf3..5a1c01ff 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -311,5 +311,17 @@
     <string name="privacy_policy_host_url" translatable="false">https://openmf.github.io/privacy_policy_mifos_mobile.html</string>
     <string name="opensource_license_title">Open Source licenses</string>
 
+    <!--Beneficiaries Activity-->
+    <string name="add">Add</string>
+    <string name="list">List</string>
+    <string name="savings_account">Savings Account</string>
+    <string name="savings_account_type">Savings Account Type</string>
+    <string name="account_number">Account Number</string>
+    <string name="office_name">Office Name</string>
+    <string name="transfer_limit">Transfer Limit</string>
+    <string name="beneficiary_name">Beneficiary Name</string>
+    <string name="submit_beneficiary">Submit Beneficiaries</string>
+    <string name="name">Name</string>
+    <string name="dummy_price">$30</string>
 
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d21617bc..2e27cfe8 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="AppTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>