Fixed dropdown icon (#2201)

getodk · May 18, 2018 · 7c872bf · 7c872bf
1 parent cbf0bc1
commit 7c872bf
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 1 deletion.
diff --git a/collect_app/src/main/java/org/odk/collect/android/preferences/ServerPreferencesFragment.java b/collect_app/src/main/java/org/odk/collect/android/preferences/ServerPreferencesFragment.java
@@ -25,6 +25,7 @@
 import android.preference.Preference;
 import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
+import android.support.v7.content.res.AppCompatResources;
 import android.text.InputFilter;
 import android.view.MotionEvent;
 import android.view.View;
@@ -93,7 +94,9 @@ public void addAggregatePreferences() {
 
         urlDropdownSetup();
 
-        serverUrlPreference.getEditText().setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_arrow_drop_down, 0);
+        // TODO: use just 'serverUrlPreference.getEditText().setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_arrow_drop_down, 0);' once minSdkVersion is >= 21
+        serverUrlPreference.getEditText().setCompoundDrawablesWithIntrinsicBounds(null, null,
+                AppCompatResources.getDrawable(getActivity(), R.drawable.ic_arrow_drop_down), null);
         serverUrlPreference.getEditText().setOnTouchListener(this);
         serverUrlPreference.setOnPreferenceChangeListener(createChangeListener());
         serverUrlPreference.setSummary(serverUrlPreference.getText());

diff --git a/collect_app/src/main/res/drawable-hdpi/ic_arrow_drop_down.png b/collect_app/src/main/res/drawable-hdpi/ic_arrow_drop_down.png
diff --git a/collect_app/src/main/res/drawable-mdpi/ic_arrow_drop_down.png b/collect_app/src/main/res/drawable-mdpi/ic_arrow_drop_down.png
diff --git a/collect_app/src/main/res/drawable-xhdpi/ic_arrow_drop_down.png b/collect_app/src/main/res/drawable-xhdpi/ic_arrow_drop_down.png
diff --git a/collect_app/src/main/res/drawable-xxhdpi/ic_arrow_drop_down.png b/collect_app/src/main/res/drawable-xxhdpi/ic_arrow_drop_down.png
diff --git a/collect_app/src/main/res/drawable-xxxhdpi/ic_arrow_drop_down.png b/collect_app/src/main/res/drawable-xxxhdpi/ic_arrow_drop_down.png
diff --git a/collect_app/src/main/res/drawable/ic_arrow_drop_down.xml b/collect_app/src/main/res/drawable/ic_arrow_drop_down.xml
@@ -0,0 +1,4 @@
+<vector android:height="36dp" android:viewportHeight="24.0"
+    android:viewportWidth="24.0" android:width="36dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?iconColor" android:pathData="M7,10l5,5 5,-5z"/>
+</vector>