Skip to content

Commit a621ba2

Browse files
pandamin8Swati4star
pandamin8
authored and
Swati4star
committed
some minor typos fixed in variable names (#795)
1 parent e9a3ef2 commit a621ba2

File tree

3 files changed

+57
-52
lines changed

3 files changed

+57
-52
lines changed

‎app/src/main/java/swati4star/createpdf/activity/CropImageActivity.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ public class CropImageActivity extends AppCompatActivity {
3737
private ArrayList<String> mImages;
3838
private HashMap<Integer, Uri> mCroppedImageUris = new HashMap<>();
3939
private boolean mCurrentImageEdited = false;
40-
private boolean mFinishedclicked = false;
40+
private boolean mFinishedClicked = false;
4141

4242
@BindView(R.id.imagecount)
43-
TextView mImagecount;
43+
TextView mImageCount;
4444

4545
@BindView(R.id.cropImageView)
4646
CropImageView mCropImageView;
@@ -62,7 +62,7 @@ public void onCreate(Bundle savedInstanceState) {
6262
setUpCropImageView();
6363

6464
mImages = ImageToPdfFragment.mImagesUri;
65-
mFinishedclicked = false;
65+
mFinishedClicked = false;
6666

6767
for (int i = 0; i < mImages.size(); i++)
6868
mCroppedImageUris.put(i, Uri.fromFile(new File(mImages.get(i))));
@@ -147,7 +147,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
147147
finish();
148148
return true;
149149
case R.id.action_done:
150-
mFinishedclicked = true;
150+
mFinishedClicked = true;
151151
cropButtonClicked();
152152
return true;
153153
case R.id.action_skip:
@@ -166,7 +166,7 @@ private void setUpCropImageView() {
166166
mCroppedImageUris.put(mCurrentImageIndex, result.getUri());
167167
mCropImageView.setImageUriAsync(mCroppedImageUris.get(mCurrentImageIndex));
168168

169-
if (mFinishedclicked) {
169+
if (mFinishedClicked) {
170170
Intent intent = new Intent();
171171
intent.putExtra(CropImage.CROP_IMAGE_EXTRA_RESULT, mCroppedImageUris);
172172
setResult(Activity.RESULT_OK, intent);
@@ -185,7 +185,7 @@ private void setImage(int index) {
185185
if (index < 0 || index >= mImages.size())
186186
return;
187187

188-
mImagecount.setText(getString(R.string.cropImage_activityTitle) + " " + (index + 1) + " of " + mImages.size());
188+
mImageCount.setText(getString(R.string.cropImage_activityTitle) + " " + (index + 1) + " of " + mImages.size());
189189
mCropImageView.setImageUriAsync(mCroppedImageUris.get(index));
190190
}
191191
}

‎app/src/main/java/swati4star/createpdf/activity/FavouritesActivity.java‎

Lines changed: 51 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
import android.view.Menu;
1010
import android.view.MenuItem;
1111

12+
import java.util.Objects;
13+
1214
import swati4star.createpdf.R;
1315

1416
import static swati4star.createpdf.util.Constants.ADD_IMAGES_KEY;
@@ -35,23 +37,26 @@
3537

3638
public class FavouritesActivity extends AppCompatActivity {
3739

38-
private SharedPreferences mSharedpreferences;
40+
private SharedPreferences mSharedPreferences;
3941
private boolean[] mKeyState = new boolean[21];
4042

4143
@Override
4244
protected void onCreate(@Nullable Bundle savedInstanceState) {
4345
super.onCreate(savedInstanceState);
4446
setTitle(R.string.add_to_favourite);
45-
mSharedpreferences = PreferenceManager
47+
mSharedPreferences = PreferenceManager
4648
.getDefaultSharedPreferences(this);
4749
setContentView(R.layout.fav_pref_screen);
4850

4951
storeInitialState();
5052

5153
Toolbar toolbar = findViewById(R.id.toolbar);
5254
setSupportActionBar(toolbar);
53-
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
55+
56+
57+
Objects.requireNonNull(getSupportActionBar()).setDisplayHomeAsUpEnabled(true);
5458
getSupportActionBar().setDisplayShowHomeEnabled(true);
59+
5560
}
5661

5762
@Override
@@ -85,53 +90,54 @@ public void onBackPressed() {
8590
* the user make new changes
8691
*/
8792
private void storeInitialState() {
88-
mKeyState[0] = mSharedpreferences.getBoolean(IMAGE_TO_PDF_KEY, false);
89-
mKeyState[1] = mSharedpreferences.getBoolean(TEXT_TO_PDF_KEY, false);
90-
mKeyState[2] = mSharedpreferences.getBoolean(QR_BARCODE_KEY, false);
91-
mKeyState[3] = mSharedpreferences.getBoolean(VIEW_FILES_KEY, false);
92-
mKeyState[4] = mSharedpreferences.getBoolean(HISTORY_KEY, false);
93-
mKeyState[5] = mSharedpreferences.getBoolean(ADD_PASSWORD_KEY, false);
94-
mKeyState[6] = mSharedpreferences.getBoolean(REMOVE_PASSWORD_KEY, false);
95-
mKeyState[7] = mSharedpreferences.getBoolean(ROTATE_PAGES_KEY, false);
96-
mKeyState[8] = mSharedpreferences.getBoolean(ADD_WATERMARK_KEY, false);
97-
mKeyState[9] = mSharedpreferences.getBoolean(ADD_IMAGES_KEY, false);
98-
mKeyState[10] = mSharedpreferences.getBoolean(MERGE_PDF_KEY, false);
99-
mKeyState[11] = mSharedpreferences.getBoolean(SPLIT_PDF_KEY, false);
100-
mKeyState[12] = mSharedpreferences.getBoolean(INVERT_PDF_KEY, false);
101-
mKeyState[13] = mSharedpreferences.getBoolean(COMPRESS_PDF_KEY, false);
102-
mKeyState[14] = mSharedpreferences.getBoolean(REMOVE_DUPLICATE_PAGES_KEY, false);
103-
mKeyState[15] = mSharedpreferences.getBoolean(REMOVE_PAGES_KEY, false);
104-
mKeyState[16] = mSharedpreferences.getBoolean(REORDER_PAGES_KEY, false);
105-
mKeyState[17] = mSharedpreferences.getBoolean(EXTRACT_IMAGES_KEY, false);
106-
mKeyState[18] = mSharedpreferences.getBoolean(PDF_TO_IMAGES_KEY, false);
107-
mKeyState[19] = mSharedpreferences.getBoolean(EXCEL_TO_PDF_KEY, false);
108-
mKeyState[20] = mSharedpreferences.getBoolean(ZIP_TO_PDF_KEY, false);
93+
mKeyState[0] = mSharedPreferences.getBoolean(IMAGE_TO_PDF_KEY, false);
94+
mKeyState[1] = mSharedPreferences.getBoolean(TEXT_TO_PDF_KEY, false);
95+
mKeyState[2] = mSharedPreferences.getBoolean(QR_BARCODE_KEY, false);
96+
mKeyState[3] = mSharedPreferences.getBoolean(VIEW_FILES_KEY, false);
97+
mKeyState[4] = mSharedPreferences.getBoolean(HISTORY_KEY, false);
98+
mKeyState[5] = mSharedPreferences.getBoolean(ADD_PASSWORD_KEY, false);
99+
mKeyState[6] = mSharedPreferences.getBoolean(REMOVE_PASSWORD_KEY, false);
100+
mKeyState[7] = mSharedPreferences.getBoolean(ROTATE_PAGES_KEY, false);
101+
mKeyState[8] = mSharedPreferences.getBoolean(ADD_WATERMARK_KEY, false);
102+
mKeyState[9] = mSharedPreferences.getBoolean(ADD_IMAGES_KEY, false);
103+
mKeyState[10] = mSharedPreferences.getBoolean(MERGE_PDF_KEY, false);
104+
mKeyState[11] = mSharedPreferences.getBoolean(SPLIT_PDF_KEY, false);
105+
mKeyState[12] = mSharedPreferences.getBoolean(INVERT_PDF_KEY, false);
106+
mKeyState[13] = mSharedPreferences.getBoolean(COMPRESS_PDF_KEY, false);
107+
mKeyState[14] = mSharedPreferences.getBoolean(REMOVE_DUPLICATE_PAGES_KEY, false);
108+
mKeyState[15] = mSharedPreferences.getBoolean(REMOVE_PAGES_KEY, false);
109+
mKeyState[16] = mSharedPreferences.getBoolean(REORDER_PAGES_KEY, false);
110+
mKeyState[17] = mSharedPreferences.getBoolean(EXTRACT_IMAGES_KEY, false);
111+
mKeyState[18] = mSharedPreferences.getBoolean(PDF_TO_IMAGES_KEY, false);
112+
mKeyState[19] = mSharedPreferences.getBoolean(EXCEL_TO_PDF_KEY, false);
113+
mKeyState[20] = mSharedPreferences.getBoolean(ZIP_TO_PDF_KEY, false);
109114
}
115+
110116
/**
111117
* Restore the intial state if user
112118
* press the back button
113119
*/
114120
private void onBackPressedState() {
115-
mSharedpreferences.edit().putBoolean(IMAGE_TO_PDF_KEY, mKeyState[0] ).apply();
116-
mSharedpreferences.edit().putBoolean(TEXT_TO_PDF_KEY, mKeyState[1] ).apply();
117-
mSharedpreferences.edit().putBoolean(QR_BARCODE_KEY, mKeyState[2] ).apply();
118-
mSharedpreferences.edit().putBoolean(VIEW_FILES_KEY, mKeyState[3] ).apply();
119-
mSharedpreferences.edit().putBoolean(HISTORY_KEY, mKeyState[4] ).apply();
120-
mSharedpreferences.edit().putBoolean(ADD_PASSWORD_KEY, mKeyState[5] ).apply();
121-
mSharedpreferences.edit().putBoolean(REMOVE_PASSWORD_KEY, mKeyState[6] ).apply();
122-
mSharedpreferences.edit().putBoolean(ROTATE_PAGES_KEY, mKeyState[7] ).apply();
123-
mSharedpreferences.edit().putBoolean(ADD_WATERMARK_KEY, mKeyState[8] ).apply();
124-
mSharedpreferences.edit().putBoolean(ADD_IMAGES_KEY, mKeyState[9] ).apply();
125-
mSharedpreferences.edit().putBoolean(MERGE_PDF_KEY, mKeyState[10] ).apply();
126-
mSharedpreferences.edit().putBoolean(SPLIT_PDF_KEY, mKeyState[11] ).apply();
127-
mSharedpreferences.edit().putBoolean(INVERT_PDF_KEY, mKeyState[12] ).apply();
128-
mSharedpreferences.edit().putBoolean(COMPRESS_PDF_KEY, mKeyState[13] ).apply();
129-
mSharedpreferences.edit().putBoolean(REMOVE_DUPLICATE_PAGES_KEY, mKeyState[14] ).apply();
130-
mSharedpreferences.edit().putBoolean(REMOVE_PAGES_KEY, mKeyState[15] ).apply();
131-
mSharedpreferences.edit().putBoolean(REORDER_PAGES_KEY, mKeyState[16] ).apply();
132-
mSharedpreferences.edit().putBoolean(EXTRACT_IMAGES_KEY, mKeyState[17] ).apply();
133-
mSharedpreferences.edit().putBoolean(PDF_TO_IMAGES_KEY, mKeyState[18] ).apply();
134-
mSharedpreferences.edit().putBoolean(EXCEL_TO_PDF_KEY, mKeyState[19] ).apply();
135-
mSharedpreferences.edit().putBoolean(ZIP_TO_PDF_KEY, mKeyState[20] ).apply();
121+
mSharedPreferences.edit().putBoolean(IMAGE_TO_PDF_KEY, mKeyState[0]).apply();
122+
mSharedPreferences.edit().putBoolean(TEXT_TO_PDF_KEY, mKeyState[1]).apply();
123+
mSharedPreferences.edit().putBoolean(QR_BARCODE_KEY, mKeyState[2]).apply();
124+
mSharedPreferences.edit().putBoolean(VIEW_FILES_KEY, mKeyState[3]).apply();
125+
mSharedPreferences.edit().putBoolean(HISTORY_KEY, mKeyState[4]).apply();
126+
mSharedPreferences.edit().putBoolean(ADD_PASSWORD_KEY, mKeyState[5]).apply();
127+
mSharedPreferences.edit().putBoolean(REMOVE_PASSWORD_KEY, mKeyState[6]).apply();
128+
mSharedPreferences.edit().putBoolean(ROTATE_PAGES_KEY, mKeyState[7]).apply();
129+
mSharedPreferences.edit().putBoolean(ADD_WATERMARK_KEY, mKeyState[8]).apply();
130+
mSharedPreferences.edit().putBoolean(ADD_IMAGES_KEY, mKeyState[9]).apply();
131+
mSharedPreferences.edit().putBoolean(MERGE_PDF_KEY, mKeyState[10]).apply();
132+
mSharedPreferences.edit().putBoolean(SPLIT_PDF_KEY, mKeyState[11]).apply();
133+
mSharedPreferences.edit().putBoolean(INVERT_PDF_KEY, mKeyState[12]).apply();
134+
mSharedPreferences.edit().putBoolean(COMPRESS_PDF_KEY, mKeyState[13]).apply();
135+
mSharedPreferences.edit().putBoolean(REMOVE_DUPLICATE_PAGES_KEY, mKeyState[14]).apply();
136+
mSharedPreferences.edit().putBoolean(REMOVE_PAGES_KEY, mKeyState[15]).apply();
137+
mSharedPreferences.edit().putBoolean(REORDER_PAGES_KEY, mKeyState[16]).apply();
138+
mSharedPreferences.edit().putBoolean(EXTRACT_IMAGES_KEY, mKeyState[17]).apply();
139+
mSharedPreferences.edit().putBoolean(PDF_TO_IMAGES_KEY, mKeyState[18]).apply();
140+
mSharedPreferences.edit().putBoolean(EXCEL_TO_PDF_KEY, mKeyState[19]).apply();
141+
mSharedPreferences.edit().putBoolean(ZIP_TO_PDF_KEY, mKeyState[20]).apply();
136142
}
137143
}

‎app/src/main/java/swati4star/createpdf/activity/ImageEditor.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ public class ImageEditor extends AppCompatActivity implements OnFilterItemClicke
5454
private int mDisplaySize;
5555
private int mCurrentImage; // 0 by default
5656
private String mFilterName;
57-
5857
@BindView(R.id.nextimageButton)
5958
ImageView mNextButton;
6059
@BindView(R.id.imagecount)

0 commit comments

Comments
 (0)