Skip to content

Commit b605dcb

Browse files
author
Cameron Mace
authored
Merge pull request #190 from mapbox/more-checkstyle-fixes
libandroid checkstyle fixes
2 parents d0628f2 + abecfe1 commit b605dcb

38 files changed

Lines changed: 3884 additions & 3870 deletions

‎libandroid/app/src/androidTest/java/com/mapbox/services/android/testapp/ApplicationTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
88
*/
99
public class ApplicationTest extends ApplicationTestCase<Application> {
10-
public ApplicationTest() {
11-
super(Application.class);
12-
}
10+
public ApplicationTest() {
11+
super(Application.class);
12+
}
1313
}

‎libandroid/app/src/main/java/com/mapbox/services/android/testapp/MainActivity.java‎

Lines changed: 105 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import android.content.Intent;
44
import android.os.Bundle;
5+
import android.support.annotation.NonNull;
56
import android.support.v7.app.AppCompatActivity;
67
import android.support.v7.widget.LinearLayoutManager;
78
import android.support.v7.widget.RecyclerView;
@@ -43,123 +44,123 @@
4344
*/
4445
public class MainActivity extends AppCompatActivity {
4546

46-
private final static String LOG_TAG = "MainActivity";
47-
48-
private RecyclerView mRecyclerView;
49-
private RecyclerView.Adapter mAdapter;
50-
private RecyclerView.LayoutManager mLayoutManager;
51-
52-
private final static List<SampleItem> samples = new ArrayList<>(Arrays.asList(
53-
new SampleItem("Directions v5", "", DirectionsV5Activity.class),
54-
new SampleItem("Route Utils v5", "", RouteUtilsV5Activity.class),
55-
new SampleItem("Directions v4", "", DirectionsV4Activity.class),
56-
new SampleItem("Directions icons", "", DirectionsIconsActivity.class),
57-
new SampleItem("Reverse geocoding", "", GeocodingReverseActivity.class),
58-
new SampleItem("Geocoding widget", "", GeocodingWidgetActivity.class),
59-
new SampleItem("Geocoding service", "", GeocodingServiceActivity.class),
60-
new SampleItem("Maki icons", "", MakiIconsActivity.class),
61-
new SampleItem("Static image", "", StaticImageActivity.class),
62-
new SampleItem("Simplify polyline", "", SimplifyPolylineActivity.class),
63-
new SampleItem("Map matching", "", MapMatchingActivity.class),
64-
new SampleItem("Turf bearing", "", TurfBearingActivity.class),
65-
new SampleItem("Turf destination", "", TurfDestinationActivity.class),
66-
new SampleItem("Turf distance", "", TurfDistanceActivity.class),
67-
new SampleItem("Turf line slice", "", TurfLineSliceActivity.class),
68-
new SampleItem("Turf inside", "", TurfInsideActivity.class),
69-
new SampleItem("Turf midpoint", "", TurfMidpointActivity.class),
70-
new SampleItem("Off route detection", "", OffRouteDetectionActivity.class)
71-
));
72-
73-
@Override
74-
protected void onCreate(Bundle savedInstanceState) {
75-
super.onCreate(savedInstanceState);
76-
setContentView(R.layout.activity_main);
77-
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
78-
setSupportActionBar(toolbar);
79-
80-
// Debug information
81-
Log.d(LOG_TAG, "MAS version name: " + BuildConfig.VERSION_NAME);
82-
Log.d(LOG_TAG, "MAS version code: " + BuildConfig.VERSION_CODE);
83-
84-
// RecyclerView
85-
mRecyclerView = (RecyclerView) findViewById(R.id.recycler_view);
86-
mRecyclerView.setHasFixedSize(true);
87-
88-
// Use a linear layout manager
89-
mLayoutManager = new LinearLayoutManager(this);
90-
mRecyclerView.setLayoutManager(mLayoutManager);
91-
92-
// Specify an adapter
93-
mAdapter = new MainAdapter(samples);
94-
mRecyclerView.setAdapter(mAdapter);
95-
96-
// Check for location permission
97-
if (!PermissionsUtils.isLocationGranted(this)) {
98-
mRecyclerView.setEnabled(false);
99-
PermissionsUtils.startPermissionFlow(this);
100-
}
47+
private static final String LOG_TAG = "MainActivity";
48+
49+
private RecyclerView recyclerView;
50+
private RecyclerView.Adapter adapter;
51+
private RecyclerView.LayoutManager layoutManager;
52+
53+
private static final List<SampleItem> samples = new ArrayList<>(Arrays.asList(
54+
new SampleItem("Directions v5", "", DirectionsV5Activity.class),
55+
new SampleItem("Route Utils v5", "", RouteUtilsV5Activity.class),
56+
new SampleItem("Directions v4", "", DirectionsV4Activity.class),
57+
new SampleItem("Directions icons", "", DirectionsIconsActivity.class),
58+
new SampleItem("Reverse geocoding", "", GeocodingReverseActivity.class),
59+
new SampleItem("Geocoding widget", "", GeocodingWidgetActivity.class),
60+
new SampleItem("Geocoding service", "", GeocodingServiceActivity.class),
61+
new SampleItem("Maki icons", "", MakiIconsActivity.class),
62+
new SampleItem("Static image", "", StaticImageActivity.class),
63+
new SampleItem("Simplify polyline", "", SimplifyPolylineActivity.class),
64+
new SampleItem("Map matching", "", MapMatchingActivity.class),
65+
new SampleItem("Turf bearing", "", TurfBearingActivity.class),
66+
new SampleItem("Turf destination", "", TurfDestinationActivity.class),
67+
new SampleItem("Turf distance", "", TurfDistanceActivity.class),
68+
new SampleItem("Turf line slice", "", TurfLineSliceActivity.class),
69+
new SampleItem("Turf inside", "", TurfInsideActivity.class),
70+
new SampleItem("Turf midpoint", "", TurfMidpointActivity.class),
71+
new SampleItem("Off route detection", "", OffRouteDetectionActivity.class)
72+
));
73+
74+
@Override
75+
protected void onCreate(Bundle savedInstanceState) {
76+
super.onCreate(savedInstanceState);
77+
setContentView(R.layout.activity_main);
78+
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
79+
setSupportActionBar(toolbar);
80+
81+
// Debug information
82+
Log.d(LOG_TAG, "MAS version name: " + BuildConfig.VERSION_NAME);
83+
Log.d(LOG_TAG, "MAS version code: " + BuildConfig.VERSION_CODE);
84+
85+
// RecyclerView
86+
recyclerView = (RecyclerView) findViewById(R.id.recycler_view);
87+
recyclerView.setHasFixedSize(true);
88+
89+
// Use a linear layout manager
90+
layoutManager = new LinearLayoutManager(this);
91+
recyclerView.setLayoutManager(layoutManager);
92+
93+
// Specify an adapter
94+
adapter = new MainAdapter(samples);
95+
recyclerView.setAdapter(adapter);
96+
97+
// Check for location permission
98+
if (!PermissionsUtils.isLocationGranted(this)) {
99+
recyclerView.setEnabled(false);
100+
PermissionsUtils.startPermissionFlow(this);
101101
}
102-
103-
@Override
104-
public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
105-
if (PermissionsUtils.isRequestSuccessful(requestCode, permissions, grantResults)) {
106-
mRecyclerView.setEnabled(true);
107-
} else {
108-
PermissionsUtils.explainFallback(this);
109-
}
102+
}
103+
104+
@Override
105+
public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
106+
if (PermissionsUtils.isRequestSuccessful(requestCode, permissions, grantResults)) {
107+
recyclerView.setEnabled(true);
108+
} else {
109+
PermissionsUtils.explainFallback(this);
110110
}
111+
}
111112

112-
/*
113-
* Recycler view
114-
*/
113+
/*
114+
* Recycler view
115+
*/
115116

116-
private class MainAdapter extends RecyclerView.Adapter<MainAdapter.ViewHolder> {
117+
private class MainAdapter extends RecyclerView.Adapter<MainAdapter.ViewHolder> {
117118

118-
private List<SampleItem> samples;
119+
private List<SampleItem> samples;
119120

120-
public class ViewHolder extends RecyclerView.ViewHolder {
121+
public class ViewHolder extends RecyclerView.ViewHolder {
121122

122-
private TextView nameView;
123-
private TextView descriptionView;
123+
private TextView nameView;
124+
private TextView descriptionView;
124125

125-
public ViewHolder(View v) {
126-
super(v);
127-
nameView = (TextView) v.findViewById(R.id.nameView);
128-
descriptionView = (TextView) v.findViewById(R.id.descriptionView);
129-
}
130-
}
126+
public ViewHolder(View view) {
127+
super(view);
128+
nameView = (TextView) view.findViewById(R.id.nameView);
129+
descriptionView = (TextView) view.findViewById(R.id.descriptionView);
130+
}
131+
}
131132

132-
public MainAdapter(List<SampleItem> samples) {
133-
this.samples = samples;
134-
}
133+
public MainAdapter(List<SampleItem> samples) {
134+
this.samples = samples;
135+
}
135136

136-
@Override
137-
public MainAdapter.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
138-
View v = LayoutInflater
139-
.from(parent.getContext())
140-
.inflate(R.layout.item_main_feature, parent, false);
141-
142-
v.setOnClickListener(new View.OnClickListener() {
143-
@Override
144-
public void onClick(View v) {
145-
int position = mRecyclerView.getChildLayoutPosition(v);
146-
Intent intent = new Intent(v.getContext(), samples.get(position).getActivity());
147-
startActivity(intent);
148-
}
149-
});
150-
151-
return new ViewHolder(v);
152-
}
137+
@Override
138+
public MainAdapter.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
139+
View view = LayoutInflater
140+
.from(parent.getContext())
141+
.inflate(R.layout.item_main_feature, parent, false);
153142

143+
view.setOnClickListener(new View.OnClickListener() {
154144
@Override
155-
public void onBindViewHolder(MainAdapter.ViewHolder holder, int position) {
156-
holder.nameView.setText(samples.get(position).getName());
157-
holder.descriptionView.setText(samples.get(position).getDescription());
145+
public void onClick(View view) {
146+
int position = recyclerView.getChildLayoutPosition(view);
147+
Intent intent = new Intent(view.getContext(), samples.get(position).getActivity());
148+
startActivity(intent);
158149
}
150+
});
159151

160-
@Override
161-
public int getItemCount() {
162-
return samples.size();
163-
}
152+
return new ViewHolder(view);
153+
}
154+
155+
@Override
156+
public void onBindViewHolder(MainAdapter.ViewHolder holder, int position) {
157+
holder.nameView.setText(samples.get(position).getName());
158+
holder.descriptionView.setText(samples.get(position).getDescription());
159+
}
160+
161+
@Override
162+
public int getItemCount() {
163+
return samples.size();
164164
}
165+
}
165166
}

