Commit c3a449de authored by Aric Peng's avatar Aric Peng
Browse files

finish setting up all screens, second push attempt.

parent 235fe3bf

.gradle/7.5/fileHashes/fileHashes.bin

(125 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

.idea/workspace.xml

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

  </component>

  <component name="ChangeListManager">

    <list default="true" id="8333e8ef-d99f-4734-9d8f-4661acd87ba6" name="Changes" comment="update issue 6 branch">

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

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

    <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$/.gradle/buildOutputCleanup/outputFiles.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" afterDir="false" />

      <change beforePath="$PROJECT_DIR$/.idea/deploymentTargetDropDown.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/deploymentTargetDropDown.xml" afterDir="false" />

      <change beforePath="$PROJECT_DIR$/.idea/modules/app/AriTetrisburg.app.main.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/app/AriTetrisburg.app.main.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/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/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/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/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$/local.properties" beforeDir="false" afterPath="$PROJECT_DIR$/local.properties" afterDir="false" />

    </list>

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

    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -108,7 +96,7 @@ 
    "android-custom-viewC:/Users/peng_/AppData/Local/Android/Sdk/sources/android-33/android/widget/Button.java_SELECTED": "Button",

    "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/PlayboyBunny",

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

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

  }

}]]></component>
@@ -210,7 +198,14 @@ 
      <option name="project" value="LOCAL" />

      <updated>1682278774054</updated>

    </task>

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

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

      <created>1682361361760</created>

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

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

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

      <updated>1682361361760</updated>

    </task>

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

    <servers />

  </component>

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

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

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

    <option name="LAST_COMMIT_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" />

  </component>

</project>
 
 No newline at end of file