diff --git a/app/src/main/java/ru/myitschool/work/ui/entrylast/EntryListFragment.kt b/app/src/main/java/ru/myitschool/work/ui/entrylast/EntryListFragment.kt deleted file mode 100644 index ecdc58c..0000000 --- a/app/src/main/java/ru/myitschool/work/ui/entrylast/EntryListFragment.kt +++ /dev/null @@ -1,38 +0,0 @@ -package ru.myitschool.work.ui.entrylast - -import androidx.fragment.app.viewModels -import android.os.Bundle -import androidx.fragment.app.Fragment -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import ru.myitschool.work.R -import ru.myitschool.work.databinding.FragmentEntryListBinding -import ru.myitschool.work.databinding.FragmentLoginBinding -import ru.myitschool.work.ui.login.LoginViewModel - -class EntryListFragment : Fragment(R.layout.fragment_entry_list) { - - private var _binding: FragmentEntryListBinding? = null - private val binding: FragmentEntryListBinding get() = _binding!! - - private val viewModel: LoginViewModel by viewModels() - - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - super.onViewCreated(view, savedInstanceState) - _binding = FragmentEntryListBinding.bind(view) - - } - private fun subscribe(){ - //TODO - } - - private fun initCallback(){ - //TODO - } - - override fun onDestroyView() { - _binding = null - super.onDestroyView() - } -} \ No newline at end of file diff --git a/app/src/main/java/ru/myitschool/work/ui/entrylist/EntryListFragment.kt b/app/src/main/java/ru/myitschool/work/ui/entrylist/EntryListFragment.kt new file mode 100644 index 0000000..c62933d --- /dev/null +++ b/app/src/main/java/ru/myitschool/work/ui/entrylist/EntryListFragment.kt @@ -0,0 +1,31 @@ +package ru.myitschool.work.ui.entrylist + +import androidx.fragment.app.viewModels +import android.os.Bundle +import androidx.fragment.app.Fragment +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import ru.myitschool.work.R + +class EntryListFragment : Fragment() { + + companion object { + fun newInstance() = EntryListFragment() + } + + private val viewModel: EntryListViewModel by viewModels() + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + // TODO: Use the ViewModel + } + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View { + return inflater.inflate(R.layout.fragment_entry_list, container, false) + } +} \ No newline at end of file diff --git a/app/src/main/java/ru/myitschool/work/ui/entrylast/EntryListViewModel.kt b/app/src/main/java/ru/myitschool/work/ui/entrylist/EntryListViewModel.kt similarity index 74% rename from app/src/main/java/ru/myitschool/work/ui/entrylast/EntryListViewModel.kt rename to app/src/main/java/ru/myitschool/work/ui/entrylist/EntryListViewModel.kt index 2476f6d..c700666 100644 --- a/app/src/main/java/ru/myitschool/work/ui/entrylast/EntryListViewModel.kt +++ b/app/src/main/java/ru/myitschool/work/ui/entrylist/EntryListViewModel.kt @@ -1,4 +1,4 @@ -package ru.myitschool.work.ui.entrylast +package ru.myitschool.work.ui.entrylist import androidx.lifecycle.ViewModel diff --git a/app/src/main/res/layout/fragment_entry_list.xml b/app/src/main/res/layout/fragment_entry_list.xml index 4aeab52..8cd7d6c 100644 --- a/app/src/main/res/layout/fragment_entry_list.xml +++ b/app/src/main/res/layout/fragment_entry_list.xml @@ -1,13 +1,38 @@ - + android:padding="16dp" + tools:context=".ui.entrylist.EntryListFragment"> + + + android:id="@+id/textView5" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="TextView" + app:layout_constraintBottom_toBottomOf="@+id/floatingActionButton2" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@+id/floatingActionButton2" + app:layout_constraintTop_toTopOf="@+id/floatingActionButton2" /> - \ No newline at end of file + + \ No newline at end of file