X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Ftemplates%2FTemplateListFragment.java;h=53eb604f3df6497cca2ccc5182918b98bab0bfca;hb=ed482a14c98fe458d17f57a3174a092f0e042f6f;hp=2f0325535cf76e4f1da6e0abd1f440958709d3c9;hpb=37b0c1bde24708fe28a626c36441ec10004c519e;p=mobile-ledger.git diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/templates/TemplateListFragment.java b/app/src/main/java/net/ktnx/mobileledger/ui/templates/TemplateListFragment.java index 2f032553..53eb604f 100644 --- a/app/src/main/java/net/ktnx/mobileledger/ui/templates/TemplateListFragment.java +++ b/app/src/main/java/net/ktnx/mobileledger/ui/templates/TemplateListFragment.java @@ -17,10 +17,8 @@ package net.ktnx.mobileledger.ui.templates; -import android.app.AlertDialog; import android.content.Context; import android.os.Bundle; -import android.text.TextUtils; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; @@ -35,6 +33,7 @@ import androidx.lifecycle.Lifecycle; import androidx.lifecycle.LifecycleEventObserver; import androidx.lifecycle.LifecycleOwner; import androidx.lifecycle.LiveData; +import androidx.recyclerview.widget.DividerItemDecoration; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -44,6 +43,7 @@ import net.ktnx.mobileledger.databinding.FragmentTemplateListBinding; import net.ktnx.mobileledger.db.DB; import net.ktnx.mobileledger.db.TemplateHeader; import net.ktnx.mobileledger.ui.FabManager; +import net.ktnx.mobileledger.ui.HelpDialog; import net.ktnx.mobileledger.utils.Logger; import org.jetbrains.annotations.NotNull; @@ -67,7 +67,6 @@ public class TemplateListFragment extends Fragment { * * @return A new instance of fragment TemplateListFragment. */ - // TODO: Rename and change types and number of parameters public static TemplateListFragment newInstance() { TemplateListFragment fragment = new TemplateListFragment(); Bundle args = new Bundle(); @@ -82,14 +81,8 @@ public class TemplateListFragment extends Fragment { @Override public boolean onOptionsItemSelected(@NonNull MenuItem item) { if (item.getItemId() == R.id.menu_item_template_list_help) { - AlertDialog.Builder adb = new AlertDialog.Builder(requireContext()); - adb.setTitle(R.string.template_list_help_title); - adb.setMessage(TextUtils.join("\n\n", requireContext().getResources() - .getStringArray( - R.array.template_list_help_text))); - adb.setPositiveButton(R.string.close_button, (dialog, buttonId) -> dialog.dismiss()); - adb.create() - .show(); + HelpDialog.show(requireContext(), R.string.template_list_help_title, + R.array.template_list_help_text); return true; } return super.onOptionsItemSelected(item); @@ -98,10 +91,6 @@ public class TemplateListFragment extends Fragment { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setHasOptionsMenu(true); -// if (getArguments() != null) { -// mParam1 = getArguments().getString(ARG_PARAM1); -// mParam2 = getArguments().getString(ARG_PARAM2); -// } } @Override @@ -109,6 +98,10 @@ public class TemplateListFragment extends Fragment { Bundle savedInstanceState) { Logger.debug("flow", "PatternListFragment.onCreateView()"); b = FragmentTemplateListBinding.inflate(inflater); + FragmentActivity activity = requireActivity(); + + if (activity instanceof FabManager.FabHandler) + FabManager.handle((FabManager.FabHandler) activity, b.templateList); TemplatesRecyclerViewAdapter modelAdapter = new TemplatesRecyclerViewAdapter(); @@ -120,10 +113,9 @@ public class TemplateListFragment extends Fragment { LinearLayoutManager llm = new LinearLayoutManager(getContext()); llm.setOrientation(RecyclerView.VERTICAL); b.templateList.setLayoutManager(llm); - - FragmentActivity activity = requireActivity(); - if (activity instanceof FabManager.FabHandler) - FabManager.handle((FabManager.FabHandler) activity, b.templateList); + DividerItemDecoration did = + new TemplateListDivider(activity, DividerItemDecoration.VERTICAL); + b.templateList.addItemDecoration(did); return b.getRoot(); }