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

Commit 88398ebf authored by tibbi's avatar tibbi
Browse files

adding a FAQ Activity

parent e9d10ebb

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

+18 −6
Original line number Diff line number Diff line
@@ -2,20 +2,18 @@ package com.simplemobiletools.commons.activities 


import android.content.ActivityNotFoundException

import android.content.Intent

import android.graphics.Color

import android.os.Build

import android.os.Bundle

import android.text.Html

import android.text.method.LinkMovementMethod

import android.view.View

import com.simplemobiletools.commons.R

import com.simplemobiletools.commons.extensions.baseConfig

import com.simplemobiletools.commons.extensions.isBlackAndWhiteTheme

import com.simplemobiletools.commons.extensions.launchViewIntent

import com.simplemobiletools.commons.extensions.updateTextColors

import com.simplemobiletools.commons.extensions.*

import com.simplemobiletools.commons.helpers.APP_FAQ

import com.simplemobiletools.commons.helpers.APP_LICENSES

import com.simplemobiletools.commons.helpers.APP_NAME

import com.simplemobiletools.commons.helpers.APP_VERSION_NAME

import com.simplemobiletools.commons.models.FAQItem

import kotlinx.android.synthetic.main.activity_about.*

import java.util.*
@@ -27,7 +25,7 @@ class AboutActivity : BaseSimpleActivity() { 
        super.onCreate(savedInstanceState)

        setContentView(R.layout.activity_about)

        appName = intent.getStringExtra(APP_NAME) ?: ""

        linkColor = if (isBlackAndWhiteTheme()) Color.WHITE else baseConfig.primaryColor

        linkColor = getAdjustedPrimaryColor()

    }



    override fun onResume() {
@@ -36,6 +34,7 @@ class AboutActivity : BaseSimpleActivity() { 


        setupWebsite()

        setupEmail()

        setupFAQ()

        setupMoreApps()

        setupRateUs()

        setupInvite()
@@ -65,6 +64,19 @@ class AboutActivity : BaseSimpleActivity() { 
        about_email.movementMethod = LinkMovementMethod.getInstance()

    }



    private fun setupFAQ() {

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

        about_faq.beVisibleIf(faqItems.isNotEmpty())

        about_faq.setOnClickListener {

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

                putExtra(APP_FAQ, faqItems)

                startActivity(this)

            }

        }

        about_faq.setTextColor(linkColor)

        about_faq.underlineText()

    }



    private fun setupMoreApps() {

        about_more_apps.setOnClickListener {

            launchViewIntent("https://play.google.com/store/apps/dev?id=9070296388022589266")

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

+3 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import com.simplemobiletools.commons.dialogs.WritePermissionDialog 
import com.simplemobiletools.commons.extensions.*

import com.simplemobiletools.commons.helpers.*

import com.simplemobiletools.commons.interfaces.CopyMoveListener

import com.simplemobiletools.commons.models.FAQItem

import com.simplemobiletools.commons.models.FileDirItem

import java.io.File

import java.util.*
@@ -166,11 +167,12 @@ open class BaseSimpleActivity : AppCompatActivity() { 


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



    fun startAboutActivity(appNameId: Int, licenseMask: Int, versionName: String) {

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

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

            putExtra(APP_NAME, getString(appNameId))

            putExtra(APP_LICENSES, licenseMask)

            putExtra(APP_VERSION_NAME, versionName)

            putExtra(APP_FAQ, faqItems)

            startActivity(this)

        }

    }

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

0 → 100644
+41 −0
Original line number Diff line number Diff line 
package com.simplemobiletools.commons.activities



import android.os.Bundle

import android.view.LayoutInflater

import com.simplemobiletools.commons.R

import com.simplemobiletools.commons.extensions.baseConfig

import com.simplemobiletools.commons.extensions.getAdjustedPrimaryColor

import com.simplemobiletools.commons.extensions.underlineText

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.*



class FAQActivity : BaseSimpleActivity() {

    override fun onCreate(savedInstanceState: Bundle?) {

        super.onCreate(savedInstanceState)

        setContentView(R.layout.activity_faq)



        val titleColor = getAdjustedPrimaryColor()

        val textColor = baseConfig.textColor



        val inflater = LayoutInflater.from(this)

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

        faqItems.forEach {

            val faqItem = it

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

                license_faq_title.apply {

                    text = if (faqItem.title is Int) getString(faqItem.title) else faqItem.title as String

                    underlineText()

                    setTextColor(titleColor)

                }



                license_faq_text.apply {

                    text = if (faqItem.text is Int) getString(faqItem.text) else faqItem.text as String

                    setTextColor(textColor)

                }

                faq_holder.addView(this)

            }

        }

    }

}

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

+6 −6
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ import com.simplemobiletools.commons.extensions.* 
import com.simplemobiletools.commons.helpers.*

import com.simplemobiletools.commons.models.License

import kotlinx.android.synthetic.main.activity_license.*

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

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



class LicenseActivity : BaseSimpleActivity() {

    override fun onCreate(savedInstanceState: Bundle?) {
@@ -15,6 +15,7 @@ class LicenseActivity : BaseSimpleActivity() { 
        setContentView(R.layout.activity_license)



        val linkColor = getAdjustedPrimaryColor()

        val textColor = baseConfig.textColor

        updateTextColors(licenses_holder)



        val inflater = LayoutInflater.from(this)
@@ -22,9 +23,8 @@ class LicenseActivity : BaseSimpleActivity() { 
        val licenseMask = intent.getIntExtra(APP_LICENSES, 0)

        licenses.filter { licenseMask and it.id != 0 }.forEach {

            val license = it

            val view = inflater.inflate(R.layout.license_item, null)

            view.apply {

                license_title.apply {

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

                license_faq_title.apply {

                    text = getString(license.titleId)

                    underlineText()

                    setTextColor(linkColor)
@@ -33,8 +33,8 @@ class LicenseActivity : BaseSimpleActivity() { 
                    }

                }



                license_text.text = getString(license.textId)

                license_text.setTextColor(baseConfig.textColor)

                license_faq_text.text = getString(license.textId)

                license_faq_text.setTextColor(textColor)

                licenses_holder.addView(this)

            }

        }

commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Activity.kt

+1 −2
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ import android.content.ClipData 
import android.content.ClipboardManager

import android.content.Context

import android.content.Intent

import android.graphics.Color

import android.graphics.drawable.ColorDrawable

import android.net.Uri

import android.os.Looper
@@ -667,7 +666,7 @@ fun Activity.setupDialogStuff(view: View, dialog: AlertDialog, titleId: Int = 0, 
    if (view is ViewGroup)

        updateTextColors(view)

    else if (view is MyTextView) {

        view.setColors(baseConfig.textColor, if (isBlackAndWhiteTheme()) Color.WHITE else baseConfig.primaryColor, baseConfig.backgroundColor)

        view.setColors(baseConfig.textColor, getAdjustedPrimaryColor(), baseConfig.backgroundColor)

    }



    var title: TextView? = null