From 179675a374c63f7e65bcb339ab4dd531f6fbb483 Mon Sep 17 00:00:00 2001 From: Mygod Date: Sat, 21 Jul 2018 17:18:21 +0800 Subject: [PATCH] Refine code style --- mobile/.gitignore | 3 +-- .../src/main/java/be/mygod/vpnhotspot/ServiceNotification.kt | 2 +- .../main/java/be/mygod/vpnhotspot/client/ClientsFragment.kt | 2 +- .../main/java/be/mygod/vpnhotspot/manage/TetheringFragment.kt | 2 +- .../be/mygod/vpnhotspot/net/wifi/P2pSupplicantConfiguration.kt | 1 - mobile/src/main/res/layout/listitem_repeater.xml | 1 + 6 files changed, 5 insertions(+), 6 deletions(-) diff --git a/mobile/.gitignore b/mobile/.gitignore index 7cecd1c9..e53e1fdf 100644 --- a/mobile/.gitignore +++ b/mobile/.gitignore @@ -1,7 +1,6 @@ /build /debug -/release -/google/ +release/ # tests aren't ready yet /src/androidTest diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/ServiceNotification.kt b/mobile/src/main/java/be/mygod/vpnhotspot/ServiceNotification.kt index d7d06dbf..a4dffd67 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/ServiceNotification.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/ServiceNotification.kt @@ -25,7 +25,7 @@ object ServiceNotification { .setSmallIcon(R.drawable.ic_quick_settings_tile_on) .setContentIntent(PendingIntent.getActivity(context, 0, Intent(context, MainActivity::class.java), PendingIntent.FLAG_UPDATE_CURRENT)) - .setVisibility(Notification.VISIBILITY_PUBLIC) + .setVisibility(NotificationCompat.VISIBILITY_PUBLIC) val deviceCounts = deviceCountsMap.values.flatMap { it.entries }.sortedBy { it.key } return when (deviceCounts.size) { 0 -> builder.build() diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/client/ClientsFragment.kt b/mobile/src/main/java/be/mygod/vpnhotspot/client/ClientsFragment.kt index aaf981c1..b5356a77 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/client/ClientsFragment.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/client/ClientsFragment.kt @@ -42,7 +42,7 @@ class ClientsFragment : Fragment(), ServiceConnection { override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { binding = DataBindingUtil.inflate(inflater, R.layout.fragment_repeater, container, false) - binding.clients.layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false) + binding.clients.layoutManager = LinearLayoutManager(context, RecyclerView.VERTICAL, false) binding.clients.itemAnimator = DefaultItemAnimator() binding.clients.adapter = adapter binding.swipeRefresher.setColorSchemeResources(R.color.colorAccent) diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/manage/TetheringFragment.kt b/mobile/src/main/java/be/mygod/vpnhotspot/manage/TetheringFragment.kt index fa5c85bd..4c053fe1 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/manage/TetheringFragment.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/manage/TetheringFragment.kt @@ -95,7 +95,7 @@ class TetheringFragment : Fragment(), ServiceConnection { override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { binding = DataBindingUtil.inflate(inflater, R.layout.fragment_tethering, container, false) - binding.interfaces.layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false) + binding.interfaces.layoutManager = LinearLayoutManager(context, RecyclerView.VERTICAL, false) binding.interfaces.itemAnimator = DefaultItemAnimator() binding.interfaces.adapter = adapter adapter.update(emptyList(), emptyList(), emptyList()) diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/P2pSupplicantConfiguration.kt b/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/P2pSupplicantConfiguration.kt index 4af032ee..514db340 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/P2pSupplicantConfiguration.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/P2pSupplicantConfiguration.kt @@ -1,7 +1,6 @@ package be.mygod.vpnhotspot.net.wifi import android.net.wifi.WifiConfiguration -import android.os.Build import android.util.Log import androidx.annotation.RequiresApi import be.mygod.vpnhotspot.App.Companion.app diff --git a/mobile/src/main/res/layout/listitem_repeater.xml b/mobile/src/main/res/layout/listitem_repeater.xml index 430539f7..2711ac80 100644 --- a/mobile/src/main/res/layout/listitem_repeater.xml +++ b/mobile/src/main/res/layout/listitem_repeater.xml @@ -150,6 +150,7 @@ android:text="@={data.oc}" android:inputType="number" android:imeOptions="actionDone" + android:importantForAutofill="no" android:maxLength="3" android:hint="@string/settings_service_repeater_oc_summary"/>