From bfb41850b07b0f745d0a8a3a20ae0154ffa9202e Mon Sep 17 00:00:00 2001 From: misaochan Date: Fri, 7 Oct 2016 18:44:45 +1300 Subject: [PATCH] Add onClick() for button --- .../commons/category/CategorizationFragment.java | 7 ------- .../nrw/commons/upload/SingleUploadFragment.java | 16 +++++++++++++++- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java index 23aafdc9e..8d16a1630 100644 --- a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java @@ -318,13 +318,6 @@ public class CategorizationFragment extends Fragment { categoriesNotFoundView = (TextView) rootView.findViewById(R.id.categoriesNotFound); categoriesSkip = (TextView) rootView.findViewById(R.id.categoriesExplanation); - //FIXME: Put this back into SingleUploadFragment.java - //Retrieve last title and desc entered when user clicked Submit icon - SharedPreferences titleDesc = PreferenceManager.getDefaultSharedPreferences(getActivity()); - String title = titleDesc.getString("Title", ""); - String desc = titleDesc.getString("Desc", ""); - Log.d(TAG, "Title: " + title + ", Desc: " + desc); - categoriesSkip.setOnClickListener(new View.OnClickListener() { public void onClick(View view) { getActivity().onBackPressed(); diff --git a/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java b/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java index c6db1367c..85b98936b 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java @@ -10,6 +10,7 @@ import android.preference.PreferenceManager; import android.support.v4.app.Fragment; import android.text.Editable; import android.text.TextWatcher; +import android.util.Log; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; @@ -38,6 +39,8 @@ public class SingleUploadFragment extends Fragment { private OnUploadActionInitiated uploadActionInitiatedHandler; + private static final String TAG = "SingleUploadFragment"; + @Override public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { inflater.inflate(R.menu.activity_share, menu); @@ -76,7 +79,18 @@ public class SingleUploadFragment extends Fragment { descEdit = (EditText)rootView.findViewById(R.id.descEdit); Button titleDescButton = (Button) rootView.findViewById(R.id.titleDescButton); - //TODO: Add button here for 'copy from previous upload' + titleDescButton.setOnClickListener(new View.OnClickListener() + { + public void onClick(View v) + { + //Retrieve last title and desc entered + SharedPreferences titleDesc = PreferenceManager.getDefaultSharedPreferences(getActivity()); + String title = titleDesc.getString("Title", ""); + String desc = titleDesc.getString("Desc", ""); + Log.d(TAG, "Title: " + title + ", Desc: " + desc); + } + }); + licenseSummaryView = (TextView)rootView.findViewById(R.id.share_license_summary); TextWatcher uploadEnabler = new TextWatcher() {