Merge pull request #6148 from thundernest/update_about
Update misc section in settings screen
This commit is contained in:
cketti
GitHub
commit
7faa66f427
8 changed files with 38 additions and 2 deletions
|
|
@ -96,6 +96,7 @@ class AboutFragment : Fragment() {
|
|||
private val USED_LIBRARIES = arrayOf(
|
||||
Library("Android Jetpack libraries", "https://developer.android.com/jetpack", "Apache License, Version 2.0"),
|
||||
Library("AndroidX Preference eXtended", "https://github.com/Gericop/Android-Support-Preference-V7-Fix", "Apache License, Version 2.0"),
|
||||
Library("AppAuth for Android", "https://github.com/openid/AppAuth-Android", "Apache License, Version 2.0"),
|
||||
Library("CircleImageView", "https://github.com/hdodenhof/CircleImageView", "Apache License, Version 2.0"),
|
||||
Library("ckChangeLog", "https://github.com/cketti/ckChangeLog", "Apache License, Version 2.0"),
|
||||
Library("Commons IO", "https://commons.apache.org/io/", "Apache License, Version 2.0"),
|
||||
|
|
|
|||
|
|
@ -131,9 +131,15 @@ class SettingsListFragment : Fragment(), ItemTouchCallback {
|
|||
)
|
||||
|
||||
addUrlAction(
|
||||
text = getString(R.string.user_forum_title),
|
||||
text = getString(R.string.user_manual_title),
|
||||
url = getString(R.string.user_manual_url),
|
||||
icon = R.attr.iconUserManual
|
||||
)
|
||||
|
||||
addUrlAction(
|
||||
text = getString(R.string.get_help_title),
|
||||
url = getString(R.string.user_forum_url),
|
||||
icon = R.attr.iconUserForum
|
||||
icon = R.attr.iconHelp
|
||||
)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
10
app/ui/legacy/src/main/res/drawable/ic_help.xml
Normal file
10
app/ui/legacy/src/main/res/drawable/ic_help.xml
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:tint="?attr/colorControlNormal"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:fillColor="@android:color/white"
|
||||
android:pathData="M11,18h2v-2h-2v2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM12,6c-2.21,0 -4,1.79 -4,4h2c0,-1.1 0.9,-2 2,-2s2,0.9 2,2c0,2 -3,1.75 -3,5h2c0,-2.25 3,-2.5 3,-5 0,-2.21 -1.79,-4 -4,-4z" />
|
||||
</vector>
|
||||
10
app/ui/legacy/src/main/res/drawable/ic_open_book.xml
Normal file
10
app/ui/legacy/src/main/res/drawable/ic_open_book.xml
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:tint="?attr/colorControlNormal"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:fillColor="@android:color/white"
|
||||
android:pathData="M17.5 14.33C18.29 14.33 19.13 14.41 20 14.57V16.07C19.38 15.91 18.54 15.83 17.5 15.83C15.6 15.83 14.11 16.16 13 16.82V15.13C14.17 14.6 15.67 14.33 17.5 14.33M13 12.46C14.29 11.93 15.79 11.67 17.5 11.67C18.29 11.67 19.13 11.74 20 11.9V13.4C19.38 13.24 18.54 13.16 17.5 13.16C15.6 13.16 14.11 13.5 13 14.15M17.5 10.5C15.6 10.5 14.11 10.82 13 11.5V9.84C14.23 9.28 15.73 9 17.5 9C18.29 9 19.13 9.08 20 9.23V10.78C19.26 10.59 18.41 10.5 17.5 10.5M21 18.5V7C19.96 6.67 18.79 6.5 17.5 6.5C15.45 6.5 13.62 7 12 8V19.5C13.62 18.5 15.45 18 17.5 18C18.69 18 19.86 18.16 21 18.5M17.5 4.5C19.85 4.5 21.69 5 23 6V20.56C23 20.68 22.95 20.8 22.84 20.91C22.73 21 22.61 21.08 22.5 21.08C22.39 21.08 22.31 21.06 22.25 21.03C20.97 20.34 19.38 20 17.5 20C15.45 20 13.62 20.5 12 21.5C10.66 20.5 8.83 20 6.5 20C4.84 20 3.25 20.36 1.75 21.07C1.72 21.08 1.68 21.08 1.63 21.1C1.59 21.11 1.55 21.12 1.5 21.12C1.39 21.12 1.27 21.08 1.16 21C1.05 20.89 1 20.78 1 20.65V6C2.34 5 4.18 4.5 6.5 4.5C8.83 4.5 10.66 5 12 6C13.34 5 15.17 4.5 17.5 4.5Z" />
|
||||
</vector>
|
||||
|
|
@ -99,6 +99,8 @@
|
|||
<attr name="iconAboutTwitter" format="reference"/>
|
||||
<attr name="iconAboutFediverse" format="reference"/>
|
||||
<attr name="iconUserForum" format="reference"/>
|
||||
<attr name="iconUserManual" format="reference"/>
|
||||
<attr name="iconHelp" format="reference"/>
|
||||
|
||||
<attr name="unencryptedAttachmentUnlock" format="reference|color" />
|
||||
<attr name="openpgp_black" format="reference|color" />
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="app_webpage_url" translatable="false">https://k9mail.app/</string>
|
||||
<string name="user_manual_url" translatable="false">https://docs.k9mail.app/</string>
|
||||
<string name="user_forum_url" translatable="false">https://forum.k9mail.app/</string>
|
||||
<string name="message_header_mua" translatable="false">K-9 Mail for Android</string>
|
||||
<string name="app_authors_url" translatable="false">https://github.com/k9mail/k-9/graphs/contributors</string>
|
||||
|
|
|
|||
|
|
@ -17,6 +17,8 @@
|
|||
<string name="app_license">Apache License, Version 2.0</string>
|
||||
<string name="about_project_title">Open Source Project</string>
|
||||
<string name="about_website_title">Website</string>
|
||||
<string name="user_manual_title">User manual</string>
|
||||
<string name="get_help_title">Get help</string>
|
||||
<string name="user_forum_title">User forum</string>
|
||||
<string name="about_fediverse_title">Fediverse</string>
|
||||
<string name="about_twitter_title">Twitter</string>
|
||||
|
|
|
|||
|
|
@ -110,6 +110,8 @@
|
|||
<item name="iconAboutLicense">@drawable/ic_description</item>
|
||||
<item name="iconAboutWebsite">@drawable/ic_link</item>
|
||||
<item name="iconUserForum">@drawable/ic_forum</item>
|
||||
<item name="iconUserManual">@drawable/ic_open_book</item>
|
||||
<item name="iconHelp">@drawable/ic_help</item>
|
||||
<item name="iconAboutFediverse">@drawable/ic_mastodon</item>
|
||||
<item name="iconAboutTwitter">@drawable/ic_twitter</item>
|
||||
|
||||
|
|
@ -229,6 +231,8 @@
|
|||
<item name="iconAboutLicense">@drawable/ic_description</item>
|
||||
<item name="iconAboutWebsite">@drawable/ic_link</item>
|
||||
<item name="iconUserForum">@drawable/ic_forum</item>
|
||||
<item name="iconUserManual">@drawable/ic_open_book</item>
|
||||
<item name="iconHelp">@drawable/ic_help</item>
|
||||
<item name="iconAboutFediverse">@drawable/ic_mastodon</item>
|
||||
<item name="iconAboutTwitter">@drawable/ic_twitter</item>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue