From 4ecb589df0c91e7b7df5020eb4b63d404435470b Mon Sep 17 00:00:00 2001 From: jd003walker <41433222+jd003walker@users.noreply.github.com> Date: Sat, 9 Mar 2019 15:08:51 +0530 Subject: [PATCH 1/7] Added Favourite Section --- app/src/main/AndroidManifest.xml | 1 + .../activity/FavouritesActivity.java | 16 ++ .../createpdf/activity/MainActivity.java | 27 ++ .../fragment/FavouritesFragment.java | 149 ++++++++++ .../createpdf/fragment/FavouritesPref.java | 35 +++ .../main/res/layout/favourites_fragment.xml | 257 ++++++++++++++++++ app/src/main/res/menu/menu_favourites.xml | 12 + app/src/main/res/values-es/strings.xml | 2 +- app/src/main/res/values-fr/strings.xml | 1 + app/src/main/res/values-ja/strings.xml | 1 + app/src/main/res/values-ru/strings.xml | 1 + app/src/main/res/values/strings.xml | 3 +- .../main/res/xml/favourites_preferences.xml | 77 ++++++ 13 files changed, 580 insertions(+), 2 deletions(-) create mode 100644 app/src/main/java/swati4star/createpdf/activity/FavouritesActivity.java create mode 100644 app/src/main/java/swati4star/createpdf/fragment/FavouritesFragment.java create mode 100644 app/src/main/java/swati4star/createpdf/fragment/FavouritesPref.java create mode 100644 app/src/main/res/layout/favourites_fragment.xml create mode 100644 app/src/main/res/menu/menu_favourites.xml create mode 100644 app/src/main/res/xml/favourites_preferences.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 40e1ecd65..9b7a8ebf0 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -72,6 +72,7 @@ + diff --git a/app/src/main/java/swati4star/createpdf/activity/FavouritesActivity.java b/app/src/main/java/swati4star/createpdf/activity/FavouritesActivity.java new file mode 100644 index 000000000..7948ef838 --- /dev/null +++ b/app/src/main/java/swati4star/createpdf/activity/FavouritesActivity.java @@ -0,0 +1,16 @@ +package swati4star.createpdf.activity; + +import android.os.Bundle; +import android.support.annotation.Nullable; +import android.support.v7.app.AppCompatActivity; + +import swati4star.createpdf.R; + +public class FavouritesActivity extends AppCompatActivity { + + @Override + protected void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.fav_pref_screen); + } +} diff --git a/app/src/main/java/swati4star/createpdf/activity/MainActivity.java b/app/src/main/java/swati4star/createpdf/activity/MainActivity.java index 55f997a63..69c8b1a7a 100644 --- a/app/src/main/java/swati4star/createpdf/activity/MainActivity.java +++ b/app/src/main/java/swati4star/createpdf/activity/MainActivity.java @@ -15,9 +15,12 @@ import android.support.v4.content.ContextCompat; import android.support.v4.view.GravityCompat; import android.support.v4.widget.DrawerLayout; +import android.support.v7.app.ActionBar; import android.support.v7.app.ActionBarDrawerToggle; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; +import android.view.Menu; +import android.view.MenuInflater; import android.view.MenuItem; import android.widget.Toast; @@ -28,6 +31,7 @@ import swati4star.createpdf.R; import swati4star.createpdf.fragment.AboutUsFragment; import swati4star.createpdf.fragment.AddImagesFragment; +import swati4star.createpdf.fragment.FavouritesFragment; import swati4star.createpdf.fragment.HistoryFragment; import swati4star.createpdf.fragment.HomeFragment; import swati4star.createpdf.fragment.ImageToPdfFragment; @@ -128,6 +132,29 @@ protected void onCreate(Bundle savedInstanceState) { openWelcomeActivity(); } + @Override + protected void onResume() { + super.onResume(); + ActionBar actionBar = getSupportActionBar(); + actionBar.show(); + } + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + getMenuInflater().inflate(R.menu.menu_favourites, menu); + return true; + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + if (item.getItemId() == R.id.menu_favourites_item) { + Fragment fragment = new FavouritesFragment(); + FragmentManager fragmentManager = getSupportFragmentManager(); + fragmentManager.beginTransaction().replace(R.id.content, fragment).commit(); + } + return super.onOptionsItemSelected(item); + } + /** * if welcome activity isnt opened ever, it is shown */ diff --git a/app/src/main/java/swati4star/createpdf/fragment/FavouritesFragment.java b/app/src/main/java/swati4star/createpdf/fragment/FavouritesFragment.java new file mode 100644 index 000000000..a079eca05 --- /dev/null +++ b/app/src/main/java/swati4star/createpdf/fragment/FavouritesFragment.java @@ -0,0 +1,149 @@ +package swati4star.createpdf.fragment; + +import android.app.Activity; +import android.content.Intent; +import android.content.SharedPreferences; +import android.os.Bundle; +import android.support.annotation.Nullable; +import android.support.design.widget.FloatingActionButton; +import android.support.v4.app.Fragment; +import android.support.v7.app.ActionBar; +import android.support.v7.app.AppCompatActivity; +import android.support.v7.preference.PreferenceManager; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import butterknife.BindView; +import butterknife.ButterKnife; +import swati4star.createpdf.R; +import swati4star.createpdf.activity.FavouritesActivity; +import swati4star.createpdf.customviews.MyCardView; + +public class FavouritesFragment extends Fragment + implements SharedPreferences.OnSharedPreferenceChangeListener { + + private Activity mActivity; + private SharedPreferences mSharedPreferences; + + @BindView(R.id.fav_add_fab) + FloatingActionButton mFab; + @BindView(R.id.images_to_pdf_fav) + MyCardView pref_img_to_pdf; + @BindView(R.id.text_to_pdf_fav) + MyCardView pref_text_to_pdf; + @BindView(R.id.qr_barcode_to_pdf_fav) + MyCardView pref_qr_barcode; + @BindView(R.id.view_files_fav) + MyCardView pref_view_files; + @BindView(R.id.view_history_fav) + MyCardView pref_history; + @BindView(R.id.add_password_fav) + MyCardView pref_add_password; + @BindView(R.id.remove_password_fav) + MyCardView pref_rem_pass; + @BindView(R.id.rotate_pages_fav) + MyCardView pref_rot_pages; + @BindView(R.id.add_watermark_fav) + MyCardView pref_add_watermark; + @BindView(R.id.add_images_fav) + MyCardView pref_add_images; + @BindView(R.id.merge_pdf_fav) + MyCardView pref_merge_pdf; + @BindView(R.id.split_pdf_fav) + MyCardView pref_split_pdf; + @BindView(R.id.invert_pdf_fav) + MyCardView pref_invert_pdf; + @BindView(R.id.compress_pdf_fav) + MyCardView pref_compress; + @BindView(R.id.remove_duplicates_pages_pdf_fav) + MyCardView pref_rem_dup_pages; + @BindView(R.id.remove_pages_fav) + MyCardView pref_remove_pages; + @BindView(R.id.rearrange_pages_fav) + MyCardView pref_reorder_pages; + @BindView(R.id.extract_images_fav) + MyCardView pref_extract_img; + @BindView(R.id.pdf_to_images_fav) + MyCardView pref_pdf_to_img; + + @Nullable + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + View rootview = inflater.inflate(R.layout.favourites_fragment, container, false); + ButterKnife.bind(this, rootview); + SharedPreferences sharedPreferences = PreferenceManager + .getDefaultSharedPreferences(getActivity()); + sharedPreferences.registerOnSharedPreferenceChangeListener(this); + ActionBar actionBar = ((AppCompatActivity) getActivity()).getSupportActionBar(); + actionBar.hide(); + mFab.setOnClickListener(v -> + startActivity(new Intent(this.getContext(), FavouritesActivity.class)) + ); + return rootview; + } + + /** + * This method checks for the favourites from preferences list + * and passes them to another method for dealing with the required view. + * @param sharedPreferences + */ + private void checkFavs(SharedPreferences sharedPreferences) { + viewVisibility(sharedPreferences, pref_img_to_pdf, + getResources().getString(R.string.img_to_pdf)); + viewVisibility(sharedPreferences, pref_text_to_pdf, + getResources().getString(R.string.text_to_pdf)); + viewVisibility(sharedPreferences, pref_qr_barcode, + getResources().getString(R.string.qr_barcode_pdf)); + viewVisibility(sharedPreferences, pref_view_files, + getResources().getString(R.string.viewFiles)); + viewVisibility(sharedPreferences, pref_history, + getResources().getString(R.string.history)); + viewVisibility(sharedPreferences, pref_add_password, + getResources().getString(R.string.add_password)); + viewVisibility(sharedPreferences, pref_rem_pass, + getResources().getString(R.string.remove_password)); + viewVisibility(sharedPreferences, pref_rot_pages, + getResources().getString(R.string.rotate_pages)); + viewVisibility(sharedPreferences, pref_add_watermark, + getResources().getString(R.string.add_watermark)); + viewVisibility(sharedPreferences, pref_add_images, + getResources().getString(R.string.add_images)); + viewVisibility(sharedPreferences, pref_merge_pdf, + getResources().getString(R.string.merge_pdf)); + viewVisibility(sharedPreferences, pref_invert_pdf, + getResources().getString(R.string.invert_pdf)); + viewVisibility(sharedPreferences, pref_compress, + getResources().getString(R.string.compress_pdf)); + viewVisibility(sharedPreferences, pref_rem_dup_pages, + getResources().getString(R.string.remove_duplicate_pages)); + viewVisibility(sharedPreferences, pref_remove_pages, + getResources().getString(R.string.remove_pages)); + viewVisibility(sharedPreferences, pref_reorder_pages, + getResources().getString(R.string.reorder_pages)); + viewVisibility(sharedPreferences, pref_extract_img, + getResources().getString(R.string.extract_images)); + viewVisibility(sharedPreferences, pref_pdf_to_img, + getResources().getString(R.string.pdf_to_images)); + } + + /** + * This method toggles the visibility of the passed view. + * @param sharedPreferences + * @param view + * @param id + */ + private void viewVisibility(SharedPreferences sharedPreferences, View view, String id) { + if (sharedPreferences.getBoolean(id, false)) { + view.setVisibility(View.VISIBLE); + } else { + view.setVisibility(View.GONE); + } + } + + @Override + public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) { + checkFavs(sharedPreferences); + } +} diff --git a/app/src/main/java/swati4star/createpdf/fragment/FavouritesPref.java b/app/src/main/java/swati4star/createpdf/fragment/FavouritesPref.java new file mode 100644 index 000000000..92023c085 --- /dev/null +++ b/app/src/main/java/swati4star/createpdf/fragment/FavouritesPref.java @@ -0,0 +1,35 @@ +package swati4star.createpdf.fragment; + + +import android.content.SharedPreferences; +import android.os.Bundle; +import android.support.v7.preference.PreferenceFragmentCompat; + +import swati4star.createpdf.R; + +public class FavouritesPref extends PreferenceFragmentCompat + implements SharedPreferences.OnSharedPreferenceChangeListener { + + @Override + public void onCreatePreferences(Bundle bundle, String s) { + addPreferencesFromResource(R.xml.favourites_preferences); + } + + @Override + public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) { + } + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + getPreferenceScreen().getSharedPreferences() + .registerOnSharedPreferenceChangeListener(this); + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + getPreferenceScreen().getSharedPreferences() + .unregisterOnSharedPreferenceChangeListener(this); + } +} diff --git a/app/src/main/res/layout/favourites_fragment.xml b/app/src/main/res/layout/favourites_fragment.xml new file mode 100644 index 000000000..4bcc04bcb --- /dev/null +++ b/app/src/main/res/layout/favourites_fragment.xml @@ -0,0 +1,257 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/menu_favourites.xml b/app/src/main/res/menu/menu_favourites.xml new file mode 100644 index 000000000..904027512 --- /dev/null +++ b/app/src/main/res/menu/menu_favourites.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 6893611c8..c1c50dcb1 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -93,7 +93,7 @@ %1$d imágenes seleccionadas. - + Images to PDF Unir PDF Seleccione un archivo PDFs Unidos diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 153406d4b..3c904d64d 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -171,6 +171,7 @@ Privacy Policy Join us on Slack License + Images to PDF Rate us on Playstore Send a Mail Visit our Website diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 649624029..06a507fd0 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -327,6 +327,7 @@ Stretch image to fit on page Maintain aspect ratio of images " 画像を作成する" + Images to PDF 画像を見る " 画像を共有する" PDFファイルを選択 diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index c4cd74de8..3f593dcef 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -340,6 +340,7 @@ На главную Создание PDF Просмотр PDF + Images to PDF Изменение PDF Дополнительно Добавить пароль diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 62eb43c39..e39ea1683 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -85,6 +85,7 @@ Images successfully added. + Images to PDF Create PDF QR & Barcodes View Files @@ -140,7 +141,7 @@ Duplicate pages not found.No new PDF created. A new PDF is created after removal of duplicate pages. The PDF could not be inverted - Inverted + Colors inverted successfully. Select app to send message… diff --git a/app/src/main/res/xml/favourites_preferences.xml b/app/src/main/res/xml/favourites_preferences.xml new file mode 100644 index 000000000..80a0f4ed4 --- /dev/null +++ b/app/src/main/res/xml/favourites_preferences.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 7307a2aa8dfbd2d2b01beba5ed47549c8be42ab1 Mon Sep 17 00:00:00 2001 From: jd003walker <41433222+jd003walker@users.noreply.github.com> Date: Sat, 9 Mar 2019 15:09:49 +0530 Subject: [PATCH 2/7] Added Favourite section (revised) --- app/src/main/res/drawable/ic_favorite_white_24dp.xml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 app/src/main/res/drawable/ic_favorite_white_24dp.xml diff --git a/app/src/main/res/drawable/ic_favorite_white_24dp.xml b/app/src/main/res/drawable/ic_favorite_white_24dp.xml new file mode 100644 index 000000000..46cfb27ca --- /dev/null +++ b/app/src/main/res/drawable/ic_favorite_white_24dp.xml @@ -0,0 +1,9 @@ + + + From 19f3f83e9a02a9ed00e1ec9494393c9977127532 Mon Sep 17 00:00:00 2001 From: jd003walker <41433222+jd003walker@users.noreply.github.com> Date: Sat, 9 Mar 2019 15:19:30 +0530 Subject: [PATCH 3/7] Added favourite section(Revised) --- app/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/app/build.gradle b/app/build.gradle index d6aefdcd9..6ab5f645a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -48,6 +48,7 @@ dependencies { implementation 'com.android.support:recyclerview-v7:28.0.0' implementation 'com.android.support:cardview-v7:28.0.0' implementation 'com.android.support:support-v4:28.0.0' + implementation 'com.android.support:preference-v7:28.0.0' // butterknife implementation 'com.jakewharton:butterknife:8.8.1' From 298e0104a7d19f9f6b90cad49bcfeb955b11a0ab Mon Sep 17 00:00:00 2001 From: jd003walker <41433222+jd003walker@users.noreply.github.com> Date: Sat, 9 Mar 2019 15:26:26 +0530 Subject: [PATCH 4/7] Added favourite section --- app/src/main/res/layout/fav_pref_screen.xml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 app/src/main/res/layout/fav_pref_screen.xml diff --git a/app/src/main/res/layout/fav_pref_screen.xml b/app/src/main/res/layout/fav_pref_screen.xml new file mode 100644 index 000000000..8f99f202a --- /dev/null +++ b/app/src/main/res/layout/fav_pref_screen.xml @@ -0,0 +1,7 @@ + + \ No newline at end of file From 9a0fc6eb79f644a41786986af92974207de26faa Mon Sep 17 00:00:00 2001 From: jd003walker <41433222+jd003walker@users.noreply.github.com> Date: Sun, 10 Mar 2019 08:13:35 +0530 Subject: [PATCH 5/7] Made some changes --- .../swati4star/createpdf/fragment/FavouritesFragment.java | 4 ---- app/src/main/res/values/strings.xml | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/app/src/main/java/swati4star/createpdf/fragment/FavouritesFragment.java b/app/src/main/java/swati4star/createpdf/fragment/FavouritesFragment.java index a079eca05..fbe46dad4 100644 --- a/app/src/main/java/swati4star/createpdf/fragment/FavouritesFragment.java +++ b/app/src/main/java/swati4star/createpdf/fragment/FavouritesFragment.java @@ -1,6 +1,5 @@ package swati4star.createpdf.fragment; -import android.app.Activity; import android.content.Intent; import android.content.SharedPreferences; import android.os.Bundle; @@ -23,9 +22,6 @@ public class FavouritesFragment extends Fragment implements SharedPreferences.OnSharedPreferenceChangeListener { - private Activity mActivity; - private SharedPreferences mSharedPreferences; - @BindView(R.id.fav_add_fab) FloatingActionButton mFab; @BindView(R.id.images_to_pdf_fav) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e39ea1683..00e76df9f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -141,7 +141,7 @@ Duplicate pages not found.No new PDF created. A new PDF is created after removal of duplicate pages. The PDF could not be inverted - Colors inverted successfully. + Inverted Select app to send message… From d4ab9fc3ca4ebd7cf4ad6da29b58fb83e7dc28a5 Mon Sep 17 00:00:00 2001 From: jd003walker <41433222+jd003walker@users.noreply.github.com> Date: Sun, 10 Mar 2019 12:58:06 +0530 Subject: [PATCH 6/7] Made required changes --- .../fragment/FavouritesFragment.java | 85 ++++++++++--------- .../swati4star/createpdf/util/Constants.java | 19 +++++ app/src/main/res/values-es/strings.xml | 1 - app/src/main/res/values-fr/strings.xml | 1 - app/src/main/res/values-ja/strings.xml | 1 - app/src/main/res/values-ru/strings.xml | 1 - app/src/main/res/values/strings.xml | 1 - .../main/res/xml/favourites_preferences.xml | 4 +- 8 files changed, 65 insertions(+), 48 deletions(-) diff --git a/app/src/main/java/swati4star/createpdf/fragment/FavouritesFragment.java b/app/src/main/java/swati4star/createpdf/fragment/FavouritesFragment.java index fbe46dad4..f1885a2c5 100644 --- a/app/src/main/java/swati4star/createpdf/fragment/FavouritesFragment.java +++ b/app/src/main/java/swati4star/createpdf/fragment/FavouritesFragment.java @@ -19,8 +19,28 @@ import swati4star.createpdf.activity.FavouritesActivity; import swati4star.createpdf.customviews.MyCardView; +import static swati4star.createpdf.util.Constants.ADD_IMAGES_KEY; +import static swati4star.createpdf.util.Constants.ADD_PASSWORD_KEY; +import static swati4star.createpdf.util.Constants.ADD_WATERMARK_KEY; +import static swati4star.createpdf.util.Constants.COMPRESS_PDF_KEY; +import static swati4star.createpdf.util.Constants.EXTRACT_IMAGES_KEY; +import static swati4star.createpdf.util.Constants.HISTORY_KEY; +import static swati4star.createpdf.util.Constants.IMAGE_TO_PDF_KEY; +import static swati4star.createpdf.util.Constants.INVERT_PDF_KEY; +import static swati4star.createpdf.util.Constants.MERGE_PDF_KEY; +import static swati4star.createpdf.util.Constants.PDF_TO_IMAGES_KEY; +import static swati4star.createpdf.util.Constants.QR_BARCODE_KEY; +import static swati4star.createpdf.util.Constants.REMOVE_DUPLICATE_PAGES_KEY; +import static swati4star.createpdf.util.Constants.REMOVE_PAGES_KEY; +import static swati4star.createpdf.util.Constants.REMOVE_PASSWORD_KEY; +import static swati4star.createpdf.util.Constants.REORDER_PAGES_KEY; +import static swati4star.createpdf.util.Constants.ROTATE_PAGES_KEY; +import static swati4star.createpdf.util.Constants.TEXT_TO_PDF_KEY; +import static swati4star.createpdf.util.Constants.VIEW_FILES_KEY; + public class FavouritesFragment extends Fragment implements SharedPreferences.OnSharedPreferenceChangeListener { + private SharedPreferences mSharedpreferences; @BindView(R.id.fav_add_fab) FloatingActionButton mFab; @@ -69,9 +89,9 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { View rootview = inflater.inflate(R.layout.favourites_fragment, container, false); ButterKnife.bind(this, rootview); - SharedPreferences sharedPreferences = PreferenceManager + mSharedpreferences = PreferenceManager .getDefaultSharedPreferences(getActivity()); - sharedPreferences.registerOnSharedPreferenceChangeListener(this); + mSharedpreferences.registerOnSharedPreferenceChangeListener(this); ActionBar actionBar = ((AppCompatActivity) getActivity()).getSupportActionBar(); actionBar.hide(); mFab.setOnClickListener(v -> @@ -86,52 +106,35 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, * @param sharedPreferences */ private void checkFavs(SharedPreferences sharedPreferences) { - viewVisibility(sharedPreferences, pref_img_to_pdf, - getResources().getString(R.string.img_to_pdf)); - viewVisibility(sharedPreferences, pref_text_to_pdf, - getResources().getString(R.string.text_to_pdf)); - viewVisibility(sharedPreferences, pref_qr_barcode, - getResources().getString(R.string.qr_barcode_pdf)); - viewVisibility(sharedPreferences, pref_view_files, - getResources().getString(R.string.viewFiles)); - viewVisibility(sharedPreferences, pref_history, - getResources().getString(R.string.history)); - viewVisibility(sharedPreferences, pref_add_password, - getResources().getString(R.string.add_password)); - viewVisibility(sharedPreferences, pref_rem_pass, - getResources().getString(R.string.remove_password)); - viewVisibility(sharedPreferences, pref_rot_pages, - getResources().getString(R.string.rotate_pages)); - viewVisibility(sharedPreferences, pref_add_watermark, - getResources().getString(R.string.add_watermark)); - viewVisibility(sharedPreferences, pref_add_images, - getResources().getString(R.string.add_images)); - viewVisibility(sharedPreferences, pref_merge_pdf, - getResources().getString(R.string.merge_pdf)); - viewVisibility(sharedPreferences, pref_invert_pdf, - getResources().getString(R.string.invert_pdf)); - viewVisibility(sharedPreferences, pref_compress, - getResources().getString(R.string.compress_pdf)); - viewVisibility(sharedPreferences, pref_rem_dup_pages, - getResources().getString(R.string.remove_duplicate_pages)); - viewVisibility(sharedPreferences, pref_remove_pages, - getResources().getString(R.string.remove_pages)); - viewVisibility(sharedPreferences, pref_reorder_pages, - getResources().getString(R.string.reorder_pages)); - viewVisibility(sharedPreferences, pref_extract_img, - getResources().getString(R.string.extract_images)); - viewVisibility(sharedPreferences, pref_pdf_to_img, - getResources().getString(R.string.pdf_to_images)); + // assigned due to onSharedPreferenceChanged + mSharedpreferences = sharedPreferences; + viewVisibility(pref_img_to_pdf, IMAGE_TO_PDF_KEY); + viewVisibility(pref_text_to_pdf, TEXT_TO_PDF_KEY); + viewVisibility(pref_qr_barcode, QR_BARCODE_KEY); + viewVisibility(pref_view_files, VIEW_FILES_KEY); + viewVisibility(pref_history, HISTORY_KEY); + viewVisibility(pref_add_password, ADD_PASSWORD_KEY); + viewVisibility(pref_rem_pass, REMOVE_PASSWORD_KEY); + viewVisibility(pref_rot_pages, ROTATE_PAGES_KEY); + viewVisibility(pref_add_watermark, ADD_WATERMARK_KEY); + viewVisibility(pref_add_images, ADD_IMAGES_KEY); + viewVisibility(pref_merge_pdf, MERGE_PDF_KEY); + viewVisibility(pref_invert_pdf, INVERT_PDF_KEY); + viewVisibility(pref_compress, COMPRESS_PDF_KEY); + viewVisibility(pref_rem_dup_pages, REMOVE_DUPLICATE_PAGES_KEY); + viewVisibility(pref_remove_pages, REMOVE_PAGES_KEY); + viewVisibility(pref_reorder_pages, REORDER_PAGES_KEY); + viewVisibility(pref_extract_img, EXTRACT_IMAGES_KEY); + viewVisibility(pref_pdf_to_img, PDF_TO_IMAGES_KEY); } /** * This method toggles the visibility of the passed view. - * @param sharedPreferences * @param view * @param id */ - private void viewVisibility(SharedPreferences sharedPreferences, View view, String id) { - if (sharedPreferences.getBoolean(id, false)) { + private void viewVisibility(View view, String id) { + if (mSharedpreferences.getBoolean(id, false)) { view.setVisibility(View.VISIBLE); } else { view.setVisibility(View.GONE); diff --git a/app/src/main/java/swati4star/createpdf/util/Constants.java b/app/src/main/java/swati4star/createpdf/util/Constants.java index 450946098..6ee54b880 100644 --- a/app/src/main/java/swati4star/createpdf/util/Constants.java +++ b/app/src/main/java/swati4star/createpdf/util/Constants.java @@ -30,6 +30,25 @@ public class Constants { public static final String PG_NUM_STYLE_X = "pg_num_style_x"; public static final String MASTER_PWD_STRING = "master_password"; + public static final String IMAGE_TO_PDF_KEY = "Images to PDF"; + public static final String TEXT_TO_PDF_KEY = "Text to PDF"; + public static final String QR_BARCODE_KEY = "QR & Barcodes"; + public static final String VIEW_FILES_KEY = "View Files"; + public static final String HISTORY_KEY = "History"; + public static final String ADD_PASSWORD_KEY = "Add password"; + public static final String REMOVE_PASSWORD_KEY = "Remove password"; + public static final String ROTATE_PAGES_KEY = "Rotate Pages"; + public static final String ADD_WATERMARK_KEY = "Add Watermark"; + public static final String ADD_IMAGES_KEY = "Add Images"; + public static final String MERGE_PDF_KEY = "Merge PDF"; + public static final String INVERT_PDF_KEY = "Invert Pdf"; + public static final String COMPRESS_PDF_KEY = "Compress PDF"; + public static final String REMOVE_DUPLICATE_PAGES_KEY = "Remove Duplicate Pages"; + public static final String REMOVE_PAGES_KEY = "Remove Pages"; + public static final String REORDER_PAGES_KEY = "Reorder pages"; + public static final String EXTRACT_IMAGES_KEY = "Extract Images"; + public static final String PDF_TO_IMAGES_KEY = "PDF to Images"; + public static final String BUNDLE_DATA = "bundle_data"; public static final String REORDER_PAGES = "reorder_pages"; public static final String REMOVE_PAGES = "remove_pages"; diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index c1c50dcb1..e659ee9ac 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -93,7 +93,6 @@ %1$d imágenes seleccionadas. - Images to PDF Unir PDF Seleccione un archivo PDFs Unidos diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 3c904d64d..153406d4b 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -171,7 +171,6 @@ Privacy Policy Join us on Slack License - Images to PDF Rate us on Playstore Send a Mail Visit our Website diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 06a507fd0..649624029 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -327,7 +327,6 @@ Stretch image to fit on page Maintain aspect ratio of images " 画像を作成する" - Images to PDF 画像を見る " 画像を共有する" PDFファイルを選択 diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 3f593dcef..c4cd74de8 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -340,7 +340,6 @@ На главную Создание PDF Просмотр PDF - Images to PDF Изменение PDF Дополнительно Добавить пароль diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 00e76df9f..62eb43c39 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -85,7 +85,6 @@ Images successfully added. - Images to PDF Create PDF QR & Barcodes View Files diff --git a/app/src/main/res/xml/favourites_preferences.xml b/app/src/main/res/xml/favourites_preferences.xml index 80a0f4ed4..c368f5588 100644 --- a/app/src/main/res/xml/favourites_preferences.xml +++ b/app/src/main/res/xml/favourites_preferences.xml @@ -2,8 +2,8 @@ + android:title="Images to PDF" + android:key="Images to PDF"/> Date: Sun, 10 Mar 2019 13:04:47 +0530 Subject: [PATCH 7/7] removed extra blank lines removed extra blank lines. --- app/src/main/res/xml/favourites_preferences.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/src/main/res/xml/favourites_preferences.xml b/app/src/main/res/xml/favourites_preferences.xml index c368f5588..9897417ab 100644 --- a/app/src/main/res/xml/favourites_preferences.xml +++ b/app/src/main/res/xml/favourites_preferences.xml @@ -72,6 +72,4 @@ - - - \ No newline at end of file +