Skip to content

Commit

Permalink
Merge pull request #151 from KieronQuinn/release/2.1.2
Browse files Browse the repository at this point in the history
2.1.2
  • Loading branch information
KieronQuinn authored Mar 1, 2023
2 parents 1f267b4 + b323967 commit 9befe30
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 12 deletions.
14 changes: 7 additions & 7 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ plugins {

apply plugin: 'com.google.android.gms.oss-licenses-plugin'

String DEFAULT_MANIFEST = "243:https://storage.googleapis.com/music-iq-db/updatable_ytm_db/20230212-030106/manifest.json"
String DEFAULT_MANIFEST = "244:https://storage.googleapis.com/music-iq-db/updatable_ytm_db/20230219-030030/manifest.json"

def tagName = '2.1.1'
def version = 211
def tagName = '2.1.2'
def version = 212

def getKeystoreProperties() {
def properties = new Properties()
Expand Down Expand Up @@ -110,23 +110,23 @@ protobuf {
dependencies {
//AndroidX
implementation 'androidx.core:core-ktx:1.9.0'
implementation 'androidx.appcompat:appcompat:1.6.0'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.core:core-splashscreen:1.0.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
implementation "androidx.work:work-runtime-ktx:2.7.1"
implementation "androidx.work:work-runtime-ktx:2.8.0"
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
implementation "androidx.lifecycle:lifecycle-service:2.5.1"

//Material UI
implementation 'com.google.android.material:material:1.7.0'
implementation 'com.google.android.material:material:1.8.0'

//MonetCompat for colours on < S
implementation 'com.github.KieronQuinn:MonetCompat:0.4.1'

//Dependency Injection
implementation "io.insert-koin:koin-android:3.3.1"
implementation "io.insert-koin:koin-android:3.3.3"

//Protobuf is used in reading data from ASI
implementation "com.google.protobuf:protobuf-javalite:3.21.9"
Expand Down
4 changes: 2 additions & 2 deletions app/release/output-metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"type": "SINGLE",
"filters": [],
"attributes": [],
"versionCode": 211,
"versionName": "2.1.1",
"versionCode": 212,
"versionName": "2.1.2",
"outputFile": "app-release.apk"
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,14 @@ class BackupRestoreViewModelImpl(

companion object {
const val BACKUP_FILE_TEMPLATE = "amm_backup_%s.ammbkp"
private val BACKUP_MIME_TYPE = MimeTypeMap.getSingleton()
.getMimeTypeFromExtension("ammbkp")
}

override fun onBackupClicked(launcher: ActivityResultLauncher<String>) {
launcher.launch(getFilename())
}

override fun onRestoreClicked(launcher: ActivityResultLauncher<Array<String>>) {
launcher.launch(listOfNotNull(BACKUP_MIME_TYPE).toTypedArray())
launcher.launch(arrayOf("*/*"))
}

override fun onBackupLocationSelected(uri: Uri) {
Expand Down

0 comments on commit 9befe30

Please sign in to comment.