Skip to content

S
summative_daniel_tang
Commit bef72e56 authored by Ramposa's avatar Ramposa
Browse files
Options

final Product

parent 3ff424ff
Hide whitespace changes
Inline Side-by-side
Showing with 186 additions and 92 deletions
app/src/main/AndroidManifest.xml
View file @ bef72e56
...@@ -12,13 +12,24 @@ ...@@ -12,13 +12,24 @@
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/Theme.LoginApp1" android:theme="@style/Theme.LoginApp1"
android:usesCleartextTraffic="true"> android:usesCleartextTraffic="true">
<activity android:name=".foodDetail"></activity> <activity android:name=".reclo"
<activity android:name=".foodOrder" /> android:theme="@style/Theme.Design.Light.NoActionBar"></activity>
<activity android:name=".souvDetail" /> <activity android:name=".reycl"
<activity android:name=".souvOrder" /> android:theme="@style/Theme.Design.Light.NoActionBar"/>
<activity android:name=".viewingMuse" /> <activity android:name=".foodDetail"
<activity android:name=".bookings" /> android:theme="@style/Theme.Design.Light.NoActionBar"/>
<activity android:name=".menuActivity" /> <activity android:name=".foodOrder"
android:theme="@style/Theme.Design.Light.NoActionBar"/>
<activity android:name=".souvDetail"
android:theme="@style/Theme.Design.Light.NoActionBar"/>
<activity android:name=".souvOrder"
android:theme="@style/Theme.Design.Light.NoActionBar"/>
<activity android:name=".viewingMuse"
android:theme="@style/Theme.Design.Light.NoActionBar"/>
<activity android:name=".bookings"
android:theme="@style/Theme.Design.Light.NoActionBar"/>
<activity android:name=".menuActivity"
android:theme="@style/Theme.Design.Light.NoActionBar"/>
<activity <activity
android:name=".webAppView" android:name=".webAppView"
android:theme="@style/Theme.Design.Light.NoActionBar" /> android:theme="@style/Theme.Design.Light.NoActionBar" />
......
app/src/main/java/com/example/loginapp1/MainActivity.java
View file @ bef72e56
package com.example.loginapp1; package com.example.loginapp1;
import androidx.appcompat.app.AppCompatActivity;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler;
import android.view.View; import android.view.View;
import android.widget.Button; import android.widget.Button;
import android.widget.ProgressBar;
import android.widget.TextView; import android.widget.TextView;
import java.util.Timer;
import java.util.TimerTask;
public class MainActivity extends AppCompatActivity { import androidx.appcompat.app.AppCompatActivity;
Timer timer;
private ProgressBar mProgressBar; public class MainActivity extends AppCompatActivity {
private TextView mLoadingText;
private int mProgressStatus = 0; TextView privacyStatement;
private Handler mHandler = new Handler(); Button bookMuse, viewMuse, orderingBtn, souvBtn, btn1;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main); setContentView(R.layout.activity_main);
mProgressBar = (ProgressBar) findViewById(R.id.progressBar); btn1 = findViewById(R.id.btn1);
mLoadingText = (TextView) findViewById(R.id.loadCompleteTextView);
privacyStatement = findViewById(R.id.privacyStatement);
bookMuse = findViewById(R.id.bookMuse);
orderingBtn = findViewById(R.id.orderingBtn);
souvBtn = findViewById(R.id.souvBtn);
new Thread(new Runnable() { btn1.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void run() { public void onClick(View v) {
while(mProgressStatus < 5000){ Intent intent = new Intent(MainActivity.this, reycl.class);
mProgressStatus++; startActivity(intent);
android.os.SystemClock.sleep(5000);
mHandler.post(new Runnable() {
@Override
public void run() {
mProgressBar.setProgress(mProgressStatus);
}
});
}
mHandler.post(new Runnable() {
@Override
public void run() {
mLoadingText.setVisibility(View.VISIBLE);
}
});
} }
}).start(); });
// Automatically check to new activity. privacyStatement.setOnClickListener(new View.OnClickListener() {
timer = new Timer(); @Override
timer.schedule(new TimerTask() { public void onClick(View v) {
@Override Intent intent = new Intent(getApplicationContext(), webAppView.class);
public void run() { startActivity(intent);
Intent intent = new Intent(MainActivity.this, menuActivity.class); finish();
startActivity(intent); }
finish(); });
}
}, 5000);
bookMuse.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Intent intent = new Intent(getApplicationContext(), viewingMuse.class);
startActivity(intent);
finish();
}
});
orderingBtn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Intent intent = new Intent(getApplicationContext(), foodOrder.class);
startActivity(intent);
finish();
}
});
souvBtn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Intent intent = new Intent(getApplicationContext(), souvOrder.class);
startActivity(intent);
finish();
}
});
} }
} }
\ No newline at end of file
app/src/main/java/com/example/loginapp1/menuActivity.java
View file @ bef72e56
...@@ -11,7 +11,7 @@ import android.widget.TextView; ...@@ -11,7 +11,7 @@ import android.widget.TextView;
public class menuActivity extends AppCompatActivity { public class menuActivity extends AppCompatActivity {
TextView privacyStatement; TextView privacyStatement;
Button bookMuse, viewMuse, orderingBtn, souvBtn; Button bookMuse, viewMuse, orderingBtn, souvBtn, btn1;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
...@@ -20,9 +20,10 @@ public class menuActivity extends AppCompatActivity { ...@@ -20,9 +20,10 @@ public class menuActivity extends AppCompatActivity {
privacyStatement = findViewById(R.id.privacyStatement); privacyStatement = findViewById(R.id.privacyStatement);
bookMuse = findViewById(R.id.bookMuse); bookMuse = findViewById(R.id.bookMuse);
viewMuse = findViewById(R.id.viewMuse); //viewMuse = findViewById(R.id.viewMuse);
orderingBtn = findViewById(R.id.orderingBtn); orderingBtn = findViewById(R.id.orderingBtn);
souvBtn = findViewById(R.id.souvBtn); souvBtn = findViewById(R.id.souvBtn);
btn1 = findViewById(R.id.btn1);
privacyStatement.setOnClickListener(new View.OnClickListener() { privacyStatement.setOnClickListener(new View.OnClickListener() {
@Override @Override
...@@ -42,11 +43,11 @@ public class menuActivity extends AppCompatActivity { ...@@ -42,11 +43,11 @@ public class menuActivity extends AppCompatActivity {
} }
}); });
viewMuse.setOnClickListener(new View.OnClickListener() { btn1.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
Intent intent = new Intent(getApplicationContext(), viewingMuse.class); Intent ita = new Intent(getApplicationContext(), reclo.class);
startActivity(intent); startActivity(ita);
finish(); finish();
} }
}); });
...@@ -69,7 +70,6 @@ public class menuActivity extends AppCompatActivity { ...@@ -69,7 +70,6 @@ public class menuActivity extends AppCompatActivity {
} }
}); });
// https://www.youtube.com/watch?v=Rb4x4-mT1Bo
} }
} }
\ No newline at end of file
app/src/main/res/layout/activity_main.xml
View file @ bef72e56
...@@ -6,51 +6,120 @@ ...@@ -6,51 +6,120 @@
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".MainActivity"> tools:context=".MainActivity">
<ProgressBar <TextView
android:id="@+id/progressBar" android:id="@+id/privacyStatement"
style="@style/Widget.AppCompat.ProgressBar.Horizontal" android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="10dp" android:layout_marginTop="40dp"
android:text="Privacy Policy Statement."
android:textStyle="italic"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.416" /> app:layout_constraintVertical_bias="0.947"
tools:targetApi="jelly_bean" />
<TextView <TextView
android:id="@+id/loadCompleteTextView" android:id="@+id/textView4"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Load Complete" android:text="World Museums"
android:textSize="20dp"
android:textStyle="italic"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.06"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.476" /> app:layout_constraintVertical_bias="0.178"
tools:text="World Museums" />
<TextView <TextView
android:id="@+id/textView2" android:id="@+id/textView3"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Successful to login!" android:text="Menu"
android:textSize="30dp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintHorizontal_bias="0.498" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintHorizontal_bias="0.047"
app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.526" /> app:layout_constraintVertical_bias="0.099"
tools:text="Menu" />
<TextView
android:id="@+id/textView" <Button
android:id="@+id/souvBtn"
style="@style/Widget.AppCompat.Button.Colored"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:width="250dp"
android:text="Souvenir Shop"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintCircleRadius="50dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.503"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.729" />
<Button
android:id="@+id/orderingBtn"
style="@style/Widget.AppCompat.Button.Colored"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:width="250dp"
android:text="Ordering Food"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintCircleRadius="50dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.496"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.61" />
<Button
android:id="@+id/btn1"
style="@style/Widget.AppCompat.Button.Colored"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:width="250dp"
android:text="View Museums"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintCircleRadius="50dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.503"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.39" />
<!--
<Button
android:id="@+id/btn1"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Please wait!" android:text="Button"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintHorizontal_bias="0.498" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.609" /> app:layout_constraintVertical_bias="0.412" /> -->
<Button
android:id="@+id/bookMuse"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Book a Museum slot"
style="@style/Widget.AppCompat.Button.Colored"
android:width="250dp"
app:layout_constraintCircleRadius="50dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/layout/activity_menu.xml
View file @ bef72e56
...@@ -50,15 +50,6 @@ ...@@ -50,15 +50,6 @@
app:layout_constraintVertical_bias="0.099" app:layout_constraintVertical_bias="0.099"
tools:text="Menu" /> tools:text="Menu" />
<Button
android:id="@+id/button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Button"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<Button <Button
android:id="@+id/souvBtn" android:id="@+id/souvBtn"
...@@ -90,19 +81,37 @@ ...@@ -90,19 +81,37 @@
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.61" /> app:layout_constraintVertical_bias="0.61" />
<!--
<Button <Button
android:id="@+id/viewMuse" android:id="@+id/button"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="View Museums" android:text="Button"
android:width="250dp"
style="@style/Widget.AppCompat.Button.Colored" style="@style/Widget.AppCompat.Button.Colored"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.496"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.386" />
-->
<Button
android:id="@+id/button"
style="@style/Widget.AppCompat.Button.Colored"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:width="250dp" android:width="250dp"
app:layout_constraintCircleRadius="50dp" android:text="View Museums"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintCircleRadius="50dp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.503"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.382" /> app:layout_constraintVertical_bias="0.39" />
<Button <Button
android:id="@+id/bookMuse" android:id="@+id/bookMuse"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment