code clean up

KingsMentor · KingsMentor · commit 7538e7c7eeee · 2017-01-23T15:00:17.000+01:00
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/java/xyz/belvi/premissiondialog/MainActivity.java b/app/src/main/java/xyz/belvi/premissiondialog/MainActivity.java
@@ -19,7 +19,7 @@
 
 import xyz.belvi.permissiondialog.Rationale.Rationale;
 import xyz.belvi.permissiondialog.Permission.PermissionDetails;
-import xyz.belvi.permissiondialog.Rationale.PermissionDialog;
+import xyz.belvi.permissiondialog.Rationale.RationaleDialog;
 import xyz.belvi.permissiondialog.Rationale.PermissionResolveListener;
 import xyz.belvi.permissiondialog.Permission.PermissionTracker;
 import xyz.belvi.permissiondialog.Permission.SmoothPermission;
@@ -51,7 +51,7 @@ private void showPermDialog() {
         PermissionDetails internetPermissionDetails = new PermissionDetails().getPermissionDetails(this, Manifest.permission.INTERNET, R.drawable.ic_sms_white_24dp);
 
 
-        PermissionDialog dialog = Rationale.withActivity(this)
+        RationaleDialog dialog = Rationale.withActivity(this)
                 .addSmoothPermission(new SmoothPermission(Manifest.permission.READ_SMS, smsPermissionDetails.getDescription(), smsPermissionDetails.getDescription(), smsPermissionDetails.getPermissionIcon()),
                         new SmoothPermission(Manifest.permission.READ_EXTERNAL_STORAGE, storagePermissionDetails.getDescription(), storagePermissionDetails.getDescription(), storagePermissionDetails.getPermissionIcon()),
                         new SmoothPermission(Manifest.permission.RECORD_AUDIO, audioPermissionDetails.getDescription(), audioPermissionDetails.getDescription(), audioPermissionDetails.getPermissionIcon()),
diff --git a/permissiondialog/src/main/java/xyz/belvi/permissiondialog/Rationale/Rationale.java b/permissiondialog/src/main/java/xyz/belvi/permissiondialog/Rationale/Rationale.java
@@ -13,7 +13,7 @@
 public class Rationale implements RationaleBuilder.PermissionBuild, RationaleBuilder.PermissionInit, RationaleBuilder.DialogStyle {
 
 
-    private PermissionDialogBuilder permissionDialogBuilder;
+    private RationaleDialogBuilder permissionDialogBuilder;
     private int styleRes;
 
     private Rationale(Activity activity) {
@@ -22,7 +22,7 @@ private Rationale(Activity activity) {
 
 
     private void initialize(Activity activity) {
-        permissionDialogBuilder = new PermissionDialogBuilder(activity);
+        permissionDialogBuilder = new RationaleDialogBuilder(activity);
     }
 
     public static RationaleBuilder.PermissionInit withActivity(Activity activity) {
@@ -62,18 +62,20 @@ public RationaleBuilder.PermissionBuild withPermissionResolved(PermissionResolve
     }
 
     @Override
-    public void setPermission(SmoothPermission... smoothPermission) {
+    public RationaleBuilder.PermissionInit setPermission(SmoothPermission... smoothPermission) {
         permissionDialogBuilder.setSmoothPermission(smoothPermission);
+        return this;
     }
 
     @Override
-    public void setPermission(ArrayList<SmoothPermission> smoothPermission) {
+    public RationaleBuilder.PermissionInit setPermission(ArrayList<SmoothPermission> smoothPermission) {
         permissionDialogBuilder.setSmoothPermission(smoothPermission);
+        return this;
     }
 
 
     @Override
-    public PermissionDialog build(boolean buildAnyway) {
+    public RationaleDialog build(boolean buildAnyway) {
         return permissionDialogBuilder.build(styleRes, buildAnyway);
     }
 
diff --git a/permissiondialog/src/main/java/xyz/belvi/permissiondialog/Rationale/RationaleBuilder.java b/permissiondialog/src/main/java/xyz/belvi/permissiondialog/Rationale/RationaleBuilder.java
@@ -18,9 +18,9 @@ interface PermissionInit {
 
         DialogStyle includeStyle(int styleRes);
 
-        void setPermission(SmoothPermission... smoothPermission);
+        PermissionInit setPermission(SmoothPermission... smoothPermission);
 
-        void setPermission(ArrayList<SmoothPermission> smoothPermission);
+        PermissionInit setPermission(ArrayList<SmoothPermission> smoothPermission);
 
     }
 
@@ -29,7 +29,7 @@ interface DialogStyle {
     }
 
     interface PermissionBuild {
-        PermissionDialog build(boolean buildAnyway);
+        RationaleDialog build(boolean buildAnyway);
     }
 
 
diff --git a/permissiondialog/src/main/java/xyz/belvi/permissiondialog/Rationale/RationaleDialog.java b/permissiondialog/src/main/java/xyz/belvi/permissiondialog/Rationale/RationaleDialog.java
@@ -36,7 +36,7 @@
  * Created by zone2 on 1/19/17.
  */
 
-public class PermissionDialog extends DialogFragment {
+public class RationaleDialog extends DialogFragment {
 
     private ViewPager rationalePager;
     private AppCompatButton noButton, yesButton;
@@ -48,7 +48,7 @@ public class PermissionDialog extends DialogFragment {
     private static PermissionResolveListener permissionResolveListener;
 
 
-    public PermissionDialog initialise(ArrayList<SmoothPermission> smoothPermission, PermissionResolveListener resolveListener, int styleRes, boolean showSettings, boolean buildAnyway) {
+    public RationaleDialog initialise(ArrayList<SmoothPermission> smoothPermission, PermissionResolveListener resolveListener, int styleRes, boolean showSettings, boolean buildAnyway) {
 
         Bundle argument = new Bundle();
         argument.putParcelableArrayList(SMOOTH_PERMISSIONS, smoothPermission);
@@ -154,7 +154,7 @@ private void styleUI(View view) {
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
         waiting_for_permission = false;
-        View view = inflater.inflate(R.layout.permission_dialog, container, false);
+        View view = inflater.inflate(R.layout.rationale_dialog, container, false);
         styleUI(view);
         smoothPermissions = getArguments().getParcelableArrayList(SMOOTH_PERMISSIONS);
         showSettings = getArguments().getBoolean(SHOW_SETTINGS);
@@ -314,7 +314,7 @@ public static void returnCallback(PermissionResolveListener permissionResolveLis
             permissionResolveListener.onResolved(smoothPermissions);
         else {
             smoothPermissions = new ArrayList<>();
-            PermissionDialogBuilder.showSettings(smoothPermissions, true);
+            RationaleDialogBuilder.showSettings(smoothPermissions, true);
             permissionResolveListener.onResolved(smoothPermissions);
         }
     }
@@ -324,7 +324,7 @@ public static void returnPossibleCallback(PermissionResolveListener permissionRe
             permissionResolveListener.possiblePermissionUpdate(smoothPermissions);
         else {
             smoothPermissions = new ArrayList<>();
-            PermissionDialogBuilder.showSettings(smoothPermissions, true);
+            RationaleDialogBuilder.showSettings(smoothPermissions, true);
             permissionResolveListener.possiblePermissionUpdate(smoothPermissions);
         }
     }
@@ -339,7 +339,7 @@ public void onResume() {
             waiting_for_permission = false;
             // refresh stuff
             ArrayList<SmoothPermission> smoothPermissions = new ArrayList<>();
-            showSettings = PermissionDialogBuilder.showSettings(smoothPermissions, buildAnyway());
+            showSettings = RationaleDialogBuilder.showSettings(smoothPermissions, buildAnyway());
             this.smoothPermissions = smoothPermissions;
 //            setArguments(argument);
 
diff --git a/permissiondialog/src/main/java/xyz/belvi/permissiondialog/Rationale/RationaleDialogBuilder.java b/permissiondialog/src/main/java/xyz/belvi/permissiondialog/Rationale/RationaleDialogBuilder.java
@@ -17,32 +17,32 @@
  * Created by zone2 on 1/20/17.
  */
 
-class PermissionDialogBuilder {
+class RationaleDialogBuilder {
 
     private static ArrayList<SmoothPermission> smoothPermissions = new ArrayList<>();
     private static Activity mActivity;
     private PermissionResolveListener permissionResolveListener;
 
-    public PermissionDialogBuilder(Activity activity) {
+    public RationaleDialogBuilder(Activity activity) {
         mActivity = activity;
         smoothPermissions = new ArrayList<>();
     }
 
-    public PermissionDialogBuilder addSmoothPermission(SmoothPermission... smoothPermissions) {
+    public RationaleDialogBuilder addSmoothPermission(SmoothPermission... smoothPermissions) {
         for (SmoothPermission smoothPermission : smoothPermissions) {
             this.smoothPermissions.add(smoothPermission);
         }
         return this;
     }
 
-    public PermissionDialogBuilder addSmoothPermission(ArrayList<SmoothPermission> smoothPermissions) {
+    public RationaleDialogBuilder addSmoothPermission(ArrayList<SmoothPermission> smoothPermissions) {
         for (SmoothPermission smoothPermission : smoothPermissions) {
             this.smoothPermissions.add(smoothPermission);
         }
         return this;
     }
 
-    public PermissionDialogBuilder resolvePermission(PermissionResolveListener permissionResolver) {
+    public RationaleDialogBuilder resolvePermission(PermissionResolveListener permissionResolver) {
         permissionResolveListener = permissionResolver;
         return this;
     }
@@ -59,13 +59,13 @@ public void setSmoothPermission(ArrayList<SmoothPermission> smoothPermissions) {
     }
 
 
-    public PermissionDialog build(int styleRes, boolean buildAnyway) {
+    public RationaleDialog build(int styleRes, boolean buildAnyway) {
         ArrayList<SmoothPermission> smoothPermissions = new ArrayList<>();
         boolean showSettings = showSettings(smoothPermissions, buildAnyway);
         if (smoothPermissions.size() > 0) {
-            return new PermissionDialog().initialise(smoothPermissions, permissionResolveListener, styleRes, showSettings, buildAnyway);
+            return new RationaleDialog().initialise(smoothPermissions, permissionResolveListener, styleRes, showSettings, buildAnyway);
         } else {
-            PermissionDialog.returnCallback(permissionResolveListener, smoothPermissions, buildAnyway);
+            RationaleDialog.returnCallback(permissionResolveListener, smoothPermissions, buildAnyway);
         }
         return null;
     }
diff --git a/permissiondialog/src/main/res/layout/rationale_dialog.xml b/permissiondialog/src/main/res/layout/rationale_dialog.xml

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`public class Rationale implements RationaleBuilder.PermissionBuild, RationaleBuilder.PermissionInit, RationaleBuilder.DialogStyle {`
`14`	`14`
`15`	`15`
`16`		`- private PermissionDialogBuilder permissionDialogBuilder;`
	`16`	`+ private RationaleDialogBuilder permissionDialogBuilder;`
`17`	`17`	`private int styleRes;`
`18`	`18`
`19`	`19`	`private Rationale(Activity activity) {`
`@@ -22,7 +22,7 @@ private Rationale(Activity activity) {`
`22`	`22`
`23`	`23`
`24`	`24`	`private void initialize(Activity activity) {`
`25`		`- permissionDialogBuilder = new PermissionDialogBuilder(activity);`
	`25`	`+ permissionDialogBuilder = new RationaleDialogBuilder(activity);`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`public static RationaleBuilder.PermissionInit withActivity(Activity activity) {`
`@@ -62,18 +62,20 @@ public RationaleBuilder.PermissionBuild withPermissionResolved(PermissionResolve`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`@Override`
`65`		`- public void setPermission(SmoothPermission... smoothPermission) {`
	`65`	`+ public RationaleBuilder.PermissionInit setPermission(SmoothPermission... smoothPermission) {`
`66`	`66`	`permissionDialogBuilder.setSmoothPermission(smoothPermission);`
	`67`	`+ return this;`
`67`	`68`	`}`
`68`	`69`
`69`	`70`	`@Override`
`70`		`- public void setPermission(ArrayList<SmoothPermission> smoothPermission) {`
	`71`	`+ public RationaleBuilder.PermissionInit setPermission(ArrayList<SmoothPermission> smoothPermission) {`
`71`	`72`	`permissionDialogBuilder.setSmoothPermission(smoothPermission);`
	`73`	`+ return this;`
`72`	`74`	`}`
`73`	`75`
`74`	`76`
`75`	`77`	`@Override`
`76`		`- public PermissionDialog build(boolean buildAnyway) {`
	`78`	`+ public RationaleDialog build(boolean buildAnyway) {`
`77`	`79`	`return permissionDialogBuilder.build(styleRes, buildAnyway);`
`78`	`80`	`}`
`79`	`81`
Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,9 @@ interface PermissionInit {`
`18`	`18`
`19`	`19`	`DialogStyle includeStyle(int styleRes);`
`20`	`20`
`21`		`- void setPermission(SmoothPermission... smoothPermission);`
	`21`	`+ PermissionInit setPermission(SmoothPermission... smoothPermission);`
`22`	`22`
`23`		`- void setPermission(ArrayList<SmoothPermission> smoothPermission);`
	`23`	`+ PermissionInit setPermission(ArrayList<SmoothPermission> smoothPermission);`
`24`	`24`
`25`	`25`	`}`
`26`	`26`
`@@ -29,7 +29,7 @@ interface DialogStyle {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`interface PermissionBuild {`
`32`		`- PermissionDialog build(boolean buildAnyway);`
	`32`	`+ RationaleDialog build(boolean buildAnyway);`
`33`	`33`	`}`
`34`	`34`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -17,32 +17,32 @@`
`17`	`17`	`* Created by zone2 on 1/20/17.`
`18`	`18`	`*/`
`19`	`19`
`20`		`-class PermissionDialogBuilder {`
	`20`	`+class RationaleDialogBuilder {`
`21`	`21`
`22`	`22`	`private static ArrayList<SmoothPermission> smoothPermissions = new ArrayList<>();`
`23`	`23`	`private static Activity mActivity;`
`24`	`24`	`private PermissionResolveListener permissionResolveListener;`
`25`	`25`
`26`		`- public PermissionDialogBuilder(Activity activity) {`
	`26`	`+ public RationaleDialogBuilder(Activity activity) {`
`27`	`27`	`mActivity = activity;`
`28`	`28`	`smoothPermissions = new ArrayList<>();`
`29`	`29`	`}`
`30`	`30`
`31`		`- public PermissionDialogBuilder addSmoothPermission(SmoothPermission... smoothPermissions) {`
	`31`	`+ public RationaleDialogBuilder addSmoothPermission(SmoothPermission... smoothPermissions) {`
`32`	`32`	`for (SmoothPermission smoothPermission : smoothPermissions) {`
`33`	`33`	`this.smoothPermissions.add(smoothPermission);`
`34`	`34`	`}`
`35`	`35`	`return this;`
`36`	`36`	`}`
`37`	`37`
`38`		`- public PermissionDialogBuilder addSmoothPermission(ArrayList<SmoothPermission> smoothPermissions) {`
	`38`	`+ public RationaleDialogBuilder addSmoothPermission(ArrayList<SmoothPermission> smoothPermissions) {`
`39`	`39`	`for (SmoothPermission smoothPermission : smoothPermissions) {`
`40`	`40`	`this.smoothPermissions.add(smoothPermission);`
`41`	`41`	`}`
`42`	`42`	`return this;`
`43`	`43`	`}`
`44`	`44`
`45`		`- public PermissionDialogBuilder resolvePermission(PermissionResolveListener permissionResolver) {`
	`45`	`+ public RationaleDialogBuilder resolvePermission(PermissionResolveListener permissionResolver) {`
`46`	`46`	`permissionResolveListener = permissionResolver;`
`47`	`47`	`return this;`
`48`	`48`	`}`
`@@ -59,13 +59,13 @@ public void setSmoothPermission(ArrayList<SmoothPermission> smoothPermissions) {`
`59`	`59`	`}`
`60`	`60`
`61`	`61`
`62`		`- public PermissionDialog build(int styleRes, boolean buildAnyway) {`
	`62`	`+ public RationaleDialog build(int styleRes, boolean buildAnyway) {`
`63`	`63`	`ArrayList<SmoothPermission> smoothPermissions = new ArrayList<>();`
`64`	`64`	`boolean showSettings = showSettings(smoothPermissions, buildAnyway);`
`65`	`65`	`if (smoothPermissions.size() > 0) {`
`66`		`- return new PermissionDialog().initialise(smoothPermissions, permissionResolveListener, styleRes, showSettings, buildAnyway);`
	`66`	`+ return new RationaleDialog().initialise(smoothPermissions, permissionResolveListener, styleRes, showSettings, buildAnyway);`
`67`	`67`	`} else {`
`68`		`- PermissionDialog.returnCallback(permissionResolveListener, smoothPermissions, buildAnyway);`
	`68`	`+ RationaleDialog.returnCallback(permissionResolveListener, smoothPermissions, buildAnyway);`
`69`	`69`	`}`
`70`	`70`	`return null;`
`71`	`71`	`}`