Grammar fix, added hint to SearchView, SearchView is themed with the widget color

This commit is contained in:
Aidan Follestad 2015-04-19 12:55:44 -05:00
commit 2c65373638
23 changed files with 39 additions and 22 deletions

View file

@ -3,7 +3,11 @@ package com.kabouzeid.gramophone.ui.activities;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.app.ActionBar; import android.app.ActionBar;
import android.content.Context; import android.content.Context;
import android.graphics.PorterDuff;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.content.ContextCompat;
import android.support.v4.util.Pair; import android.support.v4.util.Pair;
import android.support.v4.view.MenuItemCompat; import android.support.v4.view.MenuItemCompat;
import android.support.v7.widget.SearchView; import android.support.v7.widget.SearchView;
@ -17,6 +21,7 @@ import android.widget.ArrayAdapter;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.ListView; import android.widget.ListView;
import com.afollestad.materialdialogs.ThemeSingleton;
import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.adapter.SearchAdapter; import com.kabouzeid.gramophone.adapter.SearchAdapter;
import com.kabouzeid.gramophone.helper.MusicPlayerRemote; import com.kabouzeid.gramophone.helper.MusicPlayerRemote;
@ -132,6 +137,17 @@ public class SearchActivity extends AbsBaseActivity {
searchView = (SearchView) MenuItemCompat.getActionView(search); searchView = (SearchView) MenuItemCompat.getActionView(search);
searchView.setIconified(false); searchView.setIconified(false);
searchView.setIconifiedByDefault(false); searchView.setIconifiedByDefault(false);
searchView.setQueryHint(getString(R.string.search_hint));
View searchViewPlate = searchView.findViewById(android.support.v7.appcompat.R.id.search_plate);
Drawable drawable = ContextCompat.getDrawable(this, R.drawable.abc_textfield_search_activated_mtrl_alpha);
drawable.setColorFilter(ThemeSingleton.get().widgetColor, PorterDuff.Mode.SRC_IN);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
searchViewPlate.setBackground(drawable);
} else {
//noinspection deprecation
searchViewPlate.setBackgroundDrawable(drawable);
}
ActionBar.LayoutParams params = new ActionBar.LayoutParams(ActionBar.LayoutParams.MATCH_PARENT, ActionBar.LayoutParams.MATCH_PARENT); ActionBar.LayoutParams params = new ActionBar.LayoutParams(ActionBar.LayoutParams.MATCH_PARENT, ActionBar.LayoutParams.MATCH_PARENT);
searchView.setLayoutParams(params); searchView.setLayoutParams(params);

View file

@ -6,7 +6,7 @@
<item <item
android:id="@+id/action_current_playing" android:id="@+id/action_current_playing"
android:icon="@drawable/ic_play_circle_fill_white_24dp" android:icon="@drawable/ic_play_circle_fill_white_24dp"
android:title="@string/action_current_playing" android:title="@string/action_currently_playing"
app:showAsAction="ifRoom"/> app:showAsAction="ifRoom"/>
<item <item

View file

@ -6,7 +6,7 @@
<item <item
android:id="@+id/action_current_playing" android:id="@+id/action_current_playing"
android:icon="@drawable/ic_play_circle_fill_white_24dp" android:icon="@drawable/ic_play_circle_fill_white_24dp"
android:title="@string/action_current_playing" android:title="@string/action_currently_playing"
app:showAsAction="always" /> app:showAsAction="always" />
<item <item

View file

@ -6,7 +6,7 @@
<item <item
android:id="@+id/action_current_playing" android:id="@+id/action_current_playing"
android:icon="@drawable/ic_play_circle_fill_white_24dp" android:icon="@drawable/ic_play_circle_fill_white_24dp"
android:title="@string/action_current_playing" android:title="@string/action_currently_playing"
app:showAsAction="ifRoom"/> app:showAsAction="ifRoom"/>
<item <item

View file

