diff --git a/.gradle/7.5/executionHistory/executionHistory.lock b/.gradle/7.5/executionHistory/executionHistory.lock
index be6fda72b33f1f983fddf434f9345b68829f0114..948e71396583bb24884ade6bba068f287d18b477 100644
Binary files a/.gradle/7.5/executionHistory/executionHistory.lock and b/.gradle/7.5/executionHistory/executionHistory.lock differ
diff --git a/.gradle/7.5/fileHashes/fileHashes.bin b/.gradle/7.5/fileHashes/fileHashes.bin
index 8d78973efcca3642c8f076b0a929fe72b35fd6ae..73632a24dcb11946d8df3e22b63ca8cd203dbdcf 100644
Binary files a/.gradle/7.5/fileHashes/fileHashes.bin and b/.gradle/7.5/fileHashes/fileHashes.bin differ
diff --git a/.gradle/7.5/fileHashes/fileHashes.lock b/.gradle/7.5/fileHashes/fileHashes.lock
index 7992f091b16d2dd17a566d39813839233f2716cf..cff769a6ff7e13713b6a0d291d423e87e5113e15 100644
Binary files a/.gradle/7.5/fileHashes/fileHashes.lock and b/.gradle/7.5/fileHashes/fileHashes.lock differ
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 4f66f8a787f4c61cc85076833567d78dad250964..3ed1ff7eee3ccc3ea8fbd59388406f0e76b02e13 100644
Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
index c767b2ff1c8f194efd0bed7e5070dbc12d034ed5..6578dc4a4872b596e766d22a99a8e44e013ea8df 100644
Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index 57b5dbf2c7864f2d728fdc792f5adae6c1ed93e6..f5a2181b171ecbcb083141cc76293f386415ad95 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -7,11 +7,11 @@
<deviceKey>
<Key>
<type value="VIRTUAL_DEVICE_PATH" />
- <value value="C:\Users\Jilin\.android\avd\Nexus_5X_API_30.avd" />
+ <value value="C:\Users\peng_\.android\avd\Pixel_6_Pro_API_33.avd" />
</Key>
</deviceKey>
</Target>
</targetSelectedWithDropDown>
- <timeTargetWasSelectedWithDropDown value="2023-04-21T03:04:20.704744900Z" />
+ <timeTargetWasSelectedWithDropDown value="2023-04-24T18:33:44.406405700Z" />
</component>
</project>
\ No newline at end of file
diff --git a/.idea/modules/app/AriTetrisburg.app.main.iml b/.idea/modules/app/AriTetrisburg.app.main.iml
index b0b2f73b9a0d92e35f5d14ee1c766b2b2a4d088b..30862d793b198d5cebef2858b482f545164a1969 100644
--- a/.idea/modules/app/AriTetrisburg.app.main.iml
+++ b/.idea/modules/app/AriTetrisburg.app.main.iml
@@ -20,6 +20,7 @@
<content url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debug/out" />
<content url="file://$MODULE_DIR$/../../../app/build/generated/ap_generated_sources/debug/out">
<sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
+ <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
</content>
<content url="file://$MODULE_DIR$/../../../app/build/generated/renderscript_source_output_dir/debug/out" />
<content url="file://$MODULE_DIR$/../../../app/build/generated/res/resValues/debug">
@@ -28,6 +29,7 @@
<content url="file://$MODULE_DIR$/../../../app/build/generated/res/rs/debug" />
<content url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/debug">
<sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+ <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
</content>
<content url="file://$MODULE_DIR$/../../../app/src/debug" />
<content url="file://$MODULE_DIR$/../../../app/src/main">
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c5fb1760f2b38091c82009f477d0081d276b68f0..eda48cba9da2e4bd0916cf238fedbcf84ee824ca 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,43 +9,31 @@
<option name="autoReloadType" value="NONE" />
</component>
<component name="ChangeListManager">
- <list default="true" id="8333e8ef-d99f-4734-9d8f-4661acd87ba6" name="Changes" comment="initial setup of all screens (activities)">
- <change afterPath="$PROJECT_DIR$/Credits.md" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/aritetrisburg/GameOverScreen.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/aritetrisburg/HomeScreen.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/aritetrisburg/PlayScreen.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/aritetrisburg/RulesScreen.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/aritetrisburg/ScoreLeaderboardScreen.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/aritetrisburg/SettingsScreen.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/home_screen_ari.png" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/sad_face.png" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/src/main/res/font/dbxlnightfever_normal.TTF" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/src/main/res/layout/game_over_screen.xml" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/src/main/res/layout/home_screen.xml" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/src/main/res/layout/rules_screen.xml" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/src/main/res/layout/score_leaderboard_screen.xml" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/src/main/res/layout/settings_screen.xml" afterDir="false" />
+ <list default="true" id="8333e8ef-d99f-4734-9d8f-4661acd87ba6" name="Changes" comment="update issue 6 branch">
+ <change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/aritetrisburg/EnterNameScreen.java" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/app/src/main/res/layout/enter_name_screen.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/7.5/executionHistory/executionHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.5/executionHistory/executionHistory.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/7.5/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.5/fileHashes/fileHashes.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/7.5/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.5/fileHashes/fileHashes.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/modules/app/AriTetrisburg.app.androidTest.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/app/AriTetrisburg.app.androidTest.iml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/modules/app/AriTetrisburg.app.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/app/AriTetrisburg.app.iml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/deploymentTargetDropDown.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/deploymentTargetDropDown.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/modules/app/AriTetrisburg.app.main.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/app/AriTetrisburg.app.main.iml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/modules/app/AriTetrisburg.app.unitTest.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/app/AriTetrisburg.app.unitTest.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/aritetrisburg/MainActivity.java" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/play_screen.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/res/values/colors.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/colors.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/aritetrisburg/HomeScreen.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/aritetrisburg/HomeScreen.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/aritetrisburg/ScoreLeaderboardScreen.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/aritetrisburg/ScoreLeaderboardScreen.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/aritetrisburg/SettingsScreen.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/aritetrisburg/SettingsScreen.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/score_leaderboard_screen.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/score_leaderboard_screen.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/settings_screen.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/settings_screen.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/local.properties" beforeDir="false" afterPath="$PROJECT_DIR$/local.properties" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
- <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[C:\Users\Jilin\.android\avd\Nexus_5X_API_30.avd]" />
+ <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[C:\Users\peng_\.android\avd\Pixel_6_Pro_API_33.avd]" />
<component name="ExternalProjectsData">
<projectState path="$PROJECT_DIR$">
<ProjectState />
@@ -93,6 +81,7 @@
<option name="RECENT_TEMPLATES">
<list>
<option value="Class" />
+ <option value="layoutResourceFile_vertical" />
</list>
</option>
</component>
@@ -116,9 +105,10 @@
"RunOnceActivity.OpenProjectViewOnStart": "true",
"RunOnceActivity.ShowReadmeOnStart": "true",
"RunOnceActivity.cidr.known.project.marker": "true",
+ "android-custom-viewC:/Users/peng_/AppData/Local/Android/Sdk/sources/android-33/android/widget/Button.java_SELECTED": "Button",
"cidr.known.project.marker": "true",
"last_directory_selection": "C:/Users/Jilin/Desktop/group3project/app/src/main/res/drawable",
- "last_opened_file_path": "C:/Users/Jilin/Desktop/group3project/app/src/main/res/drawable",
+ "last_opened_file_path": "C:/Users/peng_/AndroidStudioProjects/PlayboyBunny",
"settings.editor.selected.configurable": "vcs.Git"
}
}]]></component>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 07277876fed932d22ed094547371fba91122c15c..62a4a20ac1038b46829eb65cedab4429d3b508a4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -26,6 +26,9 @@
<activity
android:name=".PlayScreen"
android:exported="false" />
+ <activity
+ android:name=".EnterNameScreen"
+ android:exported="false" />
<activity
android:name=".HomeScreen"
android:exported="true"
diff --git a/app/src/main/java/com/example/aritetrisburg/EnterNameScreen.java b/app/src/main/java/com/example/aritetrisburg/EnterNameScreen.java
new file mode 100644
index 0000000000000000000000000000000000000000..0bf591112d43e3640b07b0e9537cd1835668f75e
--- /dev/null
+++ b/app/src/main/java/com/example/aritetrisburg/EnterNameScreen.java
@@ -0,0 +1,24 @@
+package com.example.aritetrisburg;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.widget.Button;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+public class EnterNameScreen extends AppCompatActivity {
+ Button toPlayButton;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.enter_name_screen);
+
+ toPlayButton = findViewById(R.id.btnName);
+ toPlayButton.setOnClickListener(v -> {
+ Intent intent = new Intent(EnterNameScreen.this, PlayScreen.class);
+ startActivity(intent);
+ });
+ }
+}
+
diff --git a/app/src/main/java/com/example/aritetrisburg/HomeScreen.java b/app/src/main/java/com/example/aritetrisburg/HomeScreen.java
index 96bca6f4712025d306239600038fd7efa2fc183c..a213176e696b8cfec3e7d939b98c38e85a44df42 100644
--- a/app/src/main/java/com/example/aritetrisburg/HomeScreen.java
+++ b/app/src/main/java/com/example/aritetrisburg/HomeScreen.java
@@ -6,6 +6,8 @@ import android.content.Intent;
import android.os.Bundle;
import android.widget.Button;
+import javax.xml.namespace.NamespaceContext;
+
public class HomeScreen extends AppCompatActivity {
Button toPlayButton, toSettingsButton, toRulesButton, toScoreLeaderBoardButton;
@@ -20,7 +22,7 @@ public class HomeScreen extends AppCompatActivity {
toScoreLeaderBoardButton = (Button) findViewById(R.id.scoreLeaderboardButton);
toPlayButton.setOnClickListener(v -> {
- Intent intent = new Intent(HomeScreen.this, PlayScreen.class);
+ Intent intent = new Intent(HomeScreen.this, EnterNameScreen.class);
startActivity(intent);
});
diff --git a/app/src/main/java/com/example/aritetrisburg/ScoreLeaderboardScreen.java b/app/src/main/java/com/example/aritetrisburg/ScoreLeaderboardScreen.java
index 3d0e2bad4f49ff1e5cc073baa72875ddbc94da7b..549030db1350f0a99609d8d5a48668fcfce36aa5 100644
--- a/app/src/main/java/com/example/aritetrisburg/ScoreLeaderboardScreen.java
+++ b/app/src/main/java/com/example/aritetrisburg/ScoreLeaderboardScreen.java
@@ -2,13 +2,21 @@ package com.example.aritetrisburg;
import androidx.appcompat.app.AppCompatActivity;
+import android.content.Intent;
import android.os.Bundle;
+import android.widget.Button;
public class ScoreLeaderboardScreen extends AppCompatActivity {
-
+ Button toHomeButton;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.score_leaderboard_screen);
+
+ toHomeButton = findViewById(R.id.btnLeaderboard);
+ toHomeButton.setOnClickListener(v -> {
+ Intent intent = new Intent(ScoreLeaderboardScreen.this, HomeScreen.class);
+ startActivity(intent);
+ });
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/aritetrisburg/SettingsScreen.java b/app/src/main/java/com/example/aritetrisburg/SettingsScreen.java
index c3cb54dc1623153ea953afda386e5f42e989d638..63babd1fbe65468d30cdb9fd104cd684734aadee 100644
--- a/app/src/main/java/com/example/aritetrisburg/SettingsScreen.java
+++ b/app/src/main/java/com/example/aritetrisburg/SettingsScreen.java
@@ -2,13 +2,22 @@ package com.example.aritetrisburg;
import androidx.appcompat.app.AppCompatActivity;
+import android.content.Intent;
import android.os.Bundle;
+import android.widget.Button;
public class SettingsScreen extends AppCompatActivity {
+ Button toHomeButton;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.settings_screen);
+
+ toHomeButton = findViewById(R.id.btnSetting);
+ toHomeButton.setOnClickListener(v -> {
+ Intent intent = new Intent(SettingsScreen.this, HomeScreen.class);
+ startActivity(intent);
+ });
}
}
\ No newline at end of file
diff --git a/app/src/main/res/layout/enter_name_screen.xml b/app/src/main/res/layout/enter_name_screen.xml
new file mode 100644
index 0000000000000000000000000000000000000000..13c881ee4a2135a32ecb3e3c30b64e27c48edbfb
--- /dev/null
+++ b/app/src/main/res/layout/enter_name_screen.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@color/peach_background"
+ tools:context=".EnterNameScreen"
+ android:layout_gravity="center">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:fontFamily="@font/dbxlnightfever_normal"
+ android:text="ENTER YOUR NAME"
+ android:textSize="50dp"
+ android:textColor="@color/black"
+ android:layout_marginTop="150dp"
+ android:layout_gravity="center" />
+
+ <EditText
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="name"
+ android:id="@+id/edtTxtName"
+ android:textStyle="italic|bold"
+ android:fontFamily="@font/dbxlnightfever_normal"
+ android:textSize="25dp"
+ android:textColor="@color/black"
+ android:layout_marginLeft="50dp"
+ android:layout_marginRight="50dp"
+ android:layout_marginTop="100dp"/>
+
+ <Button
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/btnName"
+ android:fontFamily="@font/dbxlnightfever_normal"
+ android:text="Start Game"
+ android:textSize="30dp"
+ android:layout_gravity="center"
+ android:layout_marginTop="50dp"
+ android:backgroundTint="@color/lavender_btn"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/score_leaderboard_screen.xml b/app/src/main/res/layout/score_leaderboard_screen.xml
index dc158efd48daab519a7ca171a24cf40680d36fa3..20ec386b8c5e3e5fa2fee664c67faa8d4c9bc543 100644
--- a/app/src/main/res/layout/score_leaderboard_screen.xml
+++ b/app/src/main/res/layout/score_leaderboard_screen.xml
@@ -1,9 +1,132 @@
<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- tools:context=".ScoreLeaderboardScreen">
+ tools:context=".ScoreLeaderboardScreen"
+ android:layout_gravity="center"
+ android:orientation="vertical"
+ android:background="@color/peach_background">
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+ <TextView
+ android:id="@+id/txtLeaderboard"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:fontFamily="@font/dbxlnightfever_normal"
+ android:text="LEADERBOARDS"
+ android:textColor="@color/black"
+ android:textSize="60dp"
+ android:layout_gravity="center"
+ android:layout_marginTop="50dp"/>
+ <RelativeLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="20dp">
+
+ <TextView
+ android:id="@+id/txtPlace"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="Place"
+ android:fontFamily="@font/dbxlnightfever_normal"
+ android:textSize="40dp"
+ android:layout_gravity="left"
+ android:layout_marginLeft="20dp"
+ />
+ <TextView
+ android:id="@+id/txtName"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="Name"
+ android:fontFamily="@font/dbxlnightfever_normal"
+ android:textSize="40dp"
+ android:layout_gravity="left"
+ android:layout_marginLeft="40dp"
+ android:layout_toRightOf="@+id/txtPlace"/>
+ <TextView
+ android:id="@+id/txtScore"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="Score"
+ android:fontFamily="@font/dbxlnightfever_normal"
+ android:textSize="40dp"
+ android:layout_gravity="left"
+ android:layout_marginLeft="40dp"
+ android:layout_toRightOf="@id/txtName"/>
+ </RelativeLayout>
+
+ <TextView
+ android:id="@+id/txtFirstPlace"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:fontFamily="@font/dbxlnightfever_normal"
+ android:text="1. "
+ android:textColor="@color/black"
+ android:textSize="50dp"
+ android:layout_gravity="left"
+ android:layout_marginLeft="50dp"
+ android:layout_marginTop="20dp"/>
+
+ <TextView
+ android:id="@+id/txtSecondPlace"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:fontFamily="@font/dbxlnightfever_normal"
+ android:text="2. "
+ android:textColor="@color/black"
+ android:textSize="50dp"
+ android:layout_gravity="left"
+ android:layout_marginLeft="50dp"
+ android:layout_marginTop="20dp"/>
+
+ <TextView
+ android:id="@+id/txtThirdPlace"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:fontFamily="@font/dbxlnightfever_normal"
+ android:text="3. "
+ android:textColor="@color/black"
+ android:textSize="50dp"
+ android:layout_gravity="left"
+ android:layout_marginLeft="50dp"
+ android:layout_marginTop="20dp"/>
+
+ <TextView
+ android:id="@+id/txtFourthPlace"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:fontFamily="@font/dbxlnightfever_normal"
+ android:text="4. "
+ android:textColor="@color/black"
+ android:textSize="50dp"
+ android:layout_gravity="left"
+ android:layout_marginLeft="50dp"
+ android:layout_marginTop="20dp"/>
+
+ <TextView
+ android:id="@+id/txtFithPlace"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:fontFamily="@font/dbxlnightfever_normal"
+ android:text="5. "
+ android:textColor="@color/black"
+ android:textSize="50dp"
+ android:layout_gravity="left"
+ android:layout_marginLeft="50dp"
+ android:layout_marginTop="20dp"/>
+
+ <Button
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/btnLeaderboard"
+ android:fontFamily="@font/dbxlnightfever_normal"
+ android:text="Return to home"
+ android:textSize="30dp"
+ android:layout_gravity="center"
+ android:layout_marginTop="50dp"
+ android:backgroundTint="@color/lavender_btn"/>
+
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/settings_screen.xml b/app/src/main/res/layout/settings_screen.xml
index 91b39467f0db052af4e30e5807dc6bbc55592b2e..68bc7352dd18498b4fd476e4c6f6ebf3d1e2174b 100644
--- a/app/src/main/res/layout/settings_screen.xml
+++ b/app/src/main/res/layout/settings_screen.xml
@@ -1,9 +1,129 @@
<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- tools:context=".SettingsScreen">
+ tools:context=".SettingsScreen"
+ android:background="@color/peach_background"
+ android:layout_gravity="center"
+ android:orientation="vertical">
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="In Game Settings"
+ android:fontFamily="@font/dbxlnightfever_normal"
+ android:textSize="50dp"
+ android:textColor="@color/black"
+ android:layout_gravity="center"
+ android:layout_marginTop="50dp"/>
+
+ <RelativeLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:layout_marginTop="20dp">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="Speed adjuster"
+ android:fontFamily="@font/dbxlnightfever_normal"
+ android:textColor="@color/black"
+ android:textSize="25dp"
+ android:layout_marginTop="20dp"
+ android:layout_marginLeft="20dp"
+ android:id="@+id/txtSpeed"/>
+
+ <SeekBar
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignBottom="@+id/txtSpeed"
+ android:layout_alignParentEnd="true"
+ android:layout_marginStart="20dp"
+ android:layout_marginEnd="20dp"
+ android:layout_marginTop="0dp"
+ android:layout_marginBottom="0dp"
+ android:layout_toEndOf="@+id/txtSpeed"
+ android:layout_toRightOf="@+id/txtSpeed"
+ android:id="@+id/seekSpeed"
+ android:thumbTint="@color/lavender_btn"/>
+ </RelativeLayout>
+ <RelativeLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content">
+ <TextView
+ android:id="@+id/txtSpeed1x"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="1.0X"
+ android:layout_marginLeft="200dp"/>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="2.0X"
+ android:layout_toRightOf="@+id/txtSpeed1x"
+ android:layout_marginLeft="120dp"/>
+ </RelativeLayout>
+
+
+ <RelativeLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="Point multiplier"
+ android:fontFamily="@font/dbxlnightfever_normal"
+ android:textColor="@color/black"
+ android:textSize="24dp"
+ android:layout_marginTop="20dp"
+ android:layout_marginLeft="20dp"
+ android:id="@+id/txtPoint"/>
+
+ <SeekBar
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignBottom="@+id/txtPoint"
+ android:layout_alignParentEnd="true"
+ android:layout_marginStart="20dp"
+ android:layout_marginEnd="20dp"
+ android:layout_marginTop="0dp"
+ android:layout_marginBottom="0dp"
+ android:layout_toEndOf="@+id/txtPoint"
+ android:layout_toRightOf="@+id/txtPoint"
+ android:id="@+id/seekPoint"
+ android:thumbTint="@color/lavender_btn"/>
+ </RelativeLayout>
+ <RelativeLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content">
+ <TextView
+ android:id="@+id/txtPoint1x"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="1.0X"
+ android:layout_marginLeft="200dp"/>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="2.0X"
+ android:layout_toRightOf="@+id/txtPoint1x"
+ android:layout_marginLeft="120dp"/>
+ </RelativeLayout>
+
+ <Button
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/btnSetting"
+ android:fontFamily="@font/dbxlnightfever_normal"
+ android:text="Return to home"
+ android:textSize="30dp"
+ android:layout_gravity="center"
+ android:layout_marginTop="50dp"
+ android:backgroundTint="@color/lavender_btn"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/local.properties b/local.properties
index 542bc490860d093cf6f4e0917ec5860f6327e0d4..aa07b029339394813c3da6826733fe909b679ba7 100644
--- a/local.properties
+++ b/local.properties
@@ -1,10 +1,8 @@
-## This file is automatically generated by Android Studio.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file should *NOT* be checked into Version Control Systems,
+## This file must *NOT* be checked into Version Control Systems,
# as it contains information specific to your local configuration.
#
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
-sdk.dir=C\:\\Users\\Jilin\\AppData\\Local\\Android\\Sdk
\ No newline at end of file
+#Mon Apr 24 02:03:06 EDT 2023
+sdk.dir=C\:\\Users\\peng_\\AppData\\Local\\Android\\Sdk