Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db7567a7 authored by tibbi's avatar tibbi
Browse files

use an arraylist for faqitems

parent 28da18b2

build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ buildscript { 
        propMinSdkVersion = 16

        propTargetSdkVersion = propCompileSdkVersion

        propVersionCode = 1

        propVersionName = '3.12.14'

        propVersionName = '3.12.15'

        kotlin_version = '1.2.21'

        support_libs = '27.0.2'

    }

commons/src/main/kotlin/com/simplemobiletools/commons/activities/AboutActivity.kt

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ class AboutActivity : BaseSimpleActivity() { 
    }



    private fun setupFAQ() {

        val faqItems = intent.getSerializableExtra(APP_FAQ) as Array<FAQItem>

        val faqItems = intent.getSerializableExtra(APP_FAQ) as ArrayList<FAQItem>

        about_faq.beVisibleIf(faqItems.isNotEmpty())

        about_faq.setOnClickListener {

            Intent(applicationContext, FAQActivity::class.java).apply {

commons/src/main/kotlin/com/simplemobiletools/commons/activities/BaseSimpleActivity.kt

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ open class BaseSimpleActivity : AppCompatActivity() { 


    private fun isExternalStorageDocument(uri: Uri) = "com.android.externalstorage.documents" == uri.authority



    fun startAboutActivity(appNameId: Int, licenseMask: Int, versionName: String, faqItems: Array<FAQItem> = arrayOf()) {

    fun startAboutActivity(appNameId: Int, licenseMask: Int, versionName: String, faqItems: ArrayList<FAQItem> = arrayListOf()) {

        Intent(applicationContext, AboutActivity::class.java).apply {

            putExtra(APP_NAME, getString(appNameId))

            putExtra(APP_LICENSES, licenseMask)

commons/src/main/kotlin/com/simplemobiletools/commons/activities/FAQActivity.kt

+2 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ import com.simplemobiletools.commons.helpers.APP_FAQ 
import com.simplemobiletools.commons.models.FAQItem

import kotlinx.android.synthetic.main.activity_faq.*

import kotlinx.android.synthetic.main.license_faq_item.view.*

import java.util.*



class FAQActivity : BaseSimpleActivity() {

    override fun onCreate(savedInstanceState: Bundle?) {
@@ -20,7 +21,7 @@ class FAQActivity : BaseSimpleActivity() { 
        val textColor = baseConfig.textColor



        val inflater = LayoutInflater.from(this)

        val faqItems = intent.getSerializableExtra(APP_FAQ) as Array<FAQItem>

        val faqItems = intent.getSerializableExtra(APP_FAQ) as ArrayList<FAQItem>

        faqItems.forEach {

            val faqItem = it

            inflater.inflate(R.layout.license_faq_item, null).apply {