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 fce0c1a..faec37a 100644 --- a/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/AnimesSelActivity.kt +++ b/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/AnimesSelActivity.kt @@ -39,12 +39,11 @@ class AnimesSelActivity : AppCompatActivity(){ /** Layout in DSL */ verticalLayout { linearLayout { - btn_exit = button("Volver"); - btn_sel = button("Seleccionar todos").lparams(width = matchParent); + btn_exit = button("Volver") + btn_sel = button("Seleccionar todos").lparams(width = matchParent) } view_list = listView { - }.lparams(width = matchParent, height = matchParent) { - } + }.lparams(width = matchParent, height = matchParent) { } } 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 0dd62b9..0b15e6a 100644 --- a/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/MainActivity.kt +++ b/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/MainActivity.kt @@ -125,8 +125,8 @@ class MainActivity : AppCompatActivity(), RewardedVideoAdListener { } + //Button for previous day btn_prev.setOnClickListener() { - //toast("Anterior") if (dayS == 1){ if (monthS == 1){ monthS=12 @@ -160,8 +160,17 @@ class MainActivity : AppCompatActivity(), RewardedVideoAdListener { } changeData() } + + btn_today.setOnClickListener(){ + //Go back to today + dayS = cal.get(Calendar.DAY_OF_MONTH) + monthS = cal.get(Calendar.MONTH)+1 + yearS = cal.get(Calendar.YEAR) + changeData() + } } + /** At onResume, called after onCreate and in resume, load ad things and refresh calendar data */ override fun onResume() { super.onResume() 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 67423c5..65e14ee 100644 --- a/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/SQLiteHelper.kt +++ b/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/SQLiteHelper.kt @@ -266,7 +266,6 @@ class SQLiteHelper(ctx: Context) : ManagedSQLiteOpenHelper(ctx, "otaku.sqlite", /** It returns to program that this sentence can't be seen */ fun getSentenceCanBeSeen(year: Int,month: Int, day: Int): Boolean { //TODO, return 0 when if check this sentence will be "nothing", for disable button - return true; } diff --git a/app/src/main/res/drawable/opts.png b/app/src/main/res/drawable/opts.png index 43fddc0..ae4a3cd 100644 Binary files a/app/src/main/res/drawable/opts.png and b/app/src/main/res/drawable/opts.png differ diff --git a/app/src/main/res/drawable/star_off.png b/app/src/main/res/drawable/star_off.png index 75348ca..1bccbf3 100644 Binary files a/app/src/main/res/drawable/star_off.png and b/app/src/main/res/drawable/star_off.png differ diff --git a/app/src/main/res/drawable/star_on.png b/app/src/main/res/drawable/star_on.png index fa6afac..3a7dc0c 100644 Binary files a/app/src/main/res/drawable/star_on.png and b/app/src/main/res/drawable/star_on.png differ diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 1d7b4a2..754641d 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -71,11 +71,11 @@ + + + android:orientation="vertical"> + + \ No newline at end of file diff --git a/app/versioncode.count b/app/versioncode.count index e8a0d19..1c2d602 100644 --- a/app/versioncode.count +++ b/app/versioncode.count @@ -1,2 +1,2 @@ -#Sat Dec 23 13:50:02 CET 2017 -VERSION_CODE=1086 +#Sat Dec 23 16:16:57 CET 2017 +VERSION_CODE=1093