Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for #214 #382

Merged
merged 2 commits into from
Aug 13, 2018
Merged

Fix for #214 #382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
716d02e
Fixed issue #214
vyankatesh24 Aug 13, 2018
3e03434
Merge branch 'master' of https://github.com/Swati4star/Images-to-PDF …
vyankatesh24 Aug 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion app/src/main/java/swati4star/createpdf/fragment/ImageToPdfFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
import swati4star.createpdf.interfaces.OnPDFCreatedInterface;
import swati4star.createpdf.model.EnhancementOptionsEntity;
import swati4star.createpdf.model.ImageToPDFOptions;
import swati4star.createpdf.util.Constants;
import swati4star.createpdf.util.CreatePdf;
import swati4star.createpdf.util.FileUtils;
import swati4star.createpdf.util.MorphButtonUtility;
Expand Down Expand Up @@ -112,7 +113,8 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
mMorphButtonUtility = new MorphButtonUtility(mActivity);
mFileUtils = new FileUtils(mActivity);
mPdfOptions = new ImageToPDFOptions();
PageSizeUtils.mPageSize = getString(R.string.a4);
PageSizeUtils.mPageSize = mSharedPreferences.getString(Constants.DEFAULT_PAGE_SIZE_TEXT ,
Constants.DEFAULT_PAGE_SIZE);
mMorphButtonUtility.morphToGrey(mCreatePdf, mMorphButtonUtility.integer());
mCreatePdf.setEnabled(false);
mOpenPdf.setVisibility(View.GONE);
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/swati4star/createpdf/fragment/TextToPdfFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
showEnhancementOptions();
mMorphButtonUtility.morphToGrey(mCreateTextPdf, mMorphButtonUtility.integer());
mCreateTextPdf.setEnabled(false);
PageSizeUtils.mPageSize = getString(R.string.a4);
PageSizeUtils.mPageSize = mSharedPreferences.getString(Constants.DEFAULT_PAGE_SIZE_TEXT ,
Constants.DEFAULT_PAGE_SIZE);

return rootview;
}
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/swati4star/createpdf/util/Constants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,6 @@ public class Constants {
public static final String DEFAULT_FONT_FAMILY_TEXT = "DefaultFontFamily";
public static final String DEFAULT_FONT_FAMILY = "TIMES_ROMAN";
public static final String RESULT = "result";
public static final String DEFAULT_PAGE_SIZE_TEXT = "DefaultPageSize";
public static final String DEFAULT_PAGE_SIZE = "A4";
}
20 changes: 19 additions & 1 deletion app/src/main/java/swati4star/createpdf/util/PageSizeUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
package swati4star.createpdf.util;

import android.content.Context;
import android.content.SharedPreferences;
import android.preference.PreferenceManager;
import android.view.View;
import android.widget.CheckBox;
import android.widget.RadioButton;
import android.widget.RadioGroup;
import android.widget.Spinner;

