Skip to content

Commit 520a1f7

Browse files
authored
Merge pull request #936 from maxrave-dev/dev
v0.2.15/development - New version
2 parents 0a7d1c0 + 4853748 commit 520a1f7

File tree

71 files changed

+2675
-621
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+2675
-621
lines changed

.github/workflows/android.yml

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,16 @@ on:
44
push:
55
branches:
66
- 'jetpack_compose'
7+
- 'dev'
8+
paths-ignore:
9+
- 'README.md'
10+
- 'fastlane/**'
11+
- 'assets/**'
12+
- '.github/**/*.md'
13+
- '.github/FUNDING.yml'
14+
- '.github/ISSUE_TEMPLATE/**'
15+
pull_request:
16+
branches: [ dev ]
717
paths-ignore:
818
- 'README.md'
919
- 'fastlane/**'
@@ -27,11 +37,30 @@ jobs:
2737
distribution: "temurin"
2838
cache: 'gradle'
2939

30-
- name: Build debug APK
31-
run: ./gradlew assembleDebug
40+
- name: Build release APK
41+
run: ./gradlew app:assembleRelease
42+
43+
- name: Check build-tools version
44+
shell: bash
45+
run: |
46+
BUILD_TOOL_VERSION=$(ls /usr/local/lib/android/sdk/build-tools/ | tail -n 1)
47+
echo "BUILD_TOOL_VERSION=$BUILD_TOOL_VERSION" >> $GITHUB_ENV
48+
echo Last build tool version is: $BUILD_TOOL_VERSION
49+
50+
- uses: kevin-david/zipalign-sign-android-release@v2
51+
id: sign_app
52+
with:
53+
releaseDirectory: app/build/outputs/apk/release
54+
signingKeyBase64: ${{ secrets.SIGNING_KEY }}
55+
alias: ${{ secrets.ALIAS }}
56+
keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
57+
keyPassword: ${{ secrets.KEY_PASSWORD }}
58+
zipAlign: true
59+
env:
60+
BUILD_TOOLS_VERSION: ${{ env.BUILD_TOOL_VERSION }}
3261

3362
- name: Upload APK
3463
uses: actions/upload-artifact@v4
3564
with:
3665
name: app
37-
path: app/build/outputs/apk/debug/
66+
path: app/build/outputs/apk/release/*-signed.apk

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,4 @@ crowdin.yml
2020
.idea
2121
/build_and_sign_apk.sh
2222
/simpmusic.jks
23+
/ffmpeg-kit/build/

MediaServiceCore

Submodule MediaServiceCore updated 19 files

README.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33

44
## Features ✨️
55

6-
- Play music from YouTube Music or YouTube free without ads in the background
6+
- Play music from YouTube Music or YouTube for free, without ads and in the background
77
- Browsing Home, Charts, Podcast, Moods & Genre with YouTube Music data at high speed
88
- Search everything on YouTube
99
- Analyze your playing data, create custom playlists, and sync with YouTube Music...
1010
- Spotify Canvas supported
1111
- Play 1080p video option with subtitle
12-
- AI suggestions songs
13-
- Notification from followed artists
14-
- Caching and can save data for offline playback
12+
- AI song suggestions
13+
- Notifications from followed artists
14+
- Caching and offline playback support
1515
- Synced lyrics from Musixmatch, LRCLIB, Spotify (require login) and YouTube Transcript and translated lyrics (Community translation from Musixmatch)
1616
- Personalize data (\*) and multi-YouTube-account support
17-
- Support SponsorBlock, Return YouTube Dislike
17+
- Supports SponsorBlock and Return YouTube Dislike
1818
- Sleep Timer
1919
- Android Auto with online content
2020
- And many more!
@@ -24,7 +24,7 @@
2424
> **Warning**
2525
2626
> This app is in the beta stage, so it may have many bugs and make it crash. If you find any bugs,
27-
> please create an issue or contact me via email or discord sever.
27+
> please create an issue or contact me via email or Discord server.
2828
2929
## Screenshots
3030

@@ -41,7 +41,7 @@
4141
<img src="https://github.com/maxrave-dev/SimpMusic/blob/jetpack_compose/asset/screenshot/11.png?raw=true" width="200" />
4242
<img src="https://github.com/maxrave-dev/SimpMusic/blob/jetpack_compose/asset/screenshot/12.png?raw=true" width="200" /> </p>
4343

44-
#### More [screenshot](https://photos.app.goo.gl/AbieoXG5ctDrpwzp7) here.
44+
#### More [screenshots](https://photos.app.goo.gl/AbieoXG5ctDrpwzp7) here.
4545

4646
## Data
4747

@@ -72,11 +72,11 @@ see [this](https://github.com/maxrave-dev/SimpMusic/blob/13f7ab6e5fa521b62a9fd31
7272

7373
YouTube Music is not an official partner of Musixmatch so you can't get lyrics directly if using YouTube"
7474
videoId" parameter. So I need to use some "String Matcher" and "Duration" for search lyrics. So
75-
sometimes, some songs or videos get the wrong lyric's
75+
sometimes, some songs or videos get the wrong lyrics
7676

7777
#### 2. Why the name or brand is "SimpMusic"?
7878

79-
Simply, because I love this name. It's a combination of Simple and Music. But SimpMusic is not a simple app, it's all you need for a powerful music streaming app.
79+
Simply, because I love the name. It's a combination of 'Simple' and 'Music'. But SimpMusic is not a simple app, it's all you need for a powerful music streaming app.
8080

8181
## Developer/Team
8282

app/build.gradle.kts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ plugins {
77
alias(libs.plugins.navigation.safeargs)
88
alias(libs.plugins.ksp)
99
alias(libs.plugins.aboutlibraries)
10+
alias(libs.plugins.room)
1011
}
1112

1213
kotlin {
@@ -20,6 +21,10 @@ android {
2021
namespace = "com.maxrave.simpmusic"
2122
compileSdk = 35
2223

24+
room {
25+
schemaDirectory("$projectDir/schemas")
26+
}
27+
2328
defaultConfig {
2429
applicationId = "com.maxrave.simpmusic"
2530
minSdk = 26
@@ -33,12 +38,6 @@ android {
3338
.get()
3439
vectorDrawables.useSupportLibrary = true
3540

36-
ksp {
37-
arg("room.schemaLocation", "$projectDir/schemas")
38-
arg("KOIN_CONFIG_CHECK", "true")
39-
arg("KOIN_USE_COMPOSE_VIEWMODEL", "true")
40-
}
41-
4241
@Suppress("UnstableApiUsage")
4342
androidResources {
4443
localeFilters +=
@@ -68,6 +67,7 @@ android {
6867
"ko",
6968
"ca",
7069
"fa",
70+
"bg"
7171
)
7272
}
7373
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

0 commit comments

Comments
 (0)