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

Quick fixes

Browse source
This commit is contained in:
Karim Abou Zeid 2015-03-23 23:35:05 +01:00
commit 7c206f5423
10 changed files with 33 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/build.gradle
View file

@ -17,14 +17,14 @@ repositories {
android {
compileSdkVersion 22
buildToolsVersion "22"
buildToolsVersion "22.0.1"
defaultConfig {
applicationId "com.kabouzeid.gramophone"
minSdkVersion 16
targetSdkVersion 22
versionCode 3
versionName "0.9.1b"
versionCode 4
versionName "0.9.2b"
}
compileOptions {
@ -64,7 +64,4 @@ dependencies {
compile('com.crashlytics.sdk.android:crashlytics:2.2.1@aar') {
transitive = true;
}
compile('com.mikepenz.aboutlibraries:library:4.5.9@aar') {
transitive = true
}
}

3
app/src/main/java/com/kabouzeid/gramophone/adapter/PlayingQueueAdapter.java
View file

@ -14,6 +14,7 @@ import android.widget.Toast;
import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.helper.AddToPlaylistDialogHelper;
import com.kabouzeid.gramophone.helper.DeleteSongsDialogHelper;
import com.kabouzeid.gramophone.helper.MusicPlayerRemote;
import com.kabouzeid.gramophone.helper.SongDetailDialogHelper;
import com.kabouzeid.gramophone.loader.SongFilePathLoader;
@ -65,7 +66,7 @@ public class PlayingQueueAdapter extends ArrayAdapter<Song> {
public boolean onMenuItemClick(MenuItem item) {
switch (item.getItemId()) {
case R.id.action_delete_from_disk:
Toast.makeText(activity, "This feature is not available yet", Toast.LENGTH_SHORT).show();
DeleteSongsDialogHelper.getDialog(activity, song).show();
return true;
case R.id.action_add_to_playlist:
AddToPlaylistDialogHelper.getDialog(activity, song).show();

3
app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/AlbumSongAdapter.java
View file

@ -15,6 +15,7 @@ import android.widget.Toast;
import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.helper.AddToPlaylistDialogHelper;
import com.kabouzeid.gramophone.helper.DeleteSongsDialogHelper;
import com.kabouzeid.gramophone.helper.MusicPlayerRemote;
import com.kabouzeid.gramophone.helper.SongDetailDialogHelper;
import com.kabouzeid.gramophone.loader.SongFilePathLoader;
@ -91,7 +92,7 @@ public class AlbumSongAdapter extends RecyclerView.Adapter<AlbumSongAdapter.View
public boolean onMenuItemClick(MenuItem item) {
switch (item.getItemId()) {
case R.id.action_delete_from_disk:
Toast.makeText(activity, "This feature is not available yet", Toast.LENGTH_SHORT).show();
DeleteSongsDialogHelper.getDialog(activity, dataSet.get(getAdapterPosition())).show();
return true;
case R.id.action_add_to_playlist:
AddToPlaylistDialogHelper.getDialog(activity, dataSet.get(getAdapterPosition())).show();

3
app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/ArtistSongAdapter.java
View file

@ -15,6 +15,7 @@ import android.widget.Toast;
import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.helper.AddToPlaylistDialogHelper;
import com.kabouzeid.gramophone.helper.DeleteSongsDialogHelper;
import com.kabouzeid.gramophone.helper.MusicPlayerRemote;
import com.kabouzeid.gramophone.helper.SongDetailDialogHelper;
import com.kabouzeid.gramophone.loader.SongFilePathLoader;
@ -70,7 +71,7 @@ public class ArtistSongAdapter extends ArrayAdapter<Song> {
public boolean onMenuItemClick(MenuItem item) {
switch (item.getItemId()) {
case R.id.action_delete_from_disk:
Toast.makeText(activity, "This feature is not available yet", Toast.LENGTH_SHORT).show();
DeleteSongsDialogHelper.getDialog(activity, song).show();
return true;
case R.id.action_add_to_playlist:
AddToPlaylistDialogHelper.getDialog(activity, song).show();

3
app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/PlaylistSongAdapter.java
View file

@ -15,6 +15,7 @@ import android.widget.Toast;
import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.helper.AddToPlaylistDialogHelper;
import com.kabouzeid.gramophone.helper.DeleteSongsDialogHelper;
import com.kabouzeid.gramophone.helper.MusicPlayerRemote;
import com.kabouzeid.gramophone.helper.SongDetailDialogHelper;
import com.kabouzeid.gramophone.loader.SongFilePathLoader;
@ -98,7 +99,7 @@ public class PlaylistSongAdapter extends RecyclerView.Adapter<PlaylistSongAdapte
public boolean onMenuItemClick(MenuItem item) {
switch (item.getItemId()) {
case R.id.action_delete_from_disk:
Toast.makeText(activity, "This feature is not available yet", Toast.LENGTH_SHORT).show();
DeleteSongsDialogHelper.getDialog(activity, dataSet.get(getAdapterPosition())).show();
return true;
case R.id.action_add_to_playlist:
AddToPlaylistDialogHelper.getDialog(activity, dataSet.get(getAdapterPosition())).show();

6
app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java
View file

@ -39,7 +39,6 @@ import com.kabouzeid.gramophone.util.NavigationUtil;
import com.kabouzeid.gramophone.util.PreferenceUtils;
import com.kabouzeid.gramophone.util.Util;
import com.kabouzeid.gramophone.util.ViewUtil;
import com.mikepenz.aboutlibraries.Libs;
import com.squareup.picasso.Picasso;
@ -216,7 +215,7 @@ public class MainActivity extends AbsFabActivity
getMenuInflater().inflate(R.menu.menu_playlists, menu);
break;
default:
getMenuInflater().inflate(R.menu.drawer, menu);
getMenuInflater().inflate(R.menu.menu_main, menu);
break;
}
restoreActionBar();
@ -237,9 +236,6 @@ public class MainActivity extends AbsFabActivity
}
int id = item.getItemId();
switch (id) {
case R.id.action_licenses:
new Libs.Builder().withAutoDetect(true).start(this);
return true;
case R.id.action_new_playlist:
CreatePlaylistDialogHelper.getDialog(this).show();
return true;

24
app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AbsTagEditorActivity.java
View file

@ -24,6 +24,7 @@ import com.kabouzeid.gramophone.App;
import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.misc.AppKeys;
import com.kabouzeid.gramophone.misc.SmallObservableScrollViewCallbacks;
import com.kabouzeid.gramophone.model.DataBaseChangedEvent;
import com.kabouzeid.gramophone.util.MusicUtil;
import com.kabouzeid.gramophone.util.Util;
import com.kabouzeid.gramophone.util.ViewUtil;
@ -362,7 +363,6 @@ public abstract class AbsTagEditorActivity extends ActionBarActivity {
}
progressDialog.dismiss();
rescanMedia();
restartApp();
}
}).start();
}
@ -370,14 +370,22 @@ public abstract class AbsTagEditorActivity extends ActionBarActivity {
private void rescanMedia() {
String[] toBeScanned = new String[songPaths.size()];
toBeScanned = songPaths.toArray(toBeScanned);
MediaScannerConnection.scanFile(this, toBeScanned, null, null);
MediaScannerConnection.scanFile(this, toBeScanned, null, new MediaScannerConnection.OnScanCompletedListener() {
boolean refreshed;
@Override
public void onScanCompleted(String s, Uri uri) {
runOnUiThread(new Runnable() {
@Override
public void run() {
if(!refreshed) {
App.bus.post(new DataBaseChangedEvent(DataBaseChangedEvent.DATABASE_CHANGED));
}
private void restartApp() {
Intent i = getBaseContext().getPackageManager()
.getLaunchIntentForPackage(getBaseContext().getPackageName());
i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
startActivity(i);
refreshed = true;
}
});
}
});
finish();
}
protected int getId() {

5
app/src/main/java/com/kabouzeid/gramophone/util/MusicUtil.java
View file

@ -146,8 +146,7 @@ public class MusicUtil {
cursor.close();
}
context.getContentResolver().notifyChange(Uri.parse("content://media"), null);
Toast.makeText(context, "Deleted " + songs.size() + " songs", Toast.LENGTH_SHORT).show();
//TODO add resource string
App.bus.post(new DataBaseChangedEvent(DataBaseChangedEvent.SONGS_CHANGED));
Toast.makeText(context, "Deleted " + songs.size() + " songs", Toast.LENGTH_SHORT).show(); //TODO add resource string
App.bus.post(new DataBaseChangedEvent(DataBaseChangedEvent.DATABASE_CHANGED));
}
}

8
app/src/main/res/menu/drawer.xml → app/src/main/res/menu/menu_main.xml
View file

@ -28,15 +28,9 @@
android:title="@string/action_settings"
app:showAsAction="never"/>
<item
android:orderInCategory="101"
android:id="@+id/action_licenses"
android:title="Open Source Licenses"
app:showAsAction="never"/>
<item
android:id="@+id/action_about"
android:orderInCategory="102"
android:orderInCategory="101"
android:title="@string/action_about"
app:showAsAction="never"/>
</menu>

8
app/src/main/res/menu/menu_playlists.xml
View file

@ -31,15 +31,9 @@
android:title="@string/action_settings"
app:showAsAction="never"/>
<item
android:id="@+id/action_licenses"
android:orderInCategory="101"
android:title="Open Source Licenses"
app:showAsAction="never"/>
<item
android:id="@+id/action_about"
android:orderInCategory="102"
android:orderInCategory="101"
android:title="@string/action_about"
app:showAsAction="never"/>
</menu>