Update f-droid version

.github/workflows/android.yml

@@ -0,0 +1,18 @@
+name: Android CI
+
+on: [push, pull_request]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: set up JDK 11
+      uses: actions/setup-java@v3
+      with:
+        distribution: 'adopt'
+        java-version: '11'
+    - name: Build with Gradle
+      run: ./gradlew assembleDebug

README.md

@@ -1,25 +1,41 @@
 # Timber
-[![Build Status](https://travis-ci.org/naman14/Timber.svg?branch=master)](https://travis-ci.org/naman14/Timber)
 
-[WIP][BETA]-Material Design Music Player
+Material Design Music Player
 
-<a href="https://play.google.com/store/apps/details?id=naman14.timber&utm_source=global_co&utm_medium=prtnr&utm_content=Mar2515&utm_campaign=PartBadge&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1"><img alt="Get it on Google Play" src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png" height=50px/></a>  
-[![Get it on F-Droid](https://guardianproject.info/wp-content/uploads/2014/07/logo-fdroid.png)](https://f-droid.org/repository/browse/?fdid=naman14.timber)
+This project is no longer in active development. Please refer to [TimberX](https://github.com/naman14/TimberX) instead
 
-## Screenshots
 
-![](https://raw.githubusercontent.com/naman14/Timber/master/graphics/Screenshot_2015-09-18-12-33-27.png)
-![](https://raw.githubusercontent.com/naman14/Timber/master/graphics/Screenshot_2015-08-05-14-23-03.png)
-![](https://raw.githubusercontent.com/naman14/Timber/master/graphics/Screenshot_2015-08-29-22-44-26.png)
-![](https://raw.githubusercontent.com/naman14/Timber/master/graphics/Screenshot_2015-08-31-11-50-50.png)
-![](https://raw.githubusercontent.com/naman14/Timber/master/graphics/Screenshot_2015-08-31-11-52-50.png)
 
-## Contribute
-### Translations
+<a href='https://f-droid.org/repository/browse/?fdid=naman14.timber'><img alt='Get it on F-Droid' src='https://guardianproject.info/wp-content/uploads/2014/07/logo-fdroid.png' height=60px/></a>
 
-If there isn't any translations in your language go to the [res folder](https://github.com/naman14/Timber/blob/master/app/src/main/res/) and create a file named "values-XX/strings.xml" where XX is the target language's code. Copy and paste the content of the [English base file](https://github.com/naman14/Timber/blob/master/app/src/main/res/values/strings.xml) and remove all strings with "translatable=false" attribute. Translate all the keys and make a pull request.
+## Screenshots
 
-If there is a translation in your language go to its folder in [res folder](https://github.com/naman14/Timber/blob/master/app/src/main/res/) and edit the strings.xml file. You'd like to update the translation with new keys by copying them from the [English base file](https://github.com/naman14/Timber/blob/master/app/src/main/res/values/strings.xml). Edit the file and make a pull request.
+<img src="https://raw.githubusercontent.com/naman14/Timber/master/graphics/screen2.png" width="360" height="640">
+<img src="https://raw.githubusercontent.com/naman14/Timber/master/graphics/screen3.png" width="360" height="640">
+<img src="https://raw.githubusercontent.com/naman14/Timber/master/graphics/screen7.png" width="360" height="640">
+<img src="https://raw.githubusercontent.com/naman14/Timber/master/graphics/screen8.png" width="360" height="640">
+<img src="https://raw.githubusercontent.com/naman14/Timber/master/graphics/screen9.jpg" width="330" height="640">
+<img src="https://raw.githubusercontent.com/naman14/Timber/master/graphics/screen10.jpg" width="330" height="640">
+<img src="https://raw.githubusercontent.com/naman14/Timber/master/graphics/screen1.png" width="360" height="640">
+<img src="https://raw.githubusercontent.com/naman14/Timber/master/graphics/screen5.png" width="360" height="640">
+<img src="https://raw.githubusercontent.com/naman14/Timber/master/graphics/screen12.jpg" width="360" height="640">
+<img src="https://raw.githubusercontent.com/naman14/Timber/master/graphics/screen4.png" width="360" height="640">
+<img src="https://raw.githubusercontent.com/naman14/Timber/master/graphics/screen6.png" width="360" height="640">
+
+## Features
+- Material design
+- Browse Songs, Albums, Artists
+- Create and edit playlists
+- 6 different now playing styles
+- Homescreen widgets
+- Browse device folders
+- Dark theme and UI customisability
+- Gestures for track switching
+- LastFM scrobble
+- Android Wear and Android Auto support
+- Playing queue in notification (Xposed)
+- Lyrics support
+- Chromecast support
 
 ## Changelog
 
@@ -34,10 +50,6 @@ Changelog is available [here](https://github.com/naman14/Timber/blob/master/Chan
 * [CircularSeekBar](https://github.com/devadvance/circularseekbar)
 * [Nammu](https://github.com/tajchert/Nammu)
 
-#Donate
-Paypal donation email-
-[email protected]
-
 
 ## License
 

app/build.gradle

@@ -1,30 +1,37 @@
 apply plugin: 'com.android.application'
 
+
 android {
-    compileSdkVersion 24
-    buildToolsVersion '24.0.3'
+    compileSdkVersion rootProject.compileSdkVersion
 
     defaultConfig {
-        applicationId "naman14.timber"
-        minSdkVersion 16
-        targetSdkVersion 24
-        versionCode 16
-        versionName "0.3b"
+        applicationId "it.fossoft.timberfoss"
+        minSdkVersion rootProject.minSdkVersion
+        targetSdkVersion rootProject.targetSdkVersion
+        versionCode 22
+        versionName "1.8"
         //renderscript support mode is not supported for 21+ with gradle version 2.0
-        renderscriptTargetApi 20
-        renderscriptSupportModeEnabled true
+        renderscriptTargetApi 16
+        renderscriptSupportModeEnabled false
+        multiDexEnabled true
     }
+
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+
         }
         debug {
             versionNameSuffix "-debug"
             minifyEnabled false
+            applicationIdSuffix '.dev'
+            manifestPlaceholders = [ appNameSuffix:" Dev"]
+
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
     lintOptions {
         disable 'MissingTranslation'
         disable 'ExtraTranslation'
@@ -37,29 +44,35 @@ repositories {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:24.2.1'
-    compile 'com.android.support:recyclerview-v7:24.2.1'
-    compile 'com.android.support:cardview-v7:24.2.1'
-    compile 'com.android.support:palette-v7:24.2.1'
-    compile 'com.android.support:design:24.2.1'
-    compile 'com.android.support:percent:24.2.1'
-
-    compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.4'
-    compile 'net.steamcrafted:materialiconlib:1.0.3'
-    compile 'com.squareup.retrofit:retrofit:1.9.0'
-    compile 'com.squareup.okhttp:okhttp-urlconnection:2.3.0'
-    compile 'com.squareup.okhttp:okhttp:2.3.0'
-    compile 'com.google.code.gson:gson:2.3'
-    compile 'de.Maxr1998:track-selector-lib:1.1'
-
-    compile 'com.afollestad.material-dialogs:core:0.9.0.2'
-    compile 'com.afollestad.material-dialogs:commons:0.9.0.2'
-
-    compile('com.github.naman14:app-theme-engine:0.5.2@aar') {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation "androidx.appcompat:appcompat:1.4.1"
+    implementation "com.google.android.material:material:1.6.0"
+    implementation "androidx.cardview:cardview:1.0.0"
+    implementation "androidx.recyclerview:recyclerview:1.2.1"
+    implementation "androidx.palette:palette:1.0.0"
+    implementation "androidx.percentlayout:percentlayout:1.0.0"
+    implementation 'androidx.multidex:multidex:2.0.1'
+
+    implementation "androidx.mediarouter:mediarouter:1.3.0"
+
+
+    implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.4'
+    implementation 'net.steamcrafted:materialiconlib:1.1.4'
+    implementation 'com.squareup.retrofit:retrofit:1.9.0'
+    implementation 'com.squareup.okhttp:okhttp-urlconnection:2.3.0'
+    implementation 'com.squareup.okhttp:okhttp:2.3.0'
+    implementation 'com.google.code.gson:gson:2.8.6'
+    implementation 'de.Maxr1998:track-selector-lib:1.2'
+
+    implementation 'com.afollestad.material-dialogs:core:0.9.0.2'
+    implementation 'com.afollestad.material-dialogs:commons:0.9.0.2'
+
+    implementation('com.github.naman14:app-theme-engine:0.5.2@aar') {
         transitive = true
     }
-    compile 'com.anjlab.android.iab.v3:library:1.0.+'
-
 
+    implementation 'com.anjlab.android.iab.v3:library:1.0.+'
+    implementation 'org.nanohttpd:nanohttpd:2.3.1'
 }
+
+apply from: '../mock.gradle'

app/src/main/AndroidManifest.xml

@@ -18,14 +18,14 @@
         android:name=".TimberApp"
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
+        android:label="Timber"
         android:theme="@style/AppTheme.FullScreen.Light"
-        tools:replace="android:allowBackup">
+        tools:replace="android:allowBackup, android:label">
 
         <activity
             android:name=".activities.MainActivity"
-            android:label="@string/app_name"
-            android:screenOrientation="portrait">
+            android:screenOrientation="portrait"
+                android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -84,9 +84,11 @@
             android:name=".activities.NowPlayingActivity"
             android:theme="@style/AppTheme.FullScreen.Light" />
 
-        <activity android:name=".activities.DonateActivity"/>
+      <!--    <activity android:name=".activities.DonateActivity"/>     -->
+
 
-        <receiver android:name=".helpers.MediaButtonIntentReceiver">
+        <receiver android:name=".helpers.MediaButtonIntentReceiver"
+                android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MEDIA_BUTTON" />
                 <action android:name="android.media.AUDIO_BECOMING_NOISY" />
@@ -98,20 +100,18 @@
             android:label="@string/app_name"
             android:process=":main" />
 
-        <service
+   <!--     <service
             android:name=".WearBrowserService"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.media.browse.MediaBrowserService" />
             </intent-filter>
-        </service>
+        </service>     -->
+
 
-        <!--use your own api key for fabric-->
-        <meta-data
-            android:name="io.fabric.ApiKey"
-            android:value="@string/fabric_api_key" />
 
-        <receiver android:name=".widgets.desktop.StandardWidget" android:label="@string/widget_standard">
+        <receiver android:name=".widgets.desktop.StandardWidget" android:label="@string/widget_standard"
+                android:exported="true">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
                 <action android:name="com.naman14.timber.metachanged" />
@@ -121,7 +121,8 @@
                 android:resource="@xml/widget_standard" />
         </receiver>
 
-        <receiver android:name=".widgets.desktop.WhiteWidget" android:label="@string/widget_white">
+        <receiver android:name=".widgets.desktop.WhiteWidget" android:label="@string/widget_white"
+                android:exported="true">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
                 <action android:name="com.naman14.timber.metachanged" />
@@ -131,7 +132,8 @@
                 android:resource="@xml/widget_white" />
         </receiver>
 
-        <receiver android:name=".widgets.desktop.SmallWidget" android:label="@string/widget_small">
+        <receiver android:name=".widgets.desktop.SmallWidget" android:label="@string/widget_small"
+                android:exported="true">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
                 <action android:name="com.naman14.timber.metachanged" />

app/src/main/aidl/com/naman14/timber/ITimberService.aidl

@@ -48,6 +48,5 @@ interface ITimberService
     int getRepeatMode();
     int getMediaMountedCount();
     int getAudioSessionId();
-    void setLockscreenAlbumArt(boolean enabled);
 }
 

app/src/main/java/com/naman14/timber/MusicPlayer.java

@@ -99,16 +99,7 @@ public static void next() {
     }
 
     public static void initPlaybackServiceWithSettings(final Context context) {
-        setShowAlbumArtOnLockscreen(true);
-    }
 
-    public static void setShowAlbumArtOnLockscreen(final boolean enabled) {
-        try {
-            if (mService != null) {
-                mService.setLockscreenAlbumArt(enabled);
-            }
-        } catch (final RemoteException ignored) {
-        }
     }
 
     public static void asyncNext(final Context context) {
@@ -515,27 +506,19 @@ public static void playNext(Context context, final long[] list, final long sourc
 
     public static void shuffleAll(final Context context) {
         Cursor cursor = SongLoader.makeSongCursor(context, null, null);
-        final long[] mTrackList = SongLoader.getSongListForCursor(cursor);
-        final int position = 0;
-        if (mTrackList.length == 0 || mService == null) {
+        final long[] trackList = SongLoader.getSongListForCursor(cursor);
+        if (trackList.length == 0 || mService == null) {
             return;
         }
         try {
             mService.setShuffleMode(MusicService.SHUFFLE_NORMAL);
-            final long mCurrentId = mService.getAudioId();
-            final int mCurrentQueuePosition = getQueuePosition();
-            if (position != -1 && mCurrentQueuePosition == position
-                    && mCurrentId == mTrackList[position]) {
-                final long[] mPlaylist = getQueue();
-                if (Arrays.equals(mTrackList, mPlaylist)) {
+            if (getQueuePosition() == 0 && mService.getAudioId() == trackList[0] && Arrays.equals(trackList, getQueue())) {
                     mService.play();
                     return;
-                }
             }
-            mService.open(mTrackList, -1, -1, IdType.NA.mId);
+            mService.open(trackList, -1, -1, IdType.NA.mId);
             mService.play();
             cursor.close();
-            cursor = null;
         } catch (final RemoteException ignored) {
         }
     }
@@ -624,6 +607,8 @@ public static void seek(final long position) {
             try {
                 mService.seek(position);
             } catch (final RemoteException ignored) {
+            } catch (IllegalStateException ignored) {
+
             }
         }
     }