@ -6,7 +6,7 @@
<item <item
android:id="@+id/action_current_playing" android:id="@+id/action_current_playing"
android:icon="@drawable/ic_play_circle_fill_white_24dp" android:icon="@drawable/ic_play_circle_fill_white_24dp"
android:title="@string/action_current_playing" android:title="@string/action_currently_playing"
app:showAsAction="always"/> app:showAsAction="always"/>
<item <item

View file

@ -6,7 +6,7 @@
<item <item
android:id="@+id/action_current_playing" android:id="@+id/action_current_playing"
android:icon="@drawable/ic_play_circle_fill_white_24dp" android:icon="@drawable/ic_play_circle_fill_white_24dp"
android:title="@string/action_current_playing" android:title="@string/action_currently_playing"
app:showAsAction="ifRoom" /> app:showAsAction="ifRoom" />
<item <item

View file

@ -4,7 +4,7 @@
<item <item
android:id="@+id/action_current_playing" android:id="@+id/action_current_playing"
android:icon="@drawable/ic_play_circle_fill_white_24dp" android:icon="@drawable/ic_play_circle_fill_white_24dp"
android:title="@string/action_current_playing" android:title="@string/action_currently_playing"
app:showAsAction="always" /> app:showAsAction="always" />
<item <item

View file

@ -2,7 +2,7 @@
<resources> <resources>
<string name="action_settings">"الإعدادات"</string> <string name="action_settings">"الإعدادات"</string>
<string name="action_about">عنّا</string> <string name="action_about">عنّا</string>
<string name="action_current_playing">يتم تشغيل</string> <string name="action_currently_playing">يتم تشغيل</string>
<string name="action_playing_queue">قائمة الانتظار</string> <string name="action_playing_queue">قائمة الانتظار</string>
<string name="action_search">بحث</string> <string name="action_search">بحث</string>
<string name="action_play_next">استمع لاحقاً</string> <string name="action_play_next">استمع لاحقاً</string>

View file

@ -2,7 +2,7 @@
<resources> <resources>
<string name="action_settings">"Nastavení"</string> <string name="action_settings">"Nastavení"</string>
<string name="action_about">O aplikaci</string> <string name="action_about">O aplikaci</string>
<string name="action_current_playing">Právě hraje</string> <string name="action_currently_playing">Právě hraje</string>
<string name="action_playing_queue">Fronta</string> <string name="action_playing_queue">Fronta</string>
<string name="action_search">Hledat</string> <string name="action_search">Hledat</string>
<string name="action_play_next">Další skladba</string> <string name="action_play_next">Další skladba</string>

View file

@ -2,7 +2,7 @@
<resources> <resources>
<string name="action_settings">"Einstellungen"</string> <string name="action_settings">"Einstellungen"</string>
<string name="action_about">Über</string> <string name="action_about">Über</string>
<string name="action_current_playing">Aktuelle Wiedergabe</string> <string name="action_currently_playing">Aktuelle Wiedergabe</string>
<string name="action_playing_queue">Wiedergabeliste</string> <string name="action_playing_queue">Wiedergabeliste</string>
<string name="action_search">Suche</string> <string name="action_search">Suche</string>
<string name="action_play_next">Als nächstes spielen</string> <string name="action_play_next">Als nächstes spielen</string>

View file

@ -2,7 +2,7 @@
<resources> <resources>
<string name="action_settings">"Ρυθμίσεις "</string> <string name="action_settings">"Ρυθμίσεις "</string>
<string name="action_about">Για εμάς</string> <string name="action_about">Για εμάς</string>
<string name="action_current_playing">Παίζει τώρα</string> <string name="action_currently_playing">Παίζει τώρα</string>
<string name="action_playing_queue">Σειρά τραγουδιών</string> <string name="action_playing_queue">Σειρά τραγουδιών</string>
<string name="action_search">Αναζήτηση</string> <string name="action_search">Αναζήτηση</string>
<string name="action_play_next">Παίζει στη συνέχεια</string> <string name="action_play_next">Παίζει στη συνέχεια</string>

View file