‎libandroid/app/src/main/java/com/mapbox/services/android/testapp/MasApplication.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66

77
public class MasApplication extends Application {
88

9-
@Override
10-
public void onCreate() {
11-
super.onCreate();
12-
MapboxAccountManager.start(getApplicationContext(), Utils.getMapboxAccessToken(getApplicationContext()));
9+
@Override
10+
public void onCreate() {
11+
super.onCreate();
12+
MapboxAccountManager.start(getApplicationContext(), Utils.getMapboxAccessToken(getApplicationContext()));
1313

14-
}
14+
}
1515
}

‎libandroid/app/src/main/java/com/mapbox/services/android/testapp/SampleItem.java‎

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,27 @@
11
package com.mapbox.services.android.testapp;
22

3-
/**
4-
* Created by antonio on 4/1/16.
5-
*/
63
public class SampleItem {
74

8-
private String name;
9-
private String description;
10-
private Class activity;
5+
private String name;
6+
private String description;
7+
private Class activity;
118

12-
public SampleItem(String name, String description, Class activity) {
13-
this.name = name;
14-
this.description = description;
15-
this.activity = activity;
16-
}
9+
public SampleItem(String name, String description, Class activity) {
10+
this.name = name;
11+
this.description = description;
12+
this.activity = activity;
13+
}
1714

18-
public String getName() {
19-
return name;
20-
}
15+
public String getName() {
16+
return name;
17+
}
2118

22-
public String getDescription() {
23-
return description;
24-
}
19+
public String getDescription() {
20+
return description;
21+
}
2522

26-
public Class getActivity() {
27-
return activity;
28-
}
23+
public Class getActivity() {
24+
return activity;
25+
}
2926

3027
}

