diff --git a/.codeclimate.yml b/.codeclimate.yml index eeb4f723a..511cef36e 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -1,2 +1,2 @@ exclude_patterns: - - "app/src/main/kotlin/io/treehouses/remote/Views/terminal" + - "app/src/main/kotlin/io/treehouses/remote/views/terminal" diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index d4480781c..f81ba2e36 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -143,7 +143,7 @@ -keep interface com.github.nkzawa.** { *; } -keep class io.treehouses.remote.pojo.** { *; } --keep class io.treehouses.remote.SSH.beans.** { *; } +-keep class io.treehouses.remote.ssh.beans.** { *; } -keep public class com.trilead.ssh2.compression.** -keep public class com.trilead.ssh2.crypto.** diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2ae824925..b5c0f297a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -43,12 +43,12 @@ diff --git a/app/src/main/kotlin/io/treehouses/remote/BaseInitialActivity.kt b/app/src/main/kotlin/io/treehouses/remote/BaseInitialActivity.kt index 6ad2f058b..fdd89c6ed 100644 --- a/app/src/main/kotlin/io/treehouses/remote/BaseInitialActivity.kt +++ b/app/src/main/kotlin/io/treehouses/remote/BaseInitialActivity.kt @@ -11,8 +11,8 @@ import androidx.appcompat.app.ActionBarDrawerToggle import androidx.core.view.GravityCompat import androidx.fragment.app.Fragment import com.google.android.material.navigation.NavigationView -import io.treehouses.remote.Fragments.* -import io.treehouses.remote.Network.BluetoothChatService +import io.treehouses.remote.fragments.* +import io.treehouses.remote.network.BluetoothChatService import io.treehouses.remote.bases.PermissionActivity import io.treehouses.remote.callback.HomeInteractListener import io.treehouses.remote.callback.NotificationCallback @@ -121,7 +121,7 @@ open class BaseInitialActivity: PermissionActivity(), NavigationView.OnNavigatio when (id) { R.id.menu_about -> openCallFragment(AboutFragment()) R.id.menu_home -> openCallFragment(HomeFragment()) - R.id.menu_ssh -> openCallFragment(SSHConfig()) + R.id.menu_ssh -> openCallFragment(SSHConfigFragment()) } } title = item.title; currentTitle = item.title.toString() @@ -139,7 +139,7 @@ open class BaseInitialActivity: PermissionActivity(), NavigationView.OnNavigatio R.id.menu_about -> AboutFragment() R.id.menu_status -> StatusFragment() R.id.menu_tunnel2 -> SSHTunnelFragment() - R.id.menu_ssh -> SSHConfig() + R.id.menu_ssh -> SSHConfigFragment() else -> HomeFragment() } diff --git a/app/src/main/kotlin/io/treehouses/remote/InitialActivity.kt b/app/src/main/kotlin/io/treehouses/remote/InitialActivity.kt index 2149dda93..c7d422704 100644 --- a/app/src/main/kotlin/io/treehouses/remote/InitialActivity.kt +++ b/app/src/main/kotlin/io/treehouses/remote/InitialActivity.kt @@ -16,10 +16,10 @@ import androidx.appcompat.widget.Toolbar import androidx.core.view.GravityCompat import androidx.drawerlayout.widget.DrawerLayout import androidx.preference.PreferenceManager -import io.treehouses.remote.Fragments.CommunityFragment -import io.treehouses.remote.Fragments.DialogFragments.FeedbackDialogFragment -import io.treehouses.remote.Fragments.DiscoverFragment -import io.treehouses.remote.Fragments.SettingsFragment +import io.treehouses.remote.fragments.CommunityFragment +import io.treehouses.remote.fragments.dialogfragments.FeedbackDialogFragment +import io.treehouses.remote.fragments.DiscoverFragment +import io.treehouses.remote.fragments.SettingsFragment import io.treehouses.remote.callback.BackPressReceiver import io.treehouses.remote.databinding.ActivityInitial2Binding import io.treehouses.remote.ui.home.HomeFragment diff --git a/app/src/main/kotlin/io/treehouses/remote/MainApplication.kt b/app/src/main/kotlin/io/treehouses/remote/MainApplication.kt index c45105cbf..64b669226 100644 --- a/app/src/main/kotlin/io/treehouses/remote/MainApplication.kt +++ b/app/src/main/kotlin/io/treehouses/remote/MainApplication.kt @@ -9,12 +9,10 @@ import android.content.Intent import android.content.ServiceConnection import android.os.Build import android.os.IBinder -import android.util.Log import androidx.core.app.NotificationCompat import androidx.preference.PreferenceManager import com.parse.Parse -import io.treehouses.remote.Network.BluetoothChatService -import io.treehouses.remote.utils.LogUtils +import io.treehouses.remote.network.BluetoothChatService import io.treehouses.remote.utils.SaveUtils import io.treehouses.remote.utils.logD import io.treehouses.remote.utils.logE diff --git a/app/src/main/kotlin/io/treehouses/remote/adapter/HelpAdapter.kt b/app/src/main/kotlin/io/treehouses/remote/adapter/HelpAdapter.kt index 100e9cbd9..f1764b582 100644 --- a/app/src/main/kotlin/io/treehouses/remote/adapter/HelpAdapter.kt +++ b/app/src/main/kotlin/io/treehouses/remote/adapter/HelpAdapter.kt @@ -4,7 +4,7 @@ import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.SortedList -import io.treehouses.remote.Views.HelpViewHolder +import io.treehouses.remote.views.HelpViewHolder import io.treehouses.remote.databinding.RowHelpBinding import io.treehouses.remote.pojo.HelpCommand diff --git a/app/src/main/kotlin/io/treehouses/remote/adapter/NetworkListAdapter.kt b/app/src/main/kotlin/io/treehouses/remote/adapter/NetworkListAdapter.kt index b82cac538..ae8f0d110 100644 --- a/app/src/main/kotlin/io/treehouses/remote/adapter/NetworkListAdapter.kt +++ b/app/src/main/kotlin/io/treehouses/remote/adapter/NetworkListAdapter.kt @@ -8,7 +8,7 @@ import android.view.ViewGroup import android.widget.BaseExpandableListAdapter import android.widget.TextView import androidx.annotation.RequiresApi -import io.treehouses.remote.Network.BluetoothChatService +import io.treehouses.remote.network.BluetoothChatService import io.treehouses.remote.R import io.treehouses.remote.callback.HomeInteractListener import io.treehouses.remote.pojo.NetworkListItem diff --git a/app/src/main/kotlin/io/treehouses/remote/adapter/ServiceCardAdapter.kt b/app/src/main/kotlin/io/treehouses/remote/adapter/ServiceCardAdapter.kt index a5a61bc2a..a1fa0e73e 100644 --- a/app/src/main/kotlin/io/treehouses/remote/adapter/ServiceCardAdapter.kt +++ b/app/src/main/kotlin/io/treehouses/remote/adapter/ServiceCardAdapter.kt @@ -3,12 +3,9 @@ package io.treehouses.remote.adapter import android.os.Bundle import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager -import androidx.fragment.app.FragmentPagerAdapter import androidx.fragment.app.FragmentStatePagerAdapter -import androidx.fragment.app.FragmentStatePagerAdapter.BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT import androidx.viewpager.widget.PagerAdapter -import androidx.viewpager2.adapter.FragmentStateAdapter -import io.treehouses.remote.Fragments.ServiceCardFragment +import io.treehouses.remote.fragments.ServiceCardFragment import io.treehouses.remote.pojo.ServiceInfo import java.util.* diff --git a/app/src/main/kotlin/io/treehouses/remote/adapter/TerminalPagerAdapter.kt b/app/src/main/kotlin/io/treehouses/remote/adapter/TerminalPagerAdapter.kt index 0af6f6b03..c097d3d3a 100644 --- a/app/src/main/kotlin/io/treehouses/remote/adapter/TerminalPagerAdapter.kt +++ b/app/src/main/kotlin/io/treehouses/remote/adapter/TerminalPagerAdapter.kt @@ -6,10 +6,10 @@ import android.view.ViewGroup import android.widget.RelativeLayout import android.widget.TextView import androidx.viewpager.widget.PagerAdapter -import io.treehouses.remote.SSHConsole.BaseSSHConsole +import io.treehouses.remote.sshconsole.BaseSSHConsole import io.treehouses.remote.R -import io.treehouses.remote.SSH.Terminal.TerminalBridge -import io.treehouses.remote.SSH.Terminal.TerminalView +import io.treehouses.remote.ssh.terminal.TerminalBridge +import io.treehouses.remote.ssh.terminal.TerminalView import io.treehouses.remote.callback.TerminalPager class TerminalPagerAdapter : PagerAdapter() { diff --git a/app/src/main/kotlin/io/treehouses/remote/adapter/TunnelPageAdapter.kt b/app/src/main/kotlin/io/treehouses/remote/adapter/TunnelPageAdapter.kt index 7833d51b0..bcbe44e5e 100644 --- a/app/src/main/kotlin/io/treehouses/remote/adapter/TunnelPageAdapter.kt +++ b/app/src/main/kotlin/io/treehouses/remote/adapter/TunnelPageAdapter.kt @@ -4,9 +4,9 @@ import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentStatePagerAdapter import androidx.viewpager.widget.PagerAdapter -import io.treehouses.remote.Fragments.SocksFragment -import io.treehouses.remote.Fragments.TorTabFragment -import io.treehouses.remote.Fragments.TunnelSSHFragment +import io.treehouses.remote.fragments.SocksFragment +import io.treehouses.remote.fragments.TorTabFragment +import io.treehouses.remote.fragments.TunnelSSHFragment import io.treehouses.remote.pojo.ServiceInfo import java.util.* diff --git a/app/src/main/kotlin/io/treehouses/remote/adapter/ViewHolderBlocker.kt b/app/src/main/kotlin/io/treehouses/remote/adapter/ViewHolderBlocker.kt index de531c645..898d040b9 100644 --- a/app/src/main/kotlin/io/treehouses/remote/adapter/ViewHolderBlocker.kt +++ b/app/src/main/kotlin/io/treehouses/remote/adapter/ViewHolderBlocker.kt @@ -4,14 +4,12 @@ import android.annotation.SuppressLint import android.content.Context import android.os.Handler import android.os.Message -import android.util.Log import android.view.View import android.widget.* import io.treehouses.remote.Constants -import io.treehouses.remote.Network.BluetoothChatService +import io.treehouses.remote.network.BluetoothChatService import io.treehouses.remote.R import io.treehouses.remote.callback.HomeInteractListener -import io.treehouses.remote.utils.LogUtils import io.treehouses.remote.utils.logD class ViewHolderBlocker internal constructor(v: View, context: Context?, listener: HomeInteractListener) { diff --git a/app/src/main/kotlin/io/treehouses/remote/adapter/ViewHolderCamera.kt b/app/src/main/kotlin/io/treehouses/remote/adapter/ViewHolderCamera.kt index 8e565769d..371599875 100644 --- a/app/src/main/kotlin/io/treehouses/remote/adapter/ViewHolderCamera.kt +++ b/app/src/main/kotlin/io/treehouses/remote/adapter/ViewHolderCamera.kt @@ -7,10 +7,8 @@ import android.view.View import android.widget.ImageView import android.widget.Switch import android.widget.Toast -import androidx.core.content.ContentProviderCompat.requireContext -import com.google.android.material.textfield.TextInputEditText import io.treehouses.remote.Constants -import io.treehouses.remote.Network.BluetoothChatService +import io.treehouses.remote.network.BluetoothChatService import io.treehouses.remote.R import io.treehouses.remote.callback.HomeInteractListener diff --git a/app/src/main/kotlin/io/treehouses/remote/adapter/ViewHolderSSH2FA.kt b/app/src/main/kotlin/io/treehouses/remote/adapter/ViewHolderSSH2FA.kt index dabae64e3..bdf878923 100644 --- a/app/src/main/kotlin/io/treehouses/remote/adapter/ViewHolderSSH2FA.kt +++ b/app/src/main/kotlin/io/treehouses/remote/adapter/ViewHolderSSH2FA.kt @@ -12,7 +12,7 @@ import android.widget.EditText import android.widget.Switch import android.widget.TextView import io.treehouses.remote.Constants -import io.treehouses.remote.Network.BluetoothChatService +import io.treehouses.remote.network.BluetoothChatService import io.treehouses.remote.R import io.treehouses.remote.callback.HomeInteractListener import io.treehouses.remote.utils.Utils diff --git a/app/src/main/kotlin/io/treehouses/remote/adapter/ViewHolderSSHAllKeyRow.kt b/app/src/main/kotlin/io/treehouses/remote/adapter/ViewHolderSSHAllKeyRow.kt index 811f6a945..3e7d7bb10 100644 --- a/app/src/main/kotlin/io/treehouses/remote/adapter/ViewHolderSSHAllKeyRow.kt +++ b/app/src/main/kotlin/io/treehouses/remote/adapter/ViewHolderSSHAllKeyRow.kt @@ -8,7 +8,7 @@ import android.widget.PopupMenu import androidx.core.view.children import androidx.recyclerview.widget.RecyclerView import io.treehouses.remote.R -import io.treehouses.remote.SSH.beans.PubKeyBean +import io.treehouses.remote.ssh.beans.PubKeyBean import io.treehouses.remote.callback.KeyMenuListener import io.treehouses.remote.databinding.RowKeyBinding diff --git a/app/src/main/kotlin/io/treehouses/remote/adapter/ViewHolderSSHKey.kt b/app/src/main/kotlin/io/treehouses/remote/adapter/ViewHolderSSHKey.kt index d2b55ce6c..f01d32ecc 100644 --- a/app/src/main/kotlin/io/treehouses/remote/adapter/ViewHolderSSHKey.kt +++ b/app/src/main/kotlin/io/treehouses/remote/adapter/ViewHolderSSHKey.kt @@ -8,7 +8,7 @@ import android.widget.Button import android.widget.Toast import com.google.android.material.textfield.TextInputEditText import io.treehouses.remote.Constants -import io.treehouses.remote.Network.BluetoothChatService +import io.treehouses.remote.network.BluetoothChatService import io.treehouses.remote.R import io.treehouses.remote.callback.HomeInteractListener import io.treehouses.remote.utils.Utils.toast diff --git a/app/src/main/kotlin/io/treehouses/remote/adapter/ViewHolderSSHRow.kt b/app/src/main/kotlin/io/treehouses/remote/adapter/ViewHolderSSHRow.kt index 08d3794c4..5459a5dbb 100644 --- a/app/src/main/kotlin/io/treehouses/remote/adapter/ViewHolderSSHRow.kt +++ b/app/src/main/kotlin/io/treehouses/remote/adapter/ViewHolderSSHRow.kt @@ -2,11 +2,11 @@ package io.treehouses.remote.adapter import android.view.View import androidx.recyclerview.widget.RecyclerView -import io.treehouses.remote.SSH.beans.HostBean -import io.treehouses.remote.callback.RVButtonClick +import io.treehouses.remote.ssh.beans.HostBean +import io.treehouses.remote.callback.RVButtonClickListener import io.treehouses.remote.databinding.RowSshBinding -class ViewHolderSSHRow(private val binding: RowSshBinding, private val listener: RVButtonClick) : RecyclerView.ViewHolder(binding.root) { +class ViewHolderSSHRow(private val binding: RowSshBinding, private val listener: RVButtonClickListener) : RecyclerView.ViewHolder(binding.root) { fun bind(host: HostBean) { binding.title.text = host.getPrettyFormat() binding.editButton.setOnClickListener { diff --git a/app/src/main/kotlin/io/treehouses/remote/adapter/ViewHolderShutdownReboot.kt b/app/src/main/kotlin/io/treehouses/remote/adapter/ViewHolderShutdownReboot.kt index 7e5da322a..75925f361 100644 --- a/app/src/main/kotlin/io/treehouses/remote/adapter/ViewHolderShutdownReboot.kt +++ b/app/src/main/kotlin/io/treehouses/remote/adapter/ViewHolderShutdownReboot.kt @@ -4,12 +4,10 @@ import android.annotation.SuppressLint import android.content.Context import android.os.Handler import android.os.Message -import android.util.Log import android.view.View import android.widget.Button -import android.widget.RadioGroup import io.treehouses.remote.Constants -import io.treehouses.remote.Network.BluetoothChatService +import io.treehouses.remote.network.BluetoothChatService import io.treehouses.remote.R import io.treehouses.remote.callback.HomeInteractListener import io.treehouses.remote.ui.home.HomeFragment diff --git a/app/src/main/kotlin/io/treehouses/remote/bases/BaseFragment.kt b/app/src/main/kotlin/io/treehouses/remote/bases/BaseFragment.kt index 2db4f67a9..0ab2b777e 100644 --- a/app/src/main/kotlin/io/treehouses/remote/bases/BaseFragment.kt +++ b/app/src/main/kotlin/io/treehouses/remote/bases/BaseFragment.kt @@ -6,11 +6,10 @@ import android.content.Context import android.content.Intent import android.os.Handler import android.os.Message -import android.util.Log import android.widget.Toast import androidx.fragment.app.Fragment import io.treehouses.remote.Constants -import io.treehouses.remote.Network.BluetoothChatService +import io.treehouses.remote.network.BluetoothChatService import io.treehouses.remote.callback.HomeInteractListener import io.treehouses.remote.utils.logE import java.lang.NullPointerException diff --git a/app/src/main/kotlin/io/treehouses/remote/bases/BaseSSH.kt b/app/src/main/kotlin/io/treehouses/remote/bases/BaseSSH.kt index e11d0445e..4e264d0ff 100644 --- a/app/src/main/kotlin/io/treehouses/remote/bases/BaseSSH.kt +++ b/app/src/main/kotlin/io/treehouses/remote/bases/BaseSSH.kt @@ -22,11 +22,11 @@ import com.trilead.ssh2.signature.ECDSASHA2Verify import com.trilead.ssh2.signature.Ed25519Verify import com.trilead.ssh2.signature.RSASHA1Verify import io.treehouses.remote.R -import io.treehouses.remote.SSH.Ed25519Provider.Companion.insertIfNeeded -import io.treehouses.remote.SSH.Terminal.TerminalBridge -import io.treehouses.remote.SSH.Terminal.TerminalManager -import io.treehouses.remote.SSH.beans.HostBean -import io.treehouses.remote.SSH.beans.PubKeyBean +import io.treehouses.remote.ssh.Ed25519Provider.Companion.insertIfNeeded +import io.treehouses.remote.ssh.terminal.TerminalBridge +import io.treehouses.remote.ssh.terminal.TerminalManager +import io.treehouses.remote.ssh.beans.HostBean +import io.treehouses.remote.ssh.beans.PubKeyBean import io.treehouses.remote.utils.KeyUtils import io.treehouses.remote.utils.logD import io.treehouses.remote.utils.logE diff --git a/app/src/main/kotlin/io/treehouses/remote/bases/BaseSSHConfig.kt b/app/src/main/kotlin/io/treehouses/remote/bases/BaseSSHConfig.kt index 1df149606..36c6bb453 100644 --- a/app/src/main/kotlin/io/treehouses/remote/bases/BaseSSHConfig.kt +++ b/app/src/main/kotlin/io/treehouses/remote/bases/BaseSSHConfig.kt @@ -7,13 +7,13 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import io.treehouses.remote.Fragments.DialogFragments.EditHostDialog -import io.treehouses.remote.SSH.Terminal.TerminalManager -import io.treehouses.remote.SSH.beans.HostBean -import io.treehouses.remote.SSH.interfaces.OnHostStatusChangedListener -import io.treehouses.remote.Views.RecyclerViewClickListener +import io.treehouses.remote.fragments.dialogfragments.EditHostDialogFragment +import io.treehouses.remote.ssh.terminal.TerminalManager +import io.treehouses.remote.ssh.beans.HostBean +import io.treehouses.remote.ssh.interfaces.OnHostStatusChangedListener +import io.treehouses.remote.views.RecyclerViewClickListener import io.treehouses.remote.adapter.ViewHolderSSHRow -import io.treehouses.remote.callback.RVButtonClick +import io.treehouses.remote.callback.RVButtonClickListener import io.treehouses.remote.databinding.DialogSshBinding import io.treehouses.remote.databinding.RowSshBinding import io.treehouses.remote.utils.SaveUtils @@ -21,7 +21,7 @@ import io.treehouses.remote.utils.logD import java.lang.Exception import java.util.regex.Pattern -open class BaseSSHConfig: BaseFragment(), RVButtonClick, OnHostStatusChangedListener { +open class BaseSSHConfig: BaseFragment(), RVButtonClickListener, OnHostStatusChangedListener { protected val sshPattern = Pattern.compile("^(.+)@(([0-9a-z.-]+)|(\\[[a-f:0-9]+\\]))(:(\\d+))?$", Pattern.CASE_INSENSITIVE) protected lateinit var bind: DialogSshBinding protected lateinit var pastHosts: List @@ -90,9 +90,9 @@ open class BaseSSHConfig: BaseFragment(), RVButtonClick, OnHostStatusChangedList } override fun onButtonClick(position: Int) { - val edit = EditHostDialog() + val edit = EditHostDialogFragment() edit.setOnDismissListener(DialogInterface.OnDismissListener { setUpAdapter() }) - edit.arguments = Bundle().apply { putString(EditHostDialog.SELECTED_HOST_URI, pastHosts[position].uri.toString())} + edit.arguments = Bundle().apply { putString(EditHostDialogFragment.SELECTED_HOST_URI, pastHosts[position].uri.toString())} edit.show(childFragmentManager, "EditHost") } diff --git a/app/src/main/kotlin/io/treehouses/remote/bases/BaseSSHKeyGen.kt b/app/src/main/kotlin/io/treehouses/remote/bases/BaseSSHKeyGen.kt index 672ff5db6..9f57a3b79 100644 --- a/app/src/main/kotlin/io/treehouses/remote/bases/BaseSSHKeyGen.kt +++ b/app/src/main/kotlin/io/treehouses/remote/bases/BaseSSHKeyGen.kt @@ -4,8 +4,8 @@ import android.view.View import android.widget.Toast import androidx.core.widget.addTextChangedListener import androidx.lifecycle.lifecycleScope -import io.treehouses.remote.SSH.PubKeyUtils -import io.treehouses.remote.SSH.beans.PubKeyBean +import io.treehouses.remote.ssh.PubKeyUtils +import io.treehouses.remote.ssh.beans.PubKeyBean import io.treehouses.remote.databinding.KeysDialogBinding import io.treehouses.remote.utils.KeyUtils import kotlinx.coroutines.* diff --git a/app/src/main/kotlin/io/treehouses/remote/bases/BaseTerminalBridge.kt b/app/src/main/kotlin/io/treehouses/remote/bases/BaseTerminalBridge.kt index 8c7583165..5740b1e28 100644 --- a/app/src/main/kotlin/io/treehouses/remote/bases/BaseTerminalBridge.kt +++ b/app/src/main/kotlin/io/treehouses/remote/bases/BaseTerminalBridge.kt @@ -4,22 +4,20 @@ import android.graphics.Bitmap import android.graphics.Canvas import android.graphics.Color import android.graphics.Paint -import android.util.Log -import io.treehouses.remote.SSH.Colors -import io.treehouses.remote.SSH.PromptHelper -import io.treehouses.remote.SSH.Relay -import io.treehouses.remote.SSH.SSH -import io.treehouses.remote.SSH.Terminal.TerminalKeyListener -import io.treehouses.remote.SSH.Terminal.TerminalManager -import io.treehouses.remote.SSH.Terminal.TerminalView -import io.treehouses.remote.SSH.beans.HostBean -import io.treehouses.remote.SSH.beans.SelectionArea -import io.treehouses.remote.SSH.interfaces.BridgeDisconnectedListener -import io.treehouses.remote.SSH.interfaces.FontSizeChangedListener -import io.treehouses.remote.Views.terminal.VDUBuffer -import io.treehouses.remote.Views.terminal.VDUDisplay -import io.treehouses.remote.Views.terminal.vt320 -import io.treehouses.remote.utils.LogUtils +import io.treehouses.remote.ssh.Colors +import io.treehouses.remote.ssh.PromptHelper +import io.treehouses.remote.ssh.Relay +import io.treehouses.remote.ssh.SSH +import io.treehouses.remote.ssh.terminal.TerminalKeyListener +import io.treehouses.remote.ssh.terminal.TerminalManager +import io.treehouses.remote.ssh.terminal.TerminalView +import io.treehouses.remote.ssh.beans.HostBean +import io.treehouses.remote.ssh.beans.SelectionArea +import io.treehouses.remote.ssh.interfaces.BridgeDisconnectedListener +import io.treehouses.remote.ssh.interfaces.FontSizeChangedListener +import io.treehouses.remote.views.terminal.VDUBuffer +import io.treehouses.remote.views.terminal.VDUDisplay +import io.treehouses.remote.views.terminal.vt320 import io.treehouses.remote.utils.logD import io.treehouses.remote.utils.logE import java.io.IOException diff --git a/app/src/main/kotlin/io/treehouses/remote/bases/BaseTerminalFragment.kt b/app/src/main/kotlin/io/treehouses/remote/bases/BaseTerminalFragment.kt index 874f33dba..8fca08b97 100644 --- a/app/src/main/kotlin/io/treehouses/remote/bases/BaseTerminalFragment.kt +++ b/app/src/main/kotlin/io/treehouses/remote/bases/BaseTerminalFragment.kt @@ -14,9 +14,9 @@ import androidx.fragment.app.DialogFragment import androidx.preference.PreferenceManager import com.google.gson.Gson import io.treehouses.remote.Constants -import io.treehouses.remote.Fragments.DialogFragments.HelpDialog -import io.treehouses.remote.Fragments.TerminalFragment -import io.treehouses.remote.Network.BluetoothChatService +import io.treehouses.remote.fragments.dialogfragments.HelpDialogFragment +import io.treehouses.remote.fragments.TerminalFragment +import io.treehouses.remote.network.BluetoothChatService import io.treehouses.remote.R import io.treehouses.remote.databinding.ActivityTerminalFragmentBinding import io.treehouses.remote.pojo.CommandsList @@ -234,7 +234,7 @@ open class BaseTerminalFragment : BaseFragment() { protected fun showHelpDialog(jsonString: String) { val b = Bundle() b.putString(Constants.JSON_STRING, jsonString) - val dialogFrag: DialogFragment = HelpDialog() + val dialogFrag: DialogFragment = HelpDialogFragment() dialogFrag.setTargetFragment(this, Constants.REQUEST_DIALOG_FRAGMENT) dialogFrag.arguments = b dialogFrag.show(requireActivity().supportFragmentManager.beginTransaction(), "helpDialog") diff --git a/app/src/main/kotlin/io/treehouses/remote/bases/BaseTerminalKeyListener.kt b/app/src/main/kotlin/io/treehouses/remote/bases/BaseTerminalKeyListener.kt index 1485cf42f..5b22a8ee3 100644 --- a/app/src/main/kotlin/io/treehouses/remote/bases/BaseTerminalKeyListener.kt +++ b/app/src/main/kotlin/io/treehouses/remote/bases/BaseTerminalKeyListener.kt @@ -21,12 +21,12 @@ import androidx.preference.PreferenceManager import android.text.ClipboardManager import android.view.KeyCharacterMap import android.view.KeyEvent -import io.treehouses.remote.Views.terminal.VDUBuffer -import io.treehouses.remote.Views.terminal.vt320 +import io.treehouses.remote.views.terminal.VDUBuffer +import io.treehouses.remote.views.terminal.vt320 import io.treehouses.remote.PreferenceConstants -import io.treehouses.remote.SSH.Terminal.TerminalBridge -import io.treehouses.remote.SSH.Terminal.TerminalManager -import io.treehouses.remote.SSH.beans.SelectionArea +import io.treehouses.remote.ssh.terminal.TerminalBridge +import io.treehouses.remote.ssh.terminal.TerminalManager +import io.treehouses.remote.ssh.beans.SelectionArea import io.treehouses.remote.utils.logD import io.treehouses.remote.utils.logE import java.io.IOException diff --git a/app/src/main/kotlin/io/treehouses/remote/bases/BaseTorTabFragment.kt b/app/src/main/kotlin/io/treehouses/remote/bases/BaseTorTabFragment.kt index 4ac653b6b..bf8bb8e8b 100644 --- a/app/src/main/kotlin/io/treehouses/remote/bases/BaseTorTabFragment.kt +++ b/app/src/main/kotlin/io/treehouses/remote/bases/BaseTorTabFragment.kt @@ -9,7 +9,7 @@ import android.view.WindowManager import android.widget.Button import android.widget.ListView import android.widget.Switch -import io.treehouses.remote.Network.BluetoothChatService +import io.treehouses.remote.network.BluetoothChatService import io.treehouses.remote.R import io.treehouses.remote.adapter.TunnelPortAdapter import io.treehouses.remote.databinding.ActivityTorFragmentBinding diff --git a/app/src/main/kotlin/io/treehouses/remote/bases/DerivedTerminalBridge.kt b/app/src/main/kotlin/io/treehouses/remote/bases/DerivedTerminalBridge.kt index d4800a389..23c259a25 100644 --- a/app/src/main/kotlin/io/treehouses/remote/bases/DerivedTerminalBridge.kt +++ b/app/src/main/kotlin/io/treehouses/remote/bases/DerivedTerminalBridge.kt @@ -4,8 +4,8 @@ import android.content.Context import android.graphics.Color import android.provider.Settings import android.text.ClipboardManager -import io.treehouses.remote.SSH.Terminal.PatternHolder -import io.treehouses.remote.SSH.Terminal.TerminalView +import io.treehouses.remote.ssh.terminal.PatternHolder +import io.treehouses.remote.ssh.terminal.TerminalView import io.treehouses.remote.utils.logD import io.treehouses.remote.utils.logE import java.util.* diff --git a/app/src/main/kotlin/io/treehouses/remote/bases/FragmentViewModel.kt b/app/src/main/kotlin/io/treehouses/remote/bases/FragmentViewModel.kt index 81e6ef789..693c51867 100644 --- a/app/src/main/kotlin/io/treehouses/remote/bases/FragmentViewModel.kt +++ b/app/src/main/kotlin/io/treehouses/remote/bases/FragmentViewModel.kt @@ -4,16 +4,13 @@ import android.annotation.SuppressLint import android.app.Application import android.os.Handler import android.os.Message -import android.util.Log import android.widget.Toast import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import androidx.lifecycle.Transformations import io.treehouses.remote.Constants import io.treehouses.remote.MainApplication -import io.treehouses.remote.Network.BluetoothChatService -import io.treehouses.remote.utils.LogUtils +import io.treehouses.remote.network.BluetoothChatService import io.treehouses.remote.utils.logE open class FragmentViewModel(application: Application) : AndroidViewModel(application) { diff --git a/app/src/main/kotlin/io/treehouses/remote/callback/HomeInteractListener.kt b/app/src/main/kotlin/io/treehouses/remote/callback/HomeInteractListener.kt index ab37d8555..fc46f22d6 100644 --- a/app/src/main/kotlin/io/treehouses/remote/callback/HomeInteractListener.kt +++ b/app/src/main/kotlin/io/treehouses/remote/callback/HomeInteractListener.kt @@ -1,7 +1,7 @@ package io.treehouses.remote.callback import androidx.fragment.app.Fragment -import io.treehouses.remote.Network.BluetoothChatService +import io.treehouses.remote.network.BluetoothChatService interface HomeInteractListener { fun sendMessage(s: String) diff --git a/app/src/main/kotlin/io/treehouses/remote/callback/RVButtonClick.kt b/app/src/main/kotlin/io/treehouses/remote/callback/RVButtonClickListener.kt similarity index 69% rename from app/src/main/kotlin/io/treehouses/remote/callback/RVButtonClick.kt rename to app/src/main/kotlin/io/treehouses/remote/callback/RVButtonClickListener.kt index fc81705a7..362628482 100644 --- a/app/src/main/kotlin/io/treehouses/remote/callback/RVButtonClick.kt +++ b/app/src/main/kotlin/io/treehouses/remote/callback/RVButtonClickListener.kt @@ -1,5 +1,5 @@ package io.treehouses.remote.callback -interface RVButtonClick { +interface RVButtonClickListener { fun onButtonClick(position: Int) } \ No newline at end of file diff --git a/app/src/main/kotlin/io/treehouses/remote/callback/ServiceAction.kt b/app/src/main/kotlin/io/treehouses/remote/callback/ServiceActionListener.kt similarity index 89% rename from app/src/main/kotlin/io/treehouses/remote/callback/ServiceAction.kt rename to app/src/main/kotlin/io/treehouses/remote/callback/ServiceActionListener.kt index 6479b2179..5b1a737a9 100644 --- a/app/src/main/kotlin/io/treehouses/remote/callback/ServiceAction.kt +++ b/app/src/main/kotlin/io/treehouses/remote/callback/ServiceActionListener.kt @@ -2,7 +2,7 @@ package io.treehouses.remote.callback import io.treehouses.remote.pojo.ServiceInfo -interface ServiceAction { +interface ServiceActionListener { fun onClickInstall(s: ServiceInfo?) fun onClickStart(s: ServiceInfo?) fun onClickLink(s: ServiceInfo?) diff --git a/app/src/main/kotlin/io/treehouses/remote/callback/TerminalPager.kt b/app/src/main/kotlin/io/treehouses/remote/callback/TerminalPager.kt index cde096bb7..717e60f5f 100644 --- a/app/src/main/kotlin/io/treehouses/remote/callback/TerminalPager.kt +++ b/app/src/main/kotlin/io/treehouses/remote/callback/TerminalPager.kt @@ -2,8 +2,8 @@ package io.treehouses.remote.callback import android.view.LayoutInflater import android.view.animation.Animation -import io.treehouses.remote.SSH.Terminal.TerminalViewPager -import io.treehouses.remote.SSH.Terminal.TerminalManager +import io.treehouses.remote.ssh.terminal.TerminalViewPager +import io.treehouses.remote.ssh.terminal.TerminalManager import android.os.Handler interface TerminalPager { diff --git a/app/src/main/kotlin/io/treehouses/remote/Fragments/AboutFragment.kt b/app/src/main/kotlin/io/treehouses/remote/fragments/AboutFragment.kt similarity index 96% rename from app/src/main/kotlin/io/treehouses/remote/Fragments/AboutFragment.kt rename to app/src/main/kotlin/io/treehouses/remote/fragments/AboutFragment.kt index dbc763d64..f5690d952 100644 --- a/app/src/main/kotlin/io/treehouses/remote/Fragments/AboutFragment.kt +++ b/app/src/main/kotlin/io/treehouses/remote/fragments/AboutFragment.kt @@ -1,4 +1,4 @@ -package io.treehouses.remote.Fragments +package io.treehouses.remote.fragments import android.content.Intent import android.net.Uri @@ -13,7 +13,7 @@ import androidx.fragment.app.DialogFragment import androidx.fragment.app.Fragment import io.treehouses.remote.BuildConfig import io.treehouses.remote.Constants -import io.treehouses.remote.Fragments.DialogFragments.FeedbackDialogFragment +import io.treehouses.remote.fragments.dialogfragments.FeedbackDialogFragment import io.treehouses.remote.R import java.text.SimpleDateFormat import java.util.* diff --git a/app/src/main/kotlin/io/treehouses/remote/Fragments/CommunityFragment.kt b/app/src/main/kotlin/io/treehouses/remote/fragments/CommunityFragment.kt similarity index 93% rename from app/src/main/kotlin/io/treehouses/remote/Fragments/CommunityFragment.kt rename to app/src/main/kotlin/io/treehouses/remote/fragments/CommunityFragment.kt index e5e01123c..5a1e4909d 100644 --- a/app/src/main/kotlin/io/treehouses/remote/Fragments/CommunityFragment.kt +++ b/app/src/main/kotlin/io/treehouses/remote/fragments/CommunityFragment.kt @@ -1,8 +1,6 @@ -package io.treehouses.remote.Fragments +package io.treehouses.remote.fragments -import android.graphics.Bitmap import android.os.Bundle -import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup diff --git a/app/src/main/kotlin/io/treehouses/remote/Fragments/DiscoverFragment.kt b/app/src/main/kotlin/io/treehouses/remote/fragments/DiscoverFragment.kt similarity index 98% rename from app/src/main/kotlin/io/treehouses/remote/Fragments/DiscoverFragment.kt rename to app/src/main/kotlin/io/treehouses/remote/fragments/DiscoverFragment.kt index 8df4a8ede..d0b366a63 100644 --- a/app/src/main/kotlin/io/treehouses/remote/Fragments/DiscoverFragment.kt +++ b/app/src/main/kotlin/io/treehouses/remote/fragments/DiscoverFragment.kt @@ -1,4 +1,4 @@ -package io.treehouses.remote.Fragments +package io.treehouses.remote.fragments import android.content.Context.WIFI_SERVICE import android.graphics.Bitmap @@ -15,8 +15,8 @@ import android.widget.ImageView import android.widget.LinearLayout import com.parse.Parse.getApplicationContext import io.treehouses.remote.Constants -import io.treehouses.remote.Fragments.DialogFragments.RPIDialogFragment -import io.treehouses.remote.Interfaces.FragmentDialogInterface +import io.treehouses.remote.fragments.dialogfragments.RPIDialogFragment +import io.treehouses.remote.interfaces.FragmentDialogInterface import io.treehouses.remote.R import io.treehouses.remote.bases.BaseFragment import io.treehouses.remote.databinding.ActivityDiscoverFragmentBinding diff --git a/app/src/main/kotlin/io/treehouses/remote/Fragments/NetworkFragment.kt b/app/src/main/kotlin/io/treehouses/remote/fragments/NetworkFragment.kt similarity index 94% rename from app/src/main/kotlin/io/treehouses/remote/Fragments/NetworkFragment.kt rename to app/src/main/kotlin/io/treehouses/remote/fragments/NetworkFragment.kt index 0274275ab..a40858cb0 100644 --- a/app/src/main/kotlin/io/treehouses/remote/Fragments/NetworkFragment.kt +++ b/app/src/main/kotlin/io/treehouses/remote/fragments/NetworkFragment.kt @@ -1,4 +1,4 @@ -package io.treehouses.remote.Fragments +package io.treehouses.remote.fragments import android.app.Activity import android.content.Context @@ -13,12 +13,12 @@ import android.view.ViewGroup import android.widget.Toast import com.google.android.material.bottomsheet.BottomSheetDialogFragment import io.treehouses.remote.Constants -import io.treehouses.remote.Fragments.DialogFragments.BottomSheetDialogs.BridgeBottomSheet -import io.treehouses.remote.Fragments.DialogFragments.BottomSheetDialogs.EthernetBottomSheet -import io.treehouses.remote.Fragments.DialogFragments.BottomSheetDialogs.HotspotBottomSheet -import io.treehouses.remote.Fragments.DialogFragments.BottomSheetDialogs.WifiBottomSheet -import io.treehouses.remote.Fragments.DialogFragments.WifiDialogFragment -import io.treehouses.remote.Interfaces.FragmentDialogInterface +import io.treehouses.remote.fragments.dialogfragments.bottomsheetdialogs.BridgeBottomSheet +import io.treehouses.remote.fragments.dialogfragments.bottomsheetdialogs.EthernetBottomSheet +import io.treehouses.remote.fragments.dialogfragments.bottomsheetdialogs.HotspotBottomSheet +import io.treehouses.remote.fragments.dialogfragments.bottomsheetdialogs.WifiBottomSheet +import io.treehouses.remote.fragments.dialogfragments.WifiDialogFragment +import io.treehouses.remote.interfaces.FragmentDialogInterface import io.treehouses.remote.R import io.treehouses.remote.Tutorials import io.treehouses.remote.bases.BaseFragment diff --git a/app/src/main/kotlin/io/treehouses/remote/Fragments/SSHConfig.kt b/app/src/main/kotlin/io/treehouses/remote/fragments/SSHConfigFragment.kt similarity index 89% rename from app/src/main/kotlin/io/treehouses/remote/Fragments/SSHConfig.kt rename to app/src/main/kotlin/io/treehouses/remote/fragments/SSHConfigFragment.kt index 02007deca..535565181 100644 --- a/app/src/main/kotlin/io/treehouses/remote/Fragments/SSHConfig.kt +++ b/app/src/main/kotlin/io/treehouses/remote/fragments/SSHConfigFragment.kt @@ -1,4 +1,4 @@ -package io.treehouses.remote.Fragments +package io.treehouses.remote.fragments import android.content.Intent import android.net.Uri @@ -10,11 +10,11 @@ import android.view.ViewGroup import androidx.core.widget.addTextChangedListener import androidx.fragment.app.FragmentActivity import io.treehouses.remote.Constants -import io.treehouses.remote.Fragments.DialogFragments.SSHAllKeys -import io.treehouses.remote.Fragments.DialogFragments.SSHKeyGen +import io.treehouses.remote.fragments.dialogfragments.SSHAllKeyFragment +import io.treehouses.remote.fragments.dialogfragments.SSHKeyGenFragment import io.treehouses.remote.R -import io.treehouses.remote.SSH.beans.HostBean -import io.treehouses.remote.SSHConsole.SSHConsole +import io.treehouses.remote.ssh.beans.HostBean +import io.treehouses.remote.sshconsole.SSHConsole import io.treehouses.remote.bases.BaseSSHConfig import io.treehouses.remote.databinding.DialogSshBinding import io.treehouses.remote.utils.KeyUtils @@ -24,7 +24,7 @@ import io.treehouses.remote.utils.Utils.toast import io.treehouses.remote.utils.logD -class SSHConfig : BaseSSHConfig() { +class SSHConfigFragment : BaseSSHConfig() { override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { bind = DialogSshBinding.inflate(inflater, container, false) @@ -44,13 +44,13 @@ class SSHConfig : BaseSSHConfig() { connect(uriString, false) } setUpAdapter() - bind.generateKeys.setOnClickListener { SSHKeyGen().show(childFragmentManager, "GenerateKey") } + bind.generateKeys.setOnClickListener { SSHKeyGenFragment().show(childFragmentManager, "GenerateKey") } bind.smartConnect.setOnClickListener { val shouldConnect = checkForSmartConnectKey() var uriString = bind.sshTextInput.text.toString() if (shouldConnect) connect(uriString, true) } - bind.showKeys.setOnClickListener { SSHAllKeys().show(childFragmentManager, "AllKeys") } + bind.showKeys.setOnClickListener { SSHAllKeyFragment().show(childFragmentManager, "AllKeys") } } private fun checkForSmartConnectKey(): Boolean { diff --git a/app/src/main/kotlin/io/treehouses/remote/Fragments/SSHTunnelFragment.kt b/app/src/main/kotlin/io/treehouses/remote/fragments/SSHTunnelFragment.kt similarity index 96% rename from app/src/main/kotlin/io/treehouses/remote/Fragments/SSHTunnelFragment.kt rename to app/src/main/kotlin/io/treehouses/remote/fragments/SSHTunnelFragment.kt index 774c65894..b97db78f6 100644 --- a/app/src/main/kotlin/io/treehouses/remote/Fragments/SSHTunnelFragment.kt +++ b/app/src/main/kotlin/io/treehouses/remote/fragments/SSHTunnelFragment.kt @@ -1,7 +1,6 @@ -package io.treehouses.remote.Fragments +package io.treehouses.remote.fragments import android.os.Bundle -import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -11,7 +10,7 @@ import android.widget.LinearLayout import androidx.viewpager.widget.ViewPager.OnPageChangeListener import com.google.android.material.tabs.TabLayout import com.google.android.material.tabs.TabLayout.OnTabSelectedListener -import io.treehouses.remote.Views.TunnelViewPager +import io.treehouses.remote.views.TunnelViewPager import io.treehouses.remote.adapter.TunnelPageAdapter import io.treehouses.remote.bases.BaseFragment import io.treehouses.remote.callback.ServicesListener diff --git a/app/src/main/kotlin/io/treehouses/remote/Fragments/ServiceCardFragment.kt b/app/src/main/kotlin/io/treehouses/remote/fragments/ServiceCardFragment.kt similarity index 94% rename from app/src/main/kotlin/io/treehouses/remote/Fragments/ServiceCardFragment.kt rename to app/src/main/kotlin/io/treehouses/remote/fragments/ServiceCardFragment.kt index 1bb84e17a..640c262dc 100644 --- a/app/src/main/kotlin/io/treehouses/remote/Fragments/ServiceCardFragment.kt +++ b/app/src/main/kotlin/io/treehouses/remote/fragments/ServiceCardFragment.kt @@ -1,4 +1,4 @@ -package io.treehouses.remote.Fragments +package io.treehouses.remote.fragments import android.content.Context import android.graphics.drawable.PictureDrawable @@ -6,20 +6,18 @@ import android.os.Bundle import android.text.SpannableString import android.text.method.LinkMovementMethod import android.text.util.Linkify -import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.CompoundButton import androidx.fragment.app.Fragment import com.caverock.androidsvg.SVG -import io.treehouses.remote.callback.ServiceAction +import io.treehouses.remote.callback.ServiceActionListener import io.treehouses.remote.databinding.ServiceCardBinding import io.treehouses.remote.pojo.ServiceInfo import io.treehouses.remote.utils.logD class ServiceCardFragment : Fragment(), View.OnClickListener { - private var actionListener: ServiceAction? = null + private var actionListener: ServiceActionListener? = null private var binding: ServiceCardBinding? = null private lateinit var serviceData: ServiceInfo @@ -139,7 +137,7 @@ class ServiceCardFragment : Fragment(), View.OnClickListener { override fun onAttach(context: Context) { super.onAttach(context) - actionListener = parentFragment as ServiceAction? + actionListener = parentFragment as ServiceActionListener? } } \ No newline at end of file diff --git a/app/src/main/kotlin/io/treehouses/remote/Fragments/SettingsFragment.kt b/app/src/main/kotlin/io/treehouses/remote/fragments/SettingsFragment.kt similarity index 88% rename from app/src/main/kotlin/io/treehouses/remote/Fragments/SettingsFragment.kt rename to app/src/main/kotlin/io/treehouses/remote/fragments/SettingsFragment.kt index 0a443bf5b..ca7bf2dd3 100644 --- a/app/src/main/kotlin/io/treehouses/remote/Fragments/SettingsFragment.kt +++ b/app/src/main/kotlin/io/treehouses/remote/fragments/SettingsFragment.kt @@ -1,16 +1,15 @@ -package io.treehouses.remote.Fragments +package io.treehouses.remote.fragments import android.content.Context import android.content.SharedPreferences.OnSharedPreferenceChangeListener import android.os.Bundle -import android.util.Log import android.view.View import androidx.core.content.ContextCompat import androidx.fragment.app.Fragment import androidx.preference.Preference import androidx.preference.PreferenceFragmentCompat -import io.treehouses.remote.Fragments.PreferenceFragments.GeneralPreference -import io.treehouses.remote.Fragments.PreferenceFragments.UserCustomizationPreference +import io.treehouses.remote.fragments.preferencefragments.GeneralPreferenceFragment +import io.treehouses.remote.fragments.preferencefragments.UserCustomizationPreferenceFragment import io.treehouses.remote.R import io.treehouses.remote.callback.HomeInteractListener import io.treehouses.remote.utils.SettingsUtils @@ -47,8 +46,8 @@ class SettingsFragment : PreferenceFragmentCompat(), Preference.OnPreferenceClic override fun onPreferenceClick(preference: Preference): Boolean { when (preference.key) { "bluetooth_file" -> openBluetoothFile() - "general" -> openFragment(GeneralPreference()) - "user_customization" -> openFragment(UserCustomizationPreference()) + "general" -> openFragment(GeneralPreferenceFragment()) + "user_customization" -> openFragment(UserCustomizationPreferenceFragment()) } return false } @@ -61,7 +60,7 @@ class SettingsFragment : PreferenceFragmentCompat(), Preference.OnPreferenceClic } private fun openBluetoothFile() { - listener.openCallFragment(ShowBluetoothFile()) + listener.openCallFragment(ShowBluetoothFileFragment()) } override fun onAttach(context: Context) { diff --git a/app/src/main/kotlin/io/treehouses/remote/Fragments/ShowBluetoothFile.kt b/app/src/main/kotlin/io/treehouses/remote/fragments/ShowBluetoothFileFragment.kt similarity index 93% rename from app/src/main/kotlin/io/treehouses/remote/Fragments/ShowBluetoothFile.kt rename to app/src/main/kotlin/io/treehouses/remote/fragments/ShowBluetoothFileFragment.kt index e551a458c..b045641fc 100644 --- a/app/src/main/kotlin/io/treehouses/remote/Fragments/ShowBluetoothFile.kt +++ b/app/src/main/kotlin/io/treehouses/remote/fragments/ShowBluetoothFileFragment.kt @@ -1,4 +1,4 @@ -package io.treehouses.remote.Fragments +package io.treehouses.remote.fragments import android.os.Bundle import android.view.LayoutInflater @@ -11,7 +11,7 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -class ShowBluetoothFile : Fragment() { +class ShowBluetoothFileFragment : Fragment() { private lateinit var bluetoothBind : FragmentShowBluetoothFileBinding override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { diff --git a/app/src/main/kotlin/io/treehouses/remote/Fragments/SocksFragment.kt b/app/src/main/kotlin/io/treehouses/remote/fragments/SocksFragment.kt similarity index 97% rename from app/src/main/kotlin/io/treehouses/remote/Fragments/SocksFragment.kt rename to app/src/main/kotlin/io/treehouses/remote/fragments/SocksFragment.kt index b8e6f395e..dacd3f18d 100644 --- a/app/src/main/kotlin/io/treehouses/remote/Fragments/SocksFragment.kt +++ b/app/src/main/kotlin/io/treehouses/remote/fragments/SocksFragment.kt @@ -1,16 +1,13 @@ -package io.treehouses.remote.Fragments +package io.treehouses.remote.fragments import android.app.AlertDialog import android.app.Dialog -import android.content.ClipData -import android.content.ClipboardManager import android.os.Bundle import android.os.Message -import android.util.Log import android.view.* import android.widget.* import android.widget.AdapterView.OnItemClickListener import io.treehouses.remote.Constants -import io.treehouses.remote.Network.BluetoothChatService +import io.treehouses.remote.network.BluetoothChatService import io.treehouses.remote.R import io.treehouses.remote.bases.BaseFragment import io.treehouses.remote.databinding.ActivitySocksFragmentBinding diff --git a/app/src/main/kotlin/io/treehouses/remote/Fragments/StatusFragment.kt b/app/src/main/kotlin/io/treehouses/remote/fragments/StatusFragment.kt similarity index 98% rename from app/src/main/kotlin/io/treehouses/remote/Fragments/StatusFragment.kt rename to app/src/main/kotlin/io/treehouses/remote/fragments/StatusFragment.kt index 58d152bff..235e86f94 100644 --- a/app/src/main/kotlin/io/treehouses/remote/Fragments/StatusFragment.kt +++ b/app/src/main/kotlin/io/treehouses/remote/fragments/StatusFragment.kt @@ -1,4 +1,4 @@ -package io.treehouses.remote.Fragments +package io.treehouses.remote.fragments import android.animation.ObjectAnimator import android.app.Dialog @@ -18,7 +18,6 @@ import io.treehouses.remote.Constants import io.treehouses.remote.R import io.treehouses.remote.Tutorials import io.treehouses.remote.bases.BaseStatusFragment -import io.treehouses.remote.callback.NotificationCallback import io.treehouses.remote.databinding.ActivityStatusFragmentBinding import io.treehouses.remote.databinding.DialogRenameStatusBinding import io.treehouses.remote.pojo.StatusData diff --git a/app/src/main/kotlin/io/treehouses/remote/Fragments/SystemFragment.kt b/app/src/main/kotlin/io/treehouses/remote/fragments/SystemFragment.kt similarity index 99% rename from app/src/main/kotlin/io/treehouses/remote/Fragments/SystemFragment.kt rename to app/src/main/kotlin/io/treehouses/remote/fragments/SystemFragment.kt index 498c74947..5f99e6016 100644 --- a/app/src/main/kotlin/io/treehouses/remote/Fragments/SystemFragment.kt +++ b/app/src/main/kotlin/io/treehouses/remote/fragments/SystemFragment.kt @@ -1,4 +1,4 @@ -package io.treehouses.remote.Fragments +package io.treehouses.remote.fragments import android.content.Context import android.net.wifi.WifiManager diff --git a/app/src/main/kotlin/io/treehouses/remote/Fragments/TerminalFragment.kt b/app/src/main/kotlin/io/treehouses/remote/fragments/TerminalFragment.kt similarity index 97% rename from app/src/main/kotlin/io/treehouses/remote/Fragments/TerminalFragment.kt rename to app/src/main/kotlin/io/treehouses/remote/fragments/TerminalFragment.kt index f57bd1d1a..428f728d9 100644 --- a/app/src/main/kotlin/io/treehouses/remote/Fragments/TerminalFragment.kt +++ b/app/src/main/kotlin/io/treehouses/remote/fragments/TerminalFragment.kt @@ -1,4 +1,4 @@ -package io.treehouses.remote.Fragments +package io.treehouses.remote.fragments import android.app.Activity import android.content.Intent @@ -14,11 +14,11 @@ import androidx.core.widget.addTextChangedListener import androidx.fragment.app.DialogFragment import androidx.preference.PreferenceManager import io.treehouses.remote.Constants -import io.treehouses.remote.Fragments.DialogFragments.AddCommandDialogFragment -import io.treehouses.remote.Fragments.DialogFragments.ChPasswordDialogFragment +import io.treehouses.remote.fragments.dialogfragments.AddCommandDialogFragment +import io.treehouses.remote.fragments.dialogfragments.ChPasswordDialogFragment import io.treehouses.remote.MainApplication.Companion.commandList import io.treehouses.remote.MainApplication.Companion.terminalList -import io.treehouses.remote.Network.BluetoothChatService +import io.treehouses.remote.network.BluetoothChatService import io.treehouses.remote.R import io.treehouses.remote.Tutorials import io.treehouses.remote.adapter.CommandListAdapter @@ -27,7 +27,6 @@ import io.treehouses.remote.databinding.ActivityTerminalFragmentBinding import io.treehouses.remote.pojo.CommandListItem import io.treehouses.remote.ui.home.HomeFragment import io.treehouses.remote.utils.SaveUtils -import io.treehouses.remote.utils.match import java.util.* class TerminalFragment : BaseTerminalFragment() { diff --git a/app/src/main/kotlin/io/treehouses/remote/Fragments/TextBoxValidation.kt b/app/src/main/kotlin/io/treehouses/remote/fragments/TextBoxValidation.kt similarity index 99% rename from app/src/main/kotlin/io/treehouses/remote/Fragments/TextBoxValidation.kt rename to app/src/main/kotlin/io/treehouses/remote/fragments/TextBoxValidation.kt index cdc41790a..4c012d7f6 100644 --- a/app/src/main/kotlin/io/treehouses/remote/Fragments/TextBoxValidation.kt +++ b/app/src/main/kotlin/io/treehouses/remote/fragments/TextBoxValidation.kt @@ -1,4 +1,4 @@ -package io.treehouses.remote.Fragments +package io.treehouses.remote.fragments import android.app.AlertDialog import android.content.Context diff --git a/app/src/main/kotlin/io/treehouses/remote/Fragments/TorTabFragment.kt b/app/src/main/kotlin/io/treehouses/remote/fragments/TorTabFragment.kt similarity index 99% rename from app/src/main/kotlin/io/treehouses/remote/Fragments/TorTabFragment.kt rename to app/src/main/kotlin/io/treehouses/remote/fragments/TorTabFragment.kt index 570d1adc9..43257b663 100644 --- a/app/src/main/kotlin/io/treehouses/remote/Fragments/TorTabFragment.kt +++ b/app/src/main/kotlin/io/treehouses/remote/fragments/TorTabFragment.kt @@ -1,4 +1,4 @@ -package io.treehouses.remote.Fragments +package io.treehouses.remote.fragments import android.app.AlertDialog import android.app.Dialog diff --git a/app/src/main/kotlin/io/treehouses/remote/Fragments/TunnelSSHFragment.kt b/app/src/main/kotlin/io/treehouses/remote/fragments/TunnelSSHFragment.kt similarity index 99% rename from app/src/main/kotlin/io/treehouses/remote/Fragments/TunnelSSHFragment.kt rename to app/src/main/kotlin/io/treehouses/remote/fragments/TunnelSSHFragment.kt index 1e55abfd5..71282ec21 100644 --- a/app/src/main/kotlin/io/treehouses/remote/Fragments/TunnelSSHFragment.kt +++ b/app/src/main/kotlin/io/treehouses/remote/fragments/TunnelSSHFragment.kt @@ -1,4 +1,4 @@ -package io.treehouses.remote.Fragments +package io.treehouses.remote.fragments import android.app.AlertDialog import android.app.Dialog @@ -9,7 +9,6 @@ import android.os.Bundle import android.os.Message import android.text.Editable import android.text.Html -import android.util.Log import android.view.* import android.widget.* import androidx.annotation.RequiresApi @@ -18,8 +17,6 @@ import io.treehouses.remote.R import io.treehouses.remote.bases.BaseTunnelSSHFragment import io.treehouses.remote.databinding.ActivityTunnelSshFragmentBinding import io.treehouses.remote.utils.* -import org.json.JSONException -import org.json.JSONObject class TunnelSSHFragment : BaseTunnelSSHFragment(), View.OnClickListener { diff --git a/app/src/main/kotlin/io/treehouses/remote/Fragments/DialogFragments/AddCommandDialogFragment.kt b/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/AddCommandDialogFragment.kt similarity index 97% rename from app/src/main/kotlin/io/treehouses/remote/Fragments/DialogFragments/AddCommandDialogFragment.kt rename to app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/AddCommandDialogFragment.kt index a89f45a0a..175c5aa74 100644 --- a/app/src/main/kotlin/io/treehouses/remote/Fragments/DialogFragments/AddCommandDialogFragment.kt +++ b/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/AddCommandDialogFragment.kt @@ -1,4 +1,4 @@ -package io.treehouses.remote.Fragments.DialogFragments +package io.treehouses.remote.fragments.dialogfragments import android.app.Activity import android.app.AlertDialog diff --git a/app/src/main/kotlin/io/treehouses/remote/Fragments/DialogFragments/BluetoothFailedDialog.kt b/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/BluetoothFailedDialogFragment.kt similarity index 93% rename from app/src/main/kotlin/io/treehouses/remote/Fragments/DialogFragments/BluetoothFailedDialog.kt rename to app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/BluetoothFailedDialogFragment.kt index 69eb55dee..abd83d3e6 100644 --- a/app/src/main/kotlin/io/treehouses/remote/Fragments/DialogFragments/BluetoothFailedDialog.kt +++ b/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/BluetoothFailedDialogFragment.kt @@ -1,4 +1,4 @@ -package io.treehouses.remote.Fragments.DialogFragments +package io.treehouses.remote.fragments.dialogfragments import android.graphics.Color import android.graphics.drawable.ColorDrawable @@ -13,7 +13,7 @@ import io.treehouses.remote.adapter.BluetoothTroubleshootAdapter import io.treehouses.remote.bases.FullScreenDialogFragment import io.treehouses.remote.databinding.DialogBluetoothTroubleshootingBinding -class BluetoothFailedDialog : FullScreenDialogFragment() { +class BluetoothFailedDialogFragment : FullScreenDialogFragment() { lateinit var bind : DialogBluetoothTroubleshootingBinding override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { bind = DialogBluetoothTroubleshootingBinding.inflate(inflater, container, false) diff --git a/app/src/main/kotlin/io/treehouses/remote/Fragments/DialogFragments/ChPasswordDialogFragment.kt b/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/ChPasswordDialogFragment.kt similarity index 94% rename from app/src/main/kotlin/io/treehouses/remote/Fragments/DialogFragments/ChPasswordDialogFragment.kt rename to app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/ChPasswordDialogFragment.kt index 83cde9d87..6113c577a 100644 --- a/app/src/main/kotlin/io/treehouses/remote/Fragments/DialogFragments/ChPasswordDialogFragment.kt +++ b/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/ChPasswordDialogFragment.kt @@ -1,4 +1,4 @@ -package io.treehouses.remote.Fragments.DialogFragments +package io.treehouses.remote.fragments.dialogfragments import android.app.Activity import android.app.AlertDialog @@ -9,8 +9,8 @@ import android.os.Bundle import android.view.ContextThemeWrapper import android.view.View import androidx.fragment.app.DialogFragment -import io.treehouses.remote.Fragments.TextBoxValidation -import io.treehouses.remote.Interfaces.FragmentDialogInterface +import io.treehouses.remote.fragments.TextBoxValidation +import io.treehouses.remote.interfaces.FragmentDialogInterface import io.treehouses.remote.R import io.treehouses.remote.databinding.ChpassDialogBinding import io.treehouses.remote.utils.logD diff --git a/app/src/main/kotlin/io/treehouses/remote/Fragments/DialogFragments/DeleteSSHKey.kt b/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/DeleteSSHKeyFragment.kt similarity index 95% rename from app/src/main/kotlin/io/treehouses/remote/Fragments/DialogFragments/DeleteSSHKey.kt rename to app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/DeleteSSHKeyFragment.kt index 04fad5fca..fd0ac1f56 100644 --- a/app/src/main/kotlin/io/treehouses/remote/Fragments/DialogFragments/DeleteSSHKey.kt +++ b/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/DeleteSSHKeyFragment.kt @@ -1,4 +1,4 @@ -package io.treehouses.remote.Fragments.DialogFragments +package io.treehouses.remote.fragments.dialogfragments import android.content.DialogInterface import android.os.Bundle @@ -11,7 +11,7 @@ import io.treehouses.remote.bases.FullScreenDialogFragment import io.treehouses.remote.databinding.DialogDeleteSshKeyBinding import io.treehouses.remote.utils.KeyUtils -class DeleteSSHKey : FullScreenDialogFragment() { +class DeleteSSHKeyFragment : FullScreenDialogFragment() { companion object { const val KEY_TO_DELETE = "KEY_TO_DELETE" } diff --git a/app/src/main/kotlin/io/treehouses/remote/Fragments/DialogFragments/EditHostDialog.kt b/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/EditHostDialogFragment.kt similarity index 91% rename from app/src/main/kotlin/io/treehouses/remote/Fragments/DialogFragments/EditHostDialog.kt rename to app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/EditHostDialogFragment.kt index 12e362fcd..d98c5a1a1 100644 --- a/app/src/main/kotlin/io/treehouses/remote/Fragments/DialogFragments/EditHostDialog.kt +++ b/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/EditHostDialogFragment.kt @@ -1,29 +1,24 @@ -package io.treehouses.remote.Fragments.DialogFragments +package io.treehouses.remote.fragments.dialogfragments -import android.app.AlertDialog -import android.content.Context import android.content.DialogInterface import android.net.Uri import android.os.Bundle -import android.util.Log -import android.view.ContextThemeWrapper import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.ArrayAdapter import android.widget.Toast -import io.treehouses.remote.Interfaces.FragmentDialogInterface +import io.treehouses.remote.interfaces.FragmentDialogInterface import io.treehouses.remote.R -import io.treehouses.remote.SSH.beans.HostBean +import io.treehouses.remote.ssh.beans.HostBean import io.treehouses.remote.bases.BaseTerminalBridge import io.treehouses.remote.bases.FullScreenDialogFragment import io.treehouses.remote.databinding.EditHostBinding import io.treehouses.remote.utils.KeyUtils -import io.treehouses.remote.utils.LogUtils import io.treehouses.remote.utils.SaveUtils import io.treehouses.remote.utils.logD -class EditHostDialog : FullScreenDialogFragment(), FragmentDialogInterface { +class EditHostDialogFragment : FullScreenDialogFragment(), FragmentDialogInterface { private lateinit var bind : EditHostBinding private lateinit var host: HostBean private lateinit var initialHostUri: String diff --git a/app/src/main/kotlin/io/treehouses/remote/Fragments/DialogFragments/FeedbackDialogFragment.kt b/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/FeedbackDialogFragment.kt similarity index 96% rename from app/src/main/kotlin/io/treehouses/remote/Fragments/DialogFragments/FeedbackDialogFragment.kt rename to app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/FeedbackDialogFragment.kt index ac8195d9b..78bad5548 100644 --- a/app/src/main/kotlin/io/treehouses/remote/Fragments/DialogFragments/FeedbackDialogFragment.kt +++ b/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/FeedbackDialogFragment.kt @@ -1,4 +1,4 @@ -package io.treehouses.remote.Fragments.DialogFragments +package io.treehouses.remote.fragments.dialogfragments import android.graphics.Color import android.graphics.drawable.ColorDrawable @@ -10,7 +10,7 @@ import android.view.View import android.view.ViewGroup import android.widget.Toast import androidx.core.widget.addTextChangedListener -import io.treehouses.remote.Network.ParseDbService +import io.treehouses.remote.network.ParseDbService import io.treehouses.remote.bases.FullScreenDialogFragment import io.treehouses.remote.databinding.DialogFeedbackBinding import java.util.* diff --git a/app/src/main/kotlin/io/treehouses/remote/Fragments/DialogFragments/HelpDialog.kt b/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/HelpDialogFragment.kt similarity index 95% rename from app/src/main/kotlin/io/treehouses/remote/Fragments/DialogFragments/HelpDialog.kt rename to app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/HelpDialogFragment.kt index c6e06aced..c96431bb7 100644 --- a/app/src/main/kotlin/io/treehouses/remote/Fragments/DialogFragments/HelpDialog.kt +++ b/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/HelpDialogFragment.kt @@ -1,4 +1,4 @@ -package io.treehouses.remote.Fragments.DialogFragments +package io.treehouses.remote.fragments.dialogfragments import android.graphics.Color import android.graphics.drawable.ColorDrawable @@ -13,7 +13,7 @@ import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.LinearLayoutManager import io.treehouses.remote.Constants -import io.treehouses.remote.Views.RecyclerViewClickListener +import io.treehouses.remote.views.RecyclerViewClickListener import io.treehouses.remote.adapter.HelpAdapter import io.treehouses.remote.bases.FullScreenDialogFragment import io.treehouses.remote.databinding.DialogHelpBinding @@ -21,7 +21,7 @@ import io.treehouses.remote.pojo.HelpCommand import org.json.JSONObject -class HelpDialog : FullScreenDialogFragment(), android.widget.SearchView.OnQueryTextListener { +class HelpDialogFragment : FullScreenDialogFragment(), android.widget.SearchView.OnQueryTextListener { private lateinit var bind: DialogHelpBinding private var jsonString = "" private val items = mutableListOf() diff --git a/app/src/main/kotlin/io/treehouses/remote/Fragments/DialogFragments/RPIDialogFragment.kt b/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/RPIDialogFragment.kt similarity index 99% rename from app/src/main/kotlin/io/treehouses/remote/Fragments/DialogFragments/RPIDialogFragment.kt rename to app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/RPIDialogFragment.kt index 884f7d684..c6598d2a4 100644 --- a/app/src/main/kotlin/io/treehouses/remote/Fragments/DialogFragments/RPIDialogFragment.kt +++ b/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/RPIDialogFragment.kt @@ -1,4 +1,4 @@ -package io.treehouses.remote.Fragments.DialogFragments +package io.treehouses.remote.fragments.dialogfragments import android.app.AlertDialog import android.app.Dialog diff --git a/app/src/main/kotlin/io/treehouses/remote/Fragments/DialogFragments/SSHAllKeys.kt b/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/SSHAllKeyFragment.kt similarity index 91% rename from app/src/main/kotlin/io/treehouses/remote/Fragments/DialogFragments/SSHAllKeys.kt rename to app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/SSHAllKeyFragment.kt index a93da80fe..b41312690 100644 --- a/app/src/main/kotlin/io/treehouses/remote/Fragments/DialogFragments/SSHAllKeys.kt +++ b/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/SSHAllKeyFragment.kt @@ -1,4 +1,4 @@ -package io.treehouses.remote.Fragments.DialogFragments +package io.treehouses.remote.fragments.dialogfragments import android.content.ClipData import android.content.ClipboardManager @@ -12,7 +12,7 @@ import android.widget.Toast import androidx.recyclerview.widget.RecyclerView import io.treehouses.remote.Constants import io.treehouses.remote.R -import io.treehouses.remote.SSH.beans.PubKeyBean +import io.treehouses.remote.ssh.beans.PubKeyBean import io.treehouses.remote.adapter.ViewHolderSSHAllKeyRow import io.treehouses.remote.bases.FullScreenDialogFragment import io.treehouses.remote.callback.KeyMenuListener @@ -22,7 +22,7 @@ import io.treehouses.remote.utils.KeyUtils import io.treehouses.remote.utils.KeyUtils.getOpenSSH -class SSHAllKeys : FullScreenDialogFragment(), KeyMenuListener { +class SSHAllKeyFragment : FullScreenDialogFragment(), KeyMenuListener { private lateinit var bind : DialogViewKeysBinding private lateinit var allKeys: List @@ -57,7 +57,7 @@ class SSHAllKeys : FullScreenDialogFragment(), KeyMenuListener { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolderSSHAllKeyRow { return ViewHolderSSHAllKeyRow( RowKeyBinding.inflate(LayoutInflater.from(parent.context), - parent, false), this@SSHAllKeys) + parent, false), this@SSHAllKeyFragment) } override fun getItemCount(): Int { @@ -89,9 +89,9 @@ class SSHAllKeys : FullScreenDialogFragment(), KeyMenuListener { } override fun onDelete(position: Int) { - val dialog = DeleteSSHKey().apply { + val dialog = DeleteSSHKeyFragment().apply { arguments = Bundle().apply { - putString(DeleteSSHKey.KEY_TO_DELETE, allKeys[position].nickname) + putString(DeleteSSHKeyFragment.KEY_TO_DELETE, allKeys[position].nickname) } } dialog.setOnDismissListener(DialogInterface.OnDismissListener { setUpKeys() }) diff --git a/app/src/main/kotlin/io/treehouses/remote/Fragments/DialogFragments/SSHKeyGen.kt b/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/SSHKeyGenFragment.kt similarity index 97% rename from app/src/main/kotlin/io/treehouses/remote/Fragments/DialogFragments/SSHKeyGen.kt rename to app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/SSHKeyGenFragment.kt index 8a0d07c1d..4369974e9 100644 --- a/app/src/main/kotlin/io/treehouses/remote/Fragments/DialogFragments/SSHKeyGen.kt +++ b/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/SSHKeyGenFragment.kt @@ -1,4 +1,4 @@ -package io.treehouses.remote.Fragments.DialogFragments +package io.treehouses.remote.fragments.dialogfragments import android.os.Bundle import android.text.Editable @@ -14,7 +14,7 @@ import io.treehouses.remote.bases.BaseSSHKeyGen import io.treehouses.remote.databinding.KeysDialogBinding import io.treehouses.remote.utils.KeyUtils -class SSHKeyGen: BaseSSHKeyGen() { +class SSHKeyGenFragment: BaseSSHKeyGen() { override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { bind = KeysDialogBinding.inflate(inflater, container, false) dialog?.window?.setBackgroundDrawableResource(android.R.color.transparent) diff --git a/app/src/main/kotlin/io/treehouses/remote/Fragments/DialogFragments/WifiDialogFragment.kt b/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/WifiDialogFragment.kt similarity index 98% rename from app/src/main/kotlin/io/treehouses/remote/Fragments/DialogFragments/WifiDialogFragment.kt rename to app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/WifiDialogFragment.kt index c37b73e0b..10bab5ad5 100644 --- a/app/src/main/kotlin/io/treehouses/remote/Fragments/DialogFragments/WifiDialogFragment.kt +++ b/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/WifiDialogFragment.kt @@ -1,4 +1,4 @@ -package io.treehouses.remote.Fragments.DialogFragments +package io.treehouses.remote.fragments.dialogfragments import android.app.Activity import android.app.AlertDialog diff --git a/app/src/main/kotlin/io/treehouses/remote/Fragments/DialogFragments/BottomSheetDialogs/BridgeBottomSheet.kt b/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/bottomsheetdialogs/BridgeBottomSheet.kt similarity index 90% rename from app/src/main/kotlin/io/treehouses/remote/Fragments/DialogFragments/BottomSheetDialogs/BridgeBottomSheet.kt rename to app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/bottomsheetdialogs/BridgeBottomSheet.kt index d1a00ce01..9dfc60060 100644 --- a/app/src/main/kotlin/io/treehouses/remote/Fragments/DialogFragments/BottomSheetDialogs/BridgeBottomSheet.kt +++ b/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/bottomsheetdialogs/BridgeBottomSheet.kt @@ -1,4 +1,4 @@ -package io.treehouses.remote.Fragments.DialogFragments.BottomSheetDialogs +package io.treehouses.remote.fragments.dialogfragments.bottomsheetdialogs import android.app.Activity import android.content.Intent @@ -9,10 +9,10 @@ import android.view.View import android.view.ViewGroup import android.widget.Toast import io.treehouses.remote.Constants -import io.treehouses.remote.Fragments.DialogFragments.WifiDialogFragment -import io.treehouses.remote.Fragments.NetworkFragment -import io.treehouses.remote.Fragments.NetworkFragment.Companion.openWifiDialog -import io.treehouses.remote.Fragments.TextBoxValidation +import io.treehouses.remote.fragments.dialogfragments.WifiDialogFragment +import io.treehouses.remote.fragments.NetworkFragment +import io.treehouses.remote.fragments.NetworkFragment.Companion.openWifiDialog +import io.treehouses.remote.fragments.TextBoxValidation import io.treehouses.remote.R import io.treehouses.remote.bases.BaseBottomSheetDialog import io.treehouses.remote.databinding.DialogBridgeBinding diff --git a/app/src/main/kotlin/io/treehouses/remote/Fragments/DialogFragments/BottomSheetDialogs/EthernetBottomSheet.kt b/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/bottomsheetdialogs/EthernetBottomSheet.kt similarity index 90% rename from app/src/main/kotlin/io/treehouses/remote/Fragments/DialogFragments/BottomSheetDialogs/EthernetBottomSheet.kt rename to app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/bottomsheetdialogs/EthernetBottomSheet.kt index 533d41e48..ab93cfe17 100644 --- a/app/src/main/kotlin/io/treehouses/remote/Fragments/DialogFragments/BottomSheetDialogs/EthernetBottomSheet.kt +++ b/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/bottomsheetdialogs/EthernetBottomSheet.kt @@ -1,4 +1,4 @@ -package io.treehouses.remote.Fragments.DialogFragments.BottomSheetDialogs +package io.treehouses.remote.fragments.dialogfragments.bottomsheetdialogs import android.app.Activity import android.content.Intent @@ -6,7 +6,7 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import io.treehouses.remote.Fragments.NetworkFragment +import io.treehouses.remote.fragments.NetworkFragment import io.treehouses.remote.R import io.treehouses.remote.bases.BaseBottomSheetDialog import io.treehouses.remote.databinding.DialogEthernetBinding diff --git a/app/src/main/kotlin/io/treehouses/remote/Fragments/DialogFragments/BottomSheetDialogs/HotspotBottomSheet.kt b/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/bottomsheetdialogs/HotspotBottomSheet.kt similarity index 94% rename from app/src/main/kotlin/io/treehouses/remote/Fragments/DialogFragments/BottomSheetDialogs/HotspotBottomSheet.kt rename to app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/bottomsheetdialogs/HotspotBottomSheet.kt index 8e2f5bdae..5ef7df3ce 100644 --- a/app/src/main/kotlin/io/treehouses/remote/Fragments/DialogFragments/BottomSheetDialogs/HotspotBottomSheet.kt +++ b/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/bottomsheetdialogs/HotspotBottomSheet.kt @@ -1,4 +1,4 @@ -package io.treehouses.remote.Fragments.DialogFragments.BottomSheetDialogs +package io.treehouses.remote.fragments.dialogfragments.bottomsheetdialogs import android.app.Activity import android.content.Intent @@ -7,7 +7,7 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.Toast -import io.treehouses.remote.Fragments.NetworkFragment +import io.treehouses.remote.fragments.NetworkFragment import io.treehouses.remote.R import io.treehouses.remote.bases.BaseBottomSheetDialog import io.treehouses.remote.databinding.DialogHotspotBinding diff --git a/app/src/main/kotlin/io/treehouses/remote/Fragments/DialogFragments/BottomSheetDialogs/WifiBottomSheet.kt b/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/bottomsheetdialogs/WifiBottomSheet.kt similarity index 92% rename from app/src/main/kotlin/io/treehouses/remote/Fragments/DialogFragments/BottomSheetDialogs/WifiBottomSheet.kt rename to app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/bottomsheetdialogs/WifiBottomSheet.kt index 4cc5f81f7..4ef43aa53 100644 --- a/app/src/main/kotlin/io/treehouses/remote/Fragments/DialogFragments/BottomSheetDialogs/WifiBottomSheet.kt +++ b/app/src/main/kotlin/io/treehouses/remote/fragments/dialogfragments/bottomsheetdialogs/WifiBottomSheet.kt @@ -1,4 +1,4 @@ -package io.treehouses.remote.Fragments.DialogFragments.BottomSheetDialogs +package io.treehouses.remote.fragments.dialogfragments.bottomsheetdialogs import android.app.Activity import android.content.Intent @@ -8,10 +8,10 @@ import android.view.View import android.view.ViewGroup import android.widget.Toast import io.treehouses.remote.Constants -import io.treehouses.remote.Fragments.DialogFragments.WifiDialogFragment -import io.treehouses.remote.Fragments.NetworkFragment -import io.treehouses.remote.Fragments.NetworkFragment.Companion.openWifiDialog -import io.treehouses.remote.Fragments.TextBoxValidation +import io.treehouses.remote.fragments.dialogfragments.WifiDialogFragment +import io.treehouses.remote.fragments.NetworkFragment +import io.treehouses.remote.fragments.NetworkFragment.Companion.openWifiDialog +import io.treehouses.remote.fragments.TextBoxValidation import io.treehouses.remote.R import io.treehouses.remote.bases.BaseBottomSheetDialog import io.treehouses.remote.databinding.DialogWifiBinding diff --git a/app/src/main/kotlin/io/treehouses/remote/Fragments/PreferenceFragments/GeneralPreference.kt b/app/src/main/kotlin/io/treehouses/remote/fragments/preferencefragments/GeneralPreferenceFragment.kt similarity index 96% rename from app/src/main/kotlin/io/treehouses/remote/Fragments/PreferenceFragments/GeneralPreference.kt rename to app/src/main/kotlin/io/treehouses/remote/fragments/preferencefragments/GeneralPreferenceFragment.kt index a180acb94..f68e95849 100644 --- a/app/src/main/kotlin/io/treehouses/remote/Fragments/PreferenceFragments/GeneralPreference.kt +++ b/app/src/main/kotlin/io/treehouses/remote/fragments/preferencefragments/GeneralPreferenceFragment.kt @@ -1,4 +1,4 @@ -package io.treehouses.remote.Fragments.PreferenceFragments +package io.treehouses.remote.fragments.preferencefragments import android.content.SharedPreferences.OnSharedPreferenceChangeListener import android.os.Bundle @@ -11,7 +11,7 @@ import io.treehouses.remote.ui.services.ServicesViewModel import io.treehouses.remote.utils.SaveUtils import io.treehouses.remote.utils.SettingsUtils -class GeneralPreference: BasePreferenceFragment() { +class GeneralPreferenceFragment: BasePreferenceFragment() { override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { setPreferencesFromResource(R.xml.general_preferences, rootKey) diff --git a/app/src/main/kotlin/io/treehouses/remote/Fragments/PreferenceFragments/UserCustomizationPreference.kt b/app/src/main/kotlin/io/treehouses/remote/fragments/preferencefragments/UserCustomizationPreferenceFragment.kt similarity index 96% rename from app/src/main/kotlin/io/treehouses/remote/Fragments/PreferenceFragments/UserCustomizationPreference.kt rename to app/src/main/kotlin/io/treehouses/remote/fragments/preferencefragments/UserCustomizationPreferenceFragment.kt index fec0fd003..3f0096383 100644 --- a/app/src/main/kotlin/io/treehouses/remote/Fragments/PreferenceFragments/UserCustomizationPreference.kt +++ b/app/src/main/kotlin/io/treehouses/remote/fragments/preferencefragments/UserCustomizationPreferenceFragment.kt @@ -1,4 +1,4 @@ -package io.treehouses.remote.Fragments.PreferenceFragments +package io.treehouses.remote.fragments.preferencefragments import android.os.Bundle import android.widget.Toast @@ -9,7 +9,7 @@ import io.treehouses.remote.utils.KeyUtils import io.treehouses.remote.utils.SaveUtils import io.treehouses.remote.utils.SettingsUtils -class UserCustomizationPreference: BasePreferenceFragment() { +class UserCustomizationPreferenceFragment: BasePreferenceFragment() { override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { setPreferencesFromResource(R.xml.user_customization_preferences, rootKey) diff --git a/app/src/main/kotlin/io/treehouses/remote/Interfaces/FragmentDialogInterface.kt b/app/src/main/kotlin/io/treehouses/remote/interfaces/FragmentDialogInterface.kt similarity index 96% rename from app/src/main/kotlin/io/treehouses/remote/Interfaces/FragmentDialogInterface.kt rename to app/src/main/kotlin/io/treehouses/remote/interfaces/FragmentDialogInterface.kt index 009973605..cffd987ff 100644 --- a/app/src/main/kotlin/io/treehouses/remote/Interfaces/FragmentDialogInterface.kt +++ b/app/src/main/kotlin/io/treehouses/remote/interfaces/FragmentDialogInterface.kt @@ -1,4 +1,4 @@ -package io.treehouses.remote.Interfaces +package io.treehouses.remote.interfaces import android.app.AlertDialog import android.content.Context diff --git a/app/src/main/kotlin/io/treehouses/remote/Network/BluetoothChatService.kt b/app/src/main/kotlin/io/treehouses/remote/network/BluetoothChatService.kt similarity index 98% rename from app/src/main/kotlin/io/treehouses/remote/Network/BluetoothChatService.kt rename to app/src/main/kotlin/io/treehouses/remote/network/BluetoothChatService.kt index 9307ebd77..519f32cc5 100644 --- a/app/src/main/kotlin/io/treehouses/remote/Network/BluetoothChatService.kt +++ b/app/src/main/kotlin/io/treehouses/remote/network/BluetoothChatService.kt @@ -15,10 +15,8 @@ * governing permissions and limitations under the License. */ -package io.treehouses.remote.Network +package io.treehouses.remote.network -import android.app.Notification -import android.app.PendingIntent import android.bluetooth.BluetoothDevice import android.bluetooth.BluetoothSocket import android.content.BroadcastReceiver @@ -26,11 +24,8 @@ import android.content.Context import android.content.Intent import android.content.IntentFilter import android.os.* -import androidx.core.app.NotificationCompat import androidx.preference.PreferenceManager import io.treehouses.remote.Constants -import io.treehouses.remote.InitialActivity -import io.treehouses.remote.R import io.treehouses.remote.bases.BaseBluetoothChatService import io.treehouses.remote.utils.logD import io.treehouses.remote.utils.logE diff --git a/app/src/main/kotlin/io/treehouses/remote/Network/ParseDbService.kt b/app/src/main/kotlin/io/treehouses/remote/network/ParseDbService.kt similarity index 98% rename from app/src/main/kotlin/io/treehouses/remote/Network/ParseDbService.kt rename to app/src/main/kotlin/io/treehouses/remote/network/ParseDbService.kt index 1da0f7f76..c91b71b5e 100644 --- a/app/src/main/kotlin/io/treehouses/remote/Network/ParseDbService.kt +++ b/app/src/main/kotlin/io/treehouses/remote/network/ParseDbService.kt @@ -1,4 +1,4 @@ -package io.treehouses.remote.Network +package io.treehouses.remote.network import android.content.Context import android.content.SharedPreferences diff --git a/app/src/main/kotlin/io/treehouses/remote/SSH/Colors.kt b/app/src/main/kotlin/io/treehouses/remote/ssh/Colors.kt similarity index 99% rename from app/src/main/kotlin/io/treehouses/remote/SSH/Colors.kt rename to app/src/main/kotlin/io/treehouses/remote/ssh/Colors.kt index 60243a2ad..d025df1d3 100644 --- a/app/src/main/kotlin/io/treehouses/remote/SSH/Colors.kt +++ b/app/src/main/kotlin/io/treehouses/remote/ssh/Colors.kt @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.treehouses.remote.SSH +package io.treehouses.remote.ssh /** * @author Kenny Root diff --git a/app/src/main/kotlin/io/treehouses/remote/SSH/EcCore.kt b/app/src/main/kotlin/io/treehouses/remote/ssh/EcCore.kt similarity index 98% rename from app/src/main/kotlin/io/treehouses/remote/SSH/EcCore.kt rename to app/src/main/kotlin/io/treehouses/remote/ssh/EcCore.kt index 3224e31a0..2e696b612 100644 --- a/app/src/main/kotlin/io/treehouses/remote/SSH/EcCore.kt +++ b/app/src/main/kotlin/io/treehouses/remote/ssh/EcCore.kt @@ -1,4 +1,4 @@ -package io.treehouses.remote.SSH +package io.treehouses.remote.ssh import java.math.BigInteger import java.security.spec.ECFieldFp diff --git a/app/src/main/kotlin/io/treehouses/remote/SSH/Ed25519Provider.kt b/app/src/main/kotlin/io/treehouses/remote/ssh/Ed25519Provider.kt similarity index 96% rename from app/src/main/kotlin/io/treehouses/remote/SSH/Ed25519Provider.kt rename to app/src/main/kotlin/io/treehouses/remote/ssh/Ed25519Provider.kt index 635b771c2..ef14c6b62 100644 --- a/app/src/main/kotlin/io/treehouses/remote/SSH/Ed25519Provider.kt +++ b/app/src/main/kotlin/io/treehouses/remote/ssh/Ed25519Provider.kt @@ -1,4 +1,4 @@ -package io.treehouses.remote.SSH +package io.treehouses.remote.ssh import net.i2p.crypto.eddsa.KeyFactory import net.i2p.crypto.eddsa.KeyPairGenerator diff --git a/app/src/main/kotlin/io/treehouses/remote/SSH/Encryptor.kt b/app/src/main/kotlin/io/treehouses/remote/ssh/Encryptor.kt similarity index 99% rename from app/src/main/kotlin/io/treehouses/remote/SSH/Encryptor.kt rename to app/src/main/kotlin/io/treehouses/remote/ssh/Encryptor.kt index 4ec361f36..d80fa4a53 100644 --- a/app/src/main/kotlin/io/treehouses/remote/SSH/Encryptor.kt +++ b/app/src/main/kotlin/io/treehouses/remote/ssh/Encryptor.kt @@ -1,4 +1,4 @@ -package io.treehouses.remote.SSH +package io.treehouses.remote.ssh import java.security.MessageDigest import java.security.SecureRandom diff --git a/app/src/main/kotlin/io/treehouses/remote/SSH/PromptHelper.kt b/app/src/main/kotlin/io/treehouses/remote/ssh/PromptHelper.kt similarity index 98% rename from app/src/main/kotlin/io/treehouses/remote/SSH/PromptHelper.kt rename to app/src/main/kotlin/io/treehouses/remote/ssh/PromptHelper.kt index 3acf3c2b9..559c78c59 100644 --- a/app/src/main/kotlin/io/treehouses/remote/SSH/PromptHelper.kt +++ b/app/src/main/kotlin/io/treehouses/remote/ssh/PromptHelper.kt @@ -14,12 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.treehouses.remote.SSH +package io.treehouses.remote.ssh import android.os.Handler import android.os.Message import android.util.Log -import io.treehouses.remote.utils.logE import java.util.concurrent.Semaphore /** diff --git a/app/src/main/kotlin/io/treehouses/remote/SSH/PubKeyUtils.kt b/app/src/main/kotlin/io/treehouses/remote/ssh/PubKeyUtils.kt similarity index 98% rename from app/src/main/kotlin/io/treehouses/remote/SSH/PubKeyUtils.kt rename to app/src/main/kotlin/io/treehouses/remote/ssh/PubKeyUtils.kt index cc629902e..c2e81ff73 100644 --- a/app/src/main/kotlin/io/treehouses/remote/SSH/PubKeyUtils.kt +++ b/app/src/main/kotlin/io/treehouses/remote/ssh/PubKeyUtils.kt @@ -14,18 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.treehouses.remote.SSH +package io.treehouses.remote.ssh -import android.util.Log import com.trilead.ssh2.crypto.Base64 import com.trilead.ssh2.signature.DSASHA1Verify import com.trilead.ssh2.signature.ECDSASHA2Verify import com.trilead.ssh2.signature.Ed25519Verify import com.trilead.ssh2.signature.RSASHA1Verify -import io.treehouses.remote.SSH.Ed25519Provider.Companion.insertIfNeeded -import io.treehouses.remote.SSH.Encryptor.decrypt -import io.treehouses.remote.SSH.beans.PubKeyBean -import io.treehouses.remote.utils.LogUtils +import io.treehouses.remote.ssh.Ed25519Provider.Companion.insertIfNeeded +import io.treehouses.remote.ssh.Encryptor.decrypt +import io.treehouses.remote.ssh.beans.PubKeyBean import net.i2p.crypto.eddsa.EdDSAPublicKey import java.io.IOException import java.security.* diff --git a/app/src/main/kotlin/io/treehouses/remote/SSH/Relay.kt b/app/src/main/kotlin/io/treehouses/remote/ssh/Relay.kt similarity index 95% rename from app/src/main/kotlin/io/treehouses/remote/SSH/Relay.kt rename to app/src/main/kotlin/io/treehouses/remote/ssh/Relay.kt index 2f29083eb..fda65af14 100644 --- a/app/src/main/kotlin/io/treehouses/remote/SSH/Relay.kt +++ b/app/src/main/kotlin/io/treehouses/remote/ssh/Relay.kt @@ -14,13 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.treehouses.remote.SSH +package io.treehouses.remote.ssh import android.text.AndroidCharacter -import android.util.Log -import io.treehouses.remote.Views.terminal.vt320 -import io.treehouses.remote.SSH.Terminal.TerminalBridge -import io.treehouses.remote.utils.LogUtils +import io.treehouses.remote.views.terminal.vt320 +import io.treehouses.remote.ssh.terminal.TerminalBridge import io.treehouses.remote.utils.logE import java.io.IOException import java.nio.ByteBuffer diff --git a/app/src/main/kotlin/io/treehouses/remote/SSH/SSH.kt b/app/src/main/kotlin/io/treehouses/remote/ssh/SSH.kt similarity index 96% rename from app/src/main/kotlin/io/treehouses/remote/SSH/SSH.kt rename to app/src/main/kotlin/io/treehouses/remote/ssh/SSH.kt index 5be413dbb..8426e4594 100644 --- a/app/src/main/kotlin/io/treehouses/remote/SSH/SSH.kt +++ b/app/src/main/kotlin/io/treehouses/remote/ssh/SSH.kt @@ -1,15 +1,14 @@ -package io.treehouses.remote.SSH +package io.treehouses.remote.ssh -import android.util.Log import com.trilead.ssh2.ChannelCondition import com.trilead.ssh2.Connection import com.trilead.ssh2.ConnectionInfo -import io.treehouses.remote.Fragments.DialogFragments.EditHostDialog +import io.treehouses.remote.fragments.dialogfragments.EditHostDialogFragment import io.treehouses.remote.R -import io.treehouses.remote.SSH.Terminal.TerminalBridge -import io.treehouses.remote.SSH.Terminal.TerminalManager -import io.treehouses.remote.SSH.beans.HostBean -import io.treehouses.remote.SSH.beans.PubKeyBean +import io.treehouses.remote.ssh.terminal.TerminalBridge +import io.treehouses.remote.ssh.terminal.TerminalManager +import io.treehouses.remote.ssh.beans.HostBean +import io.treehouses.remote.ssh.beans.PubKeyBean import io.treehouses.remote.bases.BaseSSH import io.treehouses.remote.utils.KeyUtils import io.treehouses.remote.utils.logD @@ -145,7 +144,7 @@ class SSH: BaseSSH { // if explicit pubkey defined for this host, then prompt for password as needed // otherwise just try all in-memory keys held in terminalmanager - if (pubkeyId.isEmpty() || pubkeyId == EditHostDialog.NO_KEY) tryInMemKeys(pubkeyId) + if (pubkeyId.isEmpty() || pubkeyId == EditHostDialogFragment.NO_KEY) tryInMemKeys(pubkeyId) else promptForPw(pubkeyId) pubkeysExhausted = true } else if (interactiveCanContinue && connection!!.isAuthMethodAvailable(host!!.username, AUTH_KEYBOARDINTERACTIVE)) { diff --git a/app/src/main/kotlin/io/treehouses/remote/SSH/beans/HostBean.kt b/app/src/main/kotlin/io/treehouses/remote/ssh/beans/HostBean.kt similarity index 98% rename from app/src/main/kotlin/io/treehouses/remote/SSH/beans/HostBean.kt rename to app/src/main/kotlin/io/treehouses/remote/ssh/beans/HostBean.kt index bc5d41d0e..6c08d5bd9 100644 --- a/app/src/main/kotlin/io/treehouses/remote/SSH/beans/HostBean.kt +++ b/app/src/main/kotlin/io/treehouses/remote/ssh/beans/HostBean.kt @@ -1,4 +1,4 @@ -package io.treehouses.remote.SSH.beans +package io.treehouses.remote.ssh.beans import android.net.Uri import java.nio.charset.Charset diff --git a/app/src/main/kotlin/io/treehouses/remote/SSH/beans/KnownHostBean.kt b/app/src/main/kotlin/io/treehouses/remote/ssh/beans/KnownHostBean.kt similarity index 95% rename from app/src/main/kotlin/io/treehouses/remote/SSH/beans/KnownHostBean.kt rename to app/src/main/kotlin/io/treehouses/remote/ssh/beans/KnownHostBean.kt index be740d193..723a79305 100644 --- a/app/src/main/kotlin/io/treehouses/remote/SSH/beans/KnownHostBean.kt +++ b/app/src/main/kotlin/io/treehouses/remote/ssh/beans/KnownHostBean.kt @@ -1,4 +1,4 @@ -package io.treehouses.remote.SSH.beans +package io.treehouses.remote.ssh.beans data class KnownHostBean ( val hostName:String = "", diff --git a/app/src/main/kotlin/io/treehouses/remote/SSH/beans/PubKeyBean.kt b/app/src/main/kotlin/io/treehouses/remote/ssh/beans/PubKeyBean.kt similarity index 96% rename from app/src/main/kotlin/io/treehouses/remote/SSH/beans/PubKeyBean.kt rename to app/src/main/kotlin/io/treehouses/remote/ssh/beans/PubKeyBean.kt index 36137293b..0c894b54f 100644 --- a/app/src/main/kotlin/io/treehouses/remote/SSH/beans/PubKeyBean.kt +++ b/app/src/main/kotlin/io/treehouses/remote/ssh/beans/PubKeyBean.kt @@ -1,10 +1,9 @@ -package io.treehouses.remote.SSH.beans +package io.treehouses.remote.ssh.beans import android.content.Context import io.treehouses.remote.R -import io.treehouses.remote.SSH.PubKeyUtils +import io.treehouses.remote.ssh.PubKeyUtils import java.security.NoSuchAlgorithmException -import java.security.PublicKey import java.security.spec.InvalidKeySpecException /** diff --git a/app/src/main/kotlin/io/treehouses/remote/SSH/beans/SelectionArea.kt b/app/src/main/kotlin/io/treehouses/remote/ssh/beans/SelectionArea.kt similarity index 98% rename from app/src/main/kotlin/io/treehouses/remote/SSH/beans/SelectionArea.kt rename to app/src/main/kotlin/io/treehouses/remote/ssh/beans/SelectionArea.kt index 386fa573e..59672f019 100644 --- a/app/src/main/kotlin/io/treehouses/remote/SSH/beans/SelectionArea.kt +++ b/app/src/main/kotlin/io/treehouses/remote/ssh/beans/SelectionArea.kt @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.treehouses.remote.SSH.beans +package io.treehouses.remote.ssh.beans -import io.treehouses.remote.Views.terminal.VDUBuffer +import io.treehouses.remote.views.terminal.VDUBuffer /** * @author Kenny Root diff --git a/app/src/main/kotlin/io/treehouses/remote/SSH/interfaces/BridgeDisconnectedListener.kt b/app/src/main/kotlin/io/treehouses/remote/ssh/interfaces/BridgeDisconnectedListener.kt similarity index 88% rename from app/src/main/kotlin/io/treehouses/remote/SSH/interfaces/BridgeDisconnectedListener.kt rename to app/src/main/kotlin/io/treehouses/remote/ssh/interfaces/BridgeDisconnectedListener.kt index b4cc77524..741f8535b 100644 --- a/app/src/main/kotlin/io/treehouses/remote/SSH/interfaces/BridgeDisconnectedListener.kt +++ b/app/src/main/kotlin/io/treehouses/remote/ssh/interfaces/BridgeDisconnectedListener.kt @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.treehouses.remote.SSH.interfaces +package io.treehouses.remote.ssh.interfaces -import io.treehouses.remote.SSH.Terminal.TerminalBridge +import io.treehouses.remote.ssh.terminal.TerminalBridge interface BridgeDisconnectedListener { fun onDisconnected(bridge: TerminalBridge) diff --git a/app/src/main/kotlin/io/treehouses/remote/SSH/interfaces/FontSizeChangedListener.kt b/app/src/main/kotlin/io/treehouses/remote/ssh/interfaces/FontSizeChangedListener.kt similarity index 95% rename from app/src/main/kotlin/io/treehouses/remote/SSH/interfaces/FontSizeChangedListener.kt rename to app/src/main/kotlin/io/treehouses/remote/ssh/interfaces/FontSizeChangedListener.kt index 2c066daff..121faf8d5 100644 --- a/app/src/main/kotlin/io/treehouses/remote/SSH/interfaces/FontSizeChangedListener.kt +++ b/app/src/main/kotlin/io/treehouses/remote/ssh/interfaces/FontSizeChangedListener.kt @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.treehouses.remote.SSH.interfaces +package io.treehouses.remote.ssh.interfaces /** * @author Kenny Root diff --git a/app/src/main/kotlin/io/treehouses/remote/SSH/interfaces/OnHostStatusChangedListener.kt b/app/src/main/kotlin/io/treehouses/remote/ssh/interfaces/OnHostStatusChangedListener.kt similarity index 90% rename from app/src/main/kotlin/io/treehouses/remote/SSH/interfaces/OnHostStatusChangedListener.kt rename to app/src/main/kotlin/io/treehouses/remote/ssh/interfaces/OnHostStatusChangedListener.kt index 37499317c..bf75551e6 100644 --- a/app/src/main/kotlin/io/treehouses/remote/SSH/interfaces/OnHostStatusChangedListener.kt +++ b/app/src/main/kotlin/io/treehouses/remote/ssh/interfaces/OnHostStatusChangedListener.kt @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.treehouses.remote.SSH.interfaces +package io.treehouses.remote.ssh.interfaces /** - * Used to notify interested parties when a [io.treehouses.remote.SSH.Terminal.TerminalBridge] has changed materially + * Used to notify interested parties when a [io.treehouses.remote.ssh.terminal.TerminalBridge] has changed materially * changed status (e.g., connected, disconnected, name changed, etc). */ interface OnHostStatusChangedListener { diff --git a/app/src/main/kotlin/io/treehouses/remote/SSH/Terminal/BaseTerminalView.kt b/app/src/main/kotlin/io/treehouses/remote/ssh/terminal/BaseTerminalView.kt similarity index 98% rename from app/src/main/kotlin/io/treehouses/remote/SSH/Terminal/BaseTerminalView.kt rename to app/src/main/kotlin/io/treehouses/remote/ssh/terminal/BaseTerminalView.kt index 20a67ecd1..3cf4069b4 100644 --- a/app/src/main/kotlin/io/treehouses/remote/SSH/Terminal/BaseTerminalView.kt +++ b/app/src/main/kotlin/io/treehouses/remote/ssh/terminal/BaseTerminalView.kt @@ -1,4 +1,4 @@ -package io.treehouses.remote.SSH.Terminal +package io.treehouses.remote.ssh.terminal import android.annotation.TargetApi import android.content.Context @@ -13,7 +13,7 @@ import android.view.inputmethod.EditorInfo import android.view.inputmethod.InputConnection import android.widget.FrameLayout import android.widget.Toast -import io.treehouses.remote.SSH.interfaces.FontSizeChangedListener +import io.treehouses.remote.ssh.interfaces.FontSizeChangedListener import io.treehouses.remote.bases.BaseTerminalKeyListener open class BaseTerminalView(context: Context, bridge: TerminalBridge, pager: TerminalViewPager) : FrameLayout(context), FontSizeChangedListener { diff --git a/app/src/main/kotlin/io/treehouses/remote/SSH/Terminal/PatternHolder.kt b/app/src/main/kotlin/io/treehouses/remote/ssh/terminal/PatternHolder.kt similarity index 97% rename from app/src/main/kotlin/io/treehouses/remote/SSH/Terminal/PatternHolder.kt rename to app/src/main/kotlin/io/treehouses/remote/ssh/terminal/PatternHolder.kt index 465bf5b71..f8f1efa82 100644 --- a/app/src/main/kotlin/io/treehouses/remote/SSH/Terminal/PatternHolder.kt +++ b/app/src/main/kotlin/io/treehouses/remote/ssh/terminal/PatternHolder.kt @@ -1,4 +1,4 @@ -package io.treehouses.remote.SSH.Terminal +package io.treehouses.remote.ssh.terminal import java.util.regex.Pattern diff --git a/app/src/main/kotlin/io/treehouses/remote/SSH/Terminal/TerminalBridge.kt b/app/src/main/kotlin/io/treehouses/remote/ssh/terminal/TerminalBridge.kt similarity index 97% rename from app/src/main/kotlin/io/treehouses/remote/SSH/Terminal/TerminalBridge.kt rename to app/src/main/kotlin/io/treehouses/remote/ssh/terminal/TerminalBridge.kt index f100a316e..94f8d7eef 100644 --- a/app/src/main/kotlin/io/treehouses/remote/SSH/Terminal/TerminalBridge.kt +++ b/app/src/main/kotlin/io/treehouses/remote/ssh/terminal/TerminalBridge.kt @@ -14,21 +14,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.treehouses.remote.SSH.Terminal +package io.treehouses.remote.ssh.terminal import android.graphics.Paint import android.graphics.Typeface import android.os.Handler import android.os.Looper import io.treehouses.remote.R -import io.treehouses.remote.SSH.PromptHelper -import io.treehouses.remote.SSH.Relay -import io.treehouses.remote.SSH.SSH -import io.treehouses.remote.SSH.beans.HostBean -import io.treehouses.remote.SSH.beans.SelectionArea -import io.treehouses.remote.SSH.interfaces.BridgeDisconnectedListener -import io.treehouses.remote.SSH.interfaces.FontSizeChangedListener -import io.treehouses.remote.Views.terminal.vt320 +import io.treehouses.remote.ssh.PromptHelper +import io.treehouses.remote.ssh.Relay +import io.treehouses.remote.ssh.SSH +import io.treehouses.remote.ssh.beans.HostBean +import io.treehouses.remote.ssh.beans.SelectionArea +import io.treehouses.remote.ssh.interfaces.BridgeDisconnectedListener +import io.treehouses.remote.ssh.interfaces.FontSizeChangedListener +import io.treehouses.remote.views.terminal.vt320 import io.treehouses.remote.bases.DerivedTerminalBridge import io.treehouses.remote.utils.logD import io.treehouses.remote.utils.logE diff --git a/app/src/main/kotlin/io/treehouses/remote/SSH/Terminal/TerminalKeyListener.kt b/app/src/main/kotlin/io/treehouses/remote/ssh/terminal/TerminalKeyListener.kt similarity index 98% rename from app/src/main/kotlin/io/treehouses/remote/SSH/Terminal/TerminalKeyListener.kt rename to app/src/main/kotlin/io/treehouses/remote/ssh/terminal/TerminalKeyListener.kt index 7b939949f..d81639edf 100644 --- a/app/src/main/kotlin/io/treehouses/remote/SSH/Terminal/TerminalKeyListener.kt +++ b/app/src/main/kotlin/io/treehouses/remote/ssh/terminal/TerminalKeyListener.kt @@ -1,4 +1,4 @@ -package io.treehouses.remote.SSH.Terminal +package io.treehouses.remote.ssh.terminal import android.content.SharedPreferences import android.content.SharedPreferences.OnSharedPreferenceChangeListener @@ -6,8 +6,8 @@ import android.content.res.Configuration import android.view.KeyEvent import android.view.View import io.treehouses.remote.PreferenceConstants -import io.treehouses.remote.Views.terminal.VDUBuffer -import io.treehouses.remote.Views.terminal.vt320 +import io.treehouses.remote.views.terminal.VDUBuffer +import io.treehouses.remote.views.terminal.vt320 import io.treehouses.remote.bases.BaseTerminalKeyListener import io.treehouses.remote.utils.logE import java.io.IOException diff --git a/app/src/main/kotlin/io/treehouses/remote/SSH/Terminal/TerminalManager.kt b/app/src/main/kotlin/io/treehouses/remote/ssh/terminal/TerminalManager.kt similarity index 97% rename from app/src/main/kotlin/io/treehouses/remote/SSH/Terminal/TerminalManager.kt rename to app/src/main/kotlin/io/treehouses/remote/ssh/terminal/TerminalManager.kt index 76cc8a010..204b8e987 100644 --- a/app/src/main/kotlin/io/treehouses/remote/SSH/Terminal/TerminalManager.kt +++ b/app/src/main/kotlin/io/treehouses/remote/ssh/terminal/TerminalManager.kt @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.treehouses.remote.SSH.Terminal +package io.treehouses.remote.ssh.terminal import android.app.Service import android.content.Context @@ -29,11 +29,11 @@ import android.os.IBinder import android.os.Vibrator import androidx.preference.PreferenceManager import io.treehouses.remote.PreferenceConstants -import io.treehouses.remote.SSH.PubKeyUtils -import io.treehouses.remote.SSH.beans.HostBean -import io.treehouses.remote.SSH.beans.PubKeyBean -import io.treehouses.remote.SSH.interfaces.BridgeDisconnectedListener -import io.treehouses.remote.SSH.interfaces.OnHostStatusChangedListener +import io.treehouses.remote.ssh.PubKeyUtils +import io.treehouses.remote.ssh.beans.HostBean +import io.treehouses.remote.ssh.beans.PubKeyBean +import io.treehouses.remote.ssh.interfaces.BridgeDisconnectedListener +import io.treehouses.remote.ssh.interfaces.OnHostStatusChangedListener import io.treehouses.remote.utils.SaveUtils import io.treehouses.remote.utils.logD import java.io.IOException diff --git a/app/src/main/kotlin/io/treehouses/remote/SSH/Terminal/TerminalTextViewOverlay.kt b/app/src/main/kotlin/io/treehouses/remote/ssh/terminal/TerminalTextViewOverlay.kt similarity index 99% rename from app/src/main/kotlin/io/treehouses/remote/SSH/Terminal/TerminalTextViewOverlay.kt rename to app/src/main/kotlin/io/treehouses/remote/ssh/terminal/TerminalTextViewOverlay.kt index bc0762b19..8754871cf 100644 --- a/app/src/main/kotlin/io/treehouses/remote/SSH/Terminal/TerminalTextViewOverlay.kt +++ b/app/src/main/kotlin/io/treehouses/remote/ssh/terminal/TerminalTextViewOverlay.kt @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.treehouses.remote.SSH.Terminal +package io.treehouses.remote.ssh.terminal import android.annotation.TargetApi import android.content.Context @@ -26,7 +26,7 @@ import android.view.inputmethod.EditorInfo import android.view.inputmethod.InputConnection import androidx.appcompat.widget.AppCompatTextView import androidx.core.view.MotionEventCompat -import io.treehouses.remote.Views.terminal.vt320 +import io.treehouses.remote.views.terminal.vt320 import kotlin.math.floor /** diff --git a/app/src/main/kotlin/io/treehouses/remote/SSH/Terminal/TerminalView.kt b/app/src/main/kotlin/io/treehouses/remote/ssh/terminal/TerminalView.kt similarity index 99% rename from app/src/main/kotlin/io/treehouses/remote/SSH/Terminal/TerminalView.kt rename to app/src/main/kotlin/io/treehouses/remote/ssh/terminal/TerminalView.kt index 721cecfdb..1c5357e15 100644 --- a/app/src/main/kotlin/io/treehouses/remote/SSH/Terminal/TerminalView.kt +++ b/app/src/main/kotlin/io/treehouses/remote/ssh/terminal/TerminalView.kt @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.treehouses.remote.SSH.Terminal +package io.treehouses.remote.ssh.terminal import android.app.Activity import android.content.Context @@ -29,8 +29,8 @@ import android.view.accessibility.AccessibilityEvent import android.widget.RelativeLayout import android.widget.Toast import io.treehouses.remote.PreferenceConstants -import io.treehouses.remote.Views.terminal.VDUBuffer -import io.treehouses.remote.Views.terminal.vt320 +import io.treehouses.remote.views.terminal.VDUBuffer +import io.treehouses.remote.views.terminal.vt320 import java.io.IOException import java.util.regex.Matcher import java.util.regex.Pattern diff --git a/app/src/main/kotlin/io/treehouses/remote/SSH/Terminal/TerminalViewPager.kt b/app/src/main/kotlin/io/treehouses/remote/ssh/terminal/TerminalViewPager.kt similarity index 93% rename from app/src/main/kotlin/io/treehouses/remote/SSH/Terminal/TerminalViewPager.kt rename to app/src/main/kotlin/io/treehouses/remote/ssh/terminal/TerminalViewPager.kt index f903b6131..db69f0c5e 100644 --- a/app/src/main/kotlin/io/treehouses/remote/SSH/Terminal/TerminalViewPager.kt +++ b/app/src/main/kotlin/io/treehouses/remote/ssh/terminal/TerminalViewPager.kt @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.treehouses.remote.SSH.Terminal +package io.treehouses.remote.ssh.terminal import android.content.Context import android.util.AttributeSet @@ -23,7 +23,7 @@ import androidx.viewpager.widget.ViewPager /** * Custom ViewPager [ViewPager] which is used to swipe between TerminalViews - * [io.treehouses.remote.SSH.Terminal.TerminalView]. Also allows temporary disabling of paging + * [io.treehouses.remote.ssh.terminal.TerminalView]. Also allows temporary disabling of paging * functionality to prevent event intercepts. * * @author rhansby diff --git a/app/src/main/kotlin/io/treehouses/remote/SSHConsole/BaseSSHConsole.kt b/app/src/main/kotlin/io/treehouses/remote/sshconsole/BaseSSHConsole.kt similarity index 97% rename from app/src/main/kotlin/io/treehouses/remote/SSHConsole/BaseSSHConsole.kt rename to app/src/main/kotlin/io/treehouses/remote/sshconsole/BaseSSHConsole.kt index f35984d2f..795cf6d2a 100644 --- a/app/src/main/kotlin/io/treehouses/remote/SSHConsole/BaseSSHConsole.kt +++ b/app/src/main/kotlin/io/treehouses/remote/sshconsole/BaseSSHConsole.kt @@ -1,10 +1,9 @@ -package io.treehouses.remote.SSHConsole +package io.treehouses.remote.sshconsole import android.annotation.TargetApi import android.content.pm.ActivityInfo import android.content.res.Configuration import android.os.Handler -import android.util.Log import android.view.MotionEvent import android.view.View import android.view.Window @@ -12,11 +11,9 @@ import android.view.animation.Animation import androidx.core.app.ActivityCompat import io.treehouses.remote.PreferenceConstants import io.treehouses.remote.R -import io.treehouses.remote.SSH.PromptHelper -import io.treehouses.remote.SSH.Terminal.TerminalKeyListener -import io.treehouses.remote.SSH.Terminal.TerminalView -import io.treehouses.remote.bases.BaseSSH -import io.treehouses.remote.utils.LogUtils +import io.treehouses.remote.ssh.PromptHelper +import io.treehouses.remote.ssh.terminal.TerminalKeyListener +import io.treehouses.remote.ssh.terminal.TerminalView import io.treehouses.remote.utils.logD import io.treehouses.remote.utils.logE diff --git a/app/src/main/kotlin/io/treehouses/remote/SSHConsole/DerivedSSHConsole.kt b/app/src/main/kotlin/io/treehouses/remote/sshconsole/DerivedSSHConsole.kt similarity index 98% rename from app/src/main/kotlin/io/treehouses/remote/SSHConsole/DerivedSSHConsole.kt rename to app/src/main/kotlin/io/treehouses/remote/sshconsole/DerivedSSHConsole.kt index d5dfd2092..381b546a5 100644 --- a/app/src/main/kotlin/io/treehouses/remote/SSHConsole/DerivedSSHConsole.kt +++ b/app/src/main/kotlin/io/treehouses/remote/sshconsole/DerivedSSHConsole.kt @@ -1,4 +1,4 @@ -package io.treehouses.remote.SSHConsole +package io.treehouses.remote.sshconsole import android.app.Dialog import android.content.Context @@ -18,8 +18,8 @@ import androidx.viewpager.widget.ViewPager import com.google.android.material.tabs.TabLayout import io.treehouses.remote.PreferenceConstants import io.treehouses.remote.R -import io.treehouses.remote.SSH.PromptHelper -import io.treehouses.remote.SSH.Terminal.TerminalViewPager +import io.treehouses.remote.ssh.PromptHelper +import io.treehouses.remote.ssh.terminal.TerminalViewPager import io.treehouses.remote.adapter.TerminalPagerAdapter open class DerivedSSHConsole: BaseSSHConsole() { diff --git a/app/src/main/kotlin/io/treehouses/remote/SSHConsole/RootSSHConsole.kt b/app/src/main/kotlin/io/treehouses/remote/sshconsole/RootSSHConsole.kt similarity index 94% rename from app/src/main/kotlin/io/treehouses/remote/SSHConsole/RootSSHConsole.kt rename to app/src/main/kotlin/io/treehouses/remote/sshconsole/RootSSHConsole.kt index 34eaa55d8..48364dbcd 100644 --- a/app/src/main/kotlin/io/treehouses/remote/SSHConsole/RootSSHConsole.kt +++ b/app/src/main/kotlin/io/treehouses/remote/sshconsole/RootSSHConsole.kt @@ -1,10 +1,9 @@ -package io.treehouses.remote.SSHConsole +package io.treehouses.remote.sshconsole import android.content.SharedPreferences import android.net.Uri import android.os.Handler import android.text.ClipboardManager -import android.util.Log import android.view.LayoutInflater import android.view.MenuItem import android.view.View @@ -15,16 +14,15 @@ import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.widget.Toolbar import com.google.android.material.tabs.TabLayout import io.treehouses.remote.R -import io.treehouses.remote.SSH.Terminal.TerminalKeyListener -import io.treehouses.remote.SSH.Terminal.TerminalManager -import io.treehouses.remote.SSH.Terminal.TerminalView -import io.treehouses.remote.SSH.Terminal.TerminalViewPager -import io.treehouses.remote.Views.terminal.vt320 +import io.treehouses.remote.ssh.terminal.TerminalKeyListener +import io.treehouses.remote.ssh.terminal.TerminalManager +import io.treehouses.remote.ssh.terminal.TerminalView +import io.treehouses.remote.ssh.terminal.TerminalViewPager +import io.treehouses.remote.views.terminal.vt320 import io.treehouses.remote.adapter.TerminalPagerAdapter import io.treehouses.remote.bases.BaseTerminalKeyListener import io.treehouses.remote.callback.TerminalPager import io.treehouses.remote.databinding.ActivitySshConsoleBinding -import io.treehouses.remote.utils.LogUtils import io.treehouses.remote.utils.logD open class RootSSHConsole: AppCompatActivity() { diff --git a/app/src/main/kotlin/io/treehouses/remote/SSHConsole/SSHConsole.kt b/app/src/main/kotlin/io/treehouses/remote/sshconsole/SSHConsole.kt similarity index 97% rename from app/src/main/kotlin/io/treehouses/remote/SSHConsole/SSHConsole.kt rename to app/src/main/kotlin/io/treehouses/remote/sshconsole/SSHConsole.kt index d2c08752e..639739a7a 100644 --- a/app/src/main/kotlin/io/treehouses/remote/SSHConsole/SSHConsole.kt +++ b/app/src/main/kotlin/io/treehouses/remote/sshconsole/SSHConsole.kt @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.treehouses.remote.SSHConsole +package io.treehouses.remote.sshconsole import android.annotation.SuppressLint import android.content.ComponentName @@ -29,7 +29,6 @@ import android.os.Bundle import android.os.IBinder import android.os.StrictMode import android.text.ClipboardManager -import android.util.Log import android.view.* import android.widget.HorizontalScrollView import androidx.core.view.MenuItemCompat @@ -37,12 +36,11 @@ import androidx.preference.PreferenceManager import io.treehouses.remote.InitialActivity import io.treehouses.remote.PreferenceConstants import io.treehouses.remote.R -import io.treehouses.remote.SSH.Terminal.TerminalBridge -import io.treehouses.remote.SSH.Terminal.TerminalManager -import io.treehouses.remote.SSH.Terminal.TerminalManager.TerminalBinder -import io.treehouses.remote.SSH.interfaces.BridgeDisconnectedListener +import io.treehouses.remote.ssh.terminal.TerminalBridge +import io.treehouses.remote.ssh.terminal.TerminalManager +import io.treehouses.remote.ssh.terminal.TerminalManager.TerminalBinder +import io.treehouses.remote.ssh.interfaces.BridgeDisconnectedListener import io.treehouses.remote.databinding.ActivitySshConsoleBinding -import io.treehouses.remote.utils.LogUtils import io.treehouses.remote.utils.logD import io.treehouses.remote.utils.logE diff --git a/app/src/main/kotlin/io/treehouses/remote/SSHConsole/URLItemListener.kt b/app/src/main/kotlin/io/treehouses/remote/sshconsole/URLItemListener.kt similarity index 85% rename from app/src/main/kotlin/io/treehouses/remote/SSHConsole/URLItemListener.kt rename to app/src/main/kotlin/io/treehouses/remote/sshconsole/URLItemListener.kt index 2ef8110ec..0b31ecc4e 100644 --- a/app/src/main/kotlin/io/treehouses/remote/SSHConsole/URLItemListener.kt +++ b/app/src/main/kotlin/io/treehouses/remote/sshconsole/URLItemListener.kt @@ -1,14 +1,11 @@ -package io.treehouses.remote.SSHConsole +package io.treehouses.remote.sshconsole import android.content.Context import android.content.Intent import android.net.Uri -import android.util.Log import android.view.View import android.widget.AdapterView import android.widget.TextView -import io.treehouses.remote.SSHConsole.BaseSSHConsole -import io.treehouses.remote.utils.LogUtils import io.treehouses.remote.utils.logE import java.lang.ref.WeakReference diff --git a/app/src/main/kotlin/io/treehouses/remote/ui/home/HomeFragment.kt b/app/src/main/kotlin/io/treehouses/remote/ui/home/HomeFragment.kt index 1e1b96eab..39d3ed227 100644 --- a/app/src/main/kotlin/io/treehouses/remote/ui/home/HomeFragment.kt +++ b/app/src/main/kotlin/io/treehouses/remote/ui/home/HomeFragment.kt @@ -22,10 +22,10 @@ import androidx.preference.PreferenceManager import io.treehouses.remote.* import io.treehouses.remote.BaseInitialActivity.Companion.instance import io.treehouses.remote.Constants.REQUEST_ENABLE_BT -import io.treehouses.remote.Fragments.AboutFragment -import io.treehouses.remote.Fragments.DialogFragments.BluetoothFailedDialog -import io.treehouses.remote.Fragments.DialogFragments.RPIDialogFragment -import io.treehouses.remote.Fragments.TerminalFragment +import io.treehouses.remote.fragments.AboutFragment +import io.treehouses.remote.fragments.dialogfragments.BluetoothFailedDialogFragment +import io.treehouses.remote.fragments.dialogfragments.RPIDialogFragment +import io.treehouses.remote.fragments.TerminalFragment import io.treehouses.remote.adapter.ProfilesListAdapter import io.treehouses.remote.callback.NotificationCallback import io.treehouses.remote.databinding.ActivityHomeFragmentBinding @@ -94,8 +94,8 @@ class HomeFragment : BaseHomeFragment() { viewModel.errorConnecting.observe(viewLifecycleOwner, Observer { if (it == null) return@Observer connectionDialog?.dismiss() - val noDialog = PreferenceManager.getDefaultSharedPreferences(requireContext()).getBoolean(BluetoothFailedDialog.DONT_SHOW_DIALOG, false) - if (!noDialog && viewModel.device != null) BluetoothFailedDialog().show(childFragmentManager, "ERROR") + val noDialog = PreferenceManager.getDefaultSharedPreferences(requireContext()).getBoolean(BluetoothFailedDialogFragment.DONT_SHOW_DIALOG, false) + if (!noDialog && viewModel.device != null) BluetoothFailedDialogFragment().show(childFragmentManager, "ERROR") viewModel.errorConnecting.value = null }) } diff --git a/app/src/main/kotlin/io/treehouses/remote/ui/home/HomeViewModel.kt b/app/src/main/kotlin/io/treehouses/remote/ui/home/HomeViewModel.kt index a4b167d77..80e18dc65 100644 --- a/app/src/main/kotlin/io/treehouses/remote/ui/home/HomeViewModel.kt +++ b/app/src/main/kotlin/io/treehouses/remote/ui/home/HomeViewModel.kt @@ -3,13 +3,12 @@ package io.treehouses.remote.ui.home import android.app.Application import android.bluetooth.BluetoothDevice import android.os.Message -import android.util.Log import androidx.lifecycle.MutableLiveData import androidx.preference.PreferenceManager import io.treehouses.remote.BuildConfig import io.treehouses.remote.Constants import io.treehouses.remote.MainApplication -import io.treehouses.remote.Network.ParseDbService +import io.treehouses.remote.network.ParseDbService import io.treehouses.remote.R import io.treehouses.remote.bases.FragmentViewModel import io.treehouses.remote.pojo.NetworkProfile @@ -63,7 +62,7 @@ class HomeViewModel(application: Application) : FragmentViewModel(application) { /** * Bluetooth device to connect to. Selected from the RPIDialogFragment - * @see io.treehouses.remote.Fragments.DialogFragments.RPIDialogFragment + * @see io.treehouses.remote.fragments.dialogfragments.RPIDialogFragment */ var device: BluetoothDevice? = null diff --git a/app/src/main/kotlin/io/treehouses/remote/ui/services/BaseServicesDetailsFragment.kt b/app/src/main/kotlin/io/treehouses/remote/ui/services/BaseServicesDetailsFragment.kt index f6e261af4..3e6dcf9b5 100644 --- a/app/src/main/kotlin/io/treehouses/remote/ui/services/BaseServicesDetailsFragment.kt +++ b/app/src/main/kotlin/io/treehouses/remote/ui/services/BaseServicesDetailsFragment.kt @@ -14,14 +14,14 @@ import io.treehouses.remote.R import io.treehouses.remote.adapter.ServiceCardAdapter import io.treehouses.remote.adapter.ServicesListAdapter import io.treehouses.remote.bases.BaseFragment -import io.treehouses.remote.callback.ServiceAction +import io.treehouses.remote.callback.ServiceActionListener import io.treehouses.remote.databinding.ActivityServicesDetailsBinding import io.treehouses.remote.databinding.DialogChooseUrlBinding import io.treehouses.remote.pojo.ServiceInfo import io.treehouses.remote.utils.countHeadersBefore import io.treehouses.remote.utils.logD -open class BaseServicesDetailsFragment: BaseFragment(), OnItemSelectedListener, ServiceAction { +open class BaseServicesDetailsFragment: BaseFragment(), OnItemSelectedListener, ServiceActionListener { /** * Adapter for the spinner to select a service from dropdown diff --git a/app/src/main/kotlin/io/treehouses/remote/utils/KeyUtils.kt b/app/src/main/kotlin/io/treehouses/remote/utils/KeyUtils.kt index 6ff93b6e9..25b5b8b39 100644 --- a/app/src/main/kotlin/io/treehouses/remote/utils/KeyUtils.kt +++ b/app/src/main/kotlin/io/treehouses/remote/utils/KeyUtils.kt @@ -4,9 +4,9 @@ import android.content.Context import androidx.preference.PreferenceManager import com.google.gson.* import com.trilead.ssh2.KnownHosts -import io.treehouses.remote.SSH.PubKeyUtils -import io.treehouses.remote.SSH.beans.KnownHostBean -import io.treehouses.remote.SSH.beans.PubKeyBean +import io.treehouses.remote.ssh.PubKeyUtils +import io.treehouses.remote.ssh.beans.KnownHostBean +import io.treehouses.remote.ssh.beans.PubKeyBean import java.lang.reflect.Type import java.security.KeyPairGenerator import java.security.PublicKey diff --git a/app/src/main/kotlin/io/treehouses/remote/utils/SaveUtils.kt b/app/src/main/kotlin/io/treehouses/remote/utils/SaveUtils.kt index 71e0289cf..a26a9d741 100644 --- a/app/src/main/kotlin/io/treehouses/remote/utils/SaveUtils.kt +++ b/app/src/main/kotlin/io/treehouses/remote/utils/SaveUtils.kt @@ -1,12 +1,11 @@ package io.treehouses.remote.utils import android.content.Context -import android.util.Log import androidx.preference.PreferenceManager import com.google.gson.Gson import io.treehouses.remote.R import io.treehouses.remote.ui.home.HomeFragment -import io.treehouses.remote.SSH.beans.HostBean +import io.treehouses.remote.ssh.beans.HostBean import io.treehouses.remote.pojo.CommandListItem import io.treehouses.remote.pojo.NetworkProfile import io.treehouses.remote.utils.Utils.convertToObject diff --git a/app/src/main/kotlin/io/treehouses/remote/utils/Utils.kt b/app/src/main/kotlin/io/treehouses/remote/utils/Utils.kt index 640413dd0..be4a2222f 100644 --- a/app/src/main/kotlin/io/treehouses/remote/utils/Utils.kt +++ b/app/src/main/kotlin/io/treehouses/remote/utils/Utils.kt @@ -9,15 +9,12 @@ import android.view.View import android.widget.Toast import com.google.android.material.snackbar.Snackbar import android.util.Base64 -import io.treehouses.remote.bases.BaseFragment import com.google.gson.Gson -import io.treehouses.remote.SSH.beans.HostBean import io.treehouses.remote.callback.HomeInteractListener import io.treehouses.remote.callback.NotificationCallback import java.io.ByteArrayOutputStream import java.net.NetworkInterface import java.nio.charset.Charset -import java.security.AccessController.getContext import java.security.MessageDigest import java.util.* import java.util.zip.DeflaterOutputStream diff --git a/app/src/main/kotlin/io/treehouses/remote/Views/HelpViewHolder.kt b/app/src/main/kotlin/io/treehouses/remote/views/HelpViewHolder.kt similarity index 92% rename from app/src/main/kotlin/io/treehouses/remote/Views/HelpViewHolder.kt rename to app/src/main/kotlin/io/treehouses/remote/views/HelpViewHolder.kt index fadf98f83..7cbba731b 100644 --- a/app/src/main/kotlin/io/treehouses/remote/Views/HelpViewHolder.kt +++ b/app/src/main/kotlin/io/treehouses/remote/views/HelpViewHolder.kt @@ -1,4 +1,4 @@ -package io.treehouses.remote.Views +package io.treehouses.remote.views import androidx.recyclerview.widget.RecyclerView import io.treehouses.remote.databinding.RowHelpBinding diff --git a/app/src/main/kotlin/io/treehouses/remote/Views/RecyclerViewClickListener.kt b/app/src/main/kotlin/io/treehouses/remote/views/RecyclerViewClickListener.kt similarity index 97% rename from app/src/main/kotlin/io/treehouses/remote/Views/RecyclerViewClickListener.kt rename to app/src/main/kotlin/io/treehouses/remote/views/RecyclerViewClickListener.kt index 18363625f..0d4efbc5e 100644 --- a/app/src/main/kotlin/io/treehouses/remote/Views/RecyclerViewClickListener.kt +++ b/app/src/main/kotlin/io/treehouses/remote/views/RecyclerViewClickListener.kt @@ -1,4 +1,4 @@ -package io.treehouses.remote.Views +package io.treehouses.remote.views import android.content.Context import android.view.GestureDetector diff --git a/app/src/main/kotlin/io/treehouses/remote/Views/ServiceViewPager.kt b/app/src/main/kotlin/io/treehouses/remote/views/ServiceViewPager.kt similarity index 98% rename from app/src/main/kotlin/io/treehouses/remote/Views/ServiceViewPager.kt rename to app/src/main/kotlin/io/treehouses/remote/views/ServiceViewPager.kt index 643c35b4f..9cacda054 100644 --- a/app/src/main/kotlin/io/treehouses/remote/Views/ServiceViewPager.kt +++ b/app/src/main/kotlin/io/treehouses/remote/views/ServiceViewPager.kt @@ -1,4 +1,4 @@ -package io.treehouses.remote.Views +package io.treehouses.remote.views import android.annotation.SuppressLint import android.content.Context diff --git a/app/src/main/kotlin/io/treehouses/remote/Views/TunnelViewPager.kt b/app/src/main/kotlin/io/treehouses/remote/views/TunnelViewPager.kt similarity index 98% rename from app/src/main/kotlin/io/treehouses/remote/Views/TunnelViewPager.kt rename to app/src/main/kotlin/io/treehouses/remote/views/TunnelViewPager.kt index 528d2e319..eb283b89d 100644 --- a/app/src/main/kotlin/io/treehouses/remote/Views/TunnelViewPager.kt +++ b/app/src/main/kotlin/io/treehouses/remote/views/TunnelViewPager.kt @@ -1,4 +1,4 @@ -package io.treehouses.remote.Views +package io.treehouses.remote.views import android.content.Context import android.util.AttributeSet diff --git a/app/src/main/kotlin/io/treehouses/remote/Views/terminal/Precomposer.kt b/app/src/main/kotlin/io/treehouses/remote/views/terminal/Precomposer.kt similarity index 99% rename from app/src/main/kotlin/io/treehouses/remote/Views/terminal/Precomposer.kt rename to app/src/main/kotlin/io/treehouses/remote/views/terminal/Precomposer.kt index 633086077..c3ca01293 100644 --- a/app/src/main/kotlin/io/treehouses/remote/Views/terminal/Precomposer.kt +++ b/app/src/main/kotlin/io/treehouses/remote/views/terminal/Precomposer.kt @@ -1,4 +1,4 @@ -package io.treehouses.remote.Views.terminal +package io.treehouses.remote.views.terminal /* * ConnectBot: simple, powerful, open-source SSH client for Android diff --git a/app/src/main/kotlin/io/treehouses/remote/Views/terminal/VDUBuffer.kt b/app/src/main/kotlin/io/treehouses/remote/views/terminal/VDUBuffer.kt similarity index 99% rename from app/src/main/kotlin/io/treehouses/remote/Views/terminal/VDUBuffer.kt rename to app/src/main/kotlin/io/treehouses/remote/views/terminal/VDUBuffer.kt index 438c5ca6f..bbfc0d6fb 100644 --- a/app/src/main/kotlin/io/treehouses/remote/Views/terminal/VDUBuffer.kt +++ b/app/src/main/kotlin/io/treehouses/remote/views/terminal/VDUBuffer.kt @@ -1,4 +1,4 @@ -package io.treehouses.remote.Views.terminal +package io.treehouses.remote.views.terminal import java.util.* diff --git a/app/src/main/kotlin/io/treehouses/remote/Views/terminal/VDUDisplay.kt b/app/src/main/kotlin/io/treehouses/remote/views/terminal/VDUDisplay.kt similarity index 96% rename from app/src/main/kotlin/io/treehouses/remote/Views/terminal/VDUDisplay.kt rename to app/src/main/kotlin/io/treehouses/remote/views/terminal/VDUDisplay.kt index 8b76ec85a..1e57edc4b 100644 --- a/app/src/main/kotlin/io/treehouses/remote/Views/terminal/VDUDisplay.kt +++ b/app/src/main/kotlin/io/treehouses/remote/views/terminal/VDUDisplay.kt @@ -1,4 +1,4 @@ -package io.treehouses.remote.Views.terminal +package io.treehouses.remote.views.terminal /* * This file is part of "JTA - Telnet/SSH for the JAVA(tm) platform". diff --git a/app/src/main/kotlin/io/treehouses/remote/Views/terminal/VDUInput.kt b/app/src/main/kotlin/io/treehouses/remote/views/terminal/VDUInput.kt similarity index 98% rename from app/src/main/kotlin/io/treehouses/remote/Views/terminal/VDUInput.kt rename to app/src/main/kotlin/io/treehouses/remote/views/terminal/VDUInput.kt index fe53053cf..fb080cc66 100644 --- a/app/src/main/kotlin/io/treehouses/remote/Views/terminal/VDUInput.kt +++ b/app/src/main/kotlin/io/treehouses/remote/views/terminal/VDUInput.kt @@ -1,4 +1,4 @@ -package io.treehouses.remote.Views.terminal +package io.treehouses.remote.views.terminal import java.util.* diff --git a/app/src/main/kotlin/io/treehouses/remote/Views/terminal/vt320.kt b/app/src/main/kotlin/io/treehouses/remote/views/terminal/vt320.kt similarity index 99% rename from app/src/main/kotlin/io/treehouses/remote/Views/terminal/vt320.kt rename to app/src/main/kotlin/io/treehouses/remote/views/terminal/vt320.kt index d56029be1..b4f4c12bc 100644 --- a/app/src/main/kotlin/io/treehouses/remote/Views/terminal/vt320.kt +++ b/app/src/main/kotlin/io/treehouses/remote/views/terminal/vt320.kt @@ -1,7 +1,7 @@ -package io.treehouses.remote.Views.terminal +package io.treehouses.remote.views.terminal import android.text.AndroidCharacter -import io.treehouses.remote.Views.terminal.Precomposer.precompose +import io.treehouses.remote.views.terminal.Precomposer.precompose import java.util.* /* diff --git a/app/src/main/res/layout/activity_services_details.xml b/app/src/main/res/layout/activity_services_details.xml index 642f8c394..0cd5d0ee0 100644 --- a/app/src/main/res/layout/activity_services_details.xml +++ b/app/src/main/res/layout/activity_services_details.xml @@ -21,7 +21,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> - - + - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_terminal_fragment.xml b/app/src/main/res/layout/activity_terminal_fragment.xml index b20a438b0..e6e3f0d7d 100644 --- a/app/src/main/res/layout/activity_terminal_fragment.xml +++ b/app/src/main/res/layout/activity_terminal_fragment.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@color/windowBackground" - tools:context=".Fragments.TerminalFragment"> + tools:context=".fragments.TerminalFragment"> diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml index 97cd77a3f..964875b12 100644 --- a/app/src/main/res/layout/fragment_about.xml +++ b/app/src/main/res/layout/fragment_about.xml @@ -14,7 +14,7 @@ android:layout_height="match_parent" android:textColor="@color/daynight_textColor" - tools:context=".Fragments.AboutFragment"> + tools:context=".fragments.AboutFragment">