@ -2,7 +2,7 @@
<resources> <resources>
<string name="action_settings">"Configuración"</string> <string name="action_settings">"Configuración"</string>
<string name="action_about">Acerca de</string> <string name="action_about">Acerca de</string>
<string name="action_current_playing">Reproduciendo ahora</string> <string name="action_currently_playing">Reproduciendo ahora</string>
<string name="action_playing_queue">Reproducción actual</string> <string name="action_playing_queue">Reproducción actual</string>
<string name="action_search">Buscar</string> <string name="action_search">Buscar</string>
<string name="action_play_next">"Siguiente "</string> <string name="action_play_next">"Siguiente "</string>

View file

@ -2,7 +2,7 @@
<resources> <resources>
<string name="action_settings">"Ajustes"</string> <string name="action_settings">"Ajustes"</string>
<string name="action_about">Acerca de</string> <string name="action_about">Acerca de</string>
<string name="action_current_playing">Reproduciendo</string> <string name="action_currently_playing">Reproduciendo</string>
<string name="action_playing_queue">Cola de reproducción</string> <string name="action_playing_queue">Cola de reproducción</string>
<string name="action_search">Buscar</string> <string name="action_search">Buscar</string>
<string name="action_play_next">Reproducir siguiente</string> <string name="action_play_next">Reproducir siguiente</string>

View file

@ -2,7 +2,7 @@
<resources> <resources>
<string name="action_settings">"Paramètres"</string> <string name="action_settings">"Paramètres"</string>
<string name="action_about">À propos</string> <string name="action_about">À propos</string>
<string name="action_current_playing">Lecture en cours</string> <string name="action_currently_playing">Lecture en cours</string>
<string name="action_playing_queue">File de lecture</string> <string name="action_playing_queue">File de lecture</string>
<string name="action_search">Rechercher</string> <string name="action_search">Rechercher</string>
<string name="action_play_next">Lire ensuite</string> <string name="action_play_next">Lire ensuite</string>

View file

@ -2,7 +2,7 @@
<resources> <resources>
<string name="action_settings">"Impostazioni"</string> <string name="action_settings">"Impostazioni"</string>
<string name="action_about">Informazioni</string> <string name="action_about">Informazioni</string>
<string name="action_current_playing">In riproduzione</string> <string name="action_currently_playing">In riproduzione</string>
<string name="action_playing_queue">Canzoni in coda</string> <string name="action_playing_queue">Canzoni in coda</string>
<string name="action_search">Cerca</string> <string name="action_search">Cerca</string>
<string name="action_play_next">Riproduci successiva</string> <string name="action_play_next">Riproduci successiva</string>

View file

@ -2,7 +2,7 @@
<resources> <resources>
<string name="action_settings">"Instellingen"</string> <string name="action_settings">"Instellingen"</string>
<string name="action_about">Over</string> <string name="action_about">Over</string>
<string name="action_current_playing">Momenteel spelend</string> <string name="action_currently_playing">Momenteel spelend</string>
<string name="action_playing_queue">Afspeelwachtrij</string> <string name="action_playing_queue">Afspeelwachtrij</string>
<string name="action_search">Zoeken</string> <string name="action_search">Zoeken</string>
<string name="action_play_next">Speel af als volgende</string> <string name="action_play_next">Speel af als volgende</string>

View file

@ -2,7 +2,7 @@
<resources> <resources>
<string name="action_settings">"Ustawienia"</string> <string name="action_settings">"Ustawienia"</string>
<string name="action_about">O aplikacji</string> <string name="action_about">O aplikacji</string>
<string name="action_current_playing">Obecnie gra</string> <string name="action_currently_playing">Obecnie gra</string>
<string name="action_playing_queue">Kolejka odtwarzania</string> <string name="action_playing_queue">Kolejka odtwarzania</string>
<string name="action_search">Szukaj</string> <string name="action_search">Szukaj</string>
<string name="action_play_next">Odtwarzaj następny</string> <string name="action_play_next">Odtwarzaj następny</string>

View file

