Skip to content
This repository has been archived by the owner on Jul 21, 2020. It is now read-only.

Commit

Permalink
Merge pull request #24 from Circle-Of-Music-Makers/development
Browse files Browse the repository at this point in the history 
v9 , new logo , Alarms and Sleep timer
  • Loading branch information
@sidzi
sidzi committed Jan 9, 2017
2 parents 17bbd04 + ccc4260 commit 4a68ba9
Show file tree
Hide file tree
Showing 46 changed files with 1,510 additions and 504 deletions.
6 changes: 4 additions & 2 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ android {
applicationId "com.sidzi.circleofmusic"
minSdkVersion 17
targetSdkVersion 25
versionCode 8
versionName "Guitar"
versionCode 9
versionName "Harpsichord"
}

buildTypes {
Expand All @@ -21,6 +21,7 @@ android {
}
}


dependencies {
compile 'com.android.volley:volley:1.0.0'
compile 'com.j256.ormlite:ormlite-android:5.0'
Expand All @@ -30,4 +31,5 @@ dependencies {
compile 'com.android.support:support-v13:25.1.0'
compile 'com.android.support:design:25.1.0'
compile 'com.android.support:recyclerview-v7:25.1.0'
compile 'com.android.support:support-v4:25.1.0'
}
13 changes: 0 additions & 13 deletions app/src/androidTest/java/com/sidzi/circleofmusic/ApplicationTest.java
View file

This file was deleted.

17 changes: 16 additions & 1 deletion app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
android:name=".ui.MainActivity"
android:label="@string/title_activity_main"
android:launchMode="singleTask"
android:screenOrientation="portrait"
android:theme="@style/splashScreen"
android:windowSoftInputMode="adjustPan">
<intent-filter>
Expand All @@ -37,7 +38,9 @@
</intent-filter>
</activity>

<receiver android:name=".helpers.MediaButtonHandler">
<service android:name=".services.MusicPlayerService" />

<receiver android:name=".recievers.MediaButtonHandler">
<intent-filter>
<action android:name="android.intent.action.MEDIA_BUTTON" />
</intent-filter>
Expand All @@ -51,7 +54,19 @@
<activity
android:name=".ui.SearchActivity"
android:label="@string/title_activity_search"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar" />
<activity android:name=".ui.AlarmSettingActivity" />

<receiver android:name=".recievers.AlarmReciever" />

<activity
android:name=".ui.AlarmActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/title_activity_alarm"
android:theme="@style/FullscreenTheme" />

<activity android:name=".ui.ListFileActivity" />
</application>

</manifest>
Binary file modified app/src/main/ic_launcher-web.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 7 additions & 7 deletions app/src/main/java/com/sidzi/circleofmusic/adapters/PotmAdapter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@
import com.android.volley.toolbox.JsonArrayRequest;
import com.android.volley.toolbox.Volley;
import com.sidzi.circleofmusic.R;
import com.sidzi.circleofmusic.config;
import com.sidzi.circleofmusic.entities.Potm;
import com.sidzi.circleofmusic.helpers.MusicServiceConnection;
import com.sidzi.circleofmusic.services.MusicPlayerService;
import com.sidzi.circleofmusic.ui.MainActivity;

import org.json.JSONArray;
import org.json.JSONException;
Expand Down Expand Up @@ -93,12 +95,10 @@ class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener

@Override
public void onClick(View v) {
Intent ready_track = new Intent("com.sidzi.circleofmusic.PLAY_TRACK");
ready_track.putExtra("track_path", config.com_url + v.getTag(R.id.tag_track_path).toString());
ready_track.putExtra("track_name", v.getTag(R.id.tag_track_name).toString());
ready_track.putExtra("track_artist", v.getTag(R.id.tag_track_artist).toString());
ready_track.putExtra("bucket", false);
mContext.sendBroadcast(ready_track);
Intent intent = new Intent(mContext, MusicPlayerService.class);
MusicServiceConnection mMusicServiceConnection = ((MainActivity) mContext).mMusicServiceConnection;
mContext.bindService(intent, mMusicServiceConnection, Context.BIND_AUTO_CREATE);
mMusicServiceConnection.getmMusicPlayerService().play(v.getTag(R.id.tag_track_path).toString(), v.getTag(R.id.tag_track_artist).toString(), v.getTag(R.id.tag_track_name).toString());
}
}
}
17 changes: 11 additions & 6 deletions app/src/main/java/com/sidzi/circleofmusic/adapters/TracksAdapter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@
import com.j256.ormlite.stmt.QueryBuilder;
import com.sidzi.circleofmusic.R;
import com.sidzi.circleofmusic.entities.Track;
import com.sidzi.circleofmusic.helpers.MusicServiceConnection;
import com.sidzi.circleofmusic.helpers.OrmHandler;
import com.sidzi.circleofmusic.services.MusicPlayerService;
import com.sidzi.circleofmusic.ui.MainActivity;

import java.sql.SQLException;
import java.util.ArrayList;
Expand Down Expand Up @@ -114,12 +117,14 @@ class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener

@Override
public void onClick(View v) {
Intent ready_track = new Intent("com.sidzi.circleofmusic.PLAY_TRACK");
ready_track.putExtra("track_path", v.getTag(R.id.tag_track_path).toString());
ready_track.putExtra("track_name", v.getTag(R.id.tag_track_name).toString());
ready_track.putExtra("track_artist", v.getTag(R.id.tag_track_artist).toString());
ready_track.putExtra("bucket", bucketBool);
mContext.sendBroadcast(ready_track);
Intent intent = new Intent(mContext, MusicPlayerService.class);
MusicServiceConnection mMusicServiceConnection = ((MainActivity) mContext).mMusicServiceConnection;
mContext.bindService(intent, mMusicServiceConnection, Context.BIND_AUTO_CREATE);
if (!bucketBool)
mMusicServiceConnection.getmMusicPlayerService().play(v.getTag(R.id.tag_track_path).toString());
else
mMusicServiceConnection.getmMusicPlayerService().bucketPlay(v.getTag(R.id.tag_track_path).toString());

}

@Override
Expand Down
36 changes: 35 additions & 1 deletion app/src/main/java/com/sidzi/circleofmusic/entities/Track.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,14 @@
import com.j256.ormlite.field.DatabaseField;
import com.j256.ormlite.table.DatabaseTable;

import java.io.Externalizable;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.io.Serializable;

@DatabaseTable(tableName = "table_tracks")
public class Track {
public class Track implements Serializable, Externalizable {
@DatabaseField(id = true)
private String path;
@DatabaseField
Expand All @@ -22,12 +28,23 @@ public class Track {
public Track() {
}

public Track(String path) {
this.path = path;
}

public Track(String name, String path, String artist) {
this.path = path;
this.name = name;
this.artist = artist;
}

public Track(String name, String path, String artist, String album, Boolean bucket) {
this.path = path;
this.name = name;
this.artist = artist;
this.bucket = bucket;
this.album = album;
this.play_count = 0;
}

public String getName() {
Expand Down Expand Up @@ -65,4 +82,21 @@ public void setPlay_count(Integer play_count) {
public String getAlbum() {
return album;
}

@Override
public boolean equals(Object obj) {
if (obj instanceof Track)
return ((Track) obj).getPath().contentEquals(this.path);
throw new UnsupportedOperationException();
}

@Override
public void writeExternal(ObjectOutput objectOutput) throws IOException {
objectOutput.writeObject(this);
}

@Override
public void readExternal(ObjectInput objectInput) throws IOException, ClassNotFoundException {
objectInput.readObject();
}
}
Loading

0 comments on commit 4a68ba9

Please sign in to comment.