Skip to content

Commit

Permalink
Merge pull request #167 from kike-canaries/fix_transparent_settings
Browse files Browse the repository at this point in the history
Fix transparent settings
  • Loading branch information
hpsaturn authored Jan 27, 2025
2 parents 9bdafa2 + 38426da commit 93ecea7
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
13 changes: 6 additions & 7 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation project(path: ':libtoolscommon')

implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'com.google.android.material:material:1.6.1'
implementation 'com.google.android.material:material:1.12.0'
implementation 'androidx.preference:preference:1.2.1'
implementation 'androidx.multidex:multidex:2.0.1'

Expand All @@ -71,13 +71,12 @@ dependencies {
implementation 'com.github.pwittchen:reactivewifi-rx2:0.3.0'
implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0-alpha'
implementation 'com.google.code.gson:gson:2.10.1'
// implementation 'com.iamhabib:easy-preference:1.0.1'

implementation 'com.github.MKergall:osmbonuspack:6.5.2'
implementation 'io.nlopez.smartlocation:library:3.3.3'
implementation 'org.osmdroid:osmdroid-android:6.1.5'

implementation 'com.google.android.gms:play-services-location:20.0.0' // Smartlocation fails with higher version
implementation 'com.google.android.gms:play-services-location:21.3.0' // Smartlocation fails with higher version
implementation 'com.github.jemshit:DiscreteScrollView:1.5.2'
implementation 'com.github.bumptech.glide:glide:3.7.0'

Expand All @@ -97,10 +96,10 @@ dependencies {


testImplementation 'junit:junit:4.13.2'
testImplementation 'androidx.test:core:1.5.0'
testImplementation 'androidx.test:core:1.6.1'
testImplementation 'org.mockito:mockito-core:3.3.3'
androidTestImplementation 'androidx.test:runner:1.5.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
androidTestImplementation 'androidx.test:runner:1.6.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
}

apply plugin: 'com.google.gms.google-services'
Expand Down
1 change: 1 addition & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION" />
<uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
<uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:8.2.2'
classpath 'com.google.gms:google-services:4.3.13'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.1'
classpath 'com.google.gms:google-services:4.4.2'
classpath 'com.google.firebase:firebase-crashlytics-gradle:3.0.2'
}
}

Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ org.gradle.jvmargs=-Xmx3096m -Dfile.encoding=UTF-8 \
--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED \
--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED

mCompileSdkVersion=33
mCompileSdkVersion=34
mMinSdkVersion=23
mTargetSdkVersion=33
mTargetSdkVersion=34
mVersionCode=619
mVersionName=0.9.0
android.useAndroidX=true
Expand Down
2 changes: 1 addition & 1 deletion libtoolscommon
Submodule libtoolscommon updated 1 files
+3 −3 build.gradle

0 comments on commit 93ecea7

Please sign in to comment.