Skip to content

Commit

Permalink
Small UI cleanups
Browse files Browse the repository at this point in the history
  • Loading branch information
TheLastProject committed Dec 1, 2020
1 parent 2e9339b commit b209b67
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 16 deletions.
11 changes: 0 additions & 11 deletions app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -356,17 +356,6 @@ public boolean onTouch(View v, MotionEvent event) {
enterButton.setOnClickListener(new EditCardIdAndBarcode());
barcodeImage.setOnClickListener(new EditCardIdAndBarcode());

if(cardIdFieldView.getText().length() > 0)
{
cardAndBarcodeLayout.setVisibility(View.VISIBLE);
enterButton.setText(R.string.editCard);
}
else
{
cardAndBarcodeLayout.setVisibility(View.GONE);
enterButton.setText(R.string.enterCard);
}

ArrayList<String> barcodeList = new ArrayList<>(BarcodeSelectorActivity.SUPPORTED_BARCODE_TYPES);
barcodeList.add(0, getString(R.string.noBarcode));
ArrayAdapter<String> barcodeAdapter = new ArrayAdapter<>(this, android.R.layout.select_dialog_item, barcodeList);
Expand Down
8 changes: 3 additions & 5 deletions app/src/main/res/layout/loyalty_card_edit_activity.xml
Original file line number Diff line number Diff line change
Expand Up @@ -123,13 +123,11 @@
<!-- Buttons -->
<TableLayout android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:shrinkColumns="1"
android:background="@color/inputContrastBackground">
android:shrinkColumns="1">

<LinearLayout android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="@color/inputBackground">
android:layout_height="wrap_content">

<LinearLayout android:orientation="horizontal"
android:padding="10.0dip"
Expand All @@ -140,7 +138,7 @@
android:layout_margin="@dimen/inputMargin"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/enterCard"
android:text="@string/editCard"
android:layout_weight="1.0"/>
</LinearLayout>
</LinearLayout>
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit b209b67

Please sign in to comment.