Skip to content

Commit 53ac761

Browse files
ishaquehassanishaquehassan
committed
Added customizable strings for Result & progress labels
1 parent 6fd4805 commit 53ac761

4 files changed

Lines changed: 31 additions & 17 deletions

File tree

‎ScanDemoExample/scanlibrary/src/main/java/com/scanlibrary/ResultFragment.java‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import android.view.ViewGroup;
1414
import android.widget.Button;
1515
import android.widget.ImageView;
16-
import android.widget.Toast;
1716

1817
import java.io.IOException;
1918

@@ -146,8 +145,8 @@ public void run() {
146145
private class BWButtonClickListener implements View.OnClickListener {
147146
@Override
148147
public void onClick(final View v) {
149-
if(getActivity().getIntent().getStringExtra(ScanConstants.SCAN_APPLYING_FILTER) != null){
150-
showProgressDialog(getActivity().getIntent().getStringExtra(ScanConstants.SCAN_APPLYING_FILTER));
148+
if(getActivity().getIntent().getStringExtra(ScanConstants.SCAN_APPLYING_FILTER_MESSAGE) != null){
149+
showProgressDialog(getActivity().getIntent().getStringExtra(ScanConstants.SCAN_APPLYING_FILTER_MESSAGE));
151150
}else{
152151
showProgressDialog(getResources().getString(R.string.applying_filter));
153152
}
@@ -183,8 +182,8 @@ public void run() {
183182
private class MagicColorButtonClickListener implements View.OnClickListener {
184183
@Override
185184
public void onClick(final View v) {
186-
if(getActivity().getIntent().getStringExtra(ScanConstants.SCAN_APPLYING_FILTER) != null){
187-
showProgressDialog(getActivity().getIntent().getStringExtra(ScanConstants.SCAN_APPLYING_FILTER));
185+
if(getActivity().getIntent().getStringExtra(ScanConstants.SCAN_APPLYING_FILTER_MESSAGE) != null){
186+
showProgressDialog(getActivity().getIntent().getStringExtra(ScanConstants.SCAN_APPLYING_FILTER_MESSAGE));
188187
}else{
189188
showProgressDialog(getResources().getString(R.string.applying_filter));
190189
}
@@ -221,8 +220,8 @@ private class OriginalButtonClickListener implements View.OnClickListener {
221220
@Override
222221
public void onClick(View v) {
223222
try {
224-
if(getActivity().getIntent().getStringExtra(ScanConstants.SCAN_APPLYING_FILTER) != null){
225-
showProgressDialog(getActivity().getIntent().getStringExtra(ScanConstants.SCAN_APPLYING_FILTER));
223+
if(getActivity().getIntent().getStringExtra(ScanConstants.SCAN_APPLYING_FILTER_MESSAGE) != null){
224+
showProgressDialog(getActivity().getIntent().getStringExtra(ScanConstants.SCAN_APPLYING_FILTER_MESSAGE));
226225
}else{
227226
showProgressDialog(getResources().getString(R.string.applying_filter));
228227
}
@@ -239,8 +238,8 @@ public void onClick(View v) {
239238
private class GrayButtonClickListener implements View.OnClickListener {
240239
@Override
241240
public void onClick(final View v) {
242-
if(getActivity().getIntent().getStringExtra(ScanConstants.SCAN_APPLYING_FILTER) != null){
243-
showProgressDialog(getActivity().getIntent().getStringExtra(ScanConstants.SCAN_APPLYING_FILTER));
241+
if(getActivity().getIntent().getStringExtra(ScanConstants.SCAN_APPLYING_FILTER_MESSAGE) != null){
242+
showProgressDialog(getActivity().getIntent().getStringExtra(ScanConstants.SCAN_APPLYING_FILTER_MESSAGE));
244243
}else{
245244
showProgressDialog(getResources().getString(R.string.applying_filter));
246245
}
@@ -276,8 +275,8 @@ public void run() {
276275
private class RotanticlockButtonClickListener implements View.OnClickListener {
277276
@Override
278277
public void onClick(final View v) {
279-
if(getActivity().getIntent().getStringExtra(ScanConstants.SCAN_APPLYING_FILTER) != null){
280-
showProgressDialog(getActivity().getIntent().getStringExtra(ScanConstants.SCAN_APPLYING_FILTER));
278+
if(getActivity().getIntent().getStringExtra(ScanConstants.SCAN_APPLYING_FILTER_MESSAGE) != null){
279+
showProgressDialog(getActivity().getIntent().getStringExtra(ScanConstants.SCAN_APPLYING_FILTER_MESSAGE));
281280
}else{
282281
showProgressDialog(getResources().getString(R.string.applying_filter));
283282
}
@@ -325,8 +324,8 @@ public void run() {
325324
private class RotclockButtonClickListener implements View.OnClickListener {
326325
@Override
327326
public void onClick(final View v) {
328-
if(getActivity().getIntent().getStringExtra(ScanConstants.SCAN_APPLYING_FILTER) != null){
329-
showProgressDialog(getActivity().getIntent().getStringExtra(ScanConstants.SCAN_APPLYING_FILTER));
327+
if(getActivity().getIntent().getStringExtra(ScanConstants.SCAN_APPLYING_FILTER_MESSAGE) != null){
328+
showProgressDialog(getActivity().getIntent().getStringExtra(ScanConstants.SCAN_APPLYING_FILTER_MESSAGE));
330329
}else{
331330
showProgressDialog(getResources().getString(R.string.applying_filter));
332331
}

‎ScanDemoExample/scanlibrary/src/main/java/com/scanlibrary/ScanConstants.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,8 @@ public class ScanConstants {
2727
public final static String SCAN_ORG_TEXT = "scanORGText";
2828
public final static String SCAN_SCANNING_MESSAGE = "scanScanningMessage";
2929
public final static String SCAN_LOADING_MESSAGE = "scanLoadingMessage";
30-
public final static String SCAN_APPLYING_FILTER = "scanApplyingFilter";
30+
public final static String SCAN_APPLYING_FILTER_MESSAGE = "scanApplyingFilterMessage";
31+
public final static String SCAN_CANT_CROP_ERROR_MESSAGE = "scanCantCropMessage";
32+
public final static String SCAN_CANT_CROP_ERROR_TITLE = "scanCantCropFilterTitle";
33+
public final static String SCAN_OK_LABEL = "scanOkLabel";
3134
}

‎ScanDemoExample/scanlibrary/src/main/java/com/scanlibrary/ScanFragment.java‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,19 @@ public void onClick(View v) {
171171
}
172172

173173
private void showErrorDialog() {
174-
SingleButtonDialogFragment fragment = new SingleButtonDialogFragment(R.string.ok, getString(R.string.cantCrop), "Error", true);
174+
String title = "Error";
175+
String message = getString(R.string.cantCrop);
176+
String ok = getString(R.string.ok);
177+
if(getActivity().getIntent().getStringExtra(ScanConstants.SCAN_CANT_CROP_ERROR_TITLE) != null){
178+
title = getActivity().getIntent().getStringExtra(ScanConstants.SCAN_CANT_CROP_ERROR_TITLE);
179+
}
180+
if(getActivity().getIntent().getStringExtra(ScanConstants.SCAN_CANT_CROP_ERROR_MESSAGE) != null){
181+
message = getActivity().getIntent().getStringExtra(ScanConstants.SCAN_CANT_CROP_ERROR_MESSAGE);
182+
}
183+
if(getActivity().getIntent().getStringExtra(ScanConstants.SCAN_OK_LABEL) != null){
184+
ok = getActivity().getIntent().getStringExtra(ScanConstants.SCAN_OK_LABEL);
185+
}
186+
SingleButtonDialogFragment fragment = new SingleButtonDialogFragment(ok, message, title, true);
175187
FragmentManager fm = getActivity().getFragmentManager();
176188
fragment.show(fm, SingleButtonDialogFragment.class.toString());
177189
}

‎ScanDemoExample/scanlibrary/src/main/java/com/scanlibrary/SingleButtonDialogFragment.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
@SuppressLint("ValidFragment")
1111
public class SingleButtonDialogFragment extends DialogFragment {
1212

13-
protected int positiveButtonTitle;
13+
protected String positiveButtonTitle;
1414
protected String message;
1515
protected String title;
1616
protected boolean isCancelable;
1717

18-
public SingleButtonDialogFragment(int positiveButtonTitle,
18+
public SingleButtonDialogFragment(String positiveButtonTitle,
1919
String message, String title, boolean isCancelable) {
2020
this.positiveButtonTitle = positiveButtonTitle;
2121
this.message = message;

0 commit comments

Comments
 (0)