Skip to content

Commit c2005d4

Browse files
AnthonyMJAnthonyMJ
committed
Merge branch 'finished-'
2 parents 176591e + 4d5e234 commit c2005d4

File tree

15 files changed

+522
-414
lines changed

15 files changed

+522
-414
lines changed

‎FoodPointTech/app/src/main/java/io/github/anthonymj/foodpointtech/OctTwoFi.java‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎FoodPointTech/app/src/main/java/io/github/anthonymj/foodpointtech/PreviousVisits.java‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,6 @@ public void onClick(View view){
3535
startActivity(new Intent(PreviousVisits.this, OctTwoTwo.class));
3636
}
3737
});
38-
button = findViewById(R.id.button8);
39-
button.setOnClickListener(new View.OnClickListener(){
40-
@Override
41-
public void onClick(View view){
42-
startActivity(new Intent(PreviousVisits.this, OctTwoFi.class));
43-
}
44-
});
4538
button = findViewById(R.id.button9);
4639
button.setOnClickListener(new View.OnClickListener(){
4740
@Override

‎FoodPointTech/app/src/main/java/io/github/anthonymj/foodpointtech/ShoppingCart.java‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,19 @@ protected void onCreate(Bundle savedInstanceState) {
1515
setContentView(R.layout.activity_shopping_cart);
1616
ImageView imageView = (ImageView)findViewById(R.id.imageView2);
1717
Picasso.get().load("https://wegmans.com/content/dam/wegmans/products/914/11914.jpg").into(imageView);
18+
imageView = (ImageView)findViewById(R.id.imageView);
19+
Picasso.get().load("https://wegmans.com/content/dam/wegmans/products/914/11914.jpg").into(imageView);
20+
imageView = (ImageView)findViewById(R.id.imageView3);
21+
Picasso.get().load("https://wegmans.com/content/dam/wegmans/products/914/11914.jpg").into(imageView);
22+
imageView = (ImageView)findViewById(R.id.imageView4);
23+
Picasso.get().load("https://wegmans.com/content/dam/wegmans/products/914/11914.jpg").into(imageView);
24+
imageView = (ImageView)findViewById(R.id.imageView5);
25+
Picasso.get().load("https://wegmans.com/content/dam/wegmans/products/914/11914.jpg").into(imageView);
26+
imageView = (ImageView)findViewById(R.id.imageView6);
27+
Picasso.get().load("https://wegmans.com/content/dam/wegmans/products/914/11914.jpg").into(imageView);
28+
imageView = (ImageView)findViewById(R.id.imageView7);
29+
Picasso.get().load("https://wegmans.com/content/dam/wegmans/products/914/11914.jpg").into(imageView);
30+
imageView = (ImageView)findViewById(R.id.imageView8);
31+
Picasso.get().load("https://wegmans.com/content/dam/wegmans/products/914/11914.jpg").into(imageView);
1832
}
1933
}

‎FoodPointTech/app/src/main/res/drawable/debugging.png‎

89.9 KB
Loading

‎FoodPointTech/app/src/main/res/layout/activity_de_bug.xml‎

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,39 @@
88
android:background="#eda41c">
99

1010
<LinearLayout
11-
android:layout_width="103dp"
12-
android:layout_height="393dp"
11+
android:layout_width="385dp"
12+
android:layout_height="514dp"
1313
android:orientation="vertical"
1414
tools:layout_editor_absoluteX="0dp"
15-
tools:layout_editor_absoluteY="16dp">
15+
tools:layout_editor_absoluteY="0dp">
1616

17-
<Button
18-
android:id="@+id/button5"
19-
android:layout_width="wrap_content"
17+
<LinearLayout
18+
android:layout_width="match_parent"
2019
android:layout_height="wrap_content"
21-
android:text="tester"
22-
tools:layout_editor_absoluteX="26dp"
23-
tools:layout_editor_absoluteY="75dp" />
20+
android:orientation="horizontal">
2421

25-
<Button
26-
android:id="@+id/button6"
27-
android:layout_width="wrap_content"
28-
android:layout_height="wrap_content"
29-
android:text="Control"
30-
tools:layout_editor_absoluteX="124dp"
31-
tools:layout_editor_absoluteY="147dp" />
22+
<Button
23+
android:id="@+id/button5"
24+
android:layout_width="187dp"
25+
android:layout_height="36dp"
26+
android:text="tester"
27+
tools:layout_editor_absoluteX="26dp"
28+
tools:layout_editor_absoluteY="75dp" />
29+
30+
<Button
31+
android:id="@+id/button6"
32+
android:layout_width="196dp"
33+
android:layout_height="36dp"
34+
android:text="Control"
35+
tools:layout_editor_absoluteX="124dp"
36+
tools:layout_editor_absoluteY="147dp" />
37+
</LinearLayout>
38+
39+
<ImageView
40+
android:id="@+id/imageView10"
41+
android:layout_width="452dp"
42+
android:layout_height="match_parent"
43+
app:srcCompat="@drawable/debugging" />
3244
</LinearLayout>
3345

3446
</android.support.constraint.ConstraintLayout>

‎FoodPointTech/app/src/main/res/layout/activity_expiry.xml‎

Lines changed: 36 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,40 @@
77
tools:context=".Expiry"
88
android:background="#eda41c">
99

10-
<ImageView
11-
android:id="@+id/imageView"
12-
android:layout_width="wrap_content"
13-
android:layout_height="wrap_content"
14-
app:srcCompat="@drawable/apple"
15-
tools:layout_editor_absoluteX="81dp"
16-
tools:layout_editor_absoluteY="86dp" />
10+
<LinearLayout
11+
android:layout_width="match_parent"
12+
android:layout_height="match_parent"
13+
android:orientation="vertical">
14+
15+
<ProgressBar
16+
android:id="@+id/progressBar2"
17+
style="?android:attr/progressBarStyleHorizontal"
18+
android:layout_width="357dp"
19+
android:layout_height="64dp"
20+
android:indeterminate="true"
21+
android:max="7"
22+
android:progress="1"
23+
tools:layout_editor_absoluteX="16dp"
24+
tools:layout_editor_absoluteY="23dp" />
25+
26+
<ImageView
27+
android:id="@+id/imageView9"
28+
android:layout_width="wrap_content"
29+
android:layout_height="242dp"
30+
app:srcCompat="@drawable/dog"
31+
tools:layout_editor_absoluteX="0dp"
32+
tools:layout_editor_absoluteY="62dp" />
33+
34+
<TextView
35+
android:id="@+id/textView6"
36+
android:layout_width="381dp"
37+
android:layout_height="232dp"
38+
android:fontFamily="casual"
39+
android:text="\tSorry! Ol'Max is sleepin.\n\t\t\tI'm sure he'll wake \n\t\twhen this feature is \n\t\tready for public use"
40+
android:textAppearance="@style/TextAppearance.AppCompat.Display1"
41+
android:textColor="#ffffff"
42+
tools:layout_editor_absoluteX="16dp"
43+
tools:layout_editor_absoluteY="294dp" />
44+
</LinearLayout>
45+
1746
</android.support.constraint.ConstraintLayout>

‎FoodPointTech/app/src/main/res/layout/activity_nov_one.xml‎

Lines changed: 79 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -7,35 +7,83 @@
77
tools:context=".NovOne"
88
android:background="#eda41c">
99

10-
<TextView
11-
android:id="@+id/textView5"
12-
android:layout_width="wrap_content"
13-
android:layout_height="wrap_content"
14-
android:text="TextView"
15-
tools:layout_editor_absoluteX="145dp"
16-
tools:layout_editor_absoluteY="80dp" />
17-
18-
<TextView
19-
android:id="@+id/textView6"
20-
android:layout_width="wrap_content"
21-
android:layout_height="wrap_content"
22-
android:text="TextView"
23-
tools:layout_editor_absoluteX="145dp"
24-
tools:layout_editor_absoluteY="110dp" />
25-
26-
<TextView
27-
android:id="@+id/textView7"
28-
android:layout_width="wrap_content"
29-
android:layout_height="wrap_content"
30-
android:text="TextView"
31-
tools:layout_editor_absoluteX="143dp"
32-
tools:layout_editor_absoluteY="154dp" />
33-
34-
<TextView
35-
android:id="@+id/textView8"
36-
android:layout_width="wrap_content"
37-
android:layout_height="wrap_content"
38-
android:text="TextView"
39-
tools:layout_editor_absoluteX="145dp"
40-
tools:layout_editor_absoluteY="187dp" />
10+
<LinearLayout
11+
android:layout_width="match_parent"
12+
android:layout_height="match_parent"
13+
android:orientation="vertical"
14+
tools:layout_editor_absoluteX="8dp"
15+
tools:layout_editor_absoluteY="8dp">
16+
17+
<Space
18+
android:layout_width="match_parent"
19+
android:layout_height="wrap_content" />
20+
21+
<Button
22+
android:id="@+id/button16"
23+
android:layout_width="match_parent"
24+
android:layout_height="wrap_content"
25+
android:background="#8c0101"
26+
android:includeFontPadding="true"
27+
android:text="11/01/2018"
28+
android:textAppearance="@style/TextAppearance.AppCompat.Display1"
29+
android:textColor="#ffffff"
30+
android:fontFamily="casual"/>
31+
32+
<TextView
33+
android:id="@+id/textView7"
34+
android:layout_width="wrap_content"
35+
android:layout_height="wrap_content"
36+
android:text="*4 bananas*"
37+
android:textAppearance="@style/TextAppearance.AppCompat.Display1" />
38+
39+
<TextView
40+
android:id="@+id/textView8"
41+
android:layout_width="match_parent"
42+
android:layout_height="wrap_content"
43+
android:text="*4 Yogurts*"
44+
android:textAppearance="@style/TextAppearance.AppCompat.Display1" />
45+
46+
<TextView
47+
android:id="@+id/textView9"
48+
android:layout_width="match_parent"
49+
android:layout_height="wrap_content"
50+
android:text="*4 bananas*"
51+
android:textAppearance="@style/TextAppearance.AppCompat.Display1" />
52+
53+
<TextView
54+
android:id="@+id/textView18"
55+
android:layout_width="match_parent"
56+
android:layout_height="wrap_content"
57+
android:text="*4 Yogurts*"
58+
android:textAppearance="@style/TextAppearance.AppCompat.Display1" />
59+
60+
<ScrollView
61+
android:layout_width="match_parent"
62+
android:layout_height="match_parent">
63+
64+
<LinearLayout
65+
android:layout_width="match_parent"
66+
android:layout_height="wrap_content"
67+
android:orientation="vertical" >
68+
69+
<TableRow
70+
android:layout_width="match_parent"
71+
android:layout_height="match_parent">
72+
73+
</TableRow>
74+
75+
<TableRow
76+
android:layout_width="match_parent"
77+
android:layout_height="match_parent" />
78+
79+
<TableRow
80+
android:layout_width="match_parent"
81+
android:layout_height="match_parent" />
82+
83+
<TableRow
84+
android:layout_width="match_parent"
85+
android:layout_height="match_parent" />
86+
</LinearLayout>
87+
</ScrollView>
88+
</LinearLayout>
4189
</android.support.constraint.ConstraintLayout>

‎FoodPointTech/app/src/main/res/layout/activity_oct_fourtn.xml‎

Lines changed: 77 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,81 @@
77
tools:context=".OctFourtn"
88
android:background="#eda41c">
99

10-
<TextView
11-
android:id="@+id/textView16"
12-
android:layout_width="wrap_content"
13-
android:layout_height="wrap_content"
14-
android:text="TextView"
15-
tools:layout_editor_absoluteX="121dp"
16-
tools:layout_editor_absoluteY="40dp" />
17-
18-
<TextView
19-
android:id="@+id/textView17"
20-
android:layout_width="wrap_content"
21-
android:layout_height="wrap_content"
22-
android:text="TextView"
23-
tools:layout_editor_absoluteX="121dp"
24-
tools:layout_editor_absoluteY="81dp" />
10+
<LinearLayout
11+
android:layout_width="match_parent"
12+
android:layout_height="match_parent"
13+
android:orientation="vertical"
14+
tools:layout_editor_absoluteX="8dp"
15+
tools:layout_editor_absoluteY="8dp">
16+
17+
<Space
18+
android:layout_width="match_parent"
19+
android:layout_height="wrap_content" />
20+
21+
<Button
22+
android:id="@+id/button16"
23+
android:layout_width="match_parent"
24+
android:layout_height="wrap_content"
25+
android:background="#8c0101"
26+
android:fontFamily="casual"
27+
android:includeFontPadding="true"
28+
android:text="10/14/2018"
29+
android:textAppearance="@style/TextAppearance.AppCompat.Display1"
30+
android:textColor="#ffffff" />
31+
32+
<TextView
33+
android:id="@+id/textView7"
34+
android:layout_width="wrap_content"
35+
android:layout_height="wrap_content"
36+
android:text="*milk*"
37+
android:textAppearance="@style/TextAppearance.AppCompat.Display1" />
38+
39+
<TextView
40+
android:id="@+id/textView8"
41+
android:layout_width="match_parent"
42+
android:layout_height="wrap_content"
43+
android:text="*Bread Loaf*"
44+
android:textAppearance="@style/TextAppearance.AppCompat.Display1" />
45+
46+
<TextView
47+
android:id="@+id/textView9"
48+
android:layout_width="match_parent"
49+
android:layout_height="wrap_content"
50+
android:textAppearance="@style/TextAppearance.AppCompat.Display1" />
51+
52+
<TextView
53+
android:id="@+id/textView18"
54+
android:layout_width="match_parent"
55+
android:layout_height="wrap_content"
56+
android:textAppearance="@style/TextAppearance.AppCompat.Display1" />
57+
58+
<ScrollView
59+
android:layout_width="match_parent"
60+
android:layout_height="match_parent">
61+
62+
<LinearLayout
63+
android:layout_width="match_parent"
64+
android:layout_height="wrap_content"
65+
android:orientation="vertical" >
66+
67+
<TableRow
68+
android:layout_width="match_parent"
69+
android:layout_height="match_parent">
70+
71+
</TableRow>
72+
73+
<TableRow
74+
android:layout_width="match_parent"
75+
android:layout_height="match_parent" />
76+
77+
<TableRow
78+
android:layout_width="match_parent"
79+
android:layout_height="match_parent" />
80+
81+
<TableRow
82+
android:layout_width="match_parent"
83+
android:layout_height="match_parent" />
84+
</LinearLayout>
85+
</ScrollView>
86+
</LinearLayout>
2587
</android.support.constraint.ConstraintLayout>

0 commit comments

Comments
 (0)