Browse Source

Use dynamic titles

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
Andy Scherzinger 4 years ago
parent
commit
3253e1356f

+ 13 - 1
src/main/java/com/owncloud/android/ui/dialog/ChooseRichDocumentsTemplateDialogFragment.java

@@ -165,7 +165,7 @@ public class ChooseRichDocumentsTemplateDialogFragment extends DialogFragment im
         builder.setView(view)
         builder.setView(view)
             .setPositiveButton(R.string.create, null)
             .setPositiveButton(R.string.create, null)
             .setNeutralButton(R.string.common_cancel, null)
             .setNeutralButton(R.string.common_cancel, null)
-            .setTitle(R.string.select_template);
+            .setTitle(getTitle(type));
         Dialog dialog = builder.create();
         Dialog dialog = builder.create();
 
 
         Window window = dialog.getWindow();
         Window window = dialog.getWindow();
@@ -177,6 +177,18 @@ public class ChooseRichDocumentsTemplateDialogFragment extends DialogFragment im
         return dialog;
         return dialog;
     }
     }
 
 
+    private int getTitle(Type type) {
+        if (type == Type.DOCUMENT) {
+            return R.string.create_new_document;
+        } else if (type == Type.SPREADSHEET) {
+            return R.string.create_new_spreadsheet;
+        } else if (type == Type.PRESENTATION) {
+            return R.string.create_new_presentation;
+        }
+
+        return R.string.select_template;
+    }
+
     @Override
     @Override
     public void onDestroyView() {
     public void onDestroyView() {
         super.onDestroyView();
         super.onDestroyView();

+ 5 - 2
src/main/java/com/owncloud/android/ui/dialog/ChooseTemplateDialogFragment.java

@@ -81,6 +81,7 @@ public class ChooseTemplateDialogFragment extends DialogFragment implements View
 
 
     private static final String ARG_PARENT_FOLDER = "PARENT_FOLDER";
     private static final String ARG_PARENT_FOLDER = "PARENT_FOLDER";
     private static final String ARG_CREATOR = "CREATOR";
     private static final String ARG_CREATOR = "CREATOR";
+    private static final String ARG_HEADLINE = "HEADLINE";
     private static final String TAG = ChooseTemplateDialogFragment.class.getSimpleName();
     private static final String TAG = ChooseTemplateDialogFragment.class.getSimpleName();
     private static final String DOT = ".";
     private static final String DOT = ".";
 
 
@@ -99,11 +100,12 @@ public class ChooseTemplateDialogFragment extends DialogFragment implements View
 
 
     ChooseTemplateBinding binding;
     ChooseTemplateBinding binding;
 
 
-    public static ChooseTemplateDialogFragment newInstance(OCFile parentFolder, Creator creator) {
+    public static ChooseTemplateDialogFragment newInstance(OCFile parentFolder, Creator creator, String headline) {
         ChooseTemplateDialogFragment frag = new ChooseTemplateDialogFragment();
         ChooseTemplateDialogFragment frag = new ChooseTemplateDialogFragment();
         Bundle args = new Bundle();
         Bundle args = new Bundle();
         args.putParcelable(ARG_PARENT_FOLDER, parentFolder);
         args.putParcelable(ARG_PARENT_FOLDER, parentFolder);
         args.putParcelable(ARG_CREATOR, creator);
         args.putParcelable(ARG_CREATOR, creator);
+        args.putString(ARG_HEADLINE, headline);
         frag.setArguments(args);
         frag.setArguments(args);
         return frag;
         return frag;
     }
     }
@@ -139,6 +141,7 @@ public class ChooseTemplateDialogFragment extends DialogFragment implements View
 
 
         parentFolder = arguments.getParcelable(ARG_PARENT_FOLDER);
         parentFolder = arguments.getParcelable(ARG_PARENT_FOLDER);
         creator = arguments.getParcelable(ARG_CREATOR);
         creator = arguments.getParcelable(ARG_CREATOR);
+        String headline = arguments.getString(ARG_HEADLINE, getString(R.string.select_template));
 
 
         // Inflate the layout for the dialog
         // Inflate the layout for the dialog
         LayoutInflater inflater = requireActivity().getLayoutInflater();
         LayoutInflater inflater = requireActivity().getLayoutInflater();
@@ -187,7 +190,7 @@ public class ChooseTemplateDialogFragment extends DialogFragment implements View
         builder.setView(view)
         builder.setView(view)
             .setPositiveButton(R.string.create, null)
             .setPositiveButton(R.string.create, null)
             .setNeutralButton(R.string.common_cancel, null)
             .setNeutralButton(R.string.common_cancel, null)
-            .setTitle(R.string.select_template);
+            .setTitle(headline);
         Dialog dialog = builder.create();
         Dialog dialog = builder.create();
 
 
         Window window = dialog.getWindow();
         Window window = dialog.getWindow();

+ 1 - 1
src/main/java/com/owncloud/android/ui/fragment/OCFileListBottomSheetActions.java

@@ -65,7 +65,7 @@ public interface OCFileListBottomSheetActions {
     /**
     /**
      * open template selection for creator @link Creator
      * open template selection for creator @link Creator
      */
      */
-    void showTemplate(Creator creator);
+    void showTemplate(Creator creator, String headline);
 
 
     /**
     /**
      * open editor for rich workspace
      * open editor for rich workspace

+ 1 - 1
src/main/java/com/owncloud/android/ui/fragment/OCFileListBottomSheetDialog.java

@@ -121,7 +121,7 @@ public class OCFileListBottomSheetDialog extends BottomSheetDialog {
                                                                             getContext()));
                                                                             getContext()));
 
 
                     creatorView.setOnClickListener(v -> {
                     creatorView.setOnClickListener(v -> {
-                        actions.showTemplate(creator);
+                        actions.showTemplate(creator, creatorViewBinding.creatorName.getText().toString());
                         dismiss();
                         dismiss();
                     });
                     });
 
 

+ 2 - 2
src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -565,8 +565,8 @@ public class OCFileListFragment extends ExtendedListFragment implements
     }
     }
 
 
     @Override
     @Override
-    public void showTemplate(Creator creator) {
-        ChooseTemplateDialogFragment.newInstance(mFile, creator).show(requireActivity().getSupportFragmentManager(),
+    public void showTemplate(Creator creator, String headline) {
+        ChooseTemplateDialogFragment.newInstance(mFile, creator, headline).show(requireActivity().getSupportFragmentManager(),
                                                                       DIALOG_CREATE_DOCUMENT);
                                                                       DIALOG_CREATE_DOCUMENT);
     }
     }