mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-04-08 09:27:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #94 from brarcher/pre-populate-enter-card

Browse Source 
Pre-populate Barcode Selector
This commit is contained in:
Branden Archer
2017-02-12 22:48:35 -05:00
committed by GitHub
parent 596d899449 2768f4c590
commit c4b860bb3d
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/protect/card_locker/BarcodeSelectorActivity.java
View File

@@ -124,6 +124,14 @@ public class BarcodeSelectorActivity extends AppCompatActivity
// Noting to do
}
});
final Bundle b = getIntent().getExtras();
final String initialCardId = b != null ? b.getString("initialCardId") : null;
if(initialCardId != null)
{
cardId.setText(initialCardId);
}
}
private void createBarcodeOption(final ImageView image, final String formatType, final String cardId)
@@ -136,7 +144,6 @@ public class BarcodeSelectorActivity extends AppCompatActivity
}
image.setImageBitmap(null);
image.setVisibility(View.GONE);
image.setOnClickListener(new View.OnClickListener()
{
@Override

9
app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
View File

@@ -222,6 +222,15 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
public void onClick(View v)
{
Intent i = new Intent(getApplicationContext(), BarcodeSelectorActivity.class);
String cardId = cardIdFieldEdit.getText().toString();
if(cardId.length() > 0)
{
final Bundle b = new Bundle();
b.putString("initialCardId", cardId);
i.putExtras(b);
}
startActivityForResult(i, SELECT_BARCODE_REQUEST);
}
});