aboutsummaryrefslogtreecommitdiff
path: root/about
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2017-10-13 23:42:57 -0400
committerAllan Wang <me@allanwang.ca>2017-10-13 23:42:57 -0400
commitafc1a0261985dcf8e7d73255c291098af1fdc966 (patch)
tree5fad06062bf746b14f807e619d011cf41d83cf59 /about
parent1edb6e1ac1297f6feb229d8f89e07a88de1ae2e9 (diff)
parenta0b35316f7bb6014ebbd3e18be870e860b30ea71 (diff)
downloadkau-afc1a0261985dcf8e7d73255c291098af1fdc966.tar.gz
kau-afc1a0261985dcf8e7d73255c291098af1fdc966.tar.bz2
kau-afc1a0261985dcf8e7d73255c291098af1fdc966.zip
Merge dev3.4.4
Diffstat (limited to 'about')
-rw-r--r--about/src/main/kotlin/ca/allanwang/kau/about/FaqIItem.kt6
-rw-r--r--about/src/main/kotlin/ca/allanwang/kau/about/LibraryIItem.kt6
-rw-r--r--about/src/main/res/values/strings.xml5
-rw-r--r--about/src/main/res/values/strings_about.xml23
-rw-r--r--about/src/main/res/values/strings_about_kau.xml20
5 files changed, 30 insertions, 30 deletions
diff --git a/about/src/main/kotlin/ca/allanwang/kau/about/FaqIItem.kt b/about/src/main/kotlin/ca/allanwang/kau/about/FaqIItem.kt
index 629aa52..5595aed 100644
--- a/about/src/main/kotlin/ca/allanwang/kau/about/FaqIItem.kt
+++ b/about/src/main/kotlin/ca/allanwang/kau/about/FaqIItem.kt
@@ -1,5 +1,6 @@
package ca.allanwang.kau.about
+import android.annotation.SuppressLint
import android.support.v7.widget.RecyclerView
import android.text.method.LinkMovementMethod
import android.view.View
@@ -22,9 +23,7 @@ class FaqIItem(val content: FaqItem) : KauIItem<LibraryIItem, FaqIItem.ViewHolde
), ThemableIItem by ThemableIItemDelegate() {
companion object {
-
-
- @JvmStatic fun bindEvents(fastAdapter: FastAdapter<IItem<*, *>>) {
+ fun bindEvents(fastAdapter: FastAdapter<IItem<*, *>>) {
fastAdapter.withSelectable(false)
.withEventHook(object : ClickEventHook<IItem<*, *>>() {
@@ -43,6 +42,7 @@ class FaqIItem(val content: FaqItem) : KauIItem<LibraryIItem, FaqIItem.ViewHolde
private var isExpanded = false
+ @SuppressLint("SetTextI18n")
override fun bindView(holder: ViewHolder, payloads: MutableList<Any>?) {
super.bindView(holder, payloads)
with(holder) {
diff --git a/about/src/main/kotlin/ca/allanwang/kau/about/LibraryIItem.kt b/about/src/main/kotlin/ca/allanwang/kau/about/LibraryIItem.kt
index e50460e..88e6f9b 100644
--- a/about/src/main/kotlin/ca/allanwang/kau/about/LibraryIItem.kt
+++ b/about/src/main/kotlin/ca/allanwang/kau/about/LibraryIItem.kt
@@ -25,7 +25,7 @@ class LibraryIItem(val lib: Library) : KauIItem<LibraryIItem, LibraryIItem.ViewH
), ThemableIItem by ThemableIItemDelegate() {
companion object {
- @JvmStatic fun bindEvents(fastAdapter: FastAdapter<IItem<*, *>>) {
+ fun bindEvents(fastAdapter: FastAdapter<IItem<*, *>>) {
fastAdapter.withSelectable(false)
.withOnClickListener { v, _, item, _ ->
if (item !is LibraryIItem) false
@@ -53,11 +53,11 @@ class LibraryIItem(val lib: Library) : KauIItem<LibraryIItem, LibraryIItem.ViewH
Html.fromHtml(lib.libraryDescription, Html.FROM_HTML_MODE_LEGACY)
else Html.fromHtml(lib.libraryDescription)
bottomDivider.gone()
- if (lib.libraryVersion?.isNotBlank() ?: false) {
+ if (lib.libraryVersion?.isNotBlank() == true) {
bottomDivider.visible()
version.visible().text = lib.libraryVersion
}
- if (lib.license?.licenseName?.isNotBlank() ?: false) {
+ if (lib.license?.licenseName?.isNotBlank() == true) {
bottomDivider.visible()
license.visible().text = lib.license?.licenseName
}
diff --git a/about/src/main/res/values/strings.xml b/about/src/main/res/values/strings.xml
deleted file mode 100644
index 164c0c8..0000000
--- a/about/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string name="kau_about_libraries_intro">This app would not be possible without the following great libraries.</string>
- <string name="kau_about_faq_intro">FAQ</string>
-</resources> \ No newline at end of file
diff --git a/about/src/main/res/values/strings_about.xml b/about/src/main/res/values/strings_about.xml
index 592f9f4..164c0c8 100644
--- a/about/src/main/res/values/strings_about.xml
+++ b/about/src/main/res/values/strings_about.xml
@@ -1,20 +1,5 @@
-<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="ResourceName">
- <string name="define_kau"/>
- <string name="library_kau_author">Allan Wang</string>
- <string name="library_kau_authorWebsite">https://www.allanwang.ca/dev/</string>
- <string name="library_kau_libraryVersion">@string/kau_version_code</string>
- <string name="library_kau_libraryName">KAU</string>
- <string name="library_kau_libraryDescription">
- <![CDATA[
- An extensive collection of Kotlin Android Utilities.
- <br/><br/>
- KAU aims to make many common functions executable in one line. It adds numerous extensions to match Kotlin\'s DSL,
- and supports completely customizable view groups that are usable in any app project.
- ]]>
- </string>
- <string name="library_kau_libraryWebsite">https://allanwang.github.io/KAU/</string>
- <string name="library_kau_isOpenSource">true</string>
- <string name="library_kau_repositoryLink">https://github.com/AllanWang/KAU</string>
- <string name="library_kau_classPath">ca.allanwang.kau</string>
- <string name="library_kau_licenseId">apache_2_0</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="kau_about_libraries_intro">This app would not be possible without the following great libraries.</string>
+ <string name="kau_about_faq_intro">FAQ</string>
</resources> \ No newline at end of file
diff --git a/about/src/main/res/values/strings_about_kau.xml b/about/src/main/res/values/strings_about_kau.xml
new file mode 100644
index 0000000..592f9f4
--- /dev/null
+++ b/about/src/main/res/values/strings_about_kau.xml
@@ -0,0 +1,20 @@
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="ResourceName">
+ <string name="define_kau"/>
+ <string name="library_kau_author">Allan Wang</string>
+ <string name="library_kau_authorWebsite">https://www.allanwang.ca/dev/</string>
+ <string name="library_kau_libraryVersion">@string/kau_version_code</string>
+ <string name="library_kau_libraryName">KAU</string>
+ <string name="library_kau_libraryDescription">
+ <![CDATA[
+ An extensive collection of Kotlin Android Utilities.
+ <br/><br/>
+ KAU aims to make many common functions executable in one line. It adds numerous extensions to match Kotlin\'s DSL,
+ and supports completely customizable view groups that are usable in any app project.
+ ]]>
+ </string>
+ <string name="library_kau_libraryWebsite">https://allanwang.github.io/KAU/</string>
+ <string name="library_kau_isOpenSource">true</string>
+ <string name="library_kau_repositoryLink">https://github.com/AllanWang/KAU</string>
+ <string name="library_kau_classPath">ca.allanwang.kau</string>
+ <string name="library_kau_licenseId">apache_2_0</string>
+</resources> \ No newline at end of file