Add correct failure icon & remove storage permissions from sample app

opensrp · May 31, 2019 · f2a7eb4 · f2a7eb4
1 parent d39279c
commit f2a7eb4
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 40 deletions.
diff --git a/p2p-sync/src/main/res/drawable-hdpi/ic_fail.png b/p2p-sync/src/main/res/drawable-hdpi/ic_fail.png
diff --git a/p2p-sync/src/main/res/drawable-mdpi/ic_fail.png b/p2p-sync/src/main/res/drawable-mdpi/ic_fail.png
diff --git a/p2p-sync/src/main/res/drawable-xhdpi/ic_fail.png b/p2p-sync/src/main/res/drawable-xhdpi/ic_fail.png
diff --git a/p2p-sync/src/main/res/drawable-xxhdpi/ic_fail.png b/p2p-sync/src/main/res/drawable-xxhdpi/ic_fail.png
diff --git a/p2p-sync/src/main/res/drawable-xxxhdpi/ic_fail.png b/p2p-sync/src/main/res/drawable-xxxhdpi/ic_fail.png
diff --git a/p2p-sync/src/main/res/layout/fragment_successful_transfer.xml b/p2p-sync/src/main/res/layout/fragment_successful_transfer.xml
@@ -42,6 +42,7 @@
         android:textColor="@android:color/black"
         android:layout_marginTop="30dp"
         android:textSize="21sp"
+
         android:text="Transfer report"/>
 
     <Button

diff --git a/sample/src/main/java/org/smartregister/p2p/sample/MainActivity.java b/sample/src/main/java/org/smartregister/p2p/sample/MainActivity.java
@@ -1,55 +1,24 @@
 package org.smartregister.p2p.sample;
 
-import android.Manifest;
 import android.content.Intent;
-import android.content.pm.PackageManager;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AppCompatActivity;
 
 import org.smartregister.p2p.activity.P2pModeSelectActivity;
 
 public class MainActivity extends AppCompatActivity {
 
-    private String[] permissions = new String[] {
-            Manifest.permission.READ_EXTERNAL_STORAGE
-            , Manifest.permission.WRITE_EXTERNAL_STORAGE};
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-        requestPermissions();
+        startActivity(new Intent(this, P2pModeSelectActivity.class));
     }
 
     @Override
     protected void onResume() {
         super.onResume();
     }
 
-    @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        requestPermissions();
-    }
-
-    private void requestPermissions() {
-        if (!arePermissionsGranted()) {
-            ActivityCompat.requestPermissions(this, permissions, 8348);
-        } else {
-            startActivity(new Intent(this, P2pModeSelectActivity.class));
-        }
-    }
-
-    private boolean arePermissionsGranted() {
-        for (String permission: permissions) {
-            if (ContextCompat.checkSelfPermission(this, permission) != PackageManager.PERMISSION_GRANTED) {
-                return false;
-            }
-        }
-
-        return true;
-    }
 }
diff --git a/sample/src/main/java/org/smartregister/p2p/sample/dao/SampleReceiverDao.java b/sample/src/main/java/org/smartregister/p2p/sample/dao/SampleReceiverDao.java
@@ -26,8 +26,8 @@ public class SampleReceiverDao implements ReceiverTransferDao {
     public TreeSet<DataType> getDataTypes() {
         TreeSet<DataType> dataTypes = new TreeSet<>();
         dataTypes.add(new DataType(Constants.NAMES, DataType.Type.NON_MEDIA, 0));
-        dataTypes.add(new DataType(Constants.PERSONAL_DETAILS, DataType.Type.NON_MEDIA, 1));
-        dataTypes.add(new DataType(Constants.PROFILE_PICS, DataType.Type.MEDIA, 2));
+        dataTypes.add(new DataType(Constants.PERSONAL_DETAIL, DataType.Type.NON_MEDIA, 1));
+        dataTypes.add(new DataType(Constants.PROFILE_PIC, DataType.Type.MEDIA, 2));
 
         return dataTypes;
     }

diff --git a/sample/src/main/java/org/smartregister/p2p/sample/dao/SampleSenderDao.java b/sample/src/main/java/org/smartregister/p2p/sample/dao/SampleSenderDao.java
@@ -61,8 +61,8 @@ public Void call() throws Exception {
     public TreeSet<DataType> getDataTypes() {
         TreeSet<DataType> dataTypes = new TreeSet<>();
         dataTypes.add(new DataType(Constants.NAMES, DataType.Type.NON_MEDIA, 0));
-        dataTypes.add(new DataType(Constants.PERSONAL_DETAILS, DataType.Type.NON_MEDIA, 1));
-        dataTypes.add(new DataType(Constants.PROFILE_PICS, DataType.Type.MEDIA, 2));
+        dataTypes.add(new DataType(Constants.PERSONAL_DETAIL, DataType.Type.NON_MEDIA, 1));
+        dataTypes.add(new DataType(Constants.PROFILE_PIC, DataType.Type.MEDIA, 2));
 
         return dataTypes;
     }
@@ -89,7 +89,7 @@ public JsonData getJsonData(@NonNull DataType dataType, long lastRecordId, int b
 
                 return new JsonData(jsonArray, lastRecordId + recordsAdded);
             }
-        } else if (dataType.getName().equals(Constants.PERSONAL_DETAILS)) {
+        } else if (dataType.getName().equals(Constants.PERSONAL_DETAIL)) {
             JSONArray jsonArray = new JSONArray();
 
             if (lastRecordId >= personalDetailsRecords.size()) {

diff --git a/sample/src/main/java/org/smartregister/p2p/sample/util/Constants.java b/sample/src/main/java/org/smartregister/p2p/sample/util/Constants.java
@@ -6,8 +6,8 @@
 
 public class Constants {
 
-    public static final String NAMES = "Names";
-    public static final String PERSONAL_DETAILS = "Personal Details";
-    public static final String PROFILE_PICS = "Profile Pics";
+    public static final String NAMES = "Name";
+    public static final String PERSONAL_DETAIL = "Personal Detail";
+    public static final String PROFILE_PIC = "Profile Pic";
 
 }