All bottomnavigation tabs, Notification with redesign Implemented

.github/ISSUE_TEMPLATE.md

@@ -1,30 +1,30 @@
-**Summary:**
+## Summary
 
-Summarise your issue in one sentence (what goes wrong, what did you expect to happen).
+<!--Summarise your issue in one sentence (what goes wrong, what did you expect to happen).-->
 
-**Steps to reproduce:**
+## Steps to reproduce
 
-How can we reproduce the issue?
+<!--How can we reproduce the issue?-->
 
-**Expected behaviour:**
+## Expected behaviour
 
-What did you expect the app to do?
+<!--What did you expect the app to do?-->
 
-**Observed behaviour:**
+## Observed behaviour
 
-What did you see instead?  Describe your issue in detail here.
+<!--What did you see instead?  Describe your issue in detail here.-->
 
-**Logcat for the issue**
+## Logcat for the issue
 
-Provide logs for the crash here
+<!--Provide logs for the crash here-->
 
-**Device and Android version:**
+## Device and Android version
 
-What make and model device (e.g., Samsung Galaxy S3) did you encounter this on?  What Android
+<!--What make and model device (e.g., Samsung Galaxy S3) did you encounter this on?  What Android
 version (e.g., Android 4.0 Ice Cream Sandwich or Android 6.0 Marshmallow) are you running?  Is it
  the stock
-version from the manufacturer or a custom ROM?
+version from the manufacturer or a custom ROM?-->
 
-**Screenshots:**
+## Screenshots
 
-Can be created by pressing the Volume Down and Power Button at the same time on Android 4.0 and higher.
+<!--Can be created by pressing the Volume Down and Power Button at the same time on Android 4.0 and higher.-->

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,8 +1,14 @@
+## Issue Fix
 Fixes #Issue_Number
 
-Please Add Screenshots If there are any UI changes.
+## Screenshots
+<!--Please Add Screenshots or Screen Recordings which show the changes that you made.-->
 
-Please make sure these boxes are checked before submitting your pull request - thanks!
+## Description
+<!--Please Add Summary of the changes that you have made.-->
+
+##
+<!--Please make sure these boxes are checked before submitting your pull request - thanks!-->
 
 - [ ] Run the unit tests with `./gradlew check` to make sure you didn't break anything
 

app/build.gradle

@@ -13,6 +13,7 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "1.0"
+        multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
@@ -130,14 +131,17 @@ dependencies {
     implementation 'com.github.bumptech.glide:glide:4.8.0'
     kapt 'com.github.bumptech.glide:compiler:4.8.0'
 
+    implementation 'me.dm7.barcodescanner:zxing:1.9.13'
+    implementation 'com.karumi:dexter:5.0.0'
+
     //dbFlow for database
     kapt "com.github.Raizlabs.DBFlow:dbflow-processor:$rootProject.dbFlowVersion"
     implementation "com.github.Raizlabs.DBFlow:dbflow-core:$rootProject.dbFlowVersion"
     implementation "com.github.Raizlabs.DBFlow:dbflow:$rootProject.dbFlowVersion"
     implementation "com.github.Raizlabs.DBFlow:dbflow-kotlinextensions:$rootProject.dbFlowVersion"
     implementation "com.github.Raizlabs.DBFlow:dbflow-rx2:$rootProject.dbFlowVersion"
     implementation "com.github.Raizlabs.DBFlow:dbflow-rx2-kotlinextensions:$rootProject.dbFlowVersion"
-
+    implementation 'com.android.support:multidex:1.0.3'
     //OpenSource Licences
     implementation "com.google.android.gms:play-services-oss-licenses:17.0.0"
 
@@ -167,32 +171,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()}"
     }
-    }
+}

app/src/main/AndroidManifest.xml

@@ -1,31 +1,38 @@
 <?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" />
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-feature    android:name="android.hardware.camera" />
+    <uses-feature    android:name="android.hardware.camera.autofocus" />
 
     <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.login.LoginActivity" />
-        <activity android:name=".ui.mifos.passcode.PasscodeActivity"/>
+        <activity android:name=".ui.mifos.login.LoginActivity"
+            android:screenOrientation="portrait"/>
+        <activity android:name=".ui.mifos.passcode.PasscodeActivity"
+            android:screenOrientation="portrait"/>
         <activity android:name=".ui.mifos.loanApplication.loanActivity.LoanApplicationActivity"/>
         <activity android:name=".ui.mifos.customerDetails.CustomerDetailsActivity"/>
         <activity android:name=".ui.mifos.customerActivities.CustomerActivitiesActivity"/>
@@ -36,7 +43,13 @@
         <activity android:name=".ui.mifos.debtincomereport.DebtIncomeReportActivity"/>
         <activity android:name=".ui.mifos.aboutus.AboutUsActivity"/>
         <activity android:name=".ui.mifos.privacypolicy.PrivacyPolicyActivity"/>
-        <activity
+        <activity android:name=".ui.mifos.Main" />
+        <activity android:name=".ui.mifos.signup.SignupActivity" />
+        <activity android:name=".ui.mifos.Notification" />
+        <activity android:name=".ui.mifos.QRGenerator" />
+
+        <activity android:name=".ui.mifos.beneficiaries.BeneficiariesActivity" />
+                <activity
             android:name="com.google.android.gms.oss.licenses.OssLicensesMenuActivity"
             android:theme="@style/Theme.AppCompat.Light.DarkActionBar" />
     </application>

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)

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)

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)
+    }
+}

app/src/main/kotlin/org/mifos/mobile/cn/ui/adapter/PlannedPaymentAdapter.kt

@@ -10,7 +10,7 @@ import android.widget.TextView
 import androidx.annotation.DrawableRes
 import androidx.core.content.ContextCompat
 import kotlinx.android.synthetic.main.item_header_planned_payment.view.*
-import kotlinx.android.synthetic.main.item_panned_payment.view.*
+import kotlinx.android.synthetic.main.item_planned_payment.view.*
 import org.mifos.mobile.cn.R
 import org.mifos.mobile.cn.data.models.payment.CostComponent
 import org.mifos.mobile.cn.data.models.payment.PlannedPayment
@@ -100,7 +100,7 @@ class PlannedPaymentAdapter @Inject constructor(@ApplicationContext var context:
 
     override fun onCreateItemViewHolder(parent: ViewGroup?, itemType: Int): ItemViewHolder {
         val inflater = LayoutInflater.from(parent!!.context)
-        val v = inflater.inflate(R.layout.item_panned_payment, parent, false)
+        val v = inflater.inflate(R.layout.item_planned_payment, parent, false)
         return ItemViewHolder(v)
     }
 

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 {