All bottomnavigation tabs, Notification with redesign Implemented

openMF · May 29, 2020 · 00d24ae · 00d24ae
1 parent ade5d7a
commit 00d24ae
Show file tree

Hide file tree

Showing 99 changed files with 3,355 additions and 306 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -167,32 +167,32 @@ dependencies {
     testImplementation 'org.robolectric:robolectric:3.3.1'
 }
 
-    // Log out test results to console
-    tasks.matching { it instanceof Test }.all {
-        testLogging.events = ["failed", "passed", "skipped"]
-    }
+// Log out test results to console
+tasks.matching { it instanceof Test }.all {
+    testLogging.events = ["failed", "passed", "skipped"]
+}
 
-    /*
+/*
     Resolves dependency versions across test and production APKs, specifically, transitive
     dependencies. This is required since Espresso internally has a dependency on support-annotations.
     */
-    configurations.all {
-        resolutionStrategy {
-            force 'com.android.support:support-annotations:27.1.1'
-            force 'com.google.code.findbugs:jsr305:1.3.9'
-        }
+configurations.all {
+    resolutionStrategy {
+        force 'com.android.support:support-annotations:27.1.1'
+        force 'com.google.code.findbugs:jsr305:1.3.9'
     }
+}
 
 
-    /*
+/*
     All direct/transitive dependencies shared between your test and production APKs need to be
     excluded from the test APK! This is necessary because both APKs will contain the same classes. Not
     excluding these dependencies from your test configuration will result in an dex pre-verifier error
     at runtime. More info in this tools bug: (https://code.google.com/p/android/issues/detail?id=192497)
     */
-    configurations.compile.dependencies.each { compileDependency ->
+configurations.compile.dependencies.each { compileDependency ->
     println "Excluding compile dependency: ${compileDependency.getName()}"
     configurations.androidTestCompile.dependencies.each { androidTestCompileDependency ->
         configurations.androidTestCompile.exclude module: "${compileDependency.getName()}"
     }
-    }
+}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,41 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="org.mifos.mobile.cn">
+    package="org.mifos.mobile.cn">
 
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <application
+        android:name=".MifosApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:name=".MifosApplication"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
-        <activity android:name=".ui.mifos.launcher.LauncherActivity"
+        android:theme="@style/AppTheme"
+        android:usesCleartextTraffic="true">
+        <activity
+            android:name=".ui.mifos.launcher.LauncherActivity"
             android:theme="@style/LauncherTheme">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
+                <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
         <activity android:name=".ui.mifos.DashboardActivity" />
+        <activity android:name=".ui.mifos.Main" />
         <activity android:name=".ui.mifos.login.LoginActivity" />
-        <activity android:name=".ui.mifos.passcode.PasscodeActivity"/>
-        <activity android:name=".ui.mifos.loanApplication.loanActivity.LoanApplicationActivity"/>
-        <activity android:name=".ui.mifos.customerDetails.CustomerDetailsActivity"/>
-        <activity android:name=".ui.mifos.customerActivities.CustomerActivitiesActivity"/>
-        <activity android:name=".ui.mifos.identificationlist.IdentificationsActivity"/>
-        <activity android:name=".ui.mifos.viewScanCard.ViewScanCardActivity"/>
-        <activity android:name=".ui.mifos.customerProfile.CustomerProfileActivity"/>
-        <activity android:name=".ui.mifos.plannedPlayment.PlannedPaymentActivity"/>
-        <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.passcode.PasscodeActivity" />
+        <activity android:name=".ui.mifos.loanApplication.loanActivity.LoanApplicationActivity" />
+        <activity android:name=".ui.mifos.customerDetails.CustomerDetailsActivity" />
+        <activity android:name=".ui.mifos.customerActivities.CustomerActivitiesActivity" />
+        <activity android:name=".ui.mifos.identificationlist.IdentificationsActivity" />
+        <activity android:name=".ui.mifos.viewScanCard.ViewScanCardActivity" />
+        <activity android:name=".ui.mifos.customerProfile.CustomerProfileActivity" />
+        <activity android:name=".ui.mifos.plannedPlayment.PlannedPaymentActivity" />
+        <activity android:name=".ui.mifos.debtincomereport.DebtIncomeReportActivity" />
+        <activity android:name=".ui.mifos.aboutus.AboutUsActivity" />
+        <activity android:name=".ui.mifos.signup.SignupActivity" />
+        <activity android:name=".ui.mifos.Notification" />
+        <activity android:name=".ui.mifos.beneficiaries.BeneficiariesActivity" />
+        <activity android:name=".ui.mifos.privacypolicy.PrivacyPolicyActivity" />
         <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
@@ -0,0 +1,3 @@
+package org.mifos.mobile.cn.data.models.beneficiaries
+
+data class Beneficiary(val name: String, val description: String, val price: String)
diff --git a/app/src/main/kotlin/org/mifos/mobile/cn/injection/component/ActivityComponent.kt b/app/src/main/kotlin/org/mifos/mobile/cn/injection/component/ActivityComponent.kt
@@ -4,6 +4,7 @@ package org.mifos.mobile.cn.injection.component
 import dagger.Subcomponent
 import org.mifos.mobile.cn.injection.PerActivity
 import org.mifos.mobile.cn.injection.module.ActivityModule
+import org.mifos.mobile.cn.ui.mifos.Account
 import org.mifos.mobile.cn.ui.mifos.DashboardActivity
 import org.mifos.mobile.cn.ui.mifos.aboutus.AboutUsFragment
 import org.mifos.mobile.cn.ui.mifos.accounts.AccountsFragment
@@ -39,6 +40,8 @@ interface ActivityComponent {
 
     fun inject(passcodeActivity: PasscodeActivity)
 
+    fun inject(account :Account)
+
     fun inject(launcherActivity: LauncherActivity)
 
     fun inject(dashboardActivity: DashboardActivity)

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
@@ -0,0 +1,35 @@
+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.Beneficiary
+
+
+class BeneficiariesAdapter(val beneficiariesList: ArrayList<Beneficiary>) : 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: Beneficiary = 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/base/MifosBaseFragment.kt b/app/src/main/kotlin/org/mifos/mobile/cn/ui/base/MifosBaseFragment.kt
@@ -63,7 +63,7 @@ open class MifosBaseFragment : Fragment() {
         callback.showTabLayout(false)
     }
 
-    override fun onAttach(context: Context?) {
+     override fun onAttach(context: Context?) {
         super.onAttach(context)
         val activity = context as? Activity
         try {