Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
d7f49a29bc
|
@ -99,7 +99,7 @@ dependencies {
|
|||
// AndroidX
|
||||
implementation 'androidx.appcompat:appcompat:1.2.0'
|
||||
implementation 'androidx.browser:browser:1.2.0'
|
||||
implementation 'androidx.constraintlayout:constraintlayout:2.0.3'
|
||||
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
|
||||
implementation 'androidx.core:core-ktx:1.3.2'
|
||||
implementation 'androidx.fragment:fragment-ktx:1.2.5'
|
||||
implementation 'androidx.lifecycle:lifecycle-livedata-core-ktx:2.2.0'
|
||||
|
@ -112,10 +112,10 @@ dependencies {
|
|||
implementation 'com.google.android.material:material:1.3.0-alpha03'
|
||||
|
||||
// Other
|
||||
implementation 'com.beust:klaxon:5.3'
|
||||
implementation 'com.crowdin.platform:mobile-sdk:1.1.6'
|
||||
implementation 'com.beust:klaxon:5.4'
|
||||
implementation 'com.crowdin.platform:mobile-sdk:1.2.0'
|
||||
implementation 'com.github.florent37:viewtooltip:1.2.2'
|
||||
implementation 'com.github.kittinunf.fuel:fuel:2.2.3'
|
||||
implementation 'com.github.kittinunf.fuel:fuel:2.3.0'
|
||||
implementation 'com.github.kittinunf.fuel:fuel-coroutines:2.2.3'
|
||||
implementation 'com.github.kittinunf.fuel:fuel-json:2.2.3'
|
||||
implementation 'com.github.topjohnwu.libsu:core:3.0.2'
|
||||
|
@ -126,6 +126,6 @@ dependencies {
|
|||
implementation 'com.google.firebase:firebase-analytics-ktx:18.0.0'
|
||||
implementation 'com.google.firebase:firebase-crashlytics:17.2.2'
|
||||
implementation 'com.mindorks.android:prdownloader:0.6.0'
|
||||
implementation 'com.squareup.okhttp3:logging-interceptor:4.8.1'
|
||||
implementation 'com.squareup.okhttp3:logging-interceptor:4.9.0'
|
||||
|
||||
}
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
<resources>
|
||||
|
||||
<!-- Global Strings -->
|
||||
<string name="cancel">Cancel</string>
|
||||
<string name="close">Close</string>
|
||||
<string name="reset">Reset</string>
|
||||
<string name="save">Save</string>
|
||||
|
|
Loading…
Reference in New Issue