This repository has been archived by the owner on Aug 8, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
#1856 - Initial conversion to Material Design components
- Loading branch information
Showing
7 changed files
with
118 additions
and
50 deletions.
There are no files selected for viewing
Submodule .mason
updated
4 files
+0 −1 | .travis.yml | |
+1 −1 | README.md | |
+30 −84 | mason.sh | |
+0 −8 | test/c_build_android.sh |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
122 changes: 77 additions & 45 deletions
122
android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_main.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,59 +1,91 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<LinearLayout | ||
|
||
<android.support.v4.widget.DrawerLayout | ||
android:id="@+id/drawer_layout" | ||
xmlns:android="http://schemas.android.com/apk/res/android" | ||
xmlns:mapbox="http://schemas.android.com/apk/res-auto" | ||
xmlns:tools="http://schemas.android.com/tools" | ||
android:layout_width="match_parent" | ||
android:layout_height="match_parent" | ||
android:orientation="vertical"> | ||
android:fitsSystemWindows="true"> | ||
|
||
<android.support.v7.widget.Toolbar | ||
android:id="@+id/toolbar_main" | ||
android:layout_height="wrap_content" | ||
android:layout_width="match_parent" | ||
android:minHeight="?attr/actionBarSize" | ||
android:background="?attr/colorPrimary"> | ||
|
||
<Spinner | ||
android:id="@+id/spinner_style" | ||
android:layout_width="wrap_content" | ||
android:layout_height="wrap_content" /> | ||
|
||
<Spinner | ||
android:id="@+id/spinner_class" | ||
android:visibility="invisible" | ||
android:layout_width="wrap_content" | ||
android:layout_height="wrap_content" /> | ||
</android.support.v7.widget.Toolbar> | ||
|
||
<FrameLayout | ||
android:id="@+id/layout_map" | ||
|
||
<android.support.design.widget.CoordinatorLayout | ||
android:id="@+id/main_content" | ||
xmlns:android="http://schemas.android.com/apk/res/android" | ||
xmlns:app="http://schemas.android.com/apk/res-auto" | ||
android:layout_width="match_parent" | ||
android:layout_height="fill_parent" | ||
android:orientation="vertical"> | ||
android:layout_height="match_parent"> | ||
|
||
<!-- | ||
<fragment | ||
android:name="com.mapbox.mapboxgl.testapp.MapFragment" | ||
android:id="@+id/fragment_map" | ||
<android.support.design.widget.AppBarLayout | ||
android:id="@+id/appbar" | ||
android:layout_width="match_parent" | ||
android:layout_height="match_parent" | ||
tools:context="${packageName}.${activityClass}" | ||
tools:layout="@layout/fragment_main" /> | ||
--> | ||
android:layout_height="wrap_content" | ||
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"> | ||
|
||
<com.mapbox.mapboxgl.views.MapView | ||
android:id="@+id/mainMapView" | ||
<android.support.v7.widget.Toolbar | ||
android:id="@+id/toolbar" | ||
android:layout_width="match_parent" | ||
android:layout_height="?attr/actionBarSize" | ||
android:background="?attr/colorPrimary" | ||
app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/> | ||
|
||
|
||
</android.support.design.widget.AppBarLayout> | ||
|
||
<FrameLayout | ||
android:id="@+id/layout_map" | ||
android:layout_width="match_parent" | ||
android:layout_height="match_parent" | ||
/> | ||
> | ||
|
||
<TextView | ||
android:id="@+id/view_fps" | ||
android:layout_width="wrap_content" | ||
android:layout_height="wrap_content" | ||
android:textAppearance="?android:attr/textAppearanceLarge" | ||
android:text="@string/label_fps" | ||
android:layout_margin="10dp" /> | ||
<!-- | ||
<fragment | ||
android:name="com.mapbox.mapboxgl.testapp.MapFragment" | ||
android:id="@+id/fragment_map" | ||
android:layout_width="match_parent" | ||
android:layout_height="match_parent" | ||
tools:context="${packageName}.${activityClass}" | ||
tools:layout="@layout/fragment_main" /> | ||
--> | ||
|
||
<com.mapbox.mapboxgl.views.MapView | ||
android:id="@+id/mainMapView" | ||
android:layout_width="match_parent" | ||
android:layout_height="match_parent" | ||
/> | ||
|
||
<TextView | ||
android:id="@+id/view_fps" | ||
android:layout_width="wrap_content" | ||
android:layout_height="wrap_content" | ||
android:layout_margin="10dp" | ||
android:text="@string/label_fps" | ||
android:textAppearance="?android:attr/textAppearanceLarge"/> | ||
|
||
</FrameLayout> | ||
|
||
|
||
<!-- | ||
<android.support.design.widget.FloatingActionButton | ||
android:id="@+id/fab" | ||
android:layout_width="wrap_content" | ||
android:layout_height="wrap_content" | ||
android:layout_gravity="end|bottom" | ||
android:layout_margin="@dimen/fab_margin" | ||
/> | ||
--> | ||
|
||
</android.support.design.widget.CoordinatorLayout> | ||
|
||
|
||
<android.support.design.widget.NavigationView | ||
android:id="@+id/nav_view" | ||
android:layout_width="wrap_content" | ||
android:layout_height="match_parent" | ||
android:layout_gravity="start" | ||
android:fitsSystemWindows="true" | ||
tools:headerLayout="@layout/nav_header" | ||
tools:menu="@menu/drawer_view"/> | ||
|
||
</FrameLayout> | ||
</LinearLayout> | ||
</android.support.v4.widget.DrawerLayout> |
7 changes: 7 additions & 0 deletions
7
android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/colors.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<resources> | ||
<color name="primary">#1E8CAB</color> | ||
<color name="primaryDark">#166B83</color> | ||
<color name="accent">#E55E5E</color> | ||
<color name="white">#FFFFFF</color> | ||
</resources> |
4 changes: 4 additions & 0 deletions
4
android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/dimens.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<resources> | ||
<dimen name="fab_margin">16dp</dimen> | ||
</resources> |
10 changes: 9 additions & 1 deletion
10
android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/styles.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,13 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<resources> | ||
<style name="AppBaseTheme" parent="@style/Theme.AppCompat.Light.NoActionBar" /> | ||
|
||
<style name="AppTheme" parent="AppBaseTheme" /> | ||
|
||
<style name="AppBaseTheme" parent="@style/Theme.AppCompat.Light.NoActionBar"> | ||
<item name="colorPrimary">@color/primary</item> | ||
<item name="colorPrimaryDark">@color/primaryDark</item> | ||
<item name="colorAccent">@color/accent</item> | ||
<item name="android:windowBackground">@color/white</item> | ||
</style> | ||
|
||
</resources> |
Submodule geojsonvt
updated
3 files
+2 −6 | geojsonvt.cpp | |
+0 −1 | geojsonvt_convert.cpp | |
+0 −1 | geojsonvt_util.hpp |