Skip to content

Commit

Permalink
Release targetSdkVersion to 34 to comply with Google Play policy
Browse files Browse the repository at this point in the history 
- Resolved missing album art issue 
- Lots of clean up and code formatting
  • Loading branch information
@amit-bhandari
amit-bhandari committed Jan 26, 2024
1 parent 106b76a commit 7dddd28
Show file tree
Hide file tree
Showing 142 changed files with 6,132 additions and 7,903 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Expand Up @@ -20,3 +20,4 @@ app/release/app-release.apk
app/release
installDebug.sh
app/keystore.properties
keystore.properties
58 changes: 28 additions & 30 deletions app/build.gradle
View file
@@ -1,27 +1,20 @@
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-kapt'

//apk publish automation
buildscript {

repositories {
mavenCentral()
}

dependencies {
classpath 'com.github.triplet.gradle:play-publisher:1.2.2'
//classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.8.4'
}
}

apply plugin: 'com.github.triplet.play'

android {
compileSdkVersion 30
buildToolsVersion '29.0.3'

def versionPropsFile = file('version.properties') //maintains version number of apk
def value = 0
Properties versionProps = new Properties()
Expand Down Expand Up @@ -60,9 +53,9 @@ android {

defaultConfig {
applicationId 'com.bhandari.music'
minSdkVersion 19
//noinspection OldTargetApi
targetSdkVersion 30
minSdkVersion 24
compileSdk 34
targetSdkVersion 34
versionCode versionProps['VERSION_NUMBER'].toInteger()
versionName "${mVersionName} Build: ${versionProps['VERSION_BUILD']}"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
Expand All @@ -74,8 +67,8 @@ android {

//rename apk files
if ('assembleRelease' in runTasks) {
applicationVariants.all { variant ->
variant.outputs.all { output ->
applicationVariants.configureEach { variant ->
variant.outputs.configureEach { output ->
if (output.outputFile != null && output.outputFile.name.endsWith('.apk')) {
outputFileName = mFileName
}
Expand Down Expand Up @@ -114,10 +107,6 @@ android {
}
}

lintOptions {
abortOnError = false
disable 'MissingTranslation'
}

dataBinding {
enabled = true
Expand All @@ -128,8 +117,19 @@ android {
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = '17'
}
buildFeatures {
viewBinding = true
}
namespace 'com.music.player.bhandari.m'
lint {
abortOnError false
disable 'MissingTranslation', 'NonConstantResourceId'
}
}

Expand All @@ -139,11 +139,11 @@ dependencies {
exclude group: 'com.android.support', module: 'support-annotations'
})
//noinspection GradleCompatible
implementation 'androidx.appcompat:appcompat:1.3.1'
implementation 'androidx.appcompat:appcompat:1.6.1'
//noinspection GradleCompatible
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
//noinspection GradleCompatible
implementation 'com.google.android.material:material:1.4.0'
implementation 'com.google.android.material:material:1.11.0'
//noinspection GradleCompatible
implementation 'androidx.cardview:cardview:1.0.0'
testImplementation 'junit:junit:4.13.2'
Expand Down Expand Up @@ -183,20 +183,18 @@ dependencies {
implementation project(':dialogs')

//firebase
//implementation 'com.google.firebase:firebase-ads:17.1.3'
implementation 'com.google.firebase:firebase-core:20.0.0'
implementation 'com.google.android.gms:play-services-auth:19.2.0'
implementation 'com.google.firebase:firebase-messaging:23.0.0'
implementation 'com.google.firebase:firebase-database:20.0.2'
implementation 'com.google.firebase:firebase-core:21.1.1'
implementation 'com.google.firebase:firebase-messaging:23.4.0'
implementation 'com.google.firebase:firebase-database:20.3.0'
implementation 'com.google.firebase:firebase-invites:17.0.0'
implementation 'com.google.firebase:firebase-storage:20.0.0'
implementation 'com.google.firebase:firebase-config:21.0.1'
implementation 'com.google.firebase:firebase-storage:20.3.0'
implementation 'com.google.firebase:firebase-config:21.6.0'

//gson
implementation 'com.google.code.gson:gson:2.8.7'
implementation 'com.google.code.gson:gson:2.10'

//leak detection
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.7'
//debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.7'

//crop images
implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0'
Expand All @@ -223,7 +221,7 @@ dependencies {
//retrofit
implementation 'com.squareup.retrofit2:retrofit:2.9.0'
implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
implementation 'com.squareup.okhttp3:logging-interceptor:4.9.0'
implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
}

repositories {
Expand Down
41 changes: 20 additions & 21 deletions app/src/main/AndroidManifest.xml
View file
@@ -1,19 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.music.player.bhandari.m">
xmlns:tools="http://schemas.android.com/tools">

<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="com.android.vending.BILLING" />
<!--<uses-permission android:name="android.permission.WAKE_LOCK"/> -->
<uses-permission android:name="android.permission.BLUETOOTH"/>
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK"/>
<uses-permission android:name="android.permission.WRITE_SETTINGS"
tools:ignore="ProtectedPermissions" />

<uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
android:maxSdkVersion="32"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
android:maxSdkVersion="29" />

<!-- Needed for android 9 (p)-->
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />

Expand All @@ -25,7 +29,8 @@
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/AppTheme"
tools:ignore="AllowBackup,UnusedAttribute">
android:requestLegacyExternalStorage="true"
tools:ignore="AllowBackup,UnusedAttribute,LockedOrientationActivity">

<uses-library android:name="org.apache.http.legacy" android:required="false" />

Expand All @@ -51,31 +56,20 @@

<activity
android:name=".activity.ActivityMain"
android:label="@string/app_name"
android:launchMode="singleTask"
android:theme="@style/AppTheme"
android:screenOrientation="portrait">
</activity>

<activity
android:name=".activity.ActivityDonateFunds"
android:label="@string/app_name"
android:launchMode="singleTask"
android:theme="@style/AppTheme"
android:screenOrientation="portrait">
</activity>

<activity
android:name="com.music.player.bhandari.m.lyricCard.ActivityLyricCard"
android:label="@string/app_name"
android:launchMode="singleTask"
android:theme="@style/AppTheme"
android:screenOrientation="portrait">
</activity>

<activity
android:name="com.music.player.bhandari.m.activity.ActivityNowPlaying"
android:label="@string/app_name"
android:theme="@style/AppTheme"
android:launchMode="singleTask"
android:windowSoftInputMode="adjustPan"
Expand All @@ -84,9 +78,9 @@

<activity
android:name="com.music.player.bhandari.m.activity.ActivityPermissionSeek"
android:label="@string/app_name"
android:theme="@style/splashScreenTheme"
android:launchMode="singleTask"
android:exported="true"
android:screenOrientation="portrait">

<intent-filter>
Expand All @@ -110,6 +104,7 @@
android:launchMode="singleTask"
android:excludeFromRecents="true"
android:taskAffinity=""
android:exported="true"
android:theme="@style/Theme.AudioPreview">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
Expand Down Expand Up @@ -233,15 +228,18 @@
android:hardwareAccelerated="true">
</activity>

<service android:name="com.music.player.bhandari.m.service.PlayerService" >
<service android:name="com.music.player.bhandari.m.service.PlayerService"
android:foregroundServiceType="mediaPlayback">
</service>

<service android:name="com.music.player.bhandari.m.service.BatchDownloaderService" >
<service android:name="com.music.player.bhandari.m.service.BatchDownloaderService"
android:exported="false">
</service>

<service
android:name=".service.NotificationListenerService"
android:label="@string/app_name"
android:exported="true"
android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE">
<intent-filter>
<action android:name="android.service.notification.NotificationListenerService"/>
Expand All @@ -258,7 +256,8 @@

<service android:name=".fcm.MyFirebaseMessagingService$generatePictureStyleNotification$NotificationActionService" />

<receiver android:name="com.music.player.bhandari.m.widget.WidgetReceiver" >
<receiver android:name="com.music.player.bhandari.m.widget.WidgetReceiver"
android:exported="true">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
</intent-filter>
Expand Down

0 comments on commit 7dddd28

Please sign in to comment.