diff --git a/app/src/main/java/net/nullsum/audinaut/provider/AudinautSearchProvider.java b/app/src/main/java/net/nullsum/audinaut/provider/AudinautSearchProvider.java index b68115c..9b99fae 100644 --- a/app/src/main/java/net/nullsum/audinaut/provider/AudinautSearchProvider.java +++ b/app/src/main/java/net/nullsum/audinaut/provider/AudinautSearchProvider.java @@ -139,30 +139,6 @@ public class AudinautSearchProvider extends ContentProvider { cursor.addRow(new Object[]{artist.getId().hashCode(), artist.getName(), null, "ar-" + artist.getId(), artist.getName(), icon}); } else { MusicDirectory.Entry entry = (MusicDirectory.Entry) obj; - - if (entry.isDirectory()) { - String icon = RESOURCE_PREFIX + R.drawable.ic_action_album; - cursor.addRow(new Object[]{entry.getId().hashCode(), entry.getTitle(), entry.getArtist(), entry.getId(), entry.getTitle(), icon}); - } else { - String icon = RESOURCE_PREFIX + R.drawable.ic_action_song; - String id; - id = entry.getAlbumId(); - - String artistDisplay; - if (entry.getArtist() == null) { - if (entry.getAlbum() != null) { - artistDisplay = entry.getAlbumDisplay(); - } else { - artistDisplay = ""; - } - } else if (entry.getAlbum() != null) { - artistDisplay = entry.getArtist() + " - " + entry.getAlbumDisplay(); - } else { - artistDisplay = entry.getArtist(); - } - - cursor.addRow(new Object[]{entry.getId().hashCode(), entry.getTitle(), artistDisplay, "so-" + id, entry.getTitle(), icon}); - } } } return cursor; diff --git a/app/src/main/res/drawable-hdpi/ic_action_album.png b/app/src/main/res/drawable-hdpi/ic_action_album.png deleted file mode 100644 index eec654a..0000000 Binary files a/app/src/main/res/drawable-hdpi/ic_action_album.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_number_border.png b/app/src/main/res/drawable-hdpi/ic_number_border.png deleted file mode 100644 index 84332e6..0000000 Binary files a/app/src/main/res/drawable-hdpi/ic_number_border.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_action_album.png b/app/src/main/res/drawable-mdpi/ic_action_album.png deleted file mode 100644 index db4c5ee..0000000 Binary files a/app/src/main/res/drawable-mdpi/ic_action_album.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_number_border.png b/app/src/main/res/drawable-mdpi/ic_number_border.png deleted file mode 100644 index 1964fd6..0000000 Binary files a/app/src/main/res/drawable-mdpi/ic_number_border.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_action_album.png b/app/src/main/res/drawable-xhdpi/ic_action_album.png deleted file mode 100644 index 8f01da6..0000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_action_album.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_number_border.png b/app/src/main/res/drawable-xhdpi/ic_number_border.png deleted file mode 100644 index 44e6a3f..0000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_number_border.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_number_border.png b/app/src/main/res/drawable-xxhdpi/ic_number_border.png deleted file mode 100644 index 56d779f..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_number_border.png and /dev/null differ diff --git a/app/src/main/res/layout/basic_count_item.xml b/app/src/main/res/layout/basic_count_item.xml index d6a8bb8..1eb877f 100644 --- a/app/src/main/res/layout/basic_count_item.xml +++ b/app/src/main/res/layout/basic_count_item.xml @@ -25,7 +25,6 @@ android:layout_marginBottom="4dp" android:layout_marginLeft="20dp" android:layout_marginRight="12dp" - android:background="@drawable/ic_number_border" android:focusable="false" android:gravity="right|center_vertical" android:paddingRight="10dp"