openMF · iamsh4shank · Feb 20, 2021 · Feb 20, 2021 · Feb 20, 2021
diff --git a/mifosng-android/build.gradle b/mifosng-android/build.gradle
@@ -110,6 +110,7 @@ android {
     lintOptions {
         abortOnError false
         disable 'InvalidPackage'
+        disable 'MissingTranslation'
     }
 
 
@@ -196,7 +197,7 @@ dependencies {
     kapt 'androidx.lifecycle:lifecycle-compiler:2.0.0'
 
     //Square dependencies
-    implementation('com.squareup.retrofit2:retrofit:$rootProject.retrofitVersionLatest') {
+    implementation("com.squareup.retrofit2:retrofit:$rootProject.retrofitVersionLatest") {
         // exclude Retrofit’s OkHttp peer-dependency module and define your own module import
         exclude module: 'okhttp'
     }
@@ -217,7 +218,7 @@ dependencies {
 
 
     implementation "com.joanzapata.iconify:android-iconify-material:2.1.1" // (v2.0.0)
-    implementation('com.crashlytics.sdk.android:crashlytics:2.6.6@aar') {
+    implementation('com.crashlytics.sdk.android:crashlytics:17.2.2@aar') {
         transitive = true
     }
     implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'

diff --git a/...ndroid/src/main/java/com/mifos/mifosxdroid/activity/pathtracking/PathTrackingService.java b/...ndroid/src/main/java/com/mifos/mifosxdroid/activity/pathtracking/PathTrackingService.java
@@ -5,17 +5,22 @@
 
 package com.mifos.mifosxdroid.activity.pathtracking;
 
+import android.Manifest;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.Service;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.pm.PackageManager;
 import android.location.Location;
 import android.os.Bundle;
 import android.os.IBinder;
+
+import androidx.core.app.ActivityCompat;
 import androidx.core.app.NotificationCompat;
+
 import android.util.Log;
 import android.widget.Toast;
 
@@ -102,6 +107,26 @@ protected void createLocationRequest() {
     }
 
     protected void startLocationUpdates() {
+        if (ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
+            // TODO: Consider calling
+            //    ActivityCompat#requestPermissions
+            // here to request the missing permissions, and then overriding
+            //   public void onRequestPermissionsResult(int requestCode, String[] permissions,
+            //                                          int[] grantResults)
+            // to handle the case where the user grants the permission. See the documentation
+            // for ActivityCompat#requestPermissions for more details.
+            return;
+        }
+        if (ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
+            // TODO: Consider calling
+            //    ActivityCompat#requestPermissions
+            // here to request the missing permissions, and then overriding
+            //   public void onRequestPermissionsResult(int requestCode, String[] permissions,
+            //                                          int[] grantResults)
+            // to handle the case where the user grants the permission. See the documentation
+            // for ActivityCompat#requestPermissions for more details.
+            return;
+        }
         LocationServices.FusedLocationApi.requestLocationUpdates(
                 googleApiClient, locationRequest, this);
     }
@@ -124,6 +149,26 @@ public int onStartCommand(Intent intent, int flags, int startId) {
     @Override
     public void onConnected(Bundle bundle) {
         if (currentLocation == null) {
+            if (ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
+                // TODO: Consider calling
+                //    ActivityCompat#requestPermissions
+                // here to request the missing permissions, and then overriding
+                //   public void onRequestPermissionsResult(int requestCode, String[] permissions,
+                //                                          int[] grantResults)
+                // to handle the case where the user grants the permission. See the documentation
+                // for ActivityCompat#requestPermissions for more details.
+                return;
+            }
+            if (ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
+                // TODO: Consider calling
+                //    ActivityCompat#requestPermissions
+                // here to request the missing permissions, and then overriding
+                //   public void onRequestPermissionsResult(int requestCode, String[] permissions,
+                //                                          int[] grantResults)
+                // to handle the case where the user grants the permission. See the documentation
+                // for ActivityCompat#requestPermissions for more details.
+                return;
+            }
             currentLocation = LocationServices.FusedLocationApi.getLastLocation(googleApiClient);
             latLngs.add(new UserLatLng(currentLocation.getLatitude(),
                     currentLocation.getLongitude()));

diff --git a/...ifos/mifosxdroid/dialogfragments/collectionsheetdialog/CollectionSheetDialogFragment.java b/...ifos/mifosxdroid/dialogfragments/collectionsheetdialog/CollectionSheetDialogFragment.java
@@ -56,7 +56,6 @@ public static CollectionSheetDialogFragment newInstance(String date, int members
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
         ((MifosBaseActivity) getActivity()).getActivityComponent().inject(this);
         date = getArguments().getString(Constants.REPAYMENT_DATE);
         members = getArguments().getInt(Constants.MEMBERS);

diff --git a/mifosng-android/src/main/res/layout/activity_pinpoint_location.xml b/mifosng-android/src/main/res/layout/activity_pinpoint_location.xml
@@ -7,6 +7,7 @@
 
 <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">
 
@@ -43,7 +44,7 @@
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:layout_gravity="center"
-            android:src="@drawable/ic_error_black_24dp"/>
+            app:srcCompat="@drawable/ic_error_black_24dp"/>
 
         <TextView
             android:id="@+id/tv_no_location"

diff --git a/mifosng-android/src/main/res/layout/fragment_centers_list.xml b/mifosng-android/src/main/res/layout/fragment_centers_list.xml
@@ -7,6 +7,7 @@
 
 <androidx.coordinatorlayout.widget.CoordinatorLayout
     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:fitsSystemWindows="true">
@@ -43,7 +44,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_margin="16dp"
-        android:src="@drawable/ic_add_white_24dp"/>
+        app:srcCompat="@drawable/ic_add_white_24dp"/>
 
     <include
         layout="@layout/layout_sweet_exception_handler"

diff --git a/mifosng-android/src/main/res/layout/fragment_charge_list.xml b/mifosng-android/src/main/res/layout/fragment_charge_list.xml
@@ -7,6 +7,7 @@
 
 <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">
 
@@ -37,7 +38,7 @@
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:layout_gravity="center"
-            android:src="@drawable/ic_error_black_24dp"/>
+            app:srcCompat="@drawable/ic_error_black_24dp"/>
 
         <TextView
             android:id="@+id/noChargesText"

diff --git a/mifosng-android/src/main/res/layout/fragment_client.xml b/mifosng-android/src/main/res/layout/fragment_client.xml
@@ -6,6 +6,7 @@
   -->
 <androidx.coordinatorlayout.widget.CoordinatorLayout
     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:fitsSystemWindows="true">
@@ -40,7 +41,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_margin="16dp"
-        android:src="@drawable/ic_add_white_24dp"/>
+        app:srcCompat="@drawable/ic_add_white_24dp"/>
 
     <include
         layout="@layout/layout_sweet_exception_handler"

diff --git a/mifosng-android/src/main/res/layout/fragment_client_identifiers.xml b/mifosng-android/src/main/res/layout/fragment_client_identifiers.xml
@@ -7,6 +7,7 @@
 
 <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">
 
@@ -38,7 +39,7 @@
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:layout_gravity="center"
-            android:src="@drawable/ic_error_black_24dp"/>
+            app:srcCompat="@drawable/ic_error_black_24dp"/>
 
         <TextView
             android:id="@+id/noIdentifierText"

diff --git a/mifosng-android/src/main/res/layout/fragment_datatable.xml b/mifosng-android/src/main/res/layout/fragment_datatable.xml
@@ -7,6 +7,7 @@
 
 <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:orientation="vertical">
@@ -50,7 +51,7 @@
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:layout_gravity="center"
-            android:src="@drawable/ic_error_black_24dp"/>
+            app:srcCompat="@drawable/ic_error_black_24dp"/>
 
         <TextView
             android:id="@+id/tv_error"

diff --git a/mifosng-android/src/main/res/layout/fragment_datatables.xml b/mifosng-android/src/main/res/layout/fragment_datatables.xml
@@ -7,6 +7,7 @@
 
 <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:orientation="vertical">
@@ -46,7 +47,7 @@
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:layout_gravity="center"
-            android:src="@drawable/ic_error_black_24dp"/>
+            app:srcCompat="@drawable/ic_error_black_24dp"/>
 
         <TextView
             android:id="@+id/tv_error"

diff --git a/mifosng-android/src/main/res/layout/fragment_document_list.xml b/mifosng-android/src/main/res/layout/fragment_document_list.xml
@@ -6,6 +6,7 @@
 
 <RelativeLayout
     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:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -77,7 +78,7 @@
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:layout_gravity="center"
-            android:src="@drawable/ic_error_black_24dp"/>
+            app:srcCompat="@drawable/ic_error_black_24dp"/>
 
         <TextView
             android:id="@+id/noDocumentText"

diff --git a/mifosng-android/src/main/res/layout/fragment_group_list.xml b/mifosng-android/src/main/res/layout/fragment_group_list.xml
@@ -4,6 +4,7 @@
   -->
 
 <FrameLayout 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:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -42,7 +43,7 @@
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:layout_gravity="center"
-            android:src="@drawable/ic_error_black_24dp" />
+            app:srcCompat="@drawable/ic_error_black_24dp" />
 
         <TextView
             android:id="@+id/noGroupsText"

diff --git a/mifosng-android/src/main/res/layout/fragment_groups.xml b/mifosng-android/src/main/res/layout/fragment_groups.xml
@@ -7,6 +7,7 @@
 
 <androidx.coordinatorlayout.widget.CoordinatorLayout
     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:fitsSystemWindows="true">
@@ -44,7 +45,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_margin="16dp"
-        android:src="@drawable/ic_add_white_24dp"/>
+        app:srcCompat="@drawable/ic_add_white_24dp"/>
 
     <include
         layout="@layout/layout_sweet_exception_handler"

diff --git a/mifosng-android/src/main/res/layout/fragment_notes.xml b/mifosng-android/src/main/res/layout/fragment_notes.xml
@@ -6,6 +6,7 @@
   -->
 
 <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:orientation="vertical">
@@ -37,7 +38,7 @@
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:layout_gravity="center"
-            android:src="@drawable/ic_error_black_24dp" />
+            app:srcCompat="@drawable/ic_error_black_24dp" />
 
         <TextView
             android:id="@+id/tv_error"

diff --git a/mifosng-android/src/main/res/layout/fragment_offline_dashboard.xml b/mifosng-android/src/main/res/layout/fragment_offline_dashboard.xml
@@ -7,6 +7,7 @@
 
 <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:padding="10dp">
@@ -38,7 +39,7 @@
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:layout_gravity="center"
-            android:src="@drawable/ic_error_black_24dp"/>
+            app:srcCompat="@drawable/ic_error_black_24dp"/>
 
         <TextView
             android:id="@+id/noPayloadText"

diff --git a/mifosng-android/src/main/res/layout/fragment_savings_account_transaction.xml b/mifosng-android/src/main/res/layout/fragment_savings_account_transaction.xml
@@ -179,7 +179,8 @@
             android:layout_alignParentStart="true"
             android:layout_below="@+id/tbl_transaction_details"
             android:layout_marginTop="8dp"
-            android:text="@string/cancel" />
+            android:text="@string/cancel"
+            android:layout_alignParentLeft="true" />
 
         <Button
             android:id="@+id/bt_reviewTransaction"
@@ -188,7 +189,8 @@
             android:layout_alignParentEnd="true"
             android:layout_below="@+id/tbl_transaction_details"
             android:layout_marginTop="8dp"
-            android:text="@string/review_transaction" />
+            android:text="@string/review_transaction"
+            android:layout_alignParentRight="true" />
 
     </RelativeLayout>
 </ViewFlipper>
diff --git a/mifosng-android/src/main/res/layout/fragment_survey_last.xml b/mifosng-android/src/main/res/layout/fragment_survey_last.xml
@@ -31,7 +31,6 @@
         android:layout_height="wrap_content"
         android:text="@string/submit_survey"
         android:gravity="center"
-        android:onClick="submitScore"
         android:layout_marginTop="81dp"
         android:layout_marginRight="20dp"
         android:layout_marginLeft="20dp"

diff --git a/mifosng-android/src/main/res/layout/fragment_syncpayload.xml b/mifosng-android/src/main/res/layout/fragment_syncpayload.xml
@@ -7,6 +7,7 @@
 
 <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">
 
@@ -38,7 +39,7 @@
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:layout_gravity="center"
-            android:src="@drawable/ic_error_black_24dp"/>
+            app:srcCompat="@drawable/ic_error_black_24dp"/>
 
         <TextView
             android:id="@+id/noPayloadText"

diff --git a/mifosng-android/src/main/res/layout/item_client_runreport.xml b/mifosng-android/src/main/res/layout/item_client_runreport.xml
@@ -1,5 +1,6 @@
 <?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="horizontal"
     android:layout_width="match_parent"
@@ -17,7 +18,7 @@
         <ImageView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/ic_report_item"
+            app:srcCompat="@drawable/ic_report_item"
             android:id="@+id/iv_image"/>
     </LinearLayout>
 

diff --git a/mifosng-android/src/main/res/layout/row_center_list_item.xml b/mifosng-android/src/main/res/layout/row_center_list_item.xml
@@ -147,7 +147,7 @@
             android:layout_height="20dp"
             android:layout_gravity="center_vertical"
             android:gravity="center"
-            android:src="@drawable/ic_done_all_black_24dp"
+            app:srcCompat="@drawable/ic_done_all_black_24dp"
             />
     </LinearLayout>
 </androidx.cardview.widget.CardView>
diff --git a/mifosng-android/src/main/res/layout/row_client_name.xml b/mifosng-android/src/main/res/layout/row_client_name.xml
@@ -70,7 +70,7 @@
             android:layout_height="20dp"
             android:layout_gravity="center_vertical"
             android:gravity="center"
-            android:src="@drawable/ic_done_all_black_24dp"
+            app:srcCompat="@drawable/ic_done_all_black_24dp"
             />
 
     </LinearLayout>