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

Unverified Commit 1def1cb0 authored by cketti's avatar cketti Committed by GitHub
Browse files

Merge pull request #5091 from k9mail/about_screen 

Rework appearance of About screen
parents 8b5ed916 431f8197

app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/AboutFragment.kt

+55 −23
Original line number Diff line number Diff line 
package com.fsck.k9.ui.settings



import android.content.ActivityNotFoundException

import android.content.Context

import android.content.Intent

import android.content.pm.PackageManager

import android.net.Uri
@@ -7,18 +9,15 @@ import android.os.Bundle 
import android.view.LayoutInflater

import android.view.View

import android.view.ViewGroup

import android.widget.TextView

import android.widget.Toast

import androidx.fragment.app.Fragment

import androidx.recyclerview.widget.LinearLayoutManager

import androidx.recyclerview.widget.RecyclerView

import com.fsck.k9.ui.R

import de.cketti.library.changelog.ChangeLog

import java.util.Calendar

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

import kotlinx.android.synthetic.main.fragment_about.*

import timber.log.Timber



private data class Library(val name: String, val URL: String, val license: String)



class AboutFragment : Fragment() {

    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {

        return inflater.inflate(R.layout.fragment_about, container, false)
@@ -27,32 +26,50 @@ class AboutFragment : Fragment() { 
    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {

        super.onViewCreated(view, savedInstanceState)



        version.text = getVersionNumber()

        versionLayout.setOnClickListener { displayChangeLog() }

        val versionTextView = view.findViewById<TextView>(R.id.version)

        versionTextView.text = getVersionNumber()



        val year = Calendar.getInstance().get(Calendar.YEAR).toString()

        copyright.text = getString(R.string.app_copyright_fmt, year, year)

        val versionLayout = view.findViewById<View>(R.id.versionLayout)

        versionLayout.setOnClickListener { displayChangeLog() }



        val authorsLayout = view.findViewById<View>(R.id.authorsLayout)

        authorsLayout.setOnClickListener {

            startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.app_authors_url))))

