ui: cleanup various pieces of kotlin
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
		
							parent
							
								
									ade8f18a95
								
							
						
					
					
						commit
						2958144fd0
					
				@ -23,6 +23,7 @@ abstract class BaseActivity : ThemeChangeAwareActivity() {
 | 
				
			|||||||
            onSelectedTunnelChanged(oldTunnel, value)
 | 
					            onSelectedTunnelChanged(oldTunnel, value)
 | 
				
			||||||
            selectionChangeRegistry.notifyCallbacks(oldTunnel, 0, value)
 | 
					            selectionChangeRegistry.notifyCallbacks(oldTunnel, 0, value)
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    fun addOnSelectedTunnelChangedListener(listener: OnSelectedTunnelChangedListener) {
 | 
					    fun addOnSelectedTunnelChangedListener(listener: OnSelectedTunnelChangedListener) {
 | 
				
			||||||
        selectionChangeRegistry.add(listener)
 | 
					        selectionChangeRegistry.add(listener)
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
				
			|||||||
@ -49,8 +49,8 @@ class ConfigNamingDialogFragment : DialogFragment() {
 | 
				
			|||||||
        val configBytes = configText!!.toByteArray(StandardCharsets.UTF_8)
 | 
					        val configBytes = configText!!.toByteArray(StandardCharsets.UTF_8)
 | 
				
			||||||
        config = try {
 | 
					        config = try {
 | 
				
			||||||
            Config.parse(ByteArrayInputStream(configBytes))
 | 
					            Config.parse(ByteArrayInputStream(configBytes))
 | 
				
			||||||
        } catch(e: Exception) {
 | 
					        } catch (e: Exception) {
 | 
				
			||||||
            when(e) {
 | 
					            when (e) {
 | 
				
			||||||
                is BadConfigException, is IOException -> throw IllegalArgumentException("Invalid config passed to ${javaClass.simpleName}", e)
 | 
					                is BadConfigException, is IOException -> throw IllegalArgumentException("Invalid config passed to ${javaClass.simpleName}", e)
 | 
				
			||||||
                else -> throw e
 | 
					                else -> throw e
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
 | 
				
			|||||||
@ -22,10 +22,10 @@ import com.wireguard.android.backend.Tunnel
 | 
				
			|||||||
import com.wireguard.android.databinding.TunnelEditorFragmentBinding
 | 
					import com.wireguard.android.databinding.TunnelEditorFragmentBinding
 | 
				
			||||||
import com.wireguard.android.fragment.AppListDialogFragment.AppExclusionListener
 | 
					import com.wireguard.android.fragment.AppListDialogFragment.AppExclusionListener
 | 
				
			||||||
import com.wireguard.android.model.ObservableTunnel
 | 
					import com.wireguard.android.model.ObservableTunnel
 | 
				
			||||||
import com.wireguard.android.widget.EdgeToEdge.setUpRoot
 | 
					 | 
				
			||||||
import com.wireguard.android.widget.EdgeToEdge.setUpScrollingContent
 | 
					 | 
				
			||||||
import com.wireguard.android.util.ErrorMessages
 | 
					import com.wireguard.android.util.ErrorMessages
 | 
				
			||||||
import com.wireguard.android.viewmodel.ConfigProxy
 | 
					import com.wireguard.android.viewmodel.ConfigProxy
 | 
				
			||||||
 | 
					import com.wireguard.android.widget.EdgeToEdge.setUpRoot
 | 
				
			||||||
 | 
					import com.wireguard.android.widget.EdgeToEdge.setUpScrollingContent
 | 
				
			||||||
import com.wireguard.config.Config
 | 
					import com.wireguard.config.Config
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 | 
				
			|||||||
@ -28,10 +28,10 @@ import com.wireguard.android.databinding.TunnelListFragmentBinding
 | 
				
			|||||||
import com.wireguard.android.databinding.TunnelListItemBinding
 | 
					import com.wireguard.android.databinding.TunnelListItemBinding
 | 
				
			||||||
import com.wireguard.android.fragment.ConfigNamingDialogFragment.Companion.newInstance
 | 
					import com.wireguard.android.fragment.ConfigNamingDialogFragment.Companion.newInstance
 | 
				
			||||||
import com.wireguard.android.model.ObservableTunnel
 | 
					import com.wireguard.android.model.ObservableTunnel
 | 
				
			||||||
 | 
					import com.wireguard.android.util.ErrorMessages
 | 
				
			||||||
import com.wireguard.android.widget.EdgeToEdge.setUpFAB
 | 
					import com.wireguard.android.widget.EdgeToEdge.setUpFAB
 | 
				
			||||||
import com.wireguard.android.widget.EdgeToEdge.setUpRoot
 | 
					import com.wireguard.android.widget.EdgeToEdge.setUpRoot
 | 
				
			||||||
import com.wireguard.android.widget.EdgeToEdge.setUpScrollingContent
 | 
					import com.wireguard.android.widget.EdgeToEdge.setUpScrollingContent
 | 
				
			||||||
import com.wireguard.android.util.ErrorMessages
 | 
					 | 
				
			||||||
import com.wireguard.android.widget.MultiselectableRelativeLayout
 | 
					import com.wireguard.android.widget.MultiselectableRelativeLayout
 | 
				
			||||||
import com.wireguard.config.Config
 | 
					import com.wireguard.config.Config
 | 
				
			||||||
import java9.util.concurrent.CompletableFuture
 | 
					import java9.util.concurrent.CompletableFuture
 | 
				
			||||||
 | 
				
			|||||||
@ -10,7 +10,7 @@ import androidx.databinding.Bindable
 | 
				
			|||||||
import com.wireguard.android.BR
 | 
					import com.wireguard.android.BR
 | 
				
			||||||
import com.wireguard.util.Keyed
 | 
					import com.wireguard.util.Keyed
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class ApplicationData(val icon: Drawable, val name: String, val packageName: String, isExcludedFromTunnel : Boolean) : BaseObservable(), Keyed<String> {
 | 
					class ApplicationData(val icon: Drawable, val name: String, val packageName: String, isExcludedFromTunnel: Boolean) : BaseObservable(), Keyed<String> {
 | 
				
			||||||
    override fun getKey(): String {
 | 
					    override fun getKey(): String {
 | 
				
			||||||
        return name
 | 
					        return name
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
				
			|||||||
@ -6,7 +6,12 @@ package com.wireguard.android.widget
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
import android.view.View
 | 
					import android.view.View
 | 
				
			||||||
import android.view.ViewGroup
 | 
					import android.view.ViewGroup
 | 
				
			||||||
import androidx.core.view.*
 | 
					import androidx.core.view.marginBottom
 | 
				
			||||||
 | 
					import androidx.core.view.marginLeft
 | 
				
			||||||
 | 
					import androidx.core.view.marginRight
 | 
				
			||||||
 | 
					import androidx.core.view.marginTop
 | 
				
			||||||
 | 
					import androidx.core.view.updateLayoutParams
 | 
				
			||||||
 | 
					import androidx.core.view.updatePadding
 | 
				
			||||||
import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
 | 
					import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 | 
				
			|||||||
@ -6,13 +6,11 @@
 | 
				
			|||||||
package com.wireguard.android.widget
 | 
					package com.wireguard.android.widget
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import android.animation.ObjectAnimator
 | 
					import android.animation.ObjectAnimator
 | 
				
			||||||
import android.animation.ValueAnimator
 | 
					 | 
				
			||||||
import android.content.res.ColorStateList
 | 
					import android.content.res.ColorStateList
 | 
				
			||||||
import android.graphics.*
 | 
					import android.graphics.*
 | 
				
			||||||
import android.graphics.drawable.Drawable
 | 
					import android.graphics.drawable.Drawable
 | 
				
			||||||
import android.os.Build
 | 
					import android.os.Build
 | 
				
			||||||
import android.util.FloatProperty
 | 
					import android.util.FloatProperty
 | 
				
			||||||
import android.util.Property
 | 
					 | 
				
			||||||
import androidx.annotation.ColorInt
 | 
					import androidx.annotation.ColorInt
 | 
				
			||||||
import androidx.annotation.IntRange
 | 
					import androidx.annotation.IntRange
 | 
				
			||||||
import androidx.annotation.RequiresApi
 | 
					import androidx.annotation.RequiresApi
 | 
				
			||||||
@ -23,6 +21,7 @@ class SlashDrawable(private val mDrawable: Drawable) : Drawable() {
 | 
				
			|||||||
    private val mPath = Path()
 | 
					    private val mPath = Path()
 | 
				
			||||||
    private val mSlashRect = RectF()
 | 
					    private val mSlashRect = RectF()
 | 
				
			||||||
    private var mAnimationEnabled = true
 | 
					    private var mAnimationEnabled = true
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // Animate this value on change
 | 
					    // Animate this value on change
 | 
				
			||||||
    private var mCurrentSlashLength = 0f
 | 
					    private var mCurrentSlashLength = 0f
 | 
				
			||||||
    private var mRotation = 0f
 | 
					    private var mRotation = 0f
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user