From 415a10c1afd5a579dda2a27ff7df84a39e171dbe Mon Sep 17 00:00:00 2001 From: Kevin Puertas Date: Fri, 16 Aug 2019 19:04:30 +0200 Subject: [PATCH] New libs --- app/build.gradle | 36 +++++++++++-------- app/src/main/AndroidManifest.xml | 3 ++ .../st/frasesdeanime/AboutActivity.kt | 2 +- .../jkanetwork/st/frasesdeanime/AlarmNotif.kt | 2 +- .../st/frasesdeanime/AnimesSelActivity.kt | 4 +-- .../com/jkanetwork/st/frasesdeanime/App.kt | 2 +- .../st/frasesdeanime/CustomListAdapter.kt | 2 +- .../st/frasesdeanime/FavsActivity.kt | 2 +- .../st/frasesdeanime/MainActivity.kt | 15 +++++--- .../st/frasesdeanime/OptsActivity.kt | 2 +- .../st/frasesdeanime/SQLiteHelper.kt | 2 +- app/src/main/res/raw/loadsqlfile | 6 ++-- app/versioncode.count | 4 +-- build.gradle | 31 +++++++++++----- gradle.properties | 2 ++ gradle/wrapper/gradle-wrapper.properties | 4 +-- 16 files changed, 78 insertions(+), 41 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 3c68ee1..2256c7d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,15 +1,17 @@ +def anko_version = '0.10.8' +def kotlin_version = '1.3.41' +ext.kotlin_version = '1.3.41' + apply plugin: 'com.android.application' apply plugin: 'kotlin-android' // apply kotlin android plugin apply plugin: 'kotlin-android-extensions' -def anko_version = '0.10.4' -def kotlin_version = '1.2.31' + android { - compileSdkVersion 27 - //buildToolsVersion '27.0.3' + compileSdkVersion 28 defaultConfig { applicationId "com.jkanetwork.st.frasesdeanime" minSdkVersion 17 - targetSdkVersion 27 + targetSdkVersion 28 // Sube automáticamente la build en cada compilacion def versionPropsFile = file('versioncode.count') def Properties versionProps = new Properties() @@ -19,8 +21,8 @@ android { versionProps.store(versionPropsFile.newWriter(), null) // Fin de subir automáticamente la build en cada compilación versionCode code - versionName "1.4.3" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + versionName "1.4.6" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { release { @@ -31,6 +33,7 @@ android { } productFlavors { } + buildToolsVersion '28.0.3' } sourceSets { @@ -40,10 +43,11 @@ sourceSets { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') /*androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { - exclude group: 'com.android.support', module: 'support-annotations' - })*/ - implementation 'com.android.support:appcompat-v7:27.1.1' - implementation 'com.android.support.constraint:constraint-layout:1.1.2' + exclude group: 'com.android.support', module: 'support-annotations' + })*/ + //implementation 'com.android.support:appcompat-v7:28.0.0' + //implementation 'com.android.support.constraint:constraint-layout:2.0.0-beta2' + //implementation 'com.android.support:recyclerview-v7:28.0.0' implementation "org.jetbrains.anko:anko-sqlite:$anko_version" implementation "org.jetbrains.anko:anko-commons:$anko_version" // Anko Layouts @@ -54,8 +58,12 @@ dependencies { implementation "org.jetbrains.anko:anko-sdk25-coroutines:$anko_version" implementation "org.jetbrains.anko:anko-appcompat-v7-coroutines:$anko_version" implementation 'com.github.mirrajabi:kotlin-preferences-extensions:1.0' - implementation 'com.android.support:recyclerview-v7:27.1.1' - implementation 'com.google.android.gms:play-services-ads:15.0.1' + + implementation 'com.google.android.gms:play-services-ads:18.1.1' //testImplementation 'junit:junit:4.12' - implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib:1.3.41" +} + +configurations.all() { + resolutionStrategy.force "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 616150c..aec8d0a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -32,6 +32,9 @@ + diff --git a/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/AboutActivity.kt b/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/AboutActivity.kt index 0d2df5d..818b2b2 100644 --- a/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/AboutActivity.kt +++ b/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/AboutActivity.kt @@ -1,7 +1,7 @@ package com.jkanetwork.st.frasesdeanime import android.os.Bundle -import android.support.v7.app.AppCompatActivity +import androidx.appcompat.app.AppCompatActivity import android.content.Context import android.widget.TextView import android.widget.ImageView diff --git a/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/AlarmNotif.kt b/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/AlarmNotif.kt index ef7242d..5e1ba50 100644 --- a/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/AlarmNotif.kt +++ b/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/AlarmNotif.kt @@ -7,7 +7,7 @@ import android.content.Context import android.content.Intent import java.util.Calendar import android.app.AlarmManager -import android.support.v4.app.NotificationCompat +import androidx.core.app.NotificationCompat import android.app.PendingIntent /* diff --git a/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/AnimesSelActivity.kt b/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/AnimesSelActivity.kt index faec37a..258aa34 100644 --- a/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/AnimesSelActivity.kt +++ b/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/AnimesSelActivity.kt @@ -2,7 +2,7 @@ package com.jkanetwork.st.frasesdeanime import android.content.Context import android.os.Bundle -import android.support.v7.app.AppCompatActivity +import androidx.appcompat.app.AppCompatActivity import android.view.View import android.widget.SimpleAdapter import android.widget.ListView @@ -15,7 +15,7 @@ import android.widget.Toast import android.util.Log -import android.support.v4.content.ContextCompat.startActivity +import androidx.core.content.ContextCompat.startActivity import android.content.Intent import android.widget.AdapterView diff --git a/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/App.kt b/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/App.kt index 6b57957..b9b8b6d 100644 --- a/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/App.kt +++ b/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/App.kt @@ -4,7 +4,7 @@ import android.app.Application import android.content.Context import android.content.SharedPreferences import android.content.Intent -import android.support.v7.app.AppCompatActivity +import androidx.appcompat.app.AppCompatActivity import android.app.PendingIntent import java.util.Calendar import android.app.AlarmManager diff --git a/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/CustomListAdapter.kt b/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/CustomListAdapter.kt index c1ee2fe..4a377c9 100644 --- a/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/CustomListAdapter.kt +++ b/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/CustomListAdapter.kt @@ -3,7 +3,7 @@ package com.jkanetwork.st.frasesdeanime import android.app.Application import android.content.Context import android.os.Bundle -import android.support.v7.app.AppCompatActivity +import androidx.appcompat.app.AppCompatActivity import android.view.LayoutInflater import android.view.View import android.view.ViewGroup diff --git a/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/FavsActivity.kt b/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/FavsActivity.kt index a152e10..2547bac 100644 --- a/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/FavsActivity.kt +++ b/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/FavsActivity.kt @@ -2,7 +2,7 @@ package com.jkanetwork.st.frasesdeanime import android.content.Context import android.os.Bundle -import android.support.v7.app.AppCompatActivity +import androidx.appcompat.app.AppCompatActivity import android.content.Intent import android.view.View import android.widget.SimpleAdapter diff --git a/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/MainActivity.kt b/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/MainActivity.kt index b1d672a..817dcf2 100644 --- a/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/MainActivity.kt +++ b/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/MainActivity.kt @@ -1,6 +1,6 @@ package com.jkanetwork.st.frasesdeanime -import android.support.v7.app.AppCompatActivity +import androidx.appcompat.app.AppCompatActivity import android.os.Bundle import org.jetbrains.anko.* import android.util.Log @@ -11,13 +11,14 @@ import android.view.View import android.view.MenuItem import java.util.Calendar import java.text.DateFormatSymbols -import android.support.v4.view.ViewPager +import androidx.viewpager.widget.ViewPager import android.widget.Toast import kotlinx.android.synthetic.main.activity_main.* /* Ads */ import com.google.android.gms.ads.AdRequest +import com.google.ads.mediation.admob.AdMobAdapter import com.google.android.gms.ads.MobileAds import com.google.android.gms.ads.reward.RewardItem import com.google.android.gms.ads.reward.RewardedVideoAd @@ -67,9 +68,12 @@ class MainActivity : AppCompatActivity(), RewardedVideoAdListener { mRewardedVideoAd = MobileAds.getRewardedVideoAdInstance(this) mRewardedVideoAd.setRewardedVideoAdListener(this); + val extras = Bundle() + + extras.putString("max_ad_content_rating", "PG") //Non adult ads mAdView = adView - val adRequest = AdRequest.Builder().build() + val adRequest = AdRequest.Builder().addNetworkExtrasBundle(AdMobAdapter::class.java, extras).build() mAdView.loadAd(adRequest) /* Check if first time or not, for welcoming user */ @@ -280,7 +284,10 @@ class MainActivity : AppCompatActivity(), RewardedVideoAdListener { Adr.addTestDevice("4264F289943AD2719C3F0ECB2CD4556A") Adr.addTestDevice("D0CF3543C15E51623C67081FA8B64C2B") - mRewardedVideoAd.loadAd(this.getString(R.string.admob_videoid), Adr.build()) + val extras = Bundle() + extras.putString("max_ad_content_rating", "PG") //Non adult ads + + mRewardedVideoAd.loadAd(this.getString(R.string.admob_videoid), Adr.addNetworkExtrasBundle(AdMobAdapter::class.java, extras).build()) } } diff --git a/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/OptsActivity.kt b/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/OptsActivity.kt index 531c99e..c98248f 100644 --- a/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/OptsActivity.kt +++ b/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/OptsActivity.kt @@ -1,7 +1,7 @@ package com.jkanetwork.st.frasesdeanime import android.os.Bundle -import android.support.v7.app.AppCompatActivity +import androidx.appcompat.app.AppCompatActivity import android.content.Context import android.widget.ArrayAdapter import org.jetbrains.anko.* diff --git a/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/SQLiteHelper.kt b/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/SQLiteHelper.kt index 14e32d2..234ce90 100644 --- a/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/SQLiteHelper.kt +++ b/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/SQLiteHelper.kt @@ -14,7 +14,7 @@ import android.util.Log */ /** ctx, DB.NAME, null, DB.Version */ -class SQLiteHelper(ctx: Context) : ManagedSQLiteOpenHelper(ctx, "otaku.sqlite", null, 7) { +class SQLiteHelper(ctx: Context) : ManagedSQLiteOpenHelper(ctx, "otaku.sqlite", null, 8) { val context = ctx val db = this.getWritableDatabase() diff --git a/app/src/main/res/raw/loadsqlfile b/app/src/main/res/raw/loadsqlfile index 212e438..1db7ffb 100644 --- a/app/src/main/res/raw/loadsqlfile +++ b/app/src/main/res/raw/loadsqlfile @@ -302,7 +302,8 @@ INSERT INTO `FRASES` VALUES (1,'Si quieres saber lo que alguien intenta hacer, e (296,'Es realmente problemático no hacer nada y arrepentirse después.',15), (297,'No quiero decepcionar a nadie. La verdad es que, incluso yo, quiero ser un héroe.',15), (298,'Los humanos aman las mentiras que les son convenientes.',15), - (299,'La luz por sí misma es inútil, tiene que estar con la oscuridad, o de lo contrario, no sabrás que es luz.',15), + (299,'La luz por sí misma es inútil, tiene que estar con la oscuridad, o de lo contrario, no sabrás que es luz.',15); + INSERT INTO `FRASES` VALUES (300,'Eso es porque soy un ángel. ¡Muere!',15), (301,'Mientras no haga nada, nada será mi culpa.',15), (302,'Cuando uno está preparado, los problemas no son problemas.',15), @@ -604,7 +605,8 @@ INSERT INTO `FRASES` VALUES (1,'Si quieres saber lo que alguien intenta hacer, e (596,'"Deku" suena como la palabra japonesa "Puedes hacerlo".',43), (597,'¡Recuperaré lo que es ser un héroe! ¡Vamos! ¡Vengan por mi impostores! ¡Al único que dejaré que me mate es al héroe verdadero! ¡All Might!',43), (598,'Entrometerse cuando no hacía falta es la esencia de ser un héroe.',43), - (599,'La gente que solo habla no vale nada.',43), + (599,'La gente que solo habla no vale nada.',43); + INSERT INTO `FRASES` VALUES (600,'Un objetivo sin un plan no es más que una mera ilusión.',43), (601,'Cada ser humano tiene un número de oportunidades de salir de su caparazón y crecer. Pero no pueden lograr la mayoría de esas oportunidades por su cuenta. Necesitan poderosos enemigos que llamen sus poderes de concentración y aliados con los cuales compartir sus experiencias.',44), (602,'Clase, no podemos recuperar el pasado que perdimos. Yo mismo... He cometido muchos errores. Aunque lo que podemos hacer... Es aprender de nuestro pasado, así no lo repetiremos.',44), diff --git a/app/versioncode.count b/app/versioncode.count index 69d5e33..cafe697 100644 --- a/app/versioncode.count +++ b/app/versioncode.count @@ -1,2 +1,2 @@ -#Thu Jul 26 00:09:59 CEST 2018 -VERSION_CODE=1202 +#Tue Aug 13 23:39:50 CEST 2019 +VERSION_CODE=1295 diff --git a/build.gradle b/build.gradle index 33b5fe9..6cf0d35 100644 --- a/build.gradle +++ b/build.gradle @@ -6,15 +6,33 @@ buildscript { google() } dependencies { - def kotlin_version = '1.2.31' - classpath 'com.android.tools.build:gradle:3.1.3' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - ext.kotlin_version = "$kotlin_version" + //def kotlin_version = '1.3.21' + classpath 'com.android.tools.build:gradle:3.4.2' + //classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + //ext.kotlin_version = "$kotlin_version" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } } - +plugins { + id 'org.jetbrains.kotlin.jvm' version '1.3.41' +} +repositories { + mavenCentral() +} +/*dependencies { + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.41" +}*/ +compileKotlin { + kotlinOptions { + jvmTarget = "1.8" + } +} +compileTestKotlin { + kotlinOptions { + jvmTarget = "1.8" + } +} allprojects { repositories { jcenter() @@ -27,6 +45,3 @@ allprojects { } } -task clean(type: Delete) { - delete rootProject.buildDir -} diff --git a/gradle.properties b/gradle.properties index 8b6d73d..1cec841 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,4 +13,6 @@ # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true #Tue Nov 14 12:27:09 CET 2017 +android.enableJetifier=true +android.useAndroidX=true org.gradle.jvmargs=-Xmx1536m \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index af5a818..f37242e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Apr 01 18:28:58 CEST 2018 +#Tue Aug 13 22:31:54 CEST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip