Made Profile Photo Unclickable

.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

@@ -81,6 +81,9 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$rootProject.kotlinVersion"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$rootProject.kotlinVersion"
 
+    // Circle Image View
+    implementation 'de.hdodenhof:circleimageview:3.0.1'
+
     // Support Dependencies
     implementation "androidx.appcompat:appcompat:$rootProject.supportLibraryVersion"
     implementation "com.google.android.material:material:$rootProject.supportLibraryVersion"

app/src/main/AndroidManifest.xml

@@ -24,8 +24,10 @@
         </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"/>

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/mifos/DashboardActivity.kt

@@ -52,7 +52,7 @@ class DashboardActivity : MifosBaseActivity(), View.OnClickListener, NavigationV
         setupNavigationBar()
         setToolbarElevation()
 
-        replaceFragment(DashboardFragment.newInstance(), false, R.id.container)
+        replaceFragment(DashboardFragment.newInstance("customer_identifier"), false, R.id.container)
 
     }
 
@@ -160,22 +160,19 @@ class DashboardActivity : MifosBaseActivity(), View.OnClickListener, NavigationV
         when (item.itemId) {
             R.id.item_home -> {
                 hideToolbarElevation()
-                replaceFragment(DashboardFragment.newInstance(), true, R.id.container)
+                replaceFragment(DashboardFragment.newInstance("customer_identifier"), true, R.id.container)
             }
             R.id.item_accounts -> {
                 replaceFragment(CustomerAccountFragment.newInstance(AccountType.DEPOSIT), true,
                         R.id.container)
             }
-
             R.id.item_logout -> {
                 showLogoutDialog()
             }
-
             R.id.item_product -> {
                 replaceFragment(ProductFragment.Companion.newInstance(), true,
                         R.id.container)
             }
-
                 R.id.item_recent_transactions -> {
                     replaceFragment(RecentTransactionsFragment.Companion.newInstance(),true,R.id.container)
                 }
@@ -185,8 +182,14 @@ class DashboardActivity : MifosBaseActivity(), View.OnClickListener, NavigationV
             R.id.item_settings -> {
                 replaceFragment(SettingsFragment.newInstance(), true, R.id.container)
             }
+            R.id.item_share -> {
+                val sharingIntent = Intent(android.content.Intent.ACTION_SEND)
+                sharingIntent.type = "text/plain"
+                sharingIntent.putExtra(android.content.Intent.EXTRA_SUBJECT, getString(R.string.app_link))
+                sharingIntent.putExtra(android.content.Intent.EXTRA_TEXT, getString(R.string.share_message))
+                startActivity(Intent.createChooser(sharingIntent, getString(R.string.share_the_app_link)))
+            }
         }
-
         // close the drawer
         drawerLayout.closeDrawer(GravityCompat.START)
         setNavigationViewSelectedItem(R.id.item_home)

app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/customerDetails/CustomerDetailsFragment.kt

@@ -28,44 +28,43 @@ import org.mifos.mobile.cn.ui.views.HeaderView
 
 import javax.inject.Inject
 
