diff --git a/app/build.gradle b/app/build.gradle index 8754a45..4dcefbb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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.0" + versionName "1.2.1" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } buildTypes { 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 f152506..0d2df5d 100644 --- a/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/AboutActivity.kt +++ b/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/AboutActivity.kt @@ -3,6 +3,12 @@ package com.jkanetwork.st.frasesdeanime import android.os.Bundle import android.support.v7.app.AppCompatActivity import android.content.Context +import android.widget.TextView +import android.widget.ImageView +import android.view.View +import android.graphics.Color +import android.graphics.drawable.ColorDrawable +import org.jetbrains.anko.* /** * Created by kprkpr on 30/08/17. @@ -11,10 +17,20 @@ class AboutActivity : AppCompatActivity(){ override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setContentView(R.layout.activity_about) + + //Anko DSL Layout + verticalLayout { + textView{ + text = "¡Gracias por usar Frases de Anime! \nIdea por Alba García y desarrollada por JKANetwork!" + textSize = 22f + textColor = Color.BLACK + textAlignment = View.TEXT_ALIGNMENT_CENTER + }.lparams(width=wrapContent, height=wrapContent){padding= dip(12)} + imageView{ + setImageResource(R.drawable.cerebro) + }.lparams(width=matchParent, height=matchParent){} + background = ColorDrawable(Color.parseColor("#F8F2F2")) + } } - /*override fun onBackPressed() { - startActivity() - }*/ } diff --git a/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/PagerActivity.kt b/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/PagerActivity.kt deleted file mode 100644 index d9dd7cc..0000000 --- a/app/src/main/kotlin/com/jkanetwork/st/frasesdeanime/PagerActivity.kt +++ /dev/null @@ -1,44 +0,0 @@ -/** DISABLED -package com.jkanetwork.st.frasesdeanime - -import android.content.Context -import android.os.Bundle -import android.support.v7.app.AppCompatActivity -import android.view.View -import org.jetbrains.anko.* -import android.widget.Toast -import android.support.v4.content.ContextCompat.startActivity -import android.content.Intent -import android.widget.AdapterView - -import kotlinx.android.synthetic.main.activity_pager.* - -/** - * Created by kprkpr on 25/07/17. - * Help: https://www.youtube.com/watch?v=x-M1L6tcsLo - */ - -class PagerActivity : AppCompatActivity(){ - - val act = this - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContentView(R.layout.activity_pager) - - img.setImageResource(R.drawable.drawable); - - /* Button listeners */ - btn_next.setOnClickListener() { - startActivity() - } - - } - - /** On back go to main */ - override fun onBackPressed() { - startActivity() - } -} - - - */ diff --git a/app/src/main/res/drawable/cerebro.png b/app/src/main/res/drawable/cerebro.png index 51b2cbd..bda6b41 100644 Binary files a/app/src/main/res/drawable/cerebro.png and b/app/src/main/res/drawable/cerebro.png differ diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml deleted file mode 100644 index 359fc1d..0000000 --- a/app/src/main/res/layout/activity_about.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_pager.xml b/app/src/main/res/layout/activity_pager.xml deleted file mode 100644 index 254300e..0000000 --- a/app/src/main/res/layout/activity_pager.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - -