[android] Checkstyle fixes round 1 (#6234)

* removed last of hungarian notation from testapp and fixed other checkstyle issues

* added back MapboxMap for espresso

1 files changed, 37 insertions, 19 deletions

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationTintActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationTintActivity.java
index 3fc793ad1d..937994ccd9 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationTintActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationTintActivity.java
@@ -60,29 +60,44 @@ public class MyLocationTintActivity extends AppCompatActivity implements Locatio
                 final MyLocationViewSettings myLocationViewSettings = mapboxMap.getMyLocationViewSettings();
 
                 // handle default button clicks
-                ViewUtils.attachClickListener(MyLocationTintActivity.this, R.id.default_user_dot_coloring_button, new View.OnClickListener() {
+                ViewUtils.attachClickListener(
+                    MyLocationTintActivity.this,
+                    R.id.default_user_dot_coloring_button,
+                    new View.OnClickListener() {
                     @Override
                     public void onClick(View view) {
-                        myLocationViewSettings.setAccuracyTintColor(ContextCompat.getColor(MyLocationTintActivity.this, R.color.my_location_ring));
-                        myLocationViewSettings.setForegroundTintColor(ContextCompat.getColor(MyLocationTintActivity.this, R.color.mapbox_blue));
+                        myLocationViewSettings.setAccuracyTintColor(ContextCompat.getColor(
+                            MyLocationTintActivity.this, R.color.my_location_ring));
+                        myLocationViewSettings.setForegroundTintColor(ContextCompat.getColor(
+                            MyLocationTintActivity.this, R.color.mapbox_blue));
                     }
                 });
 
                 // handle tint user dot button clicks
-                ViewUtils.attachClickListener(MyLocationTintActivity.this, R.id.tint_user_dot_button, new View.OnClickListener() {
+                ViewUtils.attachClickListener(
+                    MyLocationTintActivity.this,
+                    R.id.tint_user_dot_button,
+                    new View.OnClickListener() {
                     @Override
                     public void onClick(View view) {
-                        myLocationViewSettings.setAccuracyTintColor(ContextCompat.getColor(MyLocationTintActivity.this, R.color.mapbox_green));
-                        myLocationViewSettings.setForegroundTintColor(ContextCompat.getColor(MyLocationTintActivity.this, R.color.mapbox_green));
+                        myLocationViewSettings.setAccuracyTintColor(
+                            ContextCompat.getColor(MyLocationTintActivity.this, R.color.mapbox_green));
+                        myLocationViewSettings.setForegroundTintColor(
+                            ContextCompat.getColor(MyLocationTintActivity.this, R.color.mapbox_green));
                     }
                 });
 
                 // handle tint accuracy ring button clicks
-                ViewUtils.attachClickListener(MyLocationTintActivity.this, R.id.user_accuracy_ring_tint_button, new View.OnClickListener() {
+                ViewUtils.attachClickListener(
+                    MyLocationTintActivity.this,
+                    R.id.user_accuracy_ring_tint_button,
+                    new View.OnClickListener() {
                     @Override
                     public void onClick(View view) {
-                        myLocationViewSettings.setAccuracyTintColor(ContextCompat.getColor(MyLocationTintActivity.this, R.color.accent));
-                        myLocationViewSettings.setForegroundTintColor(ContextCompat.getColor(MyLocationTintActivity.this, R.color.mapbox_blue));
+                        myLocationViewSettings.setAccuracyTintColor(
+                            ContextCompat.getColor(MyLocationTintActivity.this, R.color.accent));
+                        myLocationViewSettings.setForegroundTintColor(
+                            ContextCompat.getColor(MyLocationTintActivity.this, R.color.mapbox_blue));
                     }
                 });
             }
@@ -154,9 +169,13 @@ public class MyLocationTintActivity extends AppCompatActivity implements Locatio
     @UiThread
     public void toggleGps(boolean enableGps) {
         if (enableGps) {
-            if ((ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) ||
-                    (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED)) {
-                ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION}, PERMISSIONS_LOCATION);
+            if ((ContextCompat.checkSelfPermission(this,
+                Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED)
+                || (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION)
+                != PackageManager.PERMISSION_GRANTED)) {
+                ActivityCompat.requestPermissions(this, new String[]{
+                    Manifest.permission.ACCESS_COARSE_LOCATION,
+                    Manifest.permission.ACCESS_FINE_LOCATION}, PERMISSIONS_LOCATION);
             } else {
                 enableLocation(true);
             }
@@ -179,19 +198,18 @@ public class MyLocationTintActivity extends AppCompatActivity implements Locatio
     }
 
     @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String permissions[], @NonNull int[] grantResults) {
-        switch (requestCode) {
-            case PERMISSIONS_LOCATION: {
-                if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                    enableLocation(true);
-                }
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        if (requestCode == PERMISSIONS_LOCATION) {
+            if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                enableLocation(true);
             }
         }
     }
 
     private static class ViewUtils {
 
-        public static void attachClickListener(@NonNull Activity activity, @IdRes int buttonId, @Nullable View.OnClickListener clickListener) {
+        public static void attachClickListener(
+            @NonNull Activity activity, @IdRes int buttonId, @Nullable View.OnClickListener clickListener) {
             View view = activity.findViewById(buttonId);
             if (view != null) {
                 view.setOnClickListener(clickListener);