From 04254f433daa44b53d14580b71635c440a93b736 Mon Sep 17 00:00:00 2001 From: Mariotaku Lee Date: Mon, 24 Apr 2017 00:44:57 +0800 Subject: [PATCH] updated version --- twidere/build.gradle | 4 ++-- twidere/src/.google.commit-id | 2 +- .../mariotaku/twidere/adapter/ExtensionsAdapter.kt | 4 ++-- .../view/holder/TwoLineWithIconViewHolder.kt | 14 +++++++------- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/twidere/build.gradle b/twidere/build.gradle index 5a557e55d..5efbae58d 100644 --- a/twidere/build.gradle +++ b/twidere/build.gradle @@ -36,8 +36,8 @@ android { applicationId "org.mariotaku.twidere" minSdkVersion project.properties['overrideMinSdkVersion'] ?: 14 targetSdkVersion 25 - versionCode 343 - versionName '3.5.26' + versionCode 344 + versionName '3.5.27' multiDexEnabled true buildConfigField 'boolean', 'LEAK_CANARY_ENABLED', 'Boolean.parseBoolean("true")' diff --git a/twidere/src/.google.commit-id b/twidere/src/.google.commit-id index 35033ec1d..a8073a979 100644 --- a/twidere/src/.google.commit-id +++ b/twidere/src/.google.commit-id @@ -1 +1 @@ -ebf9e884f18766a69aeb1fc46883c346cbbee63b +d58e701d2eab9b0819e6611e70f2ec589dbb75c1 diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/ExtensionsAdapter.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/ExtensionsAdapter.kt index 90c83a272..cae9070d8 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/ExtensionsAdapter.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/ExtensionsAdapter.kt @@ -53,9 +53,9 @@ class ExtensionsAdapter( val info = getItem(position) val permissions = info.permissions ?: emptyArray() val permissionValid = PermissionsManager.isPermissionValid(*permissions) - holder.checkbox.visibility = if (permissionValid) View.VISIBLE else View.GONE + holder.checkbox?.visibility = if (permissionValid) View.VISIBLE else View.GONE if (permissionValid) { - holder.checkbox.isChecked = permissionsManager.checkPermission(info.packageName, *permissions) + holder.checkbox?.isChecked = permissionsManager.checkPermission(info.packageName, *permissions) } holder.text1.text = info.label holder.text2.visibility = if (TextUtils.isEmpty(info.description)) View.GONE else View.VISIBLE diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/TwoLineWithIconViewHolder.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/TwoLineWithIconViewHolder.kt index d81143ddb..80c902d76 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/TwoLineWithIconViewHolder.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/TwoLineWithIconViewHolder.kt @@ -1,18 +1,18 @@ /* - * Twidere - Twitter client for Android - * - * Copyright (C) 2012-2014 Mariotaku Lee - * + * Twidere - Twitter client for Android + * + * Copyright (C) 2012-2017 Mariotaku Lee + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -30,6 +30,6 @@ open class TwoLineWithIconViewHolder(itemView: View) : RecyclerView.ViewHolder(i val icon = itemView.findViewById(android.R.id.icon) as ImageView val text1 = itemView.findViewById(android.R.id.text1) as TextView val text2 = itemView.findViewById(android.R.id.text2) as TextView - val checkbox = itemView.findViewById(android.R.id.checkbox) as CheckBox + val checkbox = itemView.findViewById(android.R.id.checkbox) as? CheckBox }