From ca6c566b698f44c53d5b1cfef20b4d300c6b1223 Mon Sep 17 00:00:00 2001
From: Christian Dresen <c.dresen@fh-muenster.de>
Date: Sat, 27 Jun 2015 17:47:14 +0200
Subject: [PATCH] no message
---
.../ms/itsecteam/warpdrink/MainActivity.java | 21 +++++++++---------
.../src/main/res/drawable/ic_menu_refresh.png | Bin 0 -> 4734 bytes
.../app/src/main/res/layout/activity_main.xml | 16 ++++++++++++-
3 files changed, 25 insertions(+), 12 deletions(-)
create mode 100644 WarpDrinkApp/app/src/main/res/drawable/ic_menu_refresh.png
diff --git a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/MainActivity.java b/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/MainActivity.java
index dd6538d..163e997 100644
--- a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/MainActivity.java
+++ b/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/MainActivity.java
@@ -10,6 +10,7 @@ import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.AutoCompleteTextView;
import android.widget.Button;
+import android.widget.ImageButton;
import android.widget.ListView;
import android.widget.TextView;
import android.widget.Toast;
@@ -23,8 +24,8 @@ import ms.itsecteam.warpdrink.orderList.Order;
public class MainActivity extends ActionBarActivity implements View.OnClickListener, View.OnKeyListener, AdapterView.OnItemClickListener, DialogInterface.OnClickListener {
-
- private Button btnOneEuro, btnFiftyCent, btnPay, btnCharge, btnLogout;
+ private Button btnPay, btnCharge, btnLogout;
+ private ImageButton btnRefresh;
private TextView txtSum,txtCredit;
private ListView lstOrdered;
private AutoCompleteTextView atxvName;
@@ -48,22 +49,16 @@ public class MainActivity extends ActionBarActivity implements View.OnClickListe
getSupportActionBar().hide();
setContentView(R.layout.activity_main);
+
this.txtSum = (TextView) findViewById(R.id.txtSum);
this.txtCredit = (TextView)findViewById(R.id.txtCredit);
this.txtCredit.setText(getResources().getString(R.string.credit,0.0));
this.txtSum.setText(getResources().getString(R.string.total,0.0));
- this.btnOneEuro = (Button) findViewById(R.id.btnOneEuro);
- this.btnFiftyCent = (Button) findViewById(R.id.btnFiftyCent);
+ this.btnLogout = (Button) findViewById(R.id.btnLogout);
+ this.btnRefresh = (ImageButton) findViewById(R.id.btnRefresh);
this.btnPay = (Button) findViewById(R.id.btnPay);
this.btnCharge = (Button) findViewById(R.id.btnCharge);
- this.btnLogout = (Button) findViewById(R.id.btnLogout);
-
- this.btnOneEuro.setOnClickListener(this);
- this.btnFiftyCent.setOnClickListener(this);
- this.btnPay.setOnClickListener(this);
- this.btnCharge.setOnClickListener(this);
- this.btnLogout.setOnClickListener(this);
this.lstAdapter = new ListViewAdapter(this, R.layout.order_list_item, new ArrayList<Order>());
this.lstOrdered = (ListView) findViewById(R.id.lstOrdered);
@@ -104,6 +99,7 @@ public class MainActivity extends ActionBarActivity implements View.OnClickListe
}
private void enableControls(boolean enable) {
this.atxvName.setEnabled(!enable);
+ this.btnRefresh.setEnabled(!enable);
this.btnCharge.setEnabled(enable);
this.btnPay.setEnabled(enable);
this.btnLogout.setEnabled(enable);
@@ -163,6 +159,9 @@ public class MainActivity extends ActionBarActivity implements View.OnClickListe
case R.id.btnLogout:
clearCurrentUser();
break;
+ case R.id.btnRefresh:
+ Toast.makeText(this,"refresh" ,Toast.LENGTH_LONG).show();
+ break;
}
}
diff --git a/WarpDrinkApp/app/src/main/res/drawable/ic_menu_refresh.png b/WarpDrinkApp/app/src/main/res/drawable/ic_menu_refresh.png
new file mode 100644
index 0000000000000000000000000000000000000000..580f4cf3b7bb9150903b3e4e92cf5c37fd0833b2
GIT binary patch
literal 4734
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
W{70@oBu4H15wbKriF;z~8Tnt8{7upT
literal 0
HcmV?d00001
diff --git a/WarpDrinkApp/app/src/main/res/layout/activity_main.xml b/WarpDrinkApp/app/src/main/res/layout/activity_main.xml
index 093981f..34f62a8 100644
--- a/WarpDrinkApp/app/src/main/res/layout/activity_main.xml
+++ b/WarpDrinkApp/app/src/main/res/layout/activity_main.xml
@@ -40,7 +40,7 @@
android:layout_height="20px" />
<AutoCompleteTextView
- android:layout_width="400dp"
+ android:layout_width="350dp"
android:layout_height="wrap_content"
android:id="@+id/atxvName"
android:imeOptions="actionNext"
@@ -48,6 +48,15 @@
android:layout_columnSpan="1"
android:layout_row="0"
android:layout_column="0" />
+
+ <ImageButton
+ android:layout_width="30dp"
+ android:layout_height="30dp"
+ android:id="@+id/btnRefresh"
+ android:scaleType="fitXY"
+ android:background="@drawable/ic_menu_refresh"
+ android:onClick="onClick"
+ android:layout_gravity="center_vertical" />
</LinearLayout>
<Space
@@ -60,6 +69,7 @@
android:layout_row="3"
android:layout_column="1"
android:width="10dp"
+ android:onClick="onClick"
android:layout_width="300dp"></Button>
<Button
@@ -71,6 +81,7 @@
android:layout_column="1"
android:width="10dp"
android:layout_width="300dp"
+ android:onClick="onClick"
android:layout_height="wrap_content" />
<Space
@@ -115,6 +126,7 @@
android:layout_width="140dp"
android:layout_height="50dp"
android:layout_gravity="right"
+ android:onClick="onClick"
android:textSize="20dp" />
</LinearLayout>
@@ -162,6 +174,7 @@
android:layout_column="1"
android:width="10dp"
android:layout_width="300dp"
+ android:onClick="onClick"
android:layout_height="60dp" />
<Space
@@ -177,6 +190,7 @@
android:layout_column="0"
android:width="10dp"
android:layout_width="355dp"
+ android:onClick="onClick"
android:layout_height="wrap_content" />
</LinearLayout>
</LinearLayout>
--
GitLab