Commit 36a279f7 authored by Jilin Zheng's avatar Jilin Zheng
Browse files

Merge branch 'v1.0_initial_setup_all_screens' of... 

Merge branch 'v1.0_initial_setup_all_screens' of https://agile.bu.edu/gitlab/ec327_projects/group3project

 Conflicts:
	.gradle/7.5/executionHistory/executionHistory.lock
	.gradle/7.5/fileHashes/fileHashes.bin
	.gradle/7.5/fileHashes/fileHashes.lock
	.gradle/buildOutputCleanup/buildOutputCleanup.lock
	.idea/workspace.xml
parents 5e61ee10 b7ad4fcd

.gradle/7.5/fileHashes/fileHashes.bin

−52.4 KiB (73 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

.gradle/7.5/fileHashes/fileHashes.lock

(17 B)

File changed.

No diff preview for this file type.

View original file
View changed file

.idea/workspace.xml

+13 −12
Original line number Diff line number Diff line
@@ -9,12 +9,8 @@ 
    <option name="autoReloadType" value="NONE" />

  </component>

  <component name="ChangeListManager">

    <list default="true" id="8333e8ef-d99f-4734-9d8f-4661acd87ba6" name="Changes" comment="finish seting up all screens">

      <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$/app/src/main/res/values/themes.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/themes.xml" afterDir="false" />

    <list default="true" id="8333e8ef-d99f-4734-9d8f-4661acd87ba6" name="Changes" comment="made game fullscreen">

      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.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" />
@@ -75,6 +71,11 @@ 
    </option>

  </component>

  <component name="Git.Settings">

    <option name="RECENT_BRANCH_BY_REPOSITORY">

      <map>

        <entry key="$PROJECT_DIR$" value="master" />

      </map>

    </option>

    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />

  </component>

  <component name="MarkdownSettingsMigration">
@@ -97,7 +98,7 @@ 
    &quot;android-custom-viewC:/Users/peng_/AppData/Local/Android/Sdk/sources/android-33/android/widget/Button.java_SELECTED&quot;: &quot;Button&quot;,

    &quot;cidr.known.project.marker&quot;: &quot;true&quot;,

    &quot;last_directory_selection&quot;: &quot;C:/Users/Jilin/Desktop/group3project/app/src/main/res/drawable&quot;,

    &quot;last_opened_file_path&quot;: &quot;C:/Users/peng_/AndroidStudioProjects/group3project&quot;,

    &quot;last_opened_file_path&quot;: &quot;C:/Users/peng_/AndroidStudioProjects/PlayboyBunny&quot;,

    &quot;settings.editor.selected.configurable&quot;: &quot;vcs.Git&quot;

  }

}</component>
@@ -199,12 +200,12 @@ 
      <option name="project" value="LOCAL" />

      <updated>1682278774054</updated>

    </task>

    <task id="LOCAL-00003" summary="finish seting up all screens">

      <created>1682361361760</created>

    <task id="LOCAL-00003" summary="made game fullscreen">

      <created>1682396022101</created>

      <option name="number" value="00003" />

      <option name="presentableId" value="LOCAL-00003" />

      <option name="project" value="LOCAL" />

      <updated>1682361361760</updated>

      <updated>1682396022101</updated>

    </task>

    <option name="localTasksCounter" value="4" />

    <servers />
@@ -224,7 +225,7 @@ 
    <MESSAGE value="upload empty project" />

    <MESSAGE value="update issue 6 branch" />

    <MESSAGE value="initial setup of all screens (activities)" />

    <MESSAGE value="finish seting up all screens" />

    <option name="LAST_COMMIT_MESSAGE" value="finish seting up all screens" />

    <MESSAGE value="made game fullscreen" />

    <option name="LAST_COMMIT_MESSAGE" value="made game fullscreen" />

  </component>

</project>
 
 No newline at end of file