From 4bdb0e2cc9613255ada077f84b8863c45975dacb Mon Sep 17 00:00:00 2001
From: tobrun <tobrun.van.nuland@gmail.com>
Date: Sun, 6 Sep 2015 15:51:11 +0200
Subject: Added styling to the Attribution AlertDialog

---
 .../src/main/java/com/mapbox/mapboxgl/views/MapView.java      |  4 ++--
 .../src/main/res/layout/attribution_list_item.xml             | 11 +++++++++++
 .../java/MapboxGLAndroidSDK/src/main/res/values/colors.xml    |  1 +
 .../java/MapboxGLAndroidSDK/src/main/res/values/styles.xml    |  9 +++++++++
 .../MapboxGLAndroidSDKTestApp/src/main/res/values/colors.xml  |  2 +-
 5 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 android/java/MapboxGLAndroidSDK/src/main/res/layout/attribution_list_item.xml
 create mode 100644 android/java/MapboxGLAndroidSDK/src/main/res/values/styles.xml

(limited to 'android')

diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java
index 714379b53b..20742ccc1a 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java
+++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java
@@ -2053,9 +2053,9 @@ public class MapView extends FrameLayout implements LocationListener {
         public void onClick(View v) {
             Context context = v.getContext();
             String[] items = context.getResources().getStringArray(R.array.attribution_names);
-            AlertDialog.Builder builder = new AlertDialog.Builder(context);
+            AlertDialog.Builder builder = new AlertDialog.Builder(context, R.style.AttributionAlertDialogStyle);
             builder.setTitle(R.string.attributionsDialogTitle);
-            builder.setAdapter(new ArrayAdapter<>(context, android.R.layout.simple_list_item_1, items), this);
+            builder.setAdapter(new ArrayAdapter<>(context, R.layout.attribution_list_item, items), this);
             builder.show();
         }
 
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/layout/attribution_list_item.xml b/android/java/MapboxGLAndroidSDK/src/main/res/layout/attribution_list_item.xml
new file mode 100644
index 0000000000..f0a9121584
--- /dev/null
+++ b/android/java/MapboxGLAndroidSDK/src/main/res/layout/attribution_list_item.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@android:id/text1"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:textAppearance="?android:attr/textAppearanceListItemSmall"
+    android:textColor="@android:color/white"
+    android:gravity="center_vertical"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
+    android:minHeight="?android:attr/listPreferredItemHeightSmall" />
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/values/colors.xml b/android/java/MapboxGLAndroidSDK/src/main/res/values/colors.xml
index bf3f484313..bb1c326a89 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/res/values/colors.xml
+++ b/android/java/MapboxGLAndroidSDK/src/main/res/values/colors.xml
@@ -2,4 +2,5 @@
 <resources>
     <color name="white">#FFFFFF</color>
     <color name="black">#000000</color>
+    <color name="mapbox_blue">#1E8CAB</color>
 </resources>
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/values/styles.xml b/android/java/MapboxGLAndroidSDK/src/main/res/values/styles.xml
new file mode 100644
index 0000000000..a0859a998c
--- /dev/null
+++ b/android/java/MapboxGLAndroidSDK/src/main/res/values/styles.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="AttributionAlertDialogStyle" parent="Theme.AppCompat.Dialog.Alert">
+        <item name="android:textColorPrimary">@android:color/white</item>
+        <item name="android:background">@color/mapbox_blue</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/colors.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/colors.xml
index ac3b4fc30d..af798515fe 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/colors.xml
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/colors.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="primary">#1E8CAB</color>
+    <color name="primary">@color/mapbox_blue</color>
     <color name="primaryDark">#166B83</color>
     <color name="accent">#E55E5E</color>
     <color name="white">#FFFFFF</color>
-- 
cgit v1.2.1