Pixelfed
/
PixelDroid-App-Android
mirror of https://gitlab.shinice.net/pixeldroid/PixelDroid
1
0
Fork 0
Code Issues Releases Wiki Activity

Finish removing deprecated kotlin-android-extensions uses

This commit is contained in:
Matthieu 2021-01-13 11:16:03 +01:00
parent bebf0233dc
commit 79c0d5c0b4
5 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/build.gradle
View File

@ -5,7 +5,6 @@ plugins {
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-kapt'
apply plugin: 'kotlin-android-extensions'
apply plugin: 'jacoco'

2
app/src/main/java/com/h/pixeldroid/posts/StatusViewHolder.kt
View File

@ -154,7 +154,7 @@ class StatusViewHolder(val binding: PostFragmentBinding) : RecyclerView.ViewHold
}
if (status?.sensitive!!) {
status?.setupSensitiveLayout(binding.root)
status?.setupSensitiveLayout(binding)
}
}

11
app/src/main/java/com/h/pixeldroid/settings/AboutActivity.kt
View File

@ -4,18 +4,21 @@ import android.content.Intent
import android.os.Bundle
import com.h.pixeldroid.BuildConfig
import com.h.pixeldroid.R
import com.h.pixeldroid.databinding.ActivityAboutBinding
import com.h.pixeldroid.utils.BaseActivity
import kotlinx.android.synthetic.main.activity_about.*
class AboutActivity : BaseActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_about)
val binding = ActivityAboutBinding.inflate(layoutInflater)
setContentView(binding.root)
supportActionBar?.setDisplayHomeAsUpEnabled(true)
supportActionBar?.setTitle(R.string.about_pixeldroid)
aboutVersionNumber.text = BuildConfig.VERSION_NAME
licensesButton.setOnClickListener{
binding.aboutVersionNumber.text = BuildConfig.VERSION_NAME
binding.licensesButton.setOnClickListener{
val intent = Intent(this, LicenseActivity::class.java)
startActivity(intent)
}

10
app/src/main/java/com/h/pixeldroid/settings/LicenseActivity.kt
View File

@ -2,16 +2,18 @@ package com.h.pixeldroid.settings
import android.os.Bundle
import com.h.pixeldroid.R
import com.h.pixeldroid.databinding.ActivityLicensesBinding
import com.h.pixeldroid.utils.BaseActivity
import kotlinx.android.synthetic.main.activity_licenses.*
class LicenseActivity : BaseActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_licenses)
val binding = ActivityLicensesBinding.inflate(layoutInflater)
setContentView(binding.root)
supportActionBar?.setDisplayHomeAsUpEnabled(true)
supportActionBar?.setTitle(R.string.dependencies_licenses)
webview.loadUrl("file:///android_asset/licenses.html")
binding.webview.loadUrl("file:///android_asset/licenses.html")
}
}

27
app/src/main/java/com/h/pixeldroid/utils/api/objects/Status.kt
View File

@ -8,19 +8,14 @@ import android.graphics.ColorMatrix
import android.graphics.ColorMatrixColorFilter
import android.net.Uri
import android.os.Environment
import android.text.Spanned
import android.view.View
import android.view.View.GONE
import android.view.View.VISIBLE
import android.widget.ImageView
import android.widget.TextView
import androidx.core.net.toUri
import com.google.android.material.snackbar.Snackbar
import com.h.pixeldroid.R
import com.h.pixeldroid.utils.api.PixelfedAPI
import com.h.pixeldroid.databinding.PostFragmentBinding
import com.h.pixeldroid.posts.getDomain
import com.h.pixeldroid.posts.parseHTMLText
import kotlinx.android.synthetic.main.post_fragment.view.*
import java.io.File
import java.io.Serializable
import java.util.*
@ -93,26 +88,26 @@ open class Status(
}
fun setupSensitiveLayout(view: View) {
fun setupSensitiveLayout(binding: PostFragmentBinding) {
// Set dark layout and warning message
view.sensitiveWarning.visibility = VISIBLE
binding.sensitiveWarning.visibility = VISIBLE
val array = floatArrayOf(0f, 0f, 0f, 0f, 0f, 0f, 0f, 0f, 0f, 0f, 0f, 0f, 0f, 0f, 0f, 0f, 0f, 0f, 1f, 0f)
val censorMatrix = ColorMatrix(array)
view.postPicture.colorFilter = ColorMatrixColorFilter(censorMatrix)
binding.postPicture.colorFilter = ColorMatrixColorFilter(censorMatrix)
fun uncensorPicture(view: View) {
view.sensitiveWarning.visibility = GONE
view.postPicture.clearColorFilter()
fun uncensorPicture(binding: PostFragmentBinding) {
binding.sensitiveWarning.visibility = GONE
binding.postPicture.clearColorFilter()
}
view.findViewById<TextView>(R.id.sensitiveWarning).setOnClickListener {
uncensorPicture(view)
binding.sensitiveWarning.setOnClickListener {
uncensorPicture(binding)
}
view.findViewById<ImageView>(R.id.postPicture).setOnClickListener {
uncensorPicture(view)
binding.postPicture.setOnClickListener {
uncensorPicture(binding)
}
}