mirror of
https://github.com/sudoxnym/habitica-android.git
synced 2026-04-14 11:46:32 +00:00
update dependencies
This commit is contained in:
Phillip Thelen
parent
f78e7aa889
commit
5a8d8788ef
6 changed files with 37 additions and 37 deletions
|
|
@ -16,7 +16,7 @@ buildscript {
|
|||
jcenter()
|
||||
}
|
||||
dependencies {
|
||||
classpath 'io.fabric.tools:gradle:1.25.4'
|
||||
classpath 'io.fabric.tools:gradle:1.26.1'
|
||||
classpath('com.noveogroup.android:check:1.2.5') {
|
||||
exclude module: 'checkstyle'
|
||||
exclude module: 'pmd-java'
|
||||
|
|
@ -45,16 +45,16 @@ repositories {
|
|||
dependencies {
|
||||
implementation fileTree(include: ['*.jar'], dir: 'libs')
|
||||
//Networking
|
||||
implementation 'com.squareup.okhttp3:okhttp:3.11.0'
|
||||
implementation 'com.squareup.okhttp3:logging-interceptor:3.11.0'
|
||||
implementation 'com.squareup.okhttp3:okhttp:3.12.1'
|
||||
implementation 'com.squareup.okhttp3:logging-interceptor:3.12.1'
|
||||
//REST API handling
|
||||
implementation('com.squareup.retrofit2:retrofit:2.4.0') {
|
||||
implementation('com.squareup.retrofit2:retrofit:2.5.0') {
|
||||
exclude module: 'okhttp'
|
||||
}
|
||||
implementation 'com.squareup.retrofit2:converter-gson:2.4.0'
|
||||
implementation 'com.squareup.retrofit2:adapter-rxjava2:2.4.0'
|
||||
implementation 'com.squareup.retrofit2:converter-gson:2.5.0'
|
||||
implementation 'com.squareup.retrofit2:adapter-rxjava2:2.5.0'
|
||||
//Crash Logging
|
||||
releaseImplementation('com.crashlytics.sdk.android:crashlytics:2.9.5@aar') {
|
||||
releaseImplementation('com.crashlytics.sdk.android:crashlytics:2.9.8@aar') {
|
||||
transitive = true
|
||||
}
|
||||
//Dependency Injection
|
||||
|
|
@ -63,7 +63,7 @@ dependencies {
|
|||
compileOnly 'javax.annotation:javax.annotation-api:1.3.1'
|
||||
//App Compatibility and Material Design
|
||||
implementation 'androidx.appcompat:appcompat:1.0.2'
|
||||
implementation 'com.google.android.material:material:1.1.0-alpha01'
|
||||
implementation 'com.google.android.material:material:1.1.0-alpha02'
|
||||
implementation 'androidx.recyclerview:recyclerview:1.0.0'
|
||||
implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
|
||||
//QR Code
|
||||
|
|
@ -116,23 +116,23 @@ dependencies {
|
|||
debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.6.2'
|
||||
releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.2'
|
||||
//Push Notifications
|
||||
implementation 'com.google.firebase:firebase-core:11.4.2'
|
||||
implementation 'com.google.firebase:firebase-messaging:11.4.2'
|
||||
implementation 'com.google.android.gms:play-services-auth:11.4.2'
|
||||
implementation 'io.realm:android-adapters:3.0.0'
|
||||
implementation 'com.google.firebase:firebase-core:16.0.6'
|
||||
implementation 'com.google.firebase:firebase-messaging:17.3.4'
|
||||
implementation 'com.google.android.gms:play-services-auth:16.0.1'
|
||||
implementation 'io.realm:android-adapters:3.1.0'
|
||||
implementation(project(':seeds-sdk')) {
|
||||
exclude group: 'com.google.android.gms'
|
||||
exclude group: 'com.android.support', module: 'multidex'
|
||||
}
|
||||
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
|
||||
implementation 'androidx.multidex:multidex:2.0.0'
|
||||
implementation 'androidx.multidex:multidex:2.0.1'
|
||||
implementation 'com.nex3z:flow-layout:1.2.2'
|
||||
|
||||
implementation 'androidx.core:core-ktx:1.0.1'
|
||||
implementation "androidx.lifecycle:lifecycle-extensions:2.0.0"
|
||||
kapt "androidx.lifecycle:lifecycle-compiler:2.0.0"
|
||||
implementation 'android.arch.navigation:navigation-fragment-ktx:1.0.0-alpha08'
|
||||
implementation 'android.arch.navigation:navigation-ui-ktx:1.0.0-alpha08'
|
||||
implementation 'android.arch.navigation:navigation-fragment-ktx:1.0.0-alpha09'
|
||||
implementation 'android.arch.navigation:navigation-ui-ktx:1.0.0-alpha09'
|
||||
implementation 'com.plattysoft.leonids:LeonidsLib:1.3.2'
|
||||
}
|
||||
|
||||
|
|
@ -140,7 +140,6 @@ android {
|
|||
compileSdkVersion 28
|
||||
buildToolsVersion '28.0.3'
|
||||
|
||||
|
||||
defaultConfig {
|
||||
minSdkVersion 16
|
||||
applicationId "com.habitrpg.android.habitica"
|
||||
|
|
@ -148,8 +147,8 @@ android {
|
|||
buildConfigField "String", "STORE", "\"google\""
|
||||
multiDexEnabled true
|
||||
|
||||
versionCode 2065
|
||||
versionName "1.7"
|
||||
versionCode 2066
|
||||
versionName "1.7.1"
|
||||
}
|
||||
|
||||
lintOptions {
|
||||
|
|
|
|||
|
|
@ -385,34 +385,33 @@ class FullProfileActivity : BaseActivity() {
|
|||
}
|
||||
|
||||
private fun addAttributeRow(label: String, strVal: Float, intVal: Float, conVal: Float, perVal: Float, roundDown: Boolean, isSummary: Boolean) {
|
||||
val tableRow = layoutInflater.inflate(R.layout.profile_attributetablerow, attributesTableLayout, false) as TableRow
|
||||
val tableRow = layoutInflater.inflate(R.layout.profile_attributetablerow, attributesTableLayout, false) as? TableRow ?: return
|
||||
val keyTextView = tableRow.findViewById<TextView>(R.id.tv_attribute_type)
|
||||
keyTextView.text = label
|
||||
keyTextView?.text = label
|
||||
|
||||
val strTextView = tableRow.findViewById<TextView>(R.id.tv_attribute_str)
|
||||
strTextView.text = getFloorValueString(strVal, roundDown)
|
||||
strTextView?.text = getFloorValueString(strVal, roundDown)
|
||||
|
||||
val intTextView = tableRow.findViewById<TextView>(R.id.tv_attribute_int)
|
||||
intTextView.text = getFloorValueString(intVal, roundDown)
|
||||
intTextView?.text = getFloorValueString(intVal, roundDown)
|
||||
|
||||
val conTextView = tableRow.findViewById<TextView>(R.id.tv_attribute_con)
|
||||
conTextView.text = getFloorValueString(conVal, roundDown)
|
||||
conTextView?.text = getFloorValueString(conVal, roundDown)
|
||||
|
||||
val perTextView = tableRow.findViewById<TextView>(R.id.tv_attribute_per)
|
||||
perTextView.text = getFloorValueString(perVal, roundDown)
|
||||
perTextView?.text = getFloorValueString(perVal, roundDown)
|
||||
|
||||
|
||||
if (isSummary) {
|
||||
strTextView.setTypeface(null, Typeface.BOLD)
|
||||
intTextView.setTypeface(null, Typeface.BOLD)
|
||||
conTextView.setTypeface(null, Typeface.BOLD)
|
||||
perTextView.setTypeface(null, Typeface.BOLD)
|
||||
strTextView?.setTypeface(null, Typeface.BOLD)
|
||||
intTextView?.setTypeface(null, Typeface.BOLD)
|
||||
conTextView?.setTypeface(null, Typeface.BOLD)
|
||||
perTextView?.setTypeface(null, Typeface.BOLD)
|
||||
} else {
|
||||
attributeStrSum += getFloorValue(strVal, roundDown)
|
||||
attributeIntSum += getFloorValue(intVal, roundDown)
|
||||
attributeConSum += getFloorValue(conVal, roundDown)
|
||||
attributePerSum += getFloorValue(perVal, roundDown)
|
||||
|
||||
attributeRows.add(tableRow)
|
||||
tableRow.visibility = if (attributeDetailsHidden) View.GONE else View.VISIBLE
|
||||
}
|
||||
|
|
|
|||
|
|
@ -60,8 +60,9 @@ class GuildFragment : BaseMainFragment() {
|
|||
|
||||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
||||
super.onViewCreated(view, savedInstanceState)
|
||||
if (arguments != null) {
|
||||
val args = GuildFragmentArgs.fromBundle(arguments)
|
||||
val newArguments = arguments
|
||||
if (newArguments != null) {
|
||||
val args = GuildFragmentArgs.fromBundle(newArguments)
|
||||
guildId = args.groupID
|
||||
isMember = args.isMember
|
||||
}
|
||||
|
|
|
|||
10
build.gradle
10
build.gradle
|
|
@ -1,7 +1,7 @@
|
|||
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
||||
|
||||
buildscript {
|
||||
ext.kotlin_version = '1.3.10'
|
||||
ext.kotlin_version = '1.3.11'
|
||||
ext.build_tools_version = '28.0.3'
|
||||
ext.sdk_version = 28
|
||||
|
||||
|
|
@ -11,13 +11,13 @@ buildscript {
|
|||
maven { url "https://plugins.gradle.org/m2/" }
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:3.2.1'
|
||||
classpath 'com.android.tools.build:gradle:3.3.0'
|
||||
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
|
||||
classpath 'com.google.gms:google-services:4.0.1'
|
||||
classpath "io.realm:realm-gradle-plugin:5.8.0"
|
||||
classpath 'com.google.gms:google-services:4.2.0'
|
||||
classpath "io.realm:realm-gradle-plugin:5.9.0"
|
||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
||||
classpath "gradle.plugin.io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.0.0.RC4-3"
|
||||
classpath "android.arch.navigation:navigation-safe-args-gradle-plugin:1.0.0-alpha07"
|
||||
classpath "android.arch.navigation:navigation-safe-args-gradle-plugin:1.0.0-alpha09"
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
android.enableJetifier=true
|
||||
android.useAndroidX=true
|
||||
android.debug.obsoleteApi=true
|
||||
org.gradle.configureondemand=true
|
||||
org.gradle.daemon=true
|
||||
org.gradle.jvmargs=-Xmx6656M
|
||||
|
|
|
|||
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
|
|
@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
|
|||
distributionPath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
|
||||
|
|
|
|||
Loading…
Reference in a new issue