Skip to content

Commit 10a9ce0

Browse files
committed
Minor update
Optimize Import Add AddItemFragment template page Navigate to bill details page after bill creation
1 parent 88ca905 commit 10a9ce0

12 files changed

Lines changed: 34 additions & 23 deletions

File tree

‎app/src/main/java/com/example/yoga/sqliteexample/Adapter/PersonRecyclerViewAdapter.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,8 @@
99
import android.widget.LinearLayout;
1010
import android.widget.TextView;
1111

12-
import com.example.yoga.sqliteexample.Model.Person;
1312
import com.example.yoga.sqliteexample.R;
1413

15-
1614
import java.util.List;
1715

1816
/**

‎app/src/main/java/com/example/yoga/sqliteexample/Fragment/AddBillFragment.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ public interface AddBillInterface {
5151
long editBill(Bill bill);
5252
Person getPerson(long person_id);
5353
Bill getBill(long bill_id);
54+
void setBillDetailFragment(int bill_id);
5455
void popFragmentStack();
5556
}
5657

@@ -177,10 +178,13 @@ public void onClick(View v) {
177178

178179

179180
if (bill_id == -1) {
180-
if(mListener.createBill(bill) == -1) {
181+
bill_id = (int) mListener.createBill(bill);
182+
if(bill_id == -1) {
181183
Snackbar.make(v, databaseInsertErrorString, Snackbar.LENGTH_SHORT).setAction("Action", null).show();
182184
} else {
183185
Snackbar.make(v, "Bill added.", Snackbar.LENGTH_SHORT).setAction("Action", null).show();
186+
mListener.popFragmentStack();
187+
mListener.setBillDetailFragment(bill_id);
184188
}
185189
} else {
186190
if(mListener.editBill(bill) == -1) {

‎app/src/main/java/com/example/yoga/sqliteexample/Fragment/AddItemFragment.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414
public class AddItemFragment extends Fragment {
1515

1616

17-
18-
19-
20-
2117
@Override
2218
public View onCreateView(LayoutInflater inflater, ViewGroup container,
2319
Bundle savedInstanceState) {

‎app/src/main/java/com/example/yoga/sqliteexample/Fragment/ListBillFragment.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,8 @@
1616
import com.example.yoga.sqliteexample.Model.Person;
1717
import com.example.yoga.sqliteexample.R;
1818

19-
import java.text.SimpleDateFormat;
2019
import java.util.ArrayList;
2120
import java.util.List;
22-
import java.util.Locale;
2321

2422
/**
2523
* Created by YOGA on 11/7/2016.

‎app/src/main/java/com/example/yoga/sqliteexample/Fragment/ListPersonFragment.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
import android.view.LayoutInflater;
1010
import android.view.View;
1111
import android.view.ViewGroup;
12-
import android.widget.ArrayAdapter;
13-
import android.widget.ListView;
1412

1513
import com.example.yoga.sqliteexample.Adapter.PersonRecyclerViewAdapter;
1614
import com.example.yoga.sqliteexample.Decoration.DividerItemDecoration;

‎app/src/main/java/com/example/yoga/sqliteexample/MainPage.java‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,17 @@ private void setAddPersonFragment() {
286286
displayHomeIcon(false);
287287
}
288288

289+
private void setAddItemFragment() {
290+
AddItemFragment addItemFragment = new AddItemFragment();
291+
FragmentTransaction ft = getFragmentManager().beginTransaction();
292+
ft.replace(R.id.content_frame, addItemFragment);
293+
ft.addToBackStack("Bill Details");
294+
ft.commit();
295+
296+
actionBar.setTitle("Add Item");
297+
displayHomeIcon(false);
298+
}
299+
289300
public void floatingActionButtonOnClick(View view) {
290301
Log.d(TAG, "floatingActionButtonOnClick");
291302
Log.d(TAG, "getDisplayHomeIcon() = " + String.valueOf(getDisplayHomeIcon()));
@@ -301,7 +312,12 @@ public void floatingActionButtonOnClick(View view) {
301312
Log.d(TAG, "ListPersonFragment");
302313
// Replace current fragment with AddPersonFragment
303314
setAddPersonFragment();
315+
} else if (f instanceof BillDetailFragment) {
316+
Log.d(TAG, "BillDetailFragment");
317+
setAddItemFragment();
304318
}
305319

306320
}
321+
322+
307323
}

‎app/src/main/java/com/example/yoga/sqliteexample/Model/Bill.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package com.example.yoga.sqliteexample.Model;
22

3-
import android.provider.BaseColumns;
4-
53
import java.util.Date;
64

75
/**

‎app/src/main/java/com/example/yoga/sqliteexample/Model/Item.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
import android.provider.BaseColumns;
44

5-
import java.text.SimpleDateFormat;
6-
75
/**
86
* Created by YOGA on 11/6/2016.
97
*/

‎app/src/main/java/com/example/yoga/sqliteexample/Model/Person.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package com.example.yoga.sqliteexample.Model;
22

3-
import android.provider.BaseColumns;
4-
53
/**
64
* Created by YOGA on 11/5/2016.
75
*/

‎app/src/main/java/com/example/yoga/sqliteexample/Model/myDatabaseHelper.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@
1010
import java.text.ParseException;
1111
import java.text.SimpleDateFormat;
1212
import java.util.ArrayList;
13-
import java.util.Calendar;
1413
import java.util.Date;
15-
import java.util.GregorianCalendar;
1614
import java.util.List;
1715
import java.util.Locale;
1816

0 commit comments

Comments
 (0)