From ffd0b00cc7f069f4d0a4af44a988709649bb2b7f Mon Sep 17 00:00:00 2001 From: Azalea Gui Date: Mon, 23 Jan 2023 14:28:06 -0500 Subject: [PATCH] [-] Remove unused activities --- .../java/org/hydev/wearsync/FirstFragment.kt | 48 ------------------- .../java/org/hydev/wearsync/MainActivity.kt | 25 ++-------- .../java/org/hydev/wearsync/SecondFragment.kt | 48 ------------------- app/src/main/res/layout/content_main.xml | 20 ++++---- app/src/main/res/layout/fragment_first.xml | 28 ----------- app/src/main/res/layout/fragment_second.xml | 27 ----------- app/src/main/res/navigation/nav_graph.xml | 28 ----------- 7 files changed, 15 insertions(+), 209 deletions(-) delete mode 100644 app/src/main/java/org/hydev/wearsync/FirstFragment.kt delete mode 100644 app/src/main/java/org/hydev/wearsync/SecondFragment.kt delete mode 100644 app/src/main/res/layout/fragment_first.xml delete mode 100644 app/src/main/res/layout/fragment_second.xml delete mode 100644 app/src/main/res/navigation/nav_graph.xml diff --git a/app/src/main/java/org/hydev/wearsync/FirstFragment.kt b/app/src/main/java/org/hydev/wearsync/FirstFragment.kt deleted file mode 100644 index 6821240..0000000 --- a/app/src/main/java/org/hydev/wearsync/FirstFragment.kt +++ /dev/null @@ -1,48 +0,0 @@ -package org.hydev.wearsync - -import android.os.Bundle -import androidx.fragment.app.Fragment -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.navigation.fragment.findNavController -import org.hydev.wearsync.databinding.FragmentFirstBinding - -/** - * A simple [Fragment] subclass as the default destination in the navigation. - */ -class FirstFragment : Fragment() -{ - - private var _binding: FragmentFirstBinding? = null - - // This property is only valid between onCreateView and - // onDestroyView. - private val binding get() = _binding!! - - override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? - ): View? - { - - _binding = FragmentFirstBinding.inflate(inflater, container, false) - return binding.root - - } - - override fun onViewCreated(view: View, savedInstanceState: Bundle?) - { - super.onViewCreated(view, savedInstanceState) - - binding.buttonFirst.setOnClickListener { - findNavController().navigate(R.id.action_FirstFragment_to_SecondFragment) - } - } - - override fun onDestroyView() - { - super.onDestroyView() - _binding = null - } -} \ No newline at end of file diff --git a/app/src/main/java/org/hydev/wearsync/MainActivity.kt b/app/src/main/java/org/hydev/wearsync/MainActivity.kt index 2462d6d..91dac1a 100644 --- a/app/src/main/java/org/hydev/wearsync/MainActivity.kt +++ b/app/src/main/java/org/hydev/wearsync/MainActivity.kt @@ -1,20 +1,14 @@ package org.hydev.wearsync import android.os.Bundle -import com.google.android.material.snackbar.Snackbar -import androidx.appcompat.app.AppCompatActivity -import androidx.navigation.findNavController -import androidx.navigation.ui.AppBarConfiguration -import androidx.navigation.ui.navigateUp -import androidx.navigation.ui.setupActionBarWithNavController import android.view.Menu import android.view.MenuItem +import androidx.appcompat.app.AppCompatActivity +import com.google.android.material.snackbar.Snackbar import org.hydev.wearsync.databinding.ActivityMainBinding class MainActivity : AppCompatActivity() { - - private lateinit var appBarConfiguration: AppBarConfiguration private lateinit var binding: ActivityMainBinding override fun onCreate(savedInstanceState: Bundle?) @@ -26,13 +20,11 @@ class MainActivity : AppCompatActivity() setSupportActionBar(binding.toolbar) - val navController = findNavController(R.id.nav_host_fragment_content_main) - appBarConfiguration = AppBarConfiguration(navController.graph) - setupActionBarWithNavController(navController, appBarConfiguration) - binding.fab.setOnClickListener { view -> - Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG) + Snackbar.make(view, "owo", Snackbar.LENGTH_LONG) .setAction("Action", null).show() + + println("owo") } } @@ -54,11 +46,4 @@ class MainActivity : AppCompatActivity() else -> super.onOptionsItemSelected(item) } } - - override fun onSupportNavigateUp(): Boolean - { - val navController = findNavController(R.id.nav_host_fragment_content_main) - return navController.navigateUp(appBarConfiguration) - || super.onSupportNavigateUp() - } } \ No newline at end of file diff --git a/app/src/main/java/org/hydev/wearsync/SecondFragment.kt b/app/src/main/java/org/hydev/wearsync/SecondFragment.kt deleted file mode 100644 index c7cbcaf..0000000 --- a/app/src/main/java/org/hydev/wearsync/SecondFragment.kt +++ /dev/null @@ -1,48 +0,0 @@ -package org.hydev.wearsync - -import android.os.Bundle -import androidx.fragment.app.Fragment -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.navigation.fragment.findNavController -import org.hydev.wearsync.databinding.FragmentSecondBinding - -/** - * A simple [Fragment] subclass as the second destination in the navigation. - */ -class SecondFragment : Fragment() -{ - - private var _binding: FragmentSecondBinding? = null - - // This property is only valid between onCreateView and - // onDestroyView. - private val binding get() = _binding!! - - override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? - ): View? - { - - _binding = FragmentSecondBinding.inflate(inflater, container, false) - return binding.root - - } - - override fun onViewCreated(view: View, savedInstanceState: Bundle?) - { - super.onViewCreated(view, savedInstanceState) - - binding.buttonSecond.setOnClickListener { - findNavController().navigate(R.id.action_SecondFragment_to_FirstFragment) - } - } - - override fun onDestroyView() - { - super.onDestroyView() - _binding = null - } -} \ No newline at end of file diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml index e416e1c..370a3da 100644 --- a/app/src/main/res/layout/content_main.xml +++ b/app/src/main/res/layout/content_main.xml @@ -5,15 +5,15 @@ android:layout_height="match_parent" app:layout_behavior="@string/appbar_scrolling_view_behavior"> - + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toTopOf="parent" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_first.xml b/app/src/main/res/layout/fragment_first.xml deleted file mode 100644 index 293818d..0000000 --- a/app/src/main/res/layout/fragment_first.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - -