From 9ffa445c3e5315d89c1792efbe0fc8d37419cc8e Mon Sep 17 00:00:00 2001 From: Tetsuro Kutsuwada Date: Thu, 12 Dec 2013 23:45:30 +0900 Subject: [PATCH 001/215] add TotalPaymentActivity --- AndroidManifest.xml | 4 +++ res/layout/activity_category_twopane.xml | 6 ++++ res/layout/activity_total_payment.xml | 9 +++++ res/layout/fragment_category_detail.xml | 21 +----------- res/layout/fragment_total_payment.xml | 22 ++++++++++++ res/values/strings.xml | 2 ++ src/com/ricoh/pos/CategoryListActivity.java | 14 ++++++++ src/com/ricoh/pos/CategoryListFragment.java | 10 ++++++ src/com/ricoh/pos/TotalPaymentActivity.java | 37 +++++++++++++++++++++ src/com/ricoh/pos/TotalPaymentFragment.java | 16 +++++++++ 10 files changed, 121 insertions(+), 20 deletions(-) create mode 100644 res/layout/activity_total_payment.xml create mode 100644 res/layout/fragment_total_payment.xml create mode 100644 src/com/ricoh/pos/TotalPaymentActivity.java create mode 100644 src/com/ricoh/pos/TotalPaymentFragment.java diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 37d54d1..5799afe 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -35,6 +35,10 @@ android:name="android.support.PARENT_ACTIVITY" android:value=".CategoryListActivity" /> + + \ No newline at end of file diff --git a/res/layout/activity_category_twopane.xml b/res/layout/activity_category_twopane.xml index f9bf6a2..07d10f2 100644 --- a/res/layout/activity_category_twopane.xml +++ b/res/layout/activity_category_twopane.xml @@ -34,5 +34,11 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="3" /> + + \ No newline at end of file diff --git a/res/layout/activity_total_payment.xml b/res/layout/activity_total_payment.xml new file mode 100644 index 0000000..37dfd90 --- /dev/null +++ b/res/layout/activity_total_payment.xml @@ -0,0 +1,9 @@ + \ No newline at end of file diff --git a/res/layout/fragment_category_detail.xml b/res/layout/fragment_category_detail.xml index b3078c1..583830c 100644 --- a/res/layout/fragment_category_detail.xml +++ b/res/layout/fragment_category_detail.xml @@ -5,23 +5,4 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" > - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/res/layout/fragment_total_payment.xml b/res/layout/fragment_total_payment.xml new file mode 100644 index 0000000..d926076 --- /dev/null +++ b/res/layout/fragment_total_payment.xml @@ -0,0 +1,22 @@ + + + + + +