@ -2,7 +2,7 @@
<resources> <resources>
<string name="action_settings">"Configurações"</string> <string name="action_settings">"Configurações"</string>
<string name="action_about">Sobre</string> <string name="action_about">Sobre</string>
<string name="action_current_playing">Tocando agora</string> <string name="action_currently_playing">Tocando agora</string>
<string name="action_playing_queue">Fila atual</string> <string name="action_playing_queue">Fila atual</string>
<string name="action_search">Pesquisar</string> <string name="action_search">Pesquisar</string>
<string name="action_play_next">Reproduzir a seguir</string> <string name="action_play_next">Reproduzir a seguir</string>

View file

@ -2,7 +2,7 @@
<resources> <resources>
<string name="action_settings">"Setări"</string> <string name="action_settings">"Setări"</string>
<string name="action_about">Despre</string> <string name="action_about">Despre</string>
<string name="action_current_playing">În redare</string> <string name="action_currently_playing">În redare</string>
<string name="action_playing_queue">Lista de melodii</string> <string name="action_playing_queue">Lista de melodii</string>
<string name="action_search">Căutare</string> <string name="action_search">Căutare</string>
<string name="action_play_next">Redă urmator</string> <string name="action_play_next">Redă urmator</string>

View file

@ -2,7 +2,7 @@
<resources> <resources>
<string name="action_settings">"Настройки"</string> <string name="action_settings">"Настройки"</string>
<string name="action_about">О программе</string> <string name="action_about">О программе</string>
<string name="action_current_playing">Сейчас играет</string> <string name="action_currently_playing">Сейчас играет</string>
<string name="action_playing_queue">Очередь воспроизведения</string> <string name="action_playing_queue">Очередь воспроизведения</string>
<string name="action_search">Поиск</string> <string name="action_search">Поиск</string>
<string name="action_play_next">Проиграть следующую</string> <string name="action_play_next">Проиграть следующую</string>

View file

@ -2,7 +2,7 @@
<resources> <resources>
<string name="action_settings">"设置"</string> <string name="action_settings">"设置"</string>
<string name="action_about">关于</string> <string name="action_about">关于</string>
<string name="action_current_playing">正在播放</string> <string name="action_currently_playing">正在播放</string>
<string name="action_playing_queue">播放队列</string> <string name="action_playing_queue">播放队列</string>
<string name="action_search">搜索</string> <string name="action_search">搜索</string>
<string name="action_play_next">下一首</string> <string name="action_play_next">下一首</string>

View file

@ -2,7 +2,7 @@
<resources> <resources>
<string name="action_settings">"設定"</string> <string name="action_settings">"設定"</string>
<string name="action_about">關於</string> <string name="action_about">關於</string>
<string name="action_current_playing">現在播放</string> <string name="action_currently_playing">現在播放</string>
<string name="action_playing_queue">播放列表</string> <string name="action_playing_queue">播放列表</string>
<string name="action_search">搜尋</string> <string name="action_search">搜尋</string>
<string name="action_play_next">下一首</string> <string name="action_play_next">下一首</string>

View file

@ -3,7 +3,7 @@
<string name="action_settings">Settings</string> <string name="action_settings">Settings</string>
<string name="action_about">About</string> <string name="action_about">About</string>
<string name="action_current_playing">Current playing</string> <string name="action_currently_playing">Currently playing</string>
<string name="action_playing_queue">Playing queue</string> <string name="action_playing_queue">Playing queue</string>
<string name="action_search">Search</string> <string name="action_search">Search</string>
<string name="action_play_next">Play next</string> <string name="action_play_next">Play next</string>
@ -125,6 +125,7 @@
<string name="pref_summary_transparent_toolbar">Content scrolling underneath the toolbar is visible.</string> <string name="pref_summary_transparent_toolbar">Content scrolling underneath the toolbar is visible.</string>
<string name="pref_summary_colored_album_footers">Album footers in the grid are colored with the album cover\'s palette.</string> <string name="pref_summary_colored_album_footers">Album footers in the grid are colored with the album cover\'s palette.</string>
<string name="failed_download_albumart">Unable to download the art for this album.</string> <string name="failed_download_albumart">Unable to download the art for this album.</string>
<string name="search_hint">Search your library…</string>
<string-array name="update_album_cover_options"> <string-array name="update_album_cover_options">
<item>Download from Last.fm</item> <item>Download from Last.fm</item>