Commit 93fbc931 authored by Aric Peng's avatar Aric Peng
Browse files

aric's update

parent c3a449de

.gradle/7.5/fileHashes/fileHashes.bin

+3.71 KiB (129 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

.idea/workspace.xml

+56 −5
Original line number Diff line number Diff line
@@ -9,12 +9,43 @@ 
    <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">

    <list default="true" id="8333e8ef-d99f-4734-9d8f-4661acd87ba6" name="Changes" comment="finish setting up all screens, second push attempt.">

      <change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/aritetrisburg/BasicBlock.java" afterDir="false" />

      <change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/aritetrisburg/Coordinate.java" afterDir="false" />

      <change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/aritetrisburg/DrawView.java" afterDir="false" />

      <change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/aritetrisburg/GameState.java" afterDir="false" />

      <change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/aritetrisburg/MainActivity.java" afterDir="false" />

      <change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/aritetrisburg/Tetramino.java" afterDir="false" />

      <change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/img.png" afterDir="false" />

      <change afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" afterDir="false" />

      <change afterPath="$PROJECT_DIR$/app/src/main/res/raw/song1.mp3" afterDir="false" />

      <change afterPath="$PROJECT_DIR$/app/src/main/res/raw/song2.mp3" afterDir="false" />

      <change afterPath="$PROJECT_DIR$/app/src/main/res/values/ids.xml" afterDir="false" />

      <change beforePath="$PROJECT_DIR$/.gradle/7.5/checksums/checksums.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.5/checksums/checksums.lock" afterDir="false" />

      <change beforePath="$PROJECT_DIR$/.gradle/7.5/dependencies-accessors/dependencies-accessors.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.5/dependencies-accessors/dependencies-accessors.lock" 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/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />

      <change beforePath="$PROJECT_DIR$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" 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/EnterNameScreen.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/aritetrisburg/EnterNameScreen.java" afterDir="false" />

      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/aritetrisburg/GameOverScreen.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/aritetrisburg/GameOverScreen.java" 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/PlayScreen.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/aritetrisburg/PlayScreen.java" afterDir="false" />

      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/aritetrisburg/RulesScreen.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/aritetrisburg/RulesScreen.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/game_over_screen.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/game_over_screen.xml" 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$/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml" afterDir="false" />

      <change beforePath="$PROJECT_DIR$/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml" afterDir="false" />

      <change beforePath="$PROJECT_DIR$/app/src/main/res/mipmap-anydpi-v33/ic_launcher.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/mipmap-anydpi-v33/ic_launcher.xml" afterDir="false" />

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

    </list>

    <option name="SHOW_DIALOG" value="false" />

    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -97,16 +128,25 @@ 
    "cidr.known.project.marker": "true",

    "last_directory_selection": "C:/Users/Jilin/Desktop/group3project/app/src/main/res/drawable",

    "last_opened_file_path": "C:/Users/peng_/AndroidStudioProjects/group3project",

    "project.structure.last.edited": "Modules",

    "project.structure.proportion": "0.17",

    "project.structure.side.proportion": "0.2",

    "settings.editor.selected.configurable": "vcs.Git"

  }

}]]></component>

  <component name="PsdUISettings">

    <option name="MODULE_TAB" value="Default Config" />

  </component>

  <component name="RecentsManager">

    <key name="CreateClassDialog.RecentsKey">

      <recent name="com.example.aritetrisburg" />

    </key>

    <key name="CopyFile.RECENT_KEYS">

      <recent name="C:\Users\Jilin\Desktop\group3project\app\src\main\res\drawable" />

      <recent name="C:\Users\Jilin\Desktop\group3project\app\src\main\res\font" />

      <recent name="C:\Users\peng_\AndroidStudioProjects\group3project\app\src\main\java\com\example\aritetrisburg" />

      <recent name="C:\Users\peng_\AndroidStudioProjects\group3project\app\src\main\java\" />

      <recent name="C:\Users\peng_\AndroidStudioProjects\group3project\app\src\main\java\com\example" />

      <recent name="C:\Users\peng_\AndroidStudioProjects\group3project\app\src\androidTest\java" />

      <recent name="C:\Users\peng_\AndroidStudioProjects\group3project\app\src\main\res" />

    </key>

    <key name="android.template.-851266308">

      <recent name="com.example.aritetrisburg" />
@@ -114,6 +154,9 @@ 
    <key name="android.template.1438731553">

      <recent name="com.example.aritetrisburg" />

    </key>

    <key name="CopyClassDialog.RECENTS_KEY">

      <recent name="com.example.aritetrisburg" />

    </key>

  </component>

  <component name="RunManager">

    <configuration name="app" type="AndroidRunConfigurationType" factoryName="Android App">
@@ -205,7 +248,14 @@ 
      <option name="project" value="LOCAL" />

      <updated>1682361361760</updated>

    </task>

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

    <task id="LOCAL-00004" summary="finish setting up all screens, second push attempt.">

      <created>1682384777399</created>

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

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

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

      <updated>1682384777399</updated>

    </task>

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

    <servers />

  </component>

  <component name="Vcs.Log.Tabs.Properties">
@@ -224,6 +274,7 @@ 
    <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="finish setting up all screens, second push attempt." />

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

  </component>

</project>
 
 No newline at end of file