Commit d8884ca7 authored by Jilin Zheng's avatar Jilin Zheng
Browse files

Merge branch 'revert-b7ad4fcd' into 'v1.0_initial_setup_all_screens' 

Revert "made game fullscreen"

See merge request ec327_projects/group3project!13
parents 36a279f7 6fa1a8bf

.idea/workspace.xml

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

  </component>

  <component name="ChangeListManager">

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

    <list default="true" id="8333e8ef-d99f-4734-9d8f-4661acd87ba6" name="Changes" comment="initial setup of all screens (activities)">

      <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/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/res/values/themes.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/themes.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" />
@@ -200,14 +206,7 @@ 
      <option name="project" value="LOCAL" />

      <updated>1682278774054</updated>

    </task>

    <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>1682396022101</updated>

    </task>

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

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

    <servers />

  </component>

  <component name="Vcs.Log.Tabs.Properties">
@@ -225,7 +224,6 @@ 
    <MESSAGE value="upload empty project" />

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

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

    <MESSAGE value="made game fullscreen" />

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

    <option name="LAST_COMMIT_MESSAGE" value="initial setup of all screens (activities)" />

  </component>

</project>
 
 No newline at end of file