aboutsummaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2020-07-18 18:38:06 -0700
committerGitHub <noreply@github.com>2020-07-18 18:38:06 -0700
commit2a00941b2c6aa33dcc1274370134d2870a06af9e (patch)
tree0522092ce58591093705ee37391b68c428b1211a /app
parentcf7962e6d285104fe3b3057e9fe4f5284c372459 (diff)
parentb999ec62b587eb93637fcdd5a73e5a2a6a90c97c (diff)
downloadfrost-2a00941b2c6aa33dcc1274370134d2870a06af9e.tar.gz
frost-2a00941b2c6aa33dcc1274370134d2870a06af9e.tar.bz2
frost-2a00941b2c6aa33dcc1274370134d2870a06af9e.zip
Merge pull request #1696 from AllanWang/versions
Diffstat (limited to 'app')
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/activities/AboutActivity.kt6
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/iitems/GenericIItems.kt4
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/iitems/NotificationIItem.kt2
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/iitems/TabIItem.kt2
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/views/AccountItem.kt2
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/views/KPrefTextSeekbar.kt2
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/views/Keywords.kt2
-rw-r--r--app/src/main/res/layout/intro_analytics.xml2
8 files changed, 11 insertions, 11 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/AboutActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/AboutActivity.kt
index 04c0334d..af5ba755 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/AboutActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/AboutActivity.kt
@@ -108,13 +108,13 @@ class AboutActivity : AboutActivityBase(null) {
isOpenSource = true,
libraryDescription = string(R.string.frost_description),
libraryVersion = BuildConfig.VERSION_NAME,
- license = License(
+ licenses = setOf(License(
definedName = "gplv3",
licenseName = "GNU GPL v3",
licenseWebsite = "https://www.gnu.org/licenses/gpl-3.0.en.html",
licenseDescription = "",
licenseShortDescription = ""
- )
+ ))
)
adapter.add(LibraryIItem(frost)).add(AboutLinks())
adapter.onClickListener = { _, _, item, _ ->
@@ -149,7 +149,7 @@ class AboutActivity : AboutActivityBase(null) {
override val type: Int
get() = R.id.item_about_links
- override fun bindView(holder: ViewHolder, payloads: MutableList<Any>) {
+ override fun bindView(holder: ViewHolder, payloads: List<Any>) {
super.bindView(holder, payloads)
with(holder) {
bindIconColor(*images.toTypedArray())
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/iitems/GenericIItems.kt b/app/src/main/kotlin/com/pitchedapps/frost/iitems/GenericIItems.kt
index 5257be5e..746f0c1c 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/iitems/GenericIItems.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/iitems/GenericIItems.kt
@@ -83,7 +83,7 @@ open class HeaderIItem(
val text: TextView by bindView(R.id.item_header_text)
- override fun bindView(item: HeaderIItem, payloads: MutableList<Any>) {
+ override fun bindView(item: HeaderIItem, payloads: List<Any>) {
text.setTextColor(prefs.accentColor)
text.text = item.text
text.setBackgroundColor(prefs.nativeBgColor)
@@ -112,7 +112,7 @@ open class TextIItem(
val text: TextView by bindView(R.id.item_text_view)
- override fun bindView(item: TextIItem, payloads: MutableList<Any>) {
+ override fun bindView(item: TextIItem, payloads: List<Any>) {
text.setTextColor(prefs.textColor)
text.text = item.text
text.background = createSimpleRippleDrawable(prefs.bgColor, prefs.nativeBgColor)
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/iitems/NotificationIItem.kt b/app/src/main/kotlin/com/pitchedapps/frost/iitems/NotificationIItem.kt
index 3150ce6d..ab8e7afd 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/iitems/NotificationIItem.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/iitems/NotificationIItem.kt
@@ -114,7 +114,7 @@ class NotificationIItem(val notification: FrostNotif, val cookie: String) :
private val glide
get() = GlideApp.with(itemView)
- override fun bindView(item: NotificationIItem, payloads: MutableList<Any>) {
+ override fun bindView(item: NotificationIItem, payloads: List<Any>) {
val notif = item.notification
frame.background = createSimpleRippleDrawable(
prefs.textColor,
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/iitems/TabIItem.kt b/app/src/main/kotlin/com/pitchedapps/frost/iitems/TabIItem.kt
index c1998c04..fcd71031 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/iitems/TabIItem.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/iitems/TabIItem.kt
@@ -50,7 +50,7 @@ class TabIItem(val item: FbItem) : KauIItem<TabIItem.ViewHolder>(
val image: ImageView by bindView(R.id.image)
val text: TextView by bindView(R.id.text)
- override fun bindView(item: TabIItem, payloads: MutableList<Any>) {
+ override fun bindView(item: TabIItem, payloads: List<Any>) {
val isInToolbar = adapterPosition < 4
val color = if (isInToolbar) prefs.iconColor else prefs.textColor
image.setIcon(item.item.icon, 20, color)
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/views/AccountItem.kt b/app/src/main/kotlin/com/pitchedapps/frost/views/AccountItem.kt
index 374488fd..aab7189c 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/views/AccountItem.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/views/AccountItem.kt
@@ -50,7 +50,7 @@ class AccountItem(val cookie: CookieEntity?) :
private val prefs: Prefs by inject()
- override fun bindView(holder: ViewHolder, payloads: MutableList<Any>) {
+ override fun bindView(holder: ViewHolder, payloads: List<Any>) {
super.bindView(holder, payloads)
with(holder) {
text.invisible()
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/views/KPrefTextSeekbar.kt b/app/src/main/kotlin/com/pitchedapps/frost/views/KPrefTextSeekbar.kt
index 1a287c46..e018b6d8 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/views/KPrefTextSeekbar.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/views/KPrefTextSeekbar.kt
@@ -45,7 +45,7 @@ class KPrefTextSeekbar(builder: KPrefSeekbarContract) : KPrefSeekbar(builder) {
}
@SuppressLint("MissingSuperCall")
- override fun bindView(holder: ViewHolder, payloads: MutableList<Any>) {
+ override fun bindView(holder: ViewHolder, payloads: List<Any>) {
super.bindView(holder, payloads)
descOriginalSize = holder.desc?.textSize ?: 1f
holder.desc?.layoutParams
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/views/Keywords.kt b/app/src/main/kotlin/com/pitchedapps/frost/views/Keywords.kt
index f2386e81..e96e2060 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/views/Keywords.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/views/Keywords.kt
@@ -104,7 +104,7 @@ class KeywordItem(val keyword: String) : AbstractItem<KeywordItem.ViewHolder>()
override val type: Int
get() = R.id.item_keyword
- override fun bindView(holder: ViewHolder, payloads: MutableList<Any>) {
+ override fun bindView(holder: ViewHolder, payloads: List<Any>) {
super.bindView(holder, payloads)
holder.text.text = keyword
}
diff --git a/app/src/main/res/layout/intro_analytics.xml b/app/src/main/res/layout/intro_analytics.xml
index a62a0b0f..3a44e0bb 100644
--- a/app/src/main/res/layout/intro_analytics.xml
+++ b/app/src/main/res/layout/intro_analytics.xml
@@ -29,7 +29,7 @@
app:layout_constraintTop_toBottomOf="@id/intro_title"
tools:layout_editor_absoluteX="112dp" />
- <Switch
+ <androidx.appcompat.widget.SwitchCompat
android:id="@+id/intro_switch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"