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 @@
android:supportsRtl="true"
android:theme="@style/Theme.LoginApp1"
android:usesCleartextTraffic="true">
<activity android:name=".foodDetail"></activity>
<activity android:name=".foodOrder" />
<activity android:name=".souvDetail" />
<activity android:name=".souvOrder" />
<activity android:name=".viewingMuse" />
<activity android:name=".bookings" />
<activity android:name=".menuActivity" />
<activity android:name=".reclo"
android:theme="@style/Theme.Design.Light.NoActionBar"></activity>
<activity android:name=".reycl"
android:theme="@style/Theme.Design.Light.NoActionBar"/>
<activity android:name=".foodDetail"
android:theme="@style/Theme.Design.Light.NoActionBar"/>
<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
android:name=".webAppView"
android:theme="@style/Theme.Design.Light.NoActionBar" />
......
app/src/main/java/com/example/loginapp1/MainActivity.java
View file @ bef72e56
package com.example.loginapp1;
import androidx.appcompat.app.AppCompatActivity;
import android.content.Intent;
import android.os.Bundle;
import android.os.Handler;
import android.view.View;
import android.widget.Button;
import android.widget.ProgressBar;
import android.widget.TextView;
import java.util.Timer;
import java.util.TimerTask;
public class MainActivity extends AppCompatActivity {
Timer timer;
import androidx.appcompat.app.AppCompatActivity;
private ProgressBar mProgressBar;
private TextView mLoadingText;
public class MainActivity extends AppCompatActivity {
private int mProgressStatus = 0;
private Handler mHandler = new Handler();
TextView privacyStatement;
Button bookMuse, viewMuse, orderingBtn, souvBtn, btn1;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
mProgressBar = (ProgressBar) findViewById(R.id.progressBar);
mLoadingText = (TextView) findViewById(R.id.loadCompleteTextView);
btn1 = findViewById(R.id.btn1);
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
public void run() {
while(mProgressStatus < 5000){
mProgressStatus++;
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);
}
});
public void onClick(View v) {
Intent intent = new Intent(MainActivity.this, reycl.class);
startActivity(intent);
}
}).start();
});
// Automatically check to new activity.
timer = new Timer();
timer.schedule(new TimerTask() {
@Override
public void run() {
Intent intent = new Intent(MainActivity.this, menuActivity.class);
startActivity(intent);
finish();
}
}, 5000);
privacyStatement.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Intent intent = new Intent(getApplicationContext(), webAppView.class);
startActivity(intent);
finish();
}
});
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;
public class menuActivity extends AppCompatActivity {
TextView privacyStatement;
Button bookMuse, viewMuse, orderingBtn, souvBtn;
Button bookMuse, viewMuse, orderingBtn, souvBtn, btn1;
@Override
protected void onCreate(Bundle savedInstanceState) {
......@@ -20,9 +20,10 @@ public class menuActivity extends AppCompatActivity {
privacyStatement = findViewById(R.id.privacyStatement);
bookMuse = findViewById(R.id.bookMuse);
viewMuse = findViewById(R.id.viewMuse);
//viewMuse = findViewById(R.id.viewMuse);
orderingBtn = findViewById(R.id.orderingBtn);
souvBtn = findViewById(R.id.souvBtn);
btn1 = findViewById(R.id.btn1);
privacyStatement.setOnClickListener(new View.OnClickListener() {
@Override
......@@ -42,11 +43,11 @@ public class menuActivity extends AppCompatActivity {
}
});
viewMuse.setOnClickListener(new View.OnClickListener() {
btn1.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Intent intent = new Intent(getApplicationContext(), viewingMuse.class);
startActivity(intent);
Intent ita = new Intent(getApplicationContext(), reclo.class);
startActivity(ita);
finish();
}
});
......@@ -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 @@
android:layout_height="match_parent"
tools:context=".MainActivity">
<ProgressBar
android:id="@+id/progressBar"
style="@style/Widget.AppCompat.ProgressBar.Horizontal"
android:layout_width="match_parent"
<TextView
android:id="@+id/privacyStatement"
android:layout_width="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_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.416" />
app:layout_constraintVertical_bias="0.947"
tools:targetApi="jelly_bean" />
<TextView
android:id="@+id/loadCompleteTextView"
android:id="@+id/textView4"
android:layout_width="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_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.06"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.476" />
app:layout_constraintVertical_bias="0.178"
tools:text="World Museums" />
<TextView
android:id="@+id/textView2"
android:id="@+id/textView3"
android:layout_width="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_constraintHorizontal_bias="0.498"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.047"
app:layout_constraintStart_toStartOf="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_height="wrap_content"
android:text="Please wait!"
android:text="Button"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintHorizontal_bias="0.498"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="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>
\ No newline at end of file
app/src/main/res/layout/activity_menu.xml
View file @ bef72e56
......@@ -50,15 +50,6 @@
app:layout_constraintVertical_bias="0.099"
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
android:id="@+id/souvBtn"
......@@ -90,19 +81,37 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.61" />
<!--
<Button
android:id="@+id/viewMuse"
android:id="@+id/button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="View Museums"
android:text="Button"
android:width="250dp"
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"
app:layout_constraintCircleRadius="50dp"
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.382" />
app:layout_constraintVertical_bias="0.39" />
<Button
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