Skip to content
This repository has been archived by the owner on Jan 6, 2022. It is now read-only.

Commit

Permalink
version 1.0 ; final fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
vhaudiquet committed Jun 5, 2018
1 parent dc926dd commit 47039fb
Show file tree
Hide file tree
Showing 9 changed files with 33 additions and 26 deletions.
30 changes: 15 additions & 15 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ android {
minSdkVersion 16
targetSdkVersion 27
versionCode 8
versionName "1.0-Alpha"
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
compileOptions {
Expand All @@ -24,28 +24,28 @@ android {
}

dependencies {
compile project(':libraries:drag-sort-listview:library')
compile fileTree(dir: 'libs', include: ['*.jar'])
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
implementation project(':libraries:drag-sort-listview:library')
implementation fileTree(dir: 'libs', include: ['*.jar'])
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})

//spotify
compile 'com.spotify.android:auth:1.0.0-alpha' //auth
compile 'com.github.kaaes:spotify-web-api-android:0.4.1' //web api access
compile 'com.spotify.sdk:spotify-player-24-noconnect-2.20b@aar' //playback (play sdk)
implementation 'com.spotify.android:auth:1.0.0-alpha' //auth
implementation 'com.github.kaaes:spotify-web-api-android:0.4.1' //web api access
implementation 'com.spotify.sdk:spotify-player-24-noconnect-2.20b@aar' //playback (play sdk)

//deezer
compile 'com.deezer.sdk:deezer-sdk-0.11.2@aar'
implementation 'com.deezer.sdk:deezer-sdk-0.11.2@aar'

//acra
compile "ch.acra:acra-http:5.1.3"
compile "ch.acra:acra-toast:5.1.3"
implementation "ch.acra:acra-http:5.1.3"
implementation "ch.acra:acra-toast:5.1.3"

//compat libs
compile 'com.android.support:support-compat:27.1.1'
compile 'com.android.support:preference-v7:27.1.1'
compile 'com.android.support:design:27.1.1'
compile 'com.android.support.constraint:constraint-layout:1.1.0'
testCompile 'junit:junit:4.12'
implementation 'com.android.support:support-compat:27.1.1'
implementation 'com.android.support:preference-v7:27.1.1'
implementation 'com.android.support:design:27.1.1'
implementation 'com.android.support.constraint:constraint-layout:1.1.0'
testImplementation 'junit:junit:4.12'
}
8 changes: 4 additions & 4 deletions app/src/main/java/v/blade/library/LibraryService.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import java.util.*;

/*
* LibraryService is the class that handles library caching/restore and synchronyzation
* LibraryService is the class that handles library caching/restore and synchronization
* It was a background service, but it works actually better as a static class that just calls a Thread to do async work
*/
public class LibraryService
Expand All @@ -36,9 +36,9 @@ public class LibraryService
private static final List<Playlist> playlists = Collections.synchronizedList(new ArrayList<Playlist>());

//song handles, that are not part of library but playable (from web sources)
private static List<Song> handles = Collections.synchronizedList(new ArrayList<Song>());
private static List<Album> albumHandles = Collections.synchronizedList(new ArrayList<Album>());
private static List<Artist> artistHandles = Collections.synchronizedList(new ArrayList<Artist>());
private static final List<Song> handles = Collections.synchronizedList(new ArrayList<Song>());
private static final List<Album> albumHandles = Collections.synchronizedList(new ArrayList<Album>());
private static final List<Artist> artistHandles = Collections.synchronizedList(new ArrayList<Artist>());
static HashMap<String, ArrayList<Song>> songsByName = new HashMap<>();

/* list callbacks */
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/layout/activity_play.xml
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,8 @@
android:text="0:00"
android:id="@+id/song_position"/>
<SeekBar android:layout_width="270dp"
android:layout_height="15dp"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_centerHorizontal="true"
android:layout_below="@id/play_button"
android:layout_marginTop="12dp"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/menu/main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
android:menuCategory="secondary"
app:showAsAction="ifRoom"
android:icon="@drawable/ic_sync"
android:title="Synchronisation"/>
android:title="@string/sync"/>
<item android:id="@+id/action_settings"
android:title="@string/action_settings"
android:orderInCategory="100"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-en/strings.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Blade</string>
<string name="action_search">Search</string>
<string name="action_settings">Settings</string>
<string name="add_to_current_playlist">Add to current playlist</string>
Expand Down Expand Up @@ -68,4 +67,5 @@
<string name="please_grant_permission_msg">Read/Write external storage permission is required to read song list and edit library</string>
<string name="please_grant_permission_title">Permission needed</string>
<string name="libraries_used">Libraries used : </string>
<string name="sync">Synchronization</string>
</resources>
2 changes: 1 addition & 1 deletion app/src/main/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Blade</string>
<string name="action_search">Recherche</string>
<string name="action_settings">Paramètres</string>
<string name="add_to_current_playlist">Ajouter à la liste en cours de lecture</string>
Expand Down Expand Up @@ -68,4 +67,5 @@
<string name="please_grant_permission_msg">L\'autorisation de lire et écrire le stockage externe est nécessaire pour obtenir les musiques de votre appareil ainsi que pour éditer la bibliothèque</string>
<string name="please_grant_permission_title">Autorisation nécessaire</string>
<string name="libraries_used">Bibliothèques utilisées : </string>
<string name="sync">Synchronisation</string>
</resources>
3 changes: 2 additions & 1 deletion app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Blade</string>
<string name="app_name" translatable="false">Blade</string>
<string name="action_search">Search</string>
<string name="action_settings">Settings</string>
<string name="add_to_current_playlist">Add to current playlist</string>
Expand Down Expand Up @@ -68,4 +68,5 @@
<string name="please_grant_permission_msg">Read/Write external storage permission is required to read song list and edit library</string>
<string name="please_grant_permission_title">Permission needed</string>
<string name="libraries_used">Libraries used : </string>
<string name="sync">Synchronization</string>
</resources>
7 changes: 6 additions & 1 deletion app/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
<item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
<item name="preferenceTheme">@style/Theme.Preferences</item>
</style>
<style name="AppTheme.NoActionBar">
<item name="windowActionBar">false</item>
Expand All @@ -28,5 +28,10 @@
<item name="colorControlActivated">@color/colorPrimary</item>
<item name="colorControlHighlight">#bdbdbd</item>
</style>
<!-- Preference theme -->
<style name="Theme.Preferences" parent="PreferenceThemeOverlay.v14.Material">
<item name="colorControlNormal">@color/colorPrimary</item>
<item name="colorControlActivated">@color/colorPrimary</item>
</style>

</resources>
2 changes: 1 addition & 1 deletion libraries/drag-sort-listview

0 comments on commit 47039fb

Please sign in to comment.