From c25f024320abf58d0831f10fa877f6a58635cd53 Mon Sep 17 00:00:00 2001 From: pacien Date: Sun, 13 Oct 2019 01:09:17 +0200 Subject: target sdk 28 switching from android.support to androidx --- .../tincapp/activities/status/nodes/NodeInfoArrayAdapter.kt | 8 ++++---- .../pacien/tincapp/activities/status/nodes/NodeListFragment.kt | 10 +++++----- .../tincapp/activities/status/nodes/NodeListViewModel.kt | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'app/src/main/java/org/pacien/tincapp/activities/status/nodes') diff --git a/app/src/main/java/org/pacien/tincapp/activities/status/nodes/NodeInfoArrayAdapter.kt b/app/src/main/java/org/pacien/tincapp/activities/status/nodes/NodeInfoArrayAdapter.kt index ee103ee..42614aa 100644 --- a/app/src/main/java/org/pacien/tincapp/activities/status/nodes/NodeInfoArrayAdapter.kt +++ b/app/src/main/java/org/pacien/tincapp/activities/status/nodes/NodeInfoArrayAdapter.kt @@ -1,6 +1,6 @@ /* * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon - * Copyright (C) 2017-2018 Pacien TRAN-GIRARD + * Copyright (C) 2017-2019 Pacien TRAN-GIRARD * * 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 @@ -19,7 +19,7 @@ package org.pacien.tincapp.activities.status.nodes import android.content.Context -import android.databinding.DataBindingUtil +import androidx.databinding.DataBindingUtil import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -29,10 +29,10 @@ import org.pacien.tincapp.databinding.StatusNodeListItemBinding /** * @author pacien */ -class NodeInfoArrayAdapter(context: Context?, private val onItemClick: (NodeInfo) -> Unit) : ArrayAdapter(context, -1) { +class NodeInfoArrayAdapter(context: Context, private val onItemClick: (NodeInfo) -> Unit) : ArrayAdapter(context, -1) { private val layoutInflater = LayoutInflater.from(context)!! - override fun getView(position: Int, convertView: View?, parent: ViewGroup?): View { + override fun getView(position: Int, convertView: View?, parent: ViewGroup): View { val binding = when (convertView) { null -> StatusNodeListItemBinding.inflate(layoutInflater, parent, false) else -> DataBindingUtil.getBinding(convertView)!! diff --git a/app/src/main/java/org/pacien/tincapp/activities/status/nodes/NodeListFragment.kt b/app/src/main/java/org/pacien/tincapp/activities/status/nodes/NodeListFragment.kt index 4d245ef..51b0c79 100644 --- a/app/src/main/java/org/pacien/tincapp/activities/status/nodes/NodeListFragment.kt +++ b/app/src/main/java/org/pacien/tincapp/activities/status/nodes/NodeListFragment.kt @@ -1,6 +1,6 @@ /* * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon - * Copyright (C) 2017-2018 Pacien TRAN-GIRARD + * Copyright (C) 2017-2019 Pacien TRAN-GIRARD * * 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 @@ -18,10 +18,10 @@ package org.pacien.tincapp.activities.status.nodes -import android.arch.lifecycle.Observer -import android.arch.lifecycle.ViewModelProviders +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModelProviders import android.os.Bundle -import android.support.v7.app.AlertDialog +import androidx.appcompat.app.AlertDialog import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -43,7 +43,7 @@ class NodeListFragment : BaseFragment() { private val tincCtl = Tinc private val netName by lazy { vpnService.getCurrentNetName()!! } private val nodeListViewModel by lazy { ViewModelProviders.of(this).get(NodeListViewModel::class.java) } - private val nodeListAdapter by lazy { NodeInfoArrayAdapter(context, this::onItemClick) } + private val nodeListAdapter by lazy { NodeInfoArrayAdapter(requireContext(), this::onItemClick) } private val nodeListObserver by lazy { Observer> { nodeListAdapter.setElements(it) } } override fun onCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/org/pacien/tincapp/activities/status/nodes/NodeListViewModel.kt b/app/src/main/java/org/pacien/tincapp/activities/status/nodes/NodeListViewModel.kt index 81b0aca..2e8c139 100644 --- a/app/src/main/java/org/pacien/tincapp/activities/status/nodes/NodeListViewModel.kt +++ b/app/src/main/java/org/pacien/tincapp/activities/status/nodes/NodeListViewModel.kt @@ -1,6 +1,6 @@ /* * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon - * Copyright (C) 2017-2018 Pacien TRAN-GIRARD + * Copyright (C) 2017-2019 Pacien TRAN-GIRARD * * 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 @@ -18,7 +18,7 @@ package org.pacien.tincapp.activities.status.nodes -import android.arch.lifecycle.ViewModel +import androidx.lifecycle.ViewModel import org.pacien.tincapp.service.TincVpnService /** -- cgit v1.2.3