Merge pull request #118 from icefields/v100-56_playlists_improvements

V100 56 playlists improvements

README.md

@@ -90,7 +90,7 @@ Feature rich music client for Ampache, Subsonic, Nextcloud backends, provides al
 
 ## Contributing
 Power Ampache 2 is developed using Clean Architecture on top of MVVM, following SOLID principles.<br>
-***A complete contribution readme coming soon***. In the meantime, before starting any contribution, please contact me for an overview of the design patterns, code style and libraries used. 
+***A complete contribution readme coming soon***. In the meantime, before starting any contribution, please contact me for an overview of the design patterns, code style and libraries used.
 <!-- - Fork the repository.
 - Make your changes in a separate branch.
 - Open a pull request. -->
@@ -126,21 +126,22 @@ Enjoy a clean, modern design with a user-friendly interface. The app features a
 **🌐 OPEN-SOURCE TRANSPARENCY:** 
 Power Ampache app is completely free of ads and does not request unnecessary permissions. Moreover, it is fully open-source, providing you with peace of mind, as you have access to the source code for security and privacy audits.
 
-## FDroid and PlayStore links coming soon (Expected Release Date May 1)
+## PlayStore version coming soon
 
 [<img src="https://s1.ax1x.com/2023/01/12/pSu1a36.png" alt="Get it on GitHub" height="80">](https://github.com/icefields/Power-Ampache-2/releases)
 
 [<img src="https://s1.ax1x.com/2023/01/12/pSnTZ0f.png"
- alt="Get it on Telegram Channel"
- height="80">](https://t.me/powerampache)
-<!--
+alt="Get it on Telegram Channel"
+height="80">](https://t.me/powerampache)
+
 [<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
- alt="Get it on F-Droid"
- height="80">](https://f-droid.org/packages/luci.sixsixsix/)
+alt="Get it on F-Droid"
+height="80">](https://f-droid.org/packages/luci.sixsixsix.powerampache2.fdroid/)
 
 F-Droid releases can not upgrade to other releases and it is compiled, signed and distributed uniformly by [F-Droid](https://f-droid.org/docs/FAQ_-_General/).
+Github, PlayStore and Telegram releases are signed by me.
 
-
+<!--
 ➡️ Explore more apps: https://www..org<br>
 ➡️ Open-Source Code: https://www.github.com/<br>
 ➡️ Join the community on Reddit: https://www.reddit.com/r/<br>
@@ -154,15 +155,15 @@ You can select a demo instance from the login screen or login into your own serv
 
 ## Translations
 The app is currently translated in the following languages:
-- English
-- Czech
- <br>
- Work in progress:
-- French
-- Italian
-- Japanese
- <br>
- In the future I will automate translation contributions, right now you have 3 options.<br>
+English
+Czech
+
+Work in progress:
+French
+Italian
+Japanese
+<br>
+In the future I will automate translation contributions, right now you have 3 options.<br>
 - If you're an Android developer just create the resource directories and files and open a PR (`strings.xml` is where translatable strings are located).
 - If you're not familiar with Android development and don't know how to create translation resources, but you are able to edit XML files: you can just grab `strings.xml`, edit it and send it back to me. I'll review it and will include it in the app in the next release.
  Example (italian translation):

app/Github/release/output-metadata.json

@@ -11,8 +11,8 @@
  "type": "SINGLE",
  "filters": [],
  "attributes": [],
- "versionCode": 55,
- "versionName": "1.00-55",
+ "versionCode": 56,
+ "versionName": "1.00-56",
  "outputFile": "app-Github-release.apk"
  }
  ],

app/build.gradle.kts

@@ -36,22 +36,27 @@ android {
  val ampacheUser = properties.getProperty("AMPACHE_USER")
  val ampachePass = properties.getProperty("AMPACHE_PASSWORD")
  val ampacheUrl = properties.getProperty("AMPACHE_URL")
+ val ampacheUrlLocal = properties.getProperty("LOCAL_STABLE_URL")
  val dogmazicPass = properties.getProperty("DOGMAZIC_PASSWORD")
  val dogmazicUser = properties.getProperty("DOGMAZIC_USER")
  val dogmazicEmail = properties.getProperty("DOGMAZIC_EMAIL")
  val errorLogUrl = properties.getProperty("URL_ERROR_LOG")
  val localDevUser = properties.getProperty("LOCAL_DEV_USER")
  val localDevPass = properties.getProperty("LOCAL_DEV_PASSWORD")
+ val localDevUrl = properties.getProperty("LOCAL_DEVELOPMENT_URL")
  val errorReportEmail = properties.getProperty("ERROR_REPORT_EMAIL")
  val pastebinApiKey = properties.getProperty("PASTEBIN_API_KEY")
+ val localNextcloudUser = properties.getProperty("LOCAL_NEXTCLOUD_USER")
+ val localNextcloudPass = properties.getProperty("LOCAL_NEXTCLOUD_PASSWORD")
+ val localNextcloudUrl = properties.getProperty("LOCAL_NEXTCLOUD_URL")
 
  defaultConfig {
  applicationId = "luci.sixsixsix.powerampache2"
  minSdk = 28
  targetSdk = 34
- versionCode = 55
- versionName = "1.00-55"
- val versionQuote = "This version is powered by the beginning of the music revolution (FDroid second release)"
+ versionCode = 56
+ versionName = "1.00-56"
+ val versionQuote = "This version is powered by financial debt"
 
  testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
@@ -65,6 +70,11 @@ android {
 
  buildConfigField("String", "VERSION_QUOTE", "\"$versionQuote\"")
  buildConfigField("String", "ERROR_REPORT_EMAIL", errorReportEmail)
+ buildConfigField("String", "LOCAL_NEXTCLOUD_USER", localNextcloudUser)
+ buildConfigField("String", "LOCAL_NEXTCLOUD_PASSWORD", localNextcloudPass)
+ buildConfigField("String", "LOCAL_NEXTCLOUD_URL", localNextcloudUrl)
+ buildConfigField("String", "DEBUG_LOCAL_STABLE_URL", ampacheUrlLocal)
+ buildConfigField("String", "DEBUG_LOCAL_DEVELOPMENT_URL", localDevUrl)
  }
 
  buildTypes {

app/src/main/java/luci/sixsixsix/powerampache2/common/Constants.kt

@@ -39,9 +39,8 @@ object Constants {
  const val DATABASE_LIMIT_ELEMENTS = 66
  const val QUICK_PLAY_MIN_SONGS = 50
  const val USER_ACCESS_DEFAULT = 25
- const val USER_EMAIL_DEFAULT = "" //""[email protected]"
+ const val USER_EMAIL_DEFAULT = ""
  const val USER_FULL_NAME_PUBLIC_DEFAULT = 0
- const val PLAYLIST_FETCH_LIMIT = 50
  const val NETWORK_REQUEST_LIMIT_ARTISTS = 30
  const val NETWORK_REQUEST_LIMIT_SONGS = 40
  const val NETWORK_REQUEST_LIMIT_SONGS_SEARCH = 100
@@ -65,7 +64,6 @@ object Constants {
  const val USER_ID_ERROR = ERROR_INT
 
  // FLAGS
- const val RESET_QUEUE_ON_NEW_SESSION = BuildConfig.RESET_QUEUE_ON_NEW_SESSION
  const val CLEAR_TABLE_AFTER_FETCH = false
  const val ALWAYS_FETCH_ALL_PLAYLISTS = true
 
@@ -92,4 +90,8 @@ object Constants {
  const val DOGMAZIC_FAKE_USERNAME = "PowerAmpache"
  const val DOGMAZIC_FAKE_STATE = "Ehime"
  const val DOGMAZIC_FAKE_CITY = "Aoshima"
+
+ // fetch this from remote config or initialize locally
+ const val CONFIG_URL = "https://icefields.github.io/powerampache/config.json"
+ var config = Pa2Config()
 }

app/src/main/java/luci/sixsixsix/powerampache2/common/Pa2Config.kt

@@ -0,0 +1,45 @@
+/**
+ * Copyright (C) 2024 Antonio Tari
+ *
+ * This file is a part of Power Ampache 2
+ * Ampache Android client application
+ * @author Antonio Tari
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http:https://www.gnu.org/licenses/>.
+ *
+ */
+package luci.sixsixsix.powerampache2.common
+
+import luci.sixsixsix.powerampache2.BuildConfig
+
+const val PLAYLIST_FETCH_LIMIT = 100
+const val PLAYLIST_ADD_NEW_ENABLE = true
+const val RESET_QUEUE_ON_NEW_SESSION = BuildConfig.RESET_QUEUE_ON_NEW_SESSION
+const val DOGMAZIC_USER = BuildConfig.DOGMAZIC_USER
+
+data class Pa2Config(
+ // use new fast method for adding albums and playlists to playlist
+ val playlistAddNewEnable: Boolean = PLAYLIST_ADD_NEW_ENABLE,
+
+ // reset queue on new session
+ val queueResetOnNewSession: Boolean = RESET_QUEUE_ON_NEW_SESSION,
+
+ val dogmazicDemoUser: String = DOGMAZIC_USER,
+
+ // limit of songs to fetch for playlists
+ // - bigger number results in faster fetching
+ // - smaller number will result in data becoming visible to the user faster, but it will
+ // take longer to completely fetch big playlists
+ val playlistSongsFetchLimit: Int = PLAYLIST_FETCH_LIMIT,
+)

app/src/main/java/luci/sixsixsix/powerampache2/data/BaseAmpacheRepository.kt

@@ -63,7 +63,6 @@ abstract class BaseAmpacheRepository(
  private val errHandler: ErrorHandler
 ) {
  protected val dao = db.dao
- //protected var offlineModeEnabledLiveData = dao.offlineModeEnabled().distinctUntilChanged().map { it == true }
 
  val settingsLiveData: LiveData<LocalSettings?>
  get() = dao.settingsLiveData().distinctUntilChanged().map {
@@ -135,7 +134,6 @@ abstract class BaseAmpacheRepository(
  }
  }
 
-
  protected suspend fun cacheSongs(songs: List<Song>) {
  val credentials = getCurrentCredentials()
  dao.insertSongs(songs.map { it.toSongEntity(username = credentials.username, serverUrl = credentials.serverUrl) })
@@ -176,7 +174,6 @@ abstract class BaseAmpacheRepository(
  MainNetwork.Type.playlist -> dao.getAllPlaylists()
  .firstOrNull { it.id == id}?.copy(flag = flag)?.let { dbPlaylist ->
  dao.insertPlaylists(listOf(dbPlaylist))
- L("like inserted")
  }
  }
  if (!isOfflineModeEnabled()) {