            openUrl(getString(R.string.app_authors_url))

        }



        val licenseLayout = view.findViewById<View>(R.id.licenseLayout)

        licenseLayout.setOnClickListener {

            startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.app_license_url))))

            openUrl(getString(R.string.app_license_url))

        }



        val sourceCodeLayout = view.findViewById<View>(R.id.sourceCodeLayout)

        sourceCodeLayout.setOnClickListener {

            openUrl(getString(R.string.app_source_url))

        }



        val websiteLayout = view.findViewById<View>(R.id.websiteLayout)

        websiteLayout.setOnClickListener {

            openUrl(getString(R.string.app_webpage_url))

        }



        source.setOnClickListener {

            startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.app_source_url))))

        val userForumLayout = view.findViewById<View>(R.id.userForumLayout)

        userForumLayout.setOnClickListener {

            openUrl(getString(R.string.user_forum_url))

        }



        changelog.setOnClickListener { displayChangeLog() }

        val fediverseLayout = view.findViewById<View>(R.id.fediverseLayout)

        fediverseLayout.setOnClickListener {

            openUrl(getString(R.string.fediverse_url))

        }



        revisions.setOnClickListener {

            startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.app_revision_url))))

        val twitterLayout = view.findViewById<View>(R.id.twitterLayout)

        twitterLayout.setOnClickListener {

            openUrl(getString(R.string.twitter_url))

        }



        val manager = LinearLayoutManager(view.context)

        libraries.apply {

        val librariesRecyclerView = view.findViewById<RecyclerView>(R.id.libraries)

        librariesRecyclerView.apply {

            layoutManager = manager

            adapter = LibrariesAdapter(USED_LIBRARIES)

            isNestedScrollingEnabled = false
@@ -104,10 +121,26 @@ class AboutFragment : Fragment() { 
    }

}



private fun Fragment.openUrl(url: String) = requireContext().openUrl(url)



private fun Context.openUrl(url: String) {

    try {

        val viewIntent = Intent(Intent.ACTION_VIEW, Uri.parse(url))

        startActivity(viewIntent)

    } catch (e: ActivityNotFoundException) {

        Toast.makeText(this, R.string.error_activity_not_found, Toast.LENGTH_SHORT).show()

    }

}



private data class Library(val name: String, val url: String, val license: String)



private class LibrariesAdapter(private val dataset: Array<Library>) :

    RecyclerView.Adapter<LibrariesAdapter.ViewHolder>() {



    class ViewHolder(val view: View) : RecyclerView.ViewHolder(view)

    class ViewHolder(view: View) : RecyclerView.ViewHolder(view) {

        val name: TextView = view.findViewById(R.id.name)

        val license: TextView = view.findViewById(R.id.license)

    }



    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {

        val view = LayoutInflater.from(parent.context).inflate(R.layout.about_library, parent, false)
@@ -116,11 +149,10 @@ private class LibrariesAdapter(private val dataset: Array<Library>) : 


    override fun onBindViewHolder(holder: ViewHolder, index: Int) {

        val library = dataset[index]

        holder.view.name.text = library.name

        holder.view.license.text = library.license

        holder.view.setOnClickListener {

            holder.view.context

                .startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(library.URL)))

        holder.name.text = library.name

        holder.license.text = library.license

        holder.itemView.setOnClickListener {

            holder.itemView.context.openUrl(library.url)

        }

    }

app/ui/legacy/src/main/res/drawable-anydpi/ic_code_dark.xml

deleted100644 → 0
+0 −9
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:viewportHeight="24.0"

    android:viewportWidth="24.0">

    <path

	android:fillColor="#FFFFFFFF"

	android:pathData="M9.4 16.6L4.8 12l4.6-4.6L8 6l-6 6 6 6 1.4-1.4zm5.2 0l4.6-4.6-4.6-4.6L16 6l6 6-6 6-1.4-1.4z" />

</vector>

app/ui/legacy/src/main/res/drawable-anydpi/ic_description_dark.xml

deleted100644 → 0
+0 −9
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:viewportHeight="24.0"

    android:viewportWidth="24.0">

    <path

	android:fillColor="#FFFFFFFF"

	android:pathData="M14 2H6c-1.1 0-1.99.9-1.99 2L4 20c0 1.1.89 2 1.99 2H18c1.1 0 2-.9 2-2V8l-6-6zm2 16H8v-2h8v2zm0-4H8v-2h8v2zm-3-5V3.5L18.5 9H13z" />

</vector>

app/ui/legacy/src/main/res/drawable-anydpi/ic_description_light.xml

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:alpha="0.54"

    android:viewportHeight="24.0"

    android:viewportWidth="24.0">

    <path

        android:fillColor="#FF000000"

        android:pathData="M14 2H6c-1.1 0-1.99.9-1.99 2L4 20c0 1.1.89 2 1.99 2H18c1.1 0 2-.9 2-2V8l-6-6zm2 16H8v-2h8v2zm0-4H8v-2h8v2zm-3-5V3.5L18.5 9H13z" />

</vector>

app/ui/legacy/src/main/res/drawable-anydpi/ic_code_light.xml→app/ui/legacy/src/main/res/drawable/ic_code.xml

+4 −4
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:alpha="0.54"

    android:viewportHeight="24.0"

    android:viewportWidth="24.0">

    android:tint="?attr/colorControlNormal"

    android:viewportWidth="24"

    android:viewportHeight="24">

    <path

        android:fillColor="#FF000000"

        android:fillColor="@android:color/white"

        android:pathData="M9.4 16.6L4.8 12l4.6-4.6L8 6l-6 6 6 6 1.4-1.4zm5.2 0l4.6-4.6-4.6-4.6L16 6l6 6-6 6-1.4-1.4z" />

</vector>