upgrading plugins and libraries 🚀🚀

This commit is contained in:
z3r0c00l-2k 2020-05-19 19:24:29 +05:30
parent 94de96e85d
commit cac9c98e31
7 changed files with 19 additions and 17 deletions

View file

@ -1,8 +1,5 @@
<component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173">
<AndroidXmlCodeStyleSettings>
<option name="ARRANGEMENT_SETTINGS_MIGRATED_TO_191" value="true" />
</AndroidXmlCodeStyleSettings>
<JetCodeStyleSettings>
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
</JetCodeStyleSettings>

View file

@ -1,8 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="GradleMigrationSettings" migrationVersion="1" />
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<option name="testRunner" value="PLATFORM" />
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="modules">

View file

@ -29,14 +29,14 @@ allprojects {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'androidx.appcompat:appcompat:1.0.2'
implementation 'androidx.core:core-ktx:1.0.2'
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.core:core-ktx:1.2.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test:runner:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
androidTestImplementation 'androidx.test:runner:1.2.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
implementation 'com.github.ceryle:RadioRealButton:v2.1.1'
implementation 'com.google.android.material:material:1.0.0'
implementation 'com.google.android.material:material:1.1.0'
implementation 'me.itangqi.waveloadingview:library:0.3.5'
implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'
implementation 'androidx.cardview:cardview:1.0.0'

View file

@ -43,7 +43,7 @@ class WalkThroughActivity : AppCompatActivity() {
return 3
}
override fun getItem(i: Int): Fragment? {
override fun getItem(i: Int): Fragment {
when (i) {
0 -> {
@ -57,9 +57,11 @@ class WalkThroughActivity : AppCompatActivity() {
2 -> {
return WalkThroughThree()
}
else -> {
return WalkThroughOne()
}
}
return null
}
}

View file

@ -28,8 +28,10 @@ class NotifierReceiver : BroadcastReceiver() {
/* Notify */
val nHelper = NotificationHelper(context)
@SuppressLint("ResourceType") val nBuilder = nHelper
.getNotification(title, messageToShow, notificationsTone)
@SuppressLint("ResourceType") val nBuilder = messageToShow?.let {
nHelper
.getNotification(title, it, notificationsTone)
}
nHelper.notify(1, nBuilder)
}

View file

@ -1,14 +1,14 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext.kotlin_version = '1.3.21'
ext.kotlin_version = '1.3.71'
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.5.3'
classpath 'com.android.tools.build:gradle:3.6.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files

View file

@ -1,7 +1,6 @@
#Mon Jan 20 09:07:54 IST 2020
#Tue May 19 18:40:37 IST 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
distributionSha256Sum=f177768e7a032727e4338c8fd047f8f263e5bd283f67a7766c1ba4182c8455a6
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip