From 8a0976fd5170cae7bb63e51c2455de8443f2fd35 Mon Sep 17 00:00:00 2001 From: Kevin Puertas Date: Sun, 1 Apr 2018 22:47:05 +0200 Subject: [PATCH] New version --- app/build.gradle | 42 +-- .../st/frasesdeanime/MainActivity.kt | 21 +- .../st/frasesdeanime/SQLiteHelper.kt | 2 +- app/src/main/res/layout/activity_main.xml | 279 ++++++++++-------- app/src/main/res/raw/sqlanimes | 18 +- app/src/main/res/raw/sqlfrases | 130 +++++++- app/versioncode.count | 4 +- build.gradle | 4 +- gradle.properties | 3 +- gradle/wrapper/gradle-wrapper.properties | 4 +- 10 files changed, 331 insertions(+), 176 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4dcefbb..05be7de 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,15 +1,15 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' // apply kotlin android plugin apply plugin: 'kotlin-android-extensions' -def anko_version = '0.10.3' -def kotlin_version = '1.2.10' +def anko_version = '0.10.4' +def kotlin_version = '1.2.30' android { - compileSdkVersion 26 - buildToolsVersion '26.0.2' + compileSdkVersion 27 + buildToolsVersion '27.0.3' defaultConfig { applicationId "com.jkanetwork.st.frasesdeanime" minSdkVersion 17 - targetSdkVersion 26 + targetSdkVersion 27 // Sube automáticamente la build en cada compilacion def versionPropsFile = file('versioncode.count') def Properties versionProps = new Properties() @@ -19,7 +19,7 @@ android { versionProps.store(versionPropsFile.newWriter(), null) // Fin de subir automáticamente la build en cada compilación versionCode code - versionName "1.2.1" + versionName "1.3.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } buildTypes { @@ -38,24 +38,24 @@ sourceSets { } dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + 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' - }) - compile 'com.android.support:appcompat-v7:26.1.0' - compile 'com.android.support.constraint:constraint-layout:1.0.2' - compile "org.jetbrains.anko:anko-sqlite:$anko_version" - compile "org.jetbrains.anko:anko-commons:$anko_version" + })*/ + implementation 'com.android.support:appcompat-v7:27.1.0' + implementation 'com.android.support.constraint:constraint-layout:1.0.2' + implementation "org.jetbrains.anko:anko-sqlite:$anko_version" + implementation "org.jetbrains.anko:anko-commons:$anko_version" // Anko Layouts - compile "org.jetbrains.anko:anko-sdk25:$anko_version" + implementation "org.jetbrains.anko:anko-sdk25:$anko_version" // sdk15, sdk19, sdk21, sdk23 are also available - compile "org.jetbrains.anko:anko-appcompat-v7:$anko_version" + implementation "org.jetbrains.anko:anko-appcompat-v7:$anko_version" // Coroutine listeners for Anko Layouts - compile "org.jetbrains.anko:anko-sdk25-coroutines:$anko_version" - compile "org.jetbrains.anko:anko-appcompat-v7-coroutines:$anko_version" - compile 'com.github.mirrajabi:kotlin-preferences-extensions:1.0' - compile 'com.android.support:recyclerview-v7:26.1.0' - compile 'com.google.android.gms:play-services-ads:11.6.2' - testCompile 'junit:junit:4.12' + 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.0' + implementation 'com.google.android.gms:play-services-ads:12.0.1' + //testImplementation 'junit:junit:4.12' implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } \ No newline at end of file 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 0b15e6a..b1d672a 100644 --- a/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/MainActivity.kt +++ b/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/MainActivity.kt @@ -8,7 +8,6 @@ import android.content.Context import android.content.SharedPreferences import android.view.Menu import android.view.View -//import android.view.ImageView import android.view.MenuItem import java.util.Calendar import java.text.DateFormatSymbols @@ -18,11 +17,13 @@ import android.widget.Toast import kotlinx.android.synthetic.main.activity_main.* /* Ads */ -import com.google.android.gms.ads.AdRequest; -import com.google.android.gms.ads.MobileAds; -import com.google.android.gms.ads.reward.RewardItem; -import com.google.android.gms.ads.reward.RewardedVideoAd; -import com.google.android.gms.ads.reward.RewardedVideoAdListener; +import com.google.android.gms.ads.AdRequest +import com.google.android.gms.ads.MobileAds +import com.google.android.gms.ads.reward.RewardItem +import com.google.android.gms.ads.reward.RewardedVideoAd +import com.google.android.gms.ads.reward.RewardedVideoAdListener + +import com.google.android.gms.ads.AdView import android.text.method.ScrollingMovementMethod @@ -35,7 +36,7 @@ class MainActivity : AppCompatActivity(), RewardedVideoAdListener { override fun onRewardedVideoAdLoaded() {} override fun onRewardedVideoAdOpened() {} override fun onRewardedVideoStarted() {} - + override fun onRewardedVideoCompleted() {} /* Prefs, database init and calendar data */ lateinit var P: Prefs @@ -48,6 +49,7 @@ class MainActivity : AppCompatActivity(), RewardedVideoAdListener { var IDFraseS = -2 /* Error if not changes */ lateinit var mRewardedVideoAd: RewardedVideoAd + lateinit var mAdView : AdView override fun onCreate(savedInstanceState: Bundle?) { @@ -66,6 +68,10 @@ class MainActivity : AppCompatActivity(), RewardedVideoAdListener { mRewardedVideoAd.setRewardedVideoAdListener(this); + mAdView = adView + val adRequest = AdRequest.Builder().build() + mAdView.loadAd(adRequest) + /* Check if first time or not, for welcoming user */ if (P.getFirstTime() == true){ alert("Bienvenido a Frases de anime! Un lugar donde puedes descubrir las frases de tus animes favoritos, todos los días!\n" + @@ -272,6 +278,7 @@ class MainActivity : AppCompatActivity(), RewardedVideoAdListener { var Adr = AdRequest.Builder() Adr.addTestDevice("C0119E16F190120A0481C80734939D71") Adr.addTestDevice("4264F289943AD2719C3F0ECB2CD4556A") + Adr.addTestDevice("D0CF3543C15E51623C67081FA8B64C2B") mRewardedVideoAd.loadAd(this.getString(R.string.admob_videoid), Adr.build()) } 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 65e14ee..d15563f 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, 3) { +class SQLiteHelper(ctx: Context) : ManagedSQLiteOpenHelper(ctx, "otaku.sqlite", null, 4) { val context = ctx val db = this.getWritableDatabase() diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 754641d..97adecb 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,139 +1,158 @@ - + android:layout_height="match_parent"> + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -