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

project demo

parent 45a80ce8

.gradle/7.5/fileHashes/fileHashes.bin

+400 B (132 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

.idea/workspace.xml

+21 −10
Original line number Diff line number Diff line
@@ -9,25 +9,21 @@ 
    <option name="autoReloadType" value="NONE" />

  </component>

  <component name="ChangeListManager">

    <list default="true" id="8333e8ef-d99f-4734-9d8f-4661acd87ba6" name="Changes" comment="link MainActivity to EnterNameScreen">

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

      <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.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/app/AriTetrisburg.app.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/java/com/example/aritetrisburg/GameState.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/aritetrisburg/GameState.java" afterDir="false" />

      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/aritetrisburg/MainActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/aritetrisburg/MainActivity.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/settings_screen.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/settings_screen.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" />

    </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\peng_\.android\avd\Pixel_6_Pro_API_33.avd]" />

  <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[C:\Users\Jilin\.android\avd\Nexus_5X_API_30.avd]" />

  <component name="ExternalProjectsData">

    <projectState path="$PROJECT_DIR$">

      <ProjectState />
@@ -82,7 +78,7 @@ 
  <component name="Git.Settings">

    <option name="RECENT_BRANCH_BY_REPOSITORY">

      <map>

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

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

      </map>

    </option>

    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -267,7 +263,21 @@ 
      <option name="project" value="LOCAL" />

      <updated>1682866939808</updated>

    </task>

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

    <task id="LOCAL-00006" summary="project demo">

      <created>1682908321311</created>

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

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

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

      <updated>1682908321311</updated>

    </task>

    <task id="LOCAL-00007" summary="project demo">

      <created>1682908437725</created>

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

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

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

      <updated>1682908437725</updated>

    </task>

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

    <servers />

  </component>

  <component name="Vcs.Log.Tabs.Properties">
@@ -288,6 +298,7 @@ 
    <MESSAGE value="finish seting up all screens" />

    <MESSAGE value="finish setting up all screens, second push attempt." />

    <MESSAGE value="aric's update" />

    <option name="LAST_COMMIT_MESSAGE" value="aric's update" />

    <MESSAGE value="project demo" />

    <option name="LAST_COMMIT_MESSAGE" value="project demo" />

  </component>

</project>
 
 No newline at end of file