Expand All @@ -12,10 +16,15 @@
public class PageSizeUtils {

private final Context mActivity;
private SharedPreferences mSharedPreferences;
public static String mPageSize = "A4";
private String mDefaultPageSize;

public PageSizeUtils(Context mActivity) {
this.mActivity = mActivity;
mSharedPreferences = PreferenceManager.getDefaultSharedPreferences(mActivity);
mDefaultPageSize = mSharedPreferences.getString(Constants.DEFAULT_PAGE_SIZE_TEXT,
Constants.DEFAULT_PAGE_SIZE);
}

/**
Expand Down Expand Up @@ -66,19 +75,28 @@ public void showPageSizeDialog() {
.negativeText(android.R.string.cancel)
.onPositive((dialog1, which) -> {
View view = dialog1.getCustomView();
CheckBox mSetAsDefault = view.findViewById(R.id.set_as_default);
RadioGroup radioGroup = view.findViewById(R.id.radio_group_page_size);
int selectedId = radioGroup.getCheckedRadioButtonId();
Spinner spinnerA = view.findViewById(R.id.spinner_page_size_a0_a10);
Spinner spinnerB = view.findViewById(R.id.spinner_page_size_b0_b10);
mPageSize = getPageSize(selectedId, spinnerA.getSelectedItem().toString(),
spinnerB.getSelectedItem().toString());
if (mSetAsDefault.isChecked()) {
SharedPreferences.Editor editor = mSharedPreferences.edit();
editor.putString(Constants.DEFAULT_PAGE_SIZE_TEXT, mPageSize);
editor.apply();
}
}).build();

View view = materialDialog.getCustomView();
RadioGroup radioGroup = view.findViewById(R.id.radio_group_page_size);
Spinner spinnerA = view.findViewById(R.id.spinner_page_size_a0_a10);
Spinner spinnerB = view.findViewById(R.id.spinner_page_size_b0_b10);
if (mPageSize.equals(mActivity.getString(R.string.a4))) {
RadioButton radioButtonDefault = view.findViewById(R.id.page_size_default);
radioButtonDefault.setText(String.format(mActivity.getString(R.string.default_page_size), mDefaultPageSize));

if (mPageSize.equals(mDefaultPageSize)) {
radioGroup.check(R.id.page_size_default);

} else if (mPageSize.equals(mActivity.getString(R.string.letter))) {
Expand Down
152 changes: 82 additions & 70 deletions app/src/main/res/layout/set_page_size_dialog.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,92 +2,104 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:orientation="vertical">

<RadioGroup
android:id="@+id/radio_group_page_size"
android:layout_width="wrap_content"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
android:orientation="horizontal">

<RadioButton
android:id="@+id/page_size_default"
<RadioGroup
android:id="@+id/radio_group_page_size"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checked="true"
android:text="@string/default_a4"
android:textSize="16sp" />
android:orientation="vertical">

<RadioButton
android:id="@+id/page_size_letter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/letter"
android:textSize="16sp" />
<RadioButton
android:id="@+id/page_size_default"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checked="true"
android:textSize="16sp" />

<RadioButton
android:id="@+id/page_size_legal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/legal"
android:textSize="16sp" />
<RadioButton
android:id="@+id/page_size_letter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/letter"
android:textSize="16sp" />

<RadioButton
android:id="@+id/page_size_executive"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/executive"
android:textSize="16sp" />
<RadioButton
android:id="@+id/page_size_legal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/legal"
android:textSize="16sp" />

<RadioButton
android:id="@+id/page_size_ledger"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/ledger"
android:textSize="16sp" />
<RadioButton
android:id="@+id/page_size_executive"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/executive"
android:textSize="16sp" />

<RadioButton
android:id="@+id/page_size_tabloid"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/tabloid"
android:textSize="16sp" />
<RadioButton
android:id="@+id/page_size_ledger"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/ledger"
android:textSize="16sp" />

<RadioButton
android:id="@+id/page_size_a0_a10"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/a0_to_a10"
android:textSize="16sp" />
<RadioButton
android:id="@+id/page_size_tabloid"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/tabloid"
android:textSize="16sp" />

<RadioButton
android:id="@+id/page_size_b0_b10"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/b0_to_b10"
android:textSize="16sp" />
<RadioButton
android:id="@+id/page_size_a0_a10"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/a0_to_a10"
android:textSize="16sp" />

</RadioGroup>
<RadioButton
android:id="@+id/page_size_b0_b10"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/b0_to_b10"
android:textSize="16sp" />

<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="bottom"
android:orientation="vertical">
</RadioGroup>

<Spinner
android:id="@+id/spinner_page_size_a0_a10"
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:baselineAligned="false"
android:entries="@array/array_page_sizes_a0_b10" />
android:layout_height="match_parent"
android:gravity="bottom"
android:orientation="vertical">

<Spinner
android:id="@+id/spinner_page_size_b0_b10"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
android:entries="@array/array_page_sizes_b0_b10" />
<Spinner
android:id="@+id/spinner_page_size_a0_a10"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:baselineAligned="false"
android:entries="@array/array_page_sizes_a0_b10" />

<Spinner
android:id="@+id/spinner_page_size_b0_b10"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
android:entries="@array/array_page_sizes_b0_b10" />
</LinearLayout>
</LinearLayout>

<CheckBox
android:id="@+id/set_as_default"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:text="@string/set_as_default" />
</LinearLayout>
2 changes: 1 addition & 1 deletion app/src/main/res/values-es/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
<string name="letter">LETTER</string>
<string name="legal">LEGAL</string>
<string name="a4">A4</string>
<string name="default_a4">DEFAULT (A4)</string>
<string name="default_page_size">DEFAULT ( %s )</string>
<!-- Directory Strings -->
<string name="text_file_selected">Text File Selected</string>
<string name="directory">Directory</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-fr/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
<string name="letter">LETTER</string>
<string name="legal">LEGAL</string>
<string name="a4">A4</string>
<string name="default_a4">DEFAULT (A4)</string>
<string name="default_page_size">DEFAULT ( %s )</string>


<!-- Directory Strings -->
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-ja/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
<string name="letter">LETTER</string>
<string name="legal">LEGAL</string>
<string name="a4">A4</string>
<string name="default_a4">DEFAULT (A4)</string>
<string name="default_page_size">DEFAULT ( %s )</string>
<!-- Directory Strings -->
<string name="directory">Directory</string>
<string name="moving_files">Moving your files</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
<string name="letter">LETTER</string>
<string name="legal">LEGAL</string>
<string name="a4">A4</string>
<string name="default_a4">DEFAULT (A4)</string>
<string name="default_page_size">DEFAULT ( %s )</string>


<string name="delete_alert">Do you want to delete all selected files?</string>
Expand Down