Skip to content

Commit 735c0de

Browse files
AnthonyMJAnthonyMJ
committed
lots of nonsense
1 parent 0ace658 commit 735c0de

File tree

14 files changed

+396
-20
lines changed

14 files changed

+396
-20
lines changed

‎FoodPointTech/app/src/main/AndroidManifest.xml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="io.github.anthonymj.foodpointtech">
4-
<uses-permission android:name="android.permission.INTERNET"></uses-permission>
4+
5+
<uses-permission android:name="android.permission.INTERNET" />
6+
57
<application
68
android:allowBackup="true"
79
android:icon="@mipmap/ic_launcher"
@@ -21,7 +23,12 @@
2123
<activity android:name=".ShoppingCart" />
2224
<activity android:name=".Expiry" />
2325
<activity android:name=".DeBug" />
24-
<activity android:name=".PreviousVisits"></activity>
26+
<activity android:name=".PreviousVisits" />
27+
<activity android:name=".OctThree" />
28+
<activity android:name=".OctFourtn" />
29+
<activity android:name=".OctTwoTwo" />
30+
<activity android:name=".OctTwoFi" />
31+
<activity android:name=".NovOne"></activity>
2532
</application>
2633

2734
</manifest>

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,16 @@ protected void onCreate(Bundle savedInstanceState) {
1919
button.setOnClickListener(new View.OnClickListener(){
2020
@Override
2121
public void onClick(View v) {
22-
<<<<<<< HEAD:FoodPointTech/app/src/main/java/io/github/anthonymj/foodpointtech/DeBugThisBiatch.java
2322
MilkTask task = new MilkTask();
2423
task.execute();
25-
=======
2624
DatabaseHelper dbH = new DatabaseHelper();
27-
String s = dbH.getMilkInline();
2825
int respcode = dbH.get_myresponsecode();
2926
String rscStr = Integer.toString(respcode);
3027
String mytext = "nope";
31-
if (s.isEmpty()){
28+
if (mytext.isEmpty()){
3229
mytext = "yesss";
3330
}
34-
Toast.makeText(DeBug.this, s, Toast.LENGTH_LONG).show();
35-
>>>>>>> pretty-boy:FoodPointTech/app/src/main/java/io/github/anthonymj/foodpointtech/DeBug.java
31+
Toast.makeText(DeBug.this, mytext, Toast.LENGTH_LONG).show();
3632
}
3733
});
3834
button = findViewById(R.id.button6);

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package io.github.anthonymj.foodpointtech;
2+
3+
import android.support.v7.app.AppCompatActivity;
4+
import android.os.Bundle;
5+
6+
public class NovOne extends AppCompatActivity {
7+
8+
@Override
9+
protected void onCreate(Bundle savedInstanceState) {
10+
super.onCreate(savedInstanceState);
11+
setContentView(R.layout.activity_nov_one);
12+
}
13+
}

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package io.github.anthonymj.foodpointtech;
2+
3+
import android.support.v7.app.AppCompatActivity;
4+
import android.os.Bundle;
5+
6+
public class OctFourtn extends AppCompatActivity {
7+
8+
@Override
9+
protected void onCreate(Bundle savedInstanceState) {
10+
super.onCreate(savedInstanceState);
11+
setContentView(R.layout.activity_oct_fourtn);
12+
}
13+
}

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package io.github.anthonymj.foodpointtech;
2+
3+
import android.support.v7.app.AppCompatActivity;
4+
import android.os.Bundle;
5+
6+
public class OctThree extends AppCompatActivity {
7+
8+
@Override
9+
protected void onCreate(Bundle savedInstanceState) {
10+
super.onCreate(savedInstanceState);
11+
setContentView(R.layout.activity_oct_three);
12+
}
13+
}

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package io.github.anthonymj.foodpointtech;
2+
3+
import android.support.v7.app.AppCompatActivity;
4+
import android.os.Bundle;
5+
6+
public class OctTwoFi extends AppCompatActivity {
7+
8+
@Override
9+
protected void onCreate(Bundle savedInstanceState) {
10+
super.onCreate(savedInstanceState);
11+
setContentView(R.layout.activity_oct_two_fi);
12+
}
13+
}

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package io.github.anthonymj.foodpointtech;
2+
3+
import android.support.v7.app.AppCompatActivity;
4+
import android.os.Bundle;
5+
6+
public class OctTwoTwo extends AppCompatActivity {
7+
8+
@Override
9+
protected void onCreate(Bundle savedInstanceState) {
10+
super.onCreate(savedInstanceState);
11+
setContentView(R.layout.activity_oct_two_two);
12+
}
13+
}

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

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,53 @@
11
package io.github.anthonymj.foodpointtech;
22

3+
import android.content.Intent;
34
import android.support.v7.app.AppCompatActivity;
45
import android.os.Bundle;
6+
import android.view.View;
7+
import android.widget.Button;
58

69
public class PreviousVisits extends AppCompatActivity {
710

811
@Override
912
protected void onCreate(Bundle savedInstanceState) {
13+
Button button;
1014
super.onCreate(savedInstanceState);
1115
setContentView(R.layout.activity_previousvisits);
16+
17+
button = findViewById(R.id.button5);
18+
button.setOnClickListener(new View.OnClickListener(){
19+
@Override
20+
public void onClick(View view){
21+
startActivity(new Intent(PreviousVisits.this, OctThree.class));
22+
}
23+
});
24+
button = findViewById(R.id.button6);
25+
button.setOnClickListener(new View.OnClickListener(){
26+
@Override
27+
public void onClick(View view){
28+
startActivity(new Intent(PreviousVisits.this, OctFourtn.class));
29+
}
30+
});
31+
button = findViewById(R.id.button7);
32+
button.setOnClickListener(new View.OnClickListener(){
33+
@Override
34+
public void onClick(View view){
35+
startActivity(new Intent(PreviousVisits.this, OctTwoTwo.class));
36+
}
37+
});
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+
});
45+
button = findViewById(R.id.button9);
46+
button.setOnClickListener(new View.OnClickListener(){
47+
@Override
48+
public void onClick(View view){
49+
startActivity(new Intent(PreviousVisits.this, NovOne.class));
50+
}
51+
});
1252
}
1353
}

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

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:app="http://schemas.android.com/apk/res-auto"
4+
xmlns:tools="http://schemas.android.com/tools"
5+
android:layout_width="match_parent"
6+
android:layout_height="match_parent"
7+
tools:context=".NovOne"
8+
android:background="#eda41c">
9+
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" />
41+
</android.support.constraint.ConstraintLayout>

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:app="http://schemas.android.com/apk/res-auto"
4+
xmlns:tools="http://schemas.android.com/tools"
5+
android:layout_width="match_parent"
6+
android:layout_height="match_parent"
7+
tools:context=".OctFourtn"
8+
android:background="#eda41c">
9+
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" />
25+
</android.support.constraint.ConstraintLayout>

0 commit comments

Comments
 (0)