tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Quick fix

Browse source
This commit is contained in:
Karim Abou Zeid 2015-03-29 18:06:34 +02:00
commit 5aa4a3dcac
5 changed files with 8 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/build.gradle
View file

@ -23,8 +23,8 @@ android {
applicationId "com.kabouzeid.gramophone" applicationId "com.kabouzeid.gramophone"
minSdkVersion 16 minSdkVersion 16
targetSdkVersion 22 targetSdkVersion 22
versionCode 6 versionCode 7
versionName "0.9.3.1b" versionName "0.9.4b"
} }
compileOptions { compileOptions {

5
app/src/main/java/com/kabouzeid/gramophone/adapter/PlaylistAdapter.java
View file

@ -1,8 +1,10 @@
package com.kabouzeid.gramophone.adapter; package com.kabouzeid.gramophone.adapter;
import android.app.Activity; import android.app.Activity;
import android.graphics.Color;
import android.support.v4.util.Pair; import android.support.v4.util.Pair;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
@ -62,14 +64,11 @@ public class PlaylistAdapter extends RecyclerView.Adapter<PlaylistAdapter.ViewHo
public class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener { public class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
public TextView playlistName; public TextView playlistName;
private ImageView menu; private ImageView menu;
private ImageView playlistIcon;
public ViewHolder(View itemView) { public ViewHolder(View itemView) {
super(itemView); super(itemView);
playlistName = (TextView) itemView.findViewById(R.id.playlist_name); playlistName = (TextView) itemView.findViewById(R.id.playlist_name);
menu = (ImageView) itemView.findViewById(R.id.menu); menu = (ImageView) itemView.findViewById(R.id.menu);
playlistIcon = (ImageView) itemView.findViewById(R.id.playlist_icon);
playlistIcon.setImageDrawable(Util.getTintedDrawable(activity.getResources(), R.drawable.ic_queue_music_white_24dp, Util.resolveColor(activity, R.attr.themed_drawable_color)));
itemView.setOnClickListener(this); itemView.setOnClickListener(this);
menu.setOnClickListener(new View.OnClickListener() { menu.setOnClickListener(new View.OnClickListener() {
@Override @Override

8
app/src/main/res/layout/activity_playlist_detail.xml
View file

@ -1,6 +1,5 @@
<FrameLayout <FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android" 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_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
@ -11,11 +10,8 @@
<android.support.v7.widget.Toolbar <android.support.v7.widget.Toolbar
android:id="@+id/toolbar" android:id="@+id/toolbar"
android:layout_width="match_parent" style="@style/Toolbar"
android:layout_height="?attr/actionBarSize" android:background="?colorPrimary"/>
android:background="?colorPrimary"
app:elevation="@dimen/toolbar_elevation"
app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"/>
<android.support.v7.widget.RecyclerView <android.support.v7.widget.RecyclerView
android:id="@+id/recycler_view" android:id="@+id/recycler_view"

2
app/src/main/res/layout/item_list_playlist.xml
View file

@ -8,11 +8,11 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingLeft="16dp"> android:paddingLeft="16dp">
<ImageView <ImageView
android:tint="?themed_drawable_color"
android:id="@+id/playlist_icon" android:id="@+id/playlist_icon"
android:layout_width="40dp" android:layout_width="40dp"
android:layout_height="40dp" android:layout_height="40dp"

2
app/src/main/res/values/styles.xml
View file

@ -46,7 +46,7 @@
<style name="Toolbar"> <style name="Toolbar">
<item name="android:layout_width">match_parent</item> <item name="android:layout_width">match_parent</item>
<item name="android:layout_height">?attr/actionBarSize</item> <item name="android:layout_height">?attr/actionBarSize</item>
<item name="android:theme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item> <item name="theme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
<item name="android:minHeight">@dimen/abc_action_bar_default_height_material</item> <item name="android:minHeight">@dimen/abc_action_bar_default_height_material</item>
<item name="popupTheme">?toolbarPopupTheme</item> <item name="popupTheme">?toolbarPopupTheme</item>
<item name="elevation">@dimen/toolbar_elevation</item> <item name="elevation">@dimen/toolbar_elevation</item>