diff --git a/res/layout/fragment_about.xml b/res/layout/fragment_about.xml index 1674bd61..2c0f43b1 100644 --- a/res/layout/fragment_about.xml +++ b/res/layout/fragment_about.xml @@ -63,13 +63,6 @@ - diff --git a/res/values/strings.xml b/res/values/strings.xml index 2f9e8589..e1c840e6 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -466,8 +466,6 @@ Website https://kdeconnect.kde.org/ - (ะก) 2013-2021 The KDE Connect Developers - About Authors Thanks To @@ -487,8 +485,6 @@ Send Compose text - Multi-platform app that allows your devices to communicate (e.g., your phone and your computer) - About

KDE is a world-wide community of software engineers, artists, writers, translators and creators who are committed to Free Software development. KDE produces the Plasma desktop environment, hundreds of applications, and the many software libraries that support them.

diff --git a/src/org/kde/kdeconnect/UserInterface/About/AboutData.kt b/src/org/kde/kdeconnect/UserInterface/About/AboutData.kt index fd9595a8..a6538f9c 100644 --- a/src/org/kde/kdeconnect/UserInterface/About/AboutData.kt +++ b/src/org/kde/kdeconnect/UserInterface/About/AboutData.kt @@ -10,19 +10,17 @@ import android.content.Context import android.os.Parcel import android.os.Parcelable -class AboutData(var name: String, var description: Int, var icon: Int, var versionName: String, var copyrightStatement: String? = null, - var bugURL: String? = null, var websiteURL: String? = null, var sourceCodeURL: String? = null, var donateURL: String? = null, +class AboutData(var name: String, var icon: Int, var versionName: String, var bugURL: String? = null, + var websiteURL: String? = null, var sourceCodeURL: String? = null, var donateURL: String? = null, var authorsFooterText: Int? = null) : Parcelable { val authors: MutableList = mutableListOf() - constructor(parcel: Parcel) : this(parcel.readString()!!, parcel.readInt(), parcel.readInt(), parcel.readString()!!, parcel.readString(), + constructor(parcel: Parcel) : this(parcel.readString()!!, parcel.readInt(), parcel.readString()!!, parcel.readString(), parcel.readString(), parcel.readString(), parcel.readString(), if (parcel.readByte() == 0x01.toByte()) parcel.readInt() else null) { parcel.readList(authors as List<*>, AboutPerson::class.java.classLoader) } - fun getDescriptionString(context: Context): String = context.resources.getString(description) - companion object CREATOR : Parcelable.Creator { override fun createFromParcel(parcel: Parcel): AboutData = AboutData(parcel) override fun newArray(size: Int): Array = arrayOfNulls(size) @@ -30,10 +28,8 @@ class AboutData(var name: String, var description: Int, var icon: Int, var versi override fun writeToParcel(parcel: Parcel, flags: Int) { parcel.writeString(name) - parcel.writeInt(description) parcel.writeInt(icon) parcel.writeString(versionName) - parcel.writeString(copyrightStatement) parcel.writeList(authors.toList()) parcel.writeString(bugURL) diff --git a/src/org/kde/kdeconnect/UserInterface/About/AboutFragment.kt b/src/org/kde/kdeconnect/UserInterface/About/AboutFragment.kt index 9331db92..e9a760ff 100644 --- a/src/org/kde/kdeconnect/UserInterface/About/AboutFragment.kt +++ b/src/org/kde/kdeconnect/UserInterface/About/AboutFragment.kt @@ -57,7 +57,6 @@ class AboutFragment : Fragment() { // Update general info binding!!.appName.text = aboutData.name - binding!!.appDescription.text = this.context?.let { aboutData.getDescriptionString(it) } + if (aboutData.copyrightStatement == null) "" else "\n\n" + aboutData.copyrightStatement binding!!.appIcon.setImageDrawable(this.context?.let { ContextCompat.getDrawable(it, aboutData.icon) }) binding!!.appVersion.text = this.context?.getString(R.string.version, aboutData.versionName) diff --git a/src/org/kde/kdeconnect/UserInterface/About/ApplicationAboutData.kt b/src/org/kde/kdeconnect/UserInterface/About/ApplicationAboutData.kt index c5e57044..9d82c493 100644 --- a/src/org/kde/kdeconnect/UserInterface/About/ApplicationAboutData.kt +++ b/src/org/kde/kdeconnect/UserInterface/About/ApplicationAboutData.kt @@ -14,7 +14,7 @@ import org.kde.kdeconnect_tp.R * Add authors and credits here */ fun getApplicationAboutData(context: Context): AboutData { - val aboutData = AboutData(context.getString(R.string.kde_connect), R.string.app_description, R.drawable.icon, BuildConfig.VERSION_NAME, context.getString(R.string.copyright_statement), + val aboutData = AboutData(context.getString(R.string.kde_connect), R.drawable.icon, BuildConfig.VERSION_NAME, context.getString(R.string.report_bug_url), context.getString(R.string.website_url), context.getString(R.string.source_code_url), context.getString(R.string.donate_url), R.string.everyone_else)