-class CustomerDetailsFragment : MifosBaseFragment(), AppBarLayout.OnOffsetChangedListener,CustomerDetailsContract.View, View.OnClickListener{
-
+class CustomerDetailsFragment : MifosBaseFragment(), AppBarLayout.OnOffsetChangedListener, CustomerDetailsContract.View, View.OnClickListener {
 
 
     @Inject
     lateinit var customerDetailsPresenter: CustomerDetailsPresenter
 
-    private lateinit var rootView : View
-    private lateinit var customerIdentification : String
-    private  var isHideToolbarView: Boolean = false
-    private lateinit var collapsingToolbarLayout : CollapsingToolbarLayout
-    private lateinit var customer : Customer
-    private lateinit var toolbarHeaderView : HeaderView
-    private  lateinit var floatHeaderView : HeaderView
-
-  companion object {
-      fun newInstance(identifier: String): CustomerDetailsFragment {
-          val fragment = CustomerDetailsFragment()
-          val args = Bundle()
-          args.putString(ConstantKeys.CUSTOMER_IDENTIFIER,identifier)
-          fragment.arguments = args
-          return fragment
-
-      }
-  }
+    private lateinit var rootView: View
+    private lateinit var customerIdentification: String
+    private var isHideToolbarView: Boolean = false
+    private lateinit var collapsingToolbarLayout: CollapsingToolbarLayout
+    private lateinit var customer: Customer
+    private lateinit var toolbarHeaderView: HeaderView
+    private lateinit var floatHeaderView: HeaderView
+
+    companion object {
+        fun newInstance(identifier: String): CustomerDetailsFragment {
+            val fragment = CustomerDetailsFragment()
+            val args = Bundle()
+            args.putString(ConstantKeys.CUSTOMER_IDENTIFIER, identifier)
+            fragment.arguments = args
+            return fragment
 
+        }
+    }
 
 
-    override fun onCreate(savedInstanceState: Bundle?){
+    override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setToolbarTitle(getString(R.string.account_overview))
-        if(arguments != null){1
+        if (arguments != null) {
+            1
             customerIdentification = arguments!!.getString(ConstantKeys.CUSTOMER_IDENTIFIER)
         }
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        rootView = inflater.inflate(R.layout.fragment_customer_details,container,false)
+        rootView = inflater.inflate(R.layout.fragment_customer_details, container, false)
         (activity as MifosBaseActivity).activityComponent.inject(this)
         customerDetailsPresenter.attachView(this)
 
@@ -88,12 +87,13 @@ class CustomerDetailsFragment : MifosBaseFragment(), AppBarLayout.OnOffsetChange
 
 
     }
+
     override fun onClick(view: View) {
-        when(view.id){
+        when (view.id) {
             R.id.ll_deposit_accounts -> {
                 openDepositAccount()
             }
-            R.id.ll_loan_accounts-> {
+            R.id.ll_loan_accounts -> {
                 openLoanAccount()
             }
             R.id.ll_activities -> {
@@ -117,13 +117,12 @@ class CustomerDetailsFragment : MifosBaseFragment(), AppBarLayout.OnOffsetChange
 
     override fun onResume() {
         super.onResume()
-       cl_customer_details.visibility = View.GONE
-        collapsingToolbarLayout.title= " "
+        cl_customer_details.visibility = View.GONE
+        collapsingToolbarLayout.title = " "
         customerDetailsPresenter.loadCustomerDetails(customerIdentification)
     }
 
 
-
     override fun showCustomerDetails(customer: Customer) {
         this.customer = customer
         cl_customer_details.visibility = View.VISIBLE
@@ -132,10 +131,10 @@ class CustomerDetailsFragment : MifosBaseFragment(), AppBarLayout.OnOffsetChange
         loadCustomerPortrait()
 
         tv_current_status.text = customer.currentState!!.name
-        StatusUtils.setCustomerStatusIcon(customer.currentState!!,iv_current_status,context)
+        StatusUtils.setCustomerStatusIcon(customer.currentState!!, iv_current_status, context)
 
 
-        val address : Address = customer.address!!
+        val address: Address = customer.address!!
         val addressBuilder = StringBuilder()
         addressBuilder
                 .append(address.street).append(", ")
@@ -171,19 +170,21 @@ class CustomerDetailsFragment : MifosBaseFragment(), AppBarLayout.OnOffsetChange
         }
         showToolbarTitleSubtitle(title, subtitle)
     }
+
     override fun showUserInterface() {
         if (toolbar_customer != null) {
             (activity as AppCompatActivity).setSupportActionBar(toolbar_customer)
             (activity as AppCompatActivity).supportActionBar!!
                     .setDisplayHomeAsUpEnabled(true)
         }
 
-        collapsingToolbarLayout.title= " "
+        collapsingToolbarLayout.title = " "
         app_bar_layout.addOnOffsetChangedListener(this)
     }
+
     override fun showToolbarTitleSubtitle(title: String, subtitle: String) {
-        toolbarHeaderView.bindTo(title,subtitle)
-       floatHeaderView.bindTo(title,subtitle)
+        toolbarHeaderView.bindTo(title, subtitle)
+        floatHeaderView.bindTo(title, subtitle)
 
     }
 
@@ -206,25 +207,22 @@ class CustomerDetailsFragment : MifosBaseFragment(), AppBarLayout.OnOffsetChange
     }
 
 
-
     override fun loadCustomerPortrait() {
 
         val imageLoaderUtils = ImageLoaderUtils(this.context!!)
-       imageLoaderUtils.loadImage(imageLoaderUtils.buildCustomerPortraitImageUrl(customer.identifier),iv_customer_profile,R.drawable.mifos_logo_new)
+        imageLoaderUtils.loadImage(imageLoaderUtils.buildCustomerPortraitImageUrl(customer.identifier), iv_customer_profile, R.drawable.mifos_logo_new)
 
     }
 
     override fun showProgressbar() {
-     showProgressBar()
+        showProgressBar()
     }
 
     override fun hideProgressbar() {
-      hideProgressBar()
+        hideProgressBar()
     }
 
 
-
-
     override fun getCustomerStatus(): Customer.State {
         return customer.currentState!!
     }
@@ -241,6 +239,7 @@ class CustomerDetailsFragment : MifosBaseFragment(), AppBarLayout.OnOffsetChange
         hideProgressDialog()
         customerDetailsPresenter.detachView()
     }
+
     override fun onOffsetChanged(appBarLayout: AppBarLayout?, verticalOffset: Int) {
         val maxScroll = appBarLayout!!.totalScrollRange
         val percentage = Math.abs(verticalOffset).toFloat() / maxScroll.toFloat()
@@ -254,28 +253,30 @@ class CustomerDetailsFragment : MifosBaseFragment(), AppBarLayout.OnOffsetChange
         }
 
     }
+
     private fun openDepositAccount() {
         (activity as MifosBaseActivity)
                 .replaceFragment(CustomerAccountFragment.newInstance(AccountType.DEPOSIT),
                         true, R.id.container)
     }
+
     private fun openLoanAccount() {
         (activity as MifosBaseActivity)
                 .replaceFragment(CustomerAccountFragment.newInstance(AccountType.LOAN),
                         true, R.id.container)
     }
+
     private fun openCustomerActivities() {
-        val intent = Intent(activity,CustomerActivitiesActivity::class.java)
-        intent.putExtra(ConstantKeys.CUSTOMER_IDENTIFIER,"customer_identifier")
+        val intent = Intent(activity, CustomerActivitiesActivity::class.java)
+        intent.putExtra(ConstantKeys.CUSTOMER_IDENTIFIER, "customer_identifier")
         startActivity(intent)
     }
+
     private fun openIdentificationCards() {
-        val intent = Intent(activity,IdentificationsActivity::class.java)
-        intent.putExtra(ConstantKeys.CUSTOMER_IDENTIFIER,"customer_identifier")
+        val intent = Intent(activity, IdentificationsActivity::class.java)
+        intent.putExtra(ConstantKeys.CUSTOMER_IDENTIFIER, "customer_identifier")
         startActivity(intent)
     }
 
 
-
-
 }