SoftwareTalent/FrasesDeAnime
2
0
Fork 0
mirror of https://gitlab.com/SoftwareTalent/FrasesDeAnime.git synced 2026-02-15 01:31:34 +01:00
Code Issues Releases Wiki Activity

Version 1.1.2

Browse Source
This commit is contained in:
Kevin Puertas
2017-12-13 08:19:10 +01:00
parent f846ba7da7
commit 8bdecca4ee
3 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@@ -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.1"
versionName "1.1.2"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {

41
app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/MainActivity.kt
View File

@@ -65,7 +65,6 @@ class MainActivity : AppCompatActivity(), RewardedVideoAdListener {
mRewardedVideoAd = MobileAds.getRewardedVideoAdInstance(this)
mRewardedVideoAd.setRewardedVideoAdListener(this);
preloadAd()
/* Check if first time or not, for welcoming user */
if (P.getFirstTime() == true){
@@ -90,14 +89,12 @@ class MainActivity : AppCompatActivity(), RewardedVideoAdListener {
positiveButton("Danos tu opinión") {browse("https://play.google.com/store/apps/details?id=com.jkanetwork.st.frasesdeanime")}
negativeButton("Más tarde") { }
}.show()
P.setRateCountdown(); //To -1, if not..you know
}else{
P.setRateCountdown(); //Countdown one
}
txt_sentence.setMovementMethod(ScrollingMovementMethod()) //Make sentence text scrollable
/* Button listeners */
btn_fav.setOnClickListener() {
db.setFav(IDFraseS)
@@ -147,32 +144,35 @@ class MainActivity : AppCompatActivity(), RewardedVideoAdListener {
}else{
dayS -=1
}
IDFraseS = db.getIDFrase(yearS,monthS, dayS)
changeData()
}
//Button of next (day) sentence
btn_next.setOnClickListener() {
//toast("Siguiente")
if ((monthS in arrayOf(1, 3, 5,7,8,10,12) && dayS == 31) || (monthS == 2 && dayS == 28)){
if ((monthS in arrayOf(1, 3, 5,7,8,10) && dayS == 31) || (monthS == 2 && dayS == 28) || (monthS in arrayOf(2,4,6,9,11) && dayS == 30)){
monthS += 1
dayS = 1
}else if (dayS == 30 && monthS in arrayOf(2,4,6,9,11) ){
monthS += 1
dayS = 1
}else{
dayS +=1
}else if (dayS == 31 && monthS == 12){ //New Year
monthS = 1;
dayS = 1;
}
IDFraseS = db.getIDFrase(yearS,monthS, dayS)
changeData()
}
}
/** At onResume, called after onCreate and in resume, check day and put sentence */
/** At onResume, called after onCreate and in resume, load ad things and refresh calendar data */
override fun onResume() {
super.onResume()
cal = Calendar.getInstance() //Because it can be changed the day
IDFraseS = db.getIDFrase(yearS,monthS, dayS)
txt_sentence.setMovementMethod(ScrollingMovementMethod()) //Make sentence text scrollable
preloadAd() //Load (Again) ads
cal = Calendar.getInstance() //Refresh calendar
//Refresh day
dayS = cal.get(Calendar.DAY_OF_MONTH)
monthS = cal.get(Calendar.MONTH)+1
yearS = cal.get(Calendar.YEAR)
changeData()
}
@@ -190,6 +190,7 @@ class MainActivity : AppCompatActivity(), RewardedVideoAdListener {
/** This function replaces texts of main activity to sentence using IDFraseS var
*/
fun changeData(){
IDFraseS = db.getIDFrase(yearS,monthS, dayS)
txt_sentence.setText(db.getSentenceFromIDF(IDFraseS))
txt_anime.setText(db.getAnimeFromIDF(IDFraseS))
//txt_date.setText("Frase de hoy")
@@ -257,7 +258,11 @@ class MainActivity : AppCompatActivity(), RewardedVideoAdListener {
fun preloadAd() {
mRewardedVideoAd.loadAd(this.getString(R.string.admob_videoid), AdRequest.Builder().build());
var Adr = AdRequest.Builder()
Adr.addTestDevice("C0119E16F190120A0481C80734939D71")
Adr.addTestDevice("4264F289943AD2719C3F0ECB2CD4556A")
mRewardedVideoAd.loadAd(this.getString(R.string.admob_videoid), Adr.build())
}
}

4
app/versioncode.count
View File

@@ -1,2 +1,2 @@
#Thu Dec 07 21:34:37 CET 2017
VERSION_CODE=873
#Sat Dec 09 20:04:45 CET 2017
VERSION_CODE=888