Skip to content

Commit 59e826e

Browse files
author
Cameron Mace
authored
Refactored test app (#258)
* refactored test app * fixed checkstyle issues
1 parent ab05c3f commit 59e826e

63 files changed

Lines changed: 568 additions & 1029 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

mapbox/app/src/main/AndroidManifest.xml

Lines changed: 108 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,126 +1,167 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.mapbox.services.android.testapp">
3+
package="com.mapbox.services.android.testapp">
44

55
<!-- Normal permissions -->
6-
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
7-
<uses-permission android:name="android.permission.INTERNET" />
6+
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
7+
<uses-permission android:name="android.permission.INTERNET"/>
88

99
<!-- Dangerous permissions -->
10-
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
10+
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
1111

1212
<application
1313
android:name=".MasApplication"
1414
android:allowBackup="true"
1515
android:icon="@mipmap/ic_launcher"
16-
android:roundIcon="@mipmap/ic_launcher_round"
1716
android:label="@string/app_name"
17+
android:roundIcon="@mipmap/ic_launcher_round"
1818
android:supportsRtl="true"
1919
android:theme="@style/AppTheme">
2020
<activity
2121
android:name=".MainActivity"
2222
android:label="@string/app_name"
23-
android:theme="@style/AppTheme.NoActionBar">
23+
android:launchMode="singleTop"
24+
android:theme="@style/AppTheme">
2425
<intent-filter>
25-
<action android:name="android.intent.action.MAIN" />
26-
<category android:name="android.intent.category.LAUNCHER" />
26+
<action android:name="android.intent.action.MAIN"/>
27+
<category android:name="android.intent.category.LAUNCHER"/>
2728
</intent-filter>
2829
</activity>
2930
<activity
3031
android:name=".directions.DirectionsV4Activity"
31-
android:label="Directions v4"
32-
android:parentActivityName=".MainActivity"
33-
android:theme="@style/AppTheme.NoActionBar" />
32+
android:label="@string/title_directions_v4">
33+
<meta-data
34+
android:name="android.support.PARENT_ACTIVITY"
35+
android:value=".MainActivity"/>
36+
</activity>
3437
<activity
3538
android:name=".directions.DirectionsV5Activity"
36-
android:label="Directions v5"
37-
android:parentActivityName=".MainActivity"
38-
android:theme="@style/AppTheme.NoActionBar" />
39+
android:label="@string/title_directions_v5">
40+
<meta-data
41+
android:name="android.support.PARENT_ACTIVITY"
42+
android:value=".MainActivity"/>
43+
</activity>
3944
<activity
4045
android:name=".directions.RouteUtilsV5Activity"
41-
android:label="Route Utils v5"
42-
android:parentActivityName=".MainActivity"
43-
android:theme="@style/AppTheme.NoActionBar" />
46+
android:label="@string/title_route_utils_v5">
47+
<meta-data
48+
android:name="android.support.PARENT_ACTIVITY"
49+
android:value=".MainActivity"/>
50+
</activity>
4451
<activity
4552
android:name=".icons.DirectionsIconsActivity"
46-
android:label="Directions icons"
47-
android:parentActivityName=".MainActivity"
48-
android:theme="@style/AppTheme.NoActionBar" />
53+
android:label="@string/title_directions_icons">
54+
<meta-data
55+
android:name="android.support.PARENT_ACTIVITY"
56+
android:value=".MainActivity"/>
57+
</activity>
4958
<activity
5059
android:name=".geocoding.GeocodingReverseActivity"
51-
android:label="Reverse geocoding"
52-
android:parentActivityName=".MainActivity"
53-
android:theme="@style/AppTheme.NoActionBar" />
60+
android:label="@string/title_reverse_geocoding">
61+
<meta-data
62+
android:name="android.support.PARENT_ACTIVITY"
63+
android:value=".MainActivity"/>
64+
</activity>
5465
<activity
5566
android:name=".geocoding.GeocodingServiceActivity"
56-
android:label="Geocoding service"
57-
android:parentActivityName=".MainActivity"
58-
android:theme="@style/AppTheme.NoActionBar" />
67+
android:label="@string/title_geocoding_service">
68+
<meta-data
69+
android:name="android.support.PARENT_ACTIVITY"
70+
android:value=".MainActivity"/>
71+
</activity>
5972
<activity
6073
android:name=".geocoding.GeocodingWidgetActivity"
61-
android:label="Geocoding widget"
62-
android:parentActivityName=".MainActivity"
63-
android:theme="@style/AppTheme.NoActionBar" />
74+
android:label="@string/title_geocoding_widget">
75+
<meta-data
76+
android:name="android.support.PARENT_ACTIVITY"
77+
android:value=".MainActivity"/>
78+
</activity>
6479
<activity
6580
android:name=".icons.MakiIconsActivity"
66-
android:label="Maki icons"
67-
android:parentActivityName=".MainActivity"
68-
android:theme="@style/AppTheme.NoActionBar" />
81+
android:label="@string/title_maki_icons">
82+
<meta-data
83+
android:name="android.support.PARENT_ACTIVITY"
84+
android:value=".MainActivity"/>
85+
</activity>
6986
<activity
7087
android:name=".staticimage.StaticImageActivity"
71-
android:label="Static image"
72-
android:parentActivityName=".MainActivity"
73-
android:theme="@style/AppTheme.NoActionBar" />
88+
android:label="@string/title_static_image">
89+
<meta-data
90+
android:name="android.support.PARENT_ACTIVITY"
91+
android:value=".MainActivity"/>
92+
</activity>
7493
<activity
7594
android:name=".utils.SimplifyPolylineActivity"
76-
android:label="Simplify polyline"
77-
android:parentActivityName=".MainActivity"
78-
android:theme="@style/AppTheme.NoActionBar" />
95+
android:label="@string/title_simplify_polyline"
96+
android:theme="@style/AppTheme.NoActionBar">
97+
<meta-data
98+
android:name="android.support.PARENT_ACTIVITY"
99+
android:value=".MainActivity"/>
100+
</activity>
79101
<activity
80102
android:name=".utils.MapMatchingActivity"
81-
android:label="Map matching"
82-
android:parentActivityName=".MainActivity"
83-
android:theme="@style/AppTheme.NoActionBar" />
103+
android:label="@string/title_map_matching"
104+
android:theme="@style/AppTheme.NoActionBar">
105+
<meta-data
106+
android:name="android.support.PARENT_ACTIVITY"
107+
android:value=".MainActivity"/>
108+
</activity>
84109
<activity
85110
android:name=".turf.TurfBearingActivity"
86-
android:label="Turf bearing"
87-
android:parentActivityName=".MainActivity"
88-
android:theme="@style/AppTheme.NoActionBar" />
111+
android:label="@string/title_turf_bearing">
112+
<meta-data
113+
android:name="android.support.PARENT_ACTIVITY"
114+
android:value=".MainActivity"/>
115+
</activity>
89116
<activity
90117
android:name=".turf.TurfDestinationActivity"
91-
android:label="Turf destination"
92-
android:parentActivityName=".MainActivity"
93-
android:theme="@style/AppTheme.NoActionBar" />
118+
android:label="@string/title_turf_destination">
119+
<meta-data
120+
android:name="android.support.PARENT_ACTIVITY"
121+
android:value=".MainActivity"/>
122+
</activity>
94123
<activity
95124
android:name=".turf.TurfDistanceActivity"
96-
android:label="Turf distance"
97-
android:parentActivityName=".MainActivity"
98-
android:theme="@style/AppTheme.NoActionBar" />
125+
android:label="@string/title_turf_distance">
126+
<meta-data
127+
android:name="android.support.PARENT_ACTIVITY"
128+
android:value=".MainActivity"/>
129+
</activity>
99130
<activity
100131
android:name=".turf.TurfLineSliceActivity"
101-
android:label="Turf line slice"
102-
android:parentActivityName=".MainActivity"
103-
android:theme="@style/AppTheme.NoActionBar" />
132+
android:label="@string/title_turf_line_slice">
133+
<meta-data
134+
android:name="android.support.PARENT_ACTIVITY"
135+
android:value=".MainActivity"/>
136+
</activity>
104137
<activity
105138
android:name=".turf.TurfInsideActivity"
106-
android:label="Turf inside"
107-
android:parentActivityName=".MainActivity"
108-
android:theme="@style/AppTheme.NoActionBar" />
139+
android:label="@string/title_turf_inside">
140+
<meta-data
141+
android:name="android.support.PARENT_ACTIVITY"
142+
android:value=".MainActivity"/>
143+
</activity>
109144
<activity
110145
android:name=".turf.TurfMidpointActivity"
111-
android:label="Turf midpoint"
112-
android:parentActivityName=".MainActivity"
113-
android:theme="@style/AppTheme.NoActionBar" />
146+
android:label="@string/title_turf_midpoint">
147+
<meta-data
148+
android:name="android.support.PARENT_ACTIVITY"
149+
android:value=".MainActivity"/>
150+
</activity>
114151
<activity
115152
android:name=".nav.OffRouteDetectionActivity"
116-
android:label="Off route detection"
117-
android:parentActivityName=".MainActivity"
118-
android:theme="@style/AppTheme.NoActionBar" />
153+
android:label="@string/title_off_route_detection">
154+
<meta-data
155+
android:name="android.support.PARENT_ACTIVITY"
156+
android:value=".MainActivity"/>
157+
</activity>
119158
<activity
120159
android:name=".distance.DistanceActivity"
121-
android:label="Distance"
122-
android:parentActivityName=".MainActivity"
123-
android:theme="@style/AppTheme.NoActionBar" />
160+
android:label="@string/title_distance">
161+
<meta-data
162+
android:name="android.support.PARENT_ACTIVITY"
163+
android:value=".MainActivity"/>
164+
</activity>
124165

125166
<!--
126167
Service to asynchronously fetch a location address using a Geocoder. Setting the
@@ -129,10 +170,10 @@
129170
-->
130171
<service
131172
android:name=".geocoding.service.FetchAddressIntentService"
132-
android:exported="false" />
173+
android:exported="false"/>
133174

134175
<!-- Telemetry -->
135-
<service android:name="com.mapbox.mapboxsdk.telemetry.TelemetryService" />
176+
<service android:name="com.mapbox.mapboxsdk.telemetry.TelemetryService"/>
136177

137178
</application>
138179

0 commit comments

Comments
 (0)