diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6df352b..4e7ca1c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -10,7 +10,7 @@ android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" - android:theme="@style/Theme.AppCompat.Light.NoActionBar" + android:theme="@style/Theme.AppCompat.DayNight.NoActionBar" tools:targetApi="31" > { - button1.setEnabled(false); - button2.setEnabled(true); - }); + LinearLayout buttonContents = dialogBase.findViewById(R.id.button_contents); + addButtons(buttonContents); + + FrameLayout dialogContents = dialogBase.findViewById(R.id.dialog_contents); + setDialogContents(dialogContents); + } + + private void setDialogContents(FrameLayout dialogContents){ + LinearLayout contents = (LinearLayout) getLayoutInflater().inflate(R.layout.dialog_room_select, dialogContents, false); - button2.setOnClickListener(v->{ - button1.setEnabled(true); - button2.setEnabled(false); + dialogContents.addView(contents); + } + + private void addButtons(LinearLayout buttonContents) { + + SmallButton findButton = new SmallButton(this); + findButton.setText("FIND"); + findButton.setEnabled(true); + findButton.setOnClickListener(v -> { + Toast toast = Toast.makeText(getApplicationContext(), "Finding Room...", Toast.LENGTH_SHORT); + toast.show(); }); + + buttonContents.addView(findButton); } } \ No newline at end of file diff --git a/app/src/main/res/drawable/add_ic.png b/app/src/main/res/drawable/add_ic.png new file mode 100644 index 0000000..70d006c Binary files /dev/null and b/app/src/main/res/drawable/add_ic.png differ diff --git a/app/src/main/res/drawable/create_map_background.png b/app/src/main/res/drawable/create_map_background.png new file mode 100644 index 0000000..87698fc Binary files /dev/null and b/app/src/main/res/drawable/create_map_background.png differ diff --git a/app/src/main/res/drawable/dark_yellow_button.xml b/app/src/main/res/drawable/dark_yellow_button.xml deleted file mode 100644 index 58fa14f..0000000 --- a/app/src/main/res/drawable/dark_yellow_button.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/gray_button.xml b/app/src/main/res/drawable/gray_button.xml deleted file mode 100644 index cb57d07..0000000 --- a/app/src/main/res/drawable/gray_button.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/light_black_button.xml b/app/src/main/res/drawable/light_black_button.xml deleted file mode 100644 index df5f4a2..0000000 --- a/app/src/main/res/drawable/light_black_button.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/light_brown_button.xml b/app/src/main/res/drawable/light_brown_button.xml deleted file mode 100644 index d270922..0000000 --- a/app/src/main/res/drawable/light_brown_button.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/light_green_button.xml b/app/src/main/res/drawable/light_green_button.xml deleted file mode 100644 index 8897e3c..0000000 --- a/app/src/main/res/drawable/light_green_button.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/light_yellow_button.xml b/app/src/main/res/drawable/light_yellow_button.xml deleted file mode 100644 index 410d957..0000000 --- a/app/src/main/res/drawable/light_yellow_button.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/mid_green_button.xml b/app/src/main/res/drawable/mid_green_button.xml deleted file mode 100644 index 2844ddf..0000000 --- a/app/src/main/res/drawable/mid_green_button.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/white_frame.xml b/app/src/main/res/drawable/white_frame_low.xml similarity index 100% rename from app/src/main/res/drawable/white_frame.xml rename to app/src/main/res/drawable/white_frame_low.xml diff --git a/app/src/main/res/drawable/white_frame_mid.xml b/app/src/main/res/drawable/white_frame_mid.xml new file mode 100644 index 0000000..f133bac --- /dev/null +++ b/app/src/main/res/drawable/white_frame_mid.xml @@ -0,0 +1,11 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_create_map.xml b/app/src/main/res/layout/activity_create_map.xml index 06b49c9..5be49d5 100644 --- a/app/src/main/res/layout/activity_create_map.xml +++ b/app/src/main/res/layout/activity_create_map.xml @@ -1,9 +1,43 @@ - + android:background="@color/titleBackgroundColor" + tools:context=".title.StartTitle"> - \ No newline at end of file + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_lobby.xml b/app/src/main/res/layout/activity_lobby.xml index e057a79..419234c 100644 --- a/app/src/main/res/layout/activity_lobby.xml +++ b/app/src/main/res/layout/activity_lobby.xml @@ -1,7 +1,7 @@ - @@ -13,39 +13,82 @@ android:scaleType="centerCrop" android:src="@drawable/lobby_background_no_animation" /> - + android:gravity="center"> + android:textSize="65sp" + app:layout_constraintTop_toTopOf="parent" /> - - - + + + android:stretchColumns="0,1" + android:visibility="visible" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintTop_toBottomOf="@+id/dialog_base"> + + + + + + + + + + + + + + + + + + + - + diff --git a/app/src/main/res/layout/dialog_base.xml b/app/src/main/res/layout/dialog_base.xml new file mode 100644 index 0000000..fe08cf6 --- /dev/null +++ b/app/src/main/res/layout/dialog_base.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_room_select.xml b/app/src/main/res/layout/dialog_room_select.xml new file mode 100644 index 0000000..8f0a36d --- /dev/null +++ b/app/src/main/res/layout/dialog_room_select.xml @@ -0,0 +1,27 @@ + + + +