Skip to content

Commit 9c16d72

Browse files
gges5110gges5110
committed
Update Colors and Floating Action Button Navigation
1 parent 114a8da commit 9c16d72

8 files changed

Lines changed: 93 additions & 32 deletions

File tree

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

Lines changed: 52 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import android.util.Log;
1414
import android.view.Menu;
1515
import android.view.MenuItem;
16+
import android.view.View;
1617

1718
import com.example.yoga.sqliteexample.Adapter.BillRecyclerViewAdapter;
1819
import com.example.yoga.sqliteexample.Fragment.*;
@@ -153,18 +154,18 @@ public void displayView(int viewId) {
153154
String title = getString(R.string.app_name);
154155

155156
switch (viewId) {
156-
case R.id.nav_add_person:
157-
fragment = new AddPersonFragment();
158-
title = "Add Person";
159-
break;
160-
case R.id.nav_add_bill:
161-
fragment = new AddBillFragment();
162-
title = "Add Bill";
163-
break;
164-
case R.id.nav_add_item:
165-
// fragment = new AddItemFragment();
166-
// title = "Add item";
167-
break;
157+
// case R.id.nav_add_person:
158+
// fragment = new AddPersonFragment();
159+
// title = "Add Person";
160+
// break;
161+
// case R.id.nav_add_bill:
162+
// fragment = new AddBillFragment();
163+
// title = "Add Bill";
164+
// break;
165+
// case R.id.nav_add_item:
166+
// // fragment = new AddItemFragment();
167+
// // title = "Add item";
168+
// break;
168169
case R.id.nav_list_person:
169170
fragment = new ListPersonFragment();
170171
title = "List Person";
@@ -230,4 +231,43 @@ public void setBillDetailFragment() {
230231
actionBar.setTitle("Bill Details");
231232
displayHomeIcon(false);
232233
}
234+
235+
private void setAddBillFragment() {
236+
AddBillFragment addBillFragment = new AddBillFragment();
237+
FragmentTransaction ft = getFragmentManager().beginTransaction();
238+
ft.replace(R.id.content_frame, addBillFragment);
239+
ft.addToBackStack("List Bill");
240+
ft.commit();
241+
242+
actionBar.setTitle("Add Bill");
243+
displayHomeIcon(false);
244+
}
245+
246+
private void setAddPersonFragment() {
247+
AddPersonFragment addPersonFragment = new AddPersonFragment();
248+
FragmentTransaction ft = getFragmentManager().beginTransaction();
249+
ft.replace(R.id.content_frame, addPersonFragment);
250+
ft.addToBackStack("List Person");
251+
ft.commit();
252+
253+
actionBar.setTitle("Add Person");
254+
displayHomeIcon(false);
255+
}
256+
257+
public void floatingActionButtonOnClick(View view) {
258+
Log.d(TAG, "floatingActionButtonOnClick");
259+
// Check which fragment it is in.
260+
Fragment f = getFragmentManager().findFragmentById(R.id.content_frame);
261+
if (f instanceof ListBillFragment) {
262+
Log.d(TAG, "ListBillFragment");
263+
// Replace current fragment with AddBillFragment
264+
setAddBillFragment();
265+
266+
} else if (f instanceof ListPersonFragment) {
267+
Log.d(TAG, "ListPersonFragment");
268+
// Replace current fragment with AddPersonFragment
269+
setAddPersonFragment();
270+
}
271+
272+
}
233273
}

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

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,26 @@
99
*/
1010

1111
public final class Item {
12-
public Item(int id, int price) {
12+
private int price, id;
13+
private String itemName;
14+
15+
public Item(int id, int price, String itemName) {
1316
this.id = id;
1417
this.price = price;
18+
this.itemName = itemName;
1519
}
1620

1721
public Item() {}
1822

19-
private int price, id;
23+
24+
public String getItemName() {
25+
return itemName;
26+
}
27+
28+
public void setItemName(String itemName) {
29+
this.itemName = itemName;
30+
}
31+
2032

2133
public int getPrice() {
2234
return price;
@@ -38,5 +50,6 @@ public static class ItemEntry implements BaseColumns {
3850
public static final String TABLE_NAME = "item_table";
3951
public static final String _ID = "item_id";
4052
public static final String COLUMN_NAME_PRICE = "price";
53+
public static final String COLUMN_NAME_ITEM_NAME = "item_name";
4154
}
4255
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,15 @@ FOREIGN KEY(payer) REFERENCES artist(person_id)
7676
/*
7777
CREATE TABLE item_table (
7878
item_id INTEGER PRIMARY KEY,
79+
item_name TEXT,
7980
price INTEGER
8081
);
8182
*/
8283

8384
private static final String CREATE_TABLE_ITEM =
8485
CREATE_TABLE + Item.ItemEntry.TABLE_NAME + " (" +
8586
Item.ItemEntry._ID + PRIMARY_KEY +
87+
Item.ItemEntry.COLUMN_NAME_ITEM_NAME + TEXT_TYPE + COMMA_SEP +
8688
Item.ItemEntry.COLUMN_NAME_PRICE + INTEGER_TYPE + " );";
8789

8890
/*

‎app/src/main/res/drawable/circle.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<shape xmlns:android="http://schemas.android.com/apk/res/android"
33
android:shape="oval">
4-
<solid android:color="@color/color_accent" />
4+
<solid android:color="@color/colorAccent" />
55
</shape>

‎app/src/main/res/drawable/ic_add_white_24dp.png‎

102 Bytes
Loading

‎app/src/main/res/layout/app_bar_main_page.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
android:layout_height="wrap_content"
3030
android:layout_gravity="bottom|end"
3131
android:layout_margin="@dimen/fab_margin"
32-
android:src="@android:drawable/ic_input_add" />
32+
android:onClick="floatingActionButtonOnClick"
33+
android:src="@drawable/ic_add_white_24dp" />
3334

3435
</android.support.design.widget.CoordinatorLayout>

‎app/src/main/res/menu/activity_main_page_drawer.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
<menu xmlns:android="http://schemas.android.com/apk/res/android">
33

44
<group android:checkableBehavior="single">
5-
<item
6-
android:id="@+id/nav_add_person"
7-
android:icon="@drawable/ic_menu_camera"
8-
android:title="Add Person" />
9-
<item
10-
android:id="@+id/nav_add_bill"
11-
android:icon="@drawable/ic_menu_gallery"
12-
android:title="Add Bill" />
13-
<item
14-
android:id="@+id/nav_add_item"
15-
android:icon="@drawable/ic_menu_slideshow"
16-
android:title="Add Item" />
5+
<!--<item-->
6+
<!--android:id="@+id/nav_add_person"-->
7+
<!--android:icon="@drawable/ic_menu_camera"-->
8+
<!--android:title="Add Person" />-->
9+
<!--<item-->
10+
<!--android:id="@+id/nav_add_bill"-->
11+
<!--android:icon="@drawable/ic_menu_gallery"-->
12+
<!--android:title="Add Bill" />-->
13+
<!--<item-->
14+
<!--android:id="@+id/nav_add_item"-->
15+
<!--android:icon="@drawable/ic_menu_slideshow"-->
16+
<!--android:title="Add Item" />-->
1717
<item
1818
android:id="@+id/nav_list_person"
1919
android:icon="@drawable/ic_menu_manage"

‎app/src/main/res/values/colors.xml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
3-
<color name="colorPrimary">#3F51B5</color>
4-
<color name="colorPrimaryDark">#303F9F</color>
5-
<color name="colorAccent">#FF4081</color>
6-
<color name="color_accent">#303F9F</color>
3+
<color name="colorPrimary">#8BC34A</color>
4+
<color name="colorPrimaryDark">#689F38</color>
5+
<color name="primary_light">#DCEDC8</color>
6+
<color name="colorAccent">#03A9F4</color>
7+
<color name="primary_text">#212121</color>
8+
<color name="secondary_text">#757575</color>
9+
<color name="icons">#212121</color>
10+
<color name="divider">#BDBDBD</color>
11+
712
</resources>

0 commit comments

Comments
 (0)