‎libandroid/app/src/main/java/com/mapbox/services/android/testapp/Utils.java‎

Lines changed: 29 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -7,40 +7,37 @@
77

88
import com.mapbox.mapboxsdk.constants.MapboxConstants;
99

10-
/**
11-
* Created by antonio on 3/24/16.
12-
*/
1310
public class Utils {
1411

15-
/**
16-
* <p>
17-
* Returns the Mapbox access token set in the app resources.
18-
* </p>
19-
* It will first search the application manifest for a {@link MapboxConstants#KEY_META_DATA_MANIFEST}
20-
* meta-data value. If not found it will then attempt to load the access token from the
21-
* {@code res/values/dev.xml} development file.
22-
*
23-
* @param context The {@link Context} of the {@link android.app.Activity} or {@link android.app.Fragment}.
24-
* @return The Mapbox access token or null if not found.
25-
* @see MapboxConstants#KEY_META_DATA_MANIFEST
26-
*/
27-
public static String getMapboxAccessToken(@NonNull Context context) {
28-
try {
29-
// Read out AndroidManifest
30-
PackageManager packageManager = context.getPackageManager();
31-
ApplicationInfo appInfo = packageManager
32-
.getApplicationInfo(context.getPackageName(), PackageManager.GET_META_DATA);
33-
String token = appInfo.metaData.getString(MapboxConstants.KEY_META_DATA_MANIFEST);
34-
if (token == null || token.isEmpty()) {
35-
throw new IllegalArgumentException();
36-
}
37-
return token;
38-
} catch (Exception e) {
39-
// Use fallback on string resource, used for development
40-
int tokenResId = context.getResources()
41-
.getIdentifier("mapbox_access_token", "string", context.getPackageName());
42-
return tokenResId != 0 ? context.getString(tokenResId) : null;
43-
}
12+
/**
13+
* <p>
14+
* Returns the Mapbox access token set in the app resources.
15+
* </p>
16+
* It will first search the application manifest for a {@link MapboxConstants#KEY_META_DATA_MANIFEST}
17+
* meta-data value. If not found it will then attempt to load the access token from the
18+
* {@code res/values/dev.xml} development file.
19+
*
20+
* @param context The {@link Context} of the {@link android.app.Activity} or {@link android.app.Fragment}.
21+
* @return The Mapbox access token or null if not found.
22+
* @see MapboxConstants#KEY_META_DATA_MANIFEST
23+
*/
24+
public static String getMapboxAccessToken(@NonNull Context context) {
25+
try {
26+
// Read out AndroidManifest
27+
PackageManager packageManager = context.getPackageManager();
28+
ApplicationInfo appInfo = packageManager
29+
.getApplicationInfo(context.getPackageName(), PackageManager.GET_META_DATA);
30+
String token = appInfo.metaData.getString(MapboxConstants.KEY_META_DATA_MANIFEST);
31+
if (token == null || token.isEmpty()) {
32+
throw new IllegalArgumentException();
33+
}
34+
return token;
35+
} catch (Exception exception) {
36+
// Use fallback on string resource, used for development
37+
int tokenResId = context.getResources()
38+
.getIdentifier("mapbox_access_token", "string", context.getPackageName());
39+
return tokenResId != 0 ? context.getString(tokenResId) : null;
4440
}
41+
}
4542

4643
}

0 commit comments

Comments
 (0)