Loading .gradle/7.5/executionHistory/executionHistory.lock (17 B) File changed.No diff preview for this file type. View original file View changed file .gradle/7.5/fileHashes/fileHashes.bin −52.2 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 .gradle/buildOutputCleanup/buildOutputCleanup.lock (17 B) File changed.No diff preview for this file type. View original file View changed file .idea/workspace.xml +19 −23 Original line number Diff line number Diff line Loading @@ -9,23 +9,14 @@ <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="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$/.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$/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" /> Loading @@ -33,7 +24,7 @@ <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\Pixel_6_Pro_API_33.avd]" /> <component name="ExternalProjectsData"> <projectState path="$PROJECT_DIR$"> <ProjectState /> Loading Loading @@ -86,6 +77,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"> Loading @@ -100,18 +96,18 @@ <option name="hideEmptyMiddlePackages" value="true" /> <option name="showLibraryContents" value="true" /> </component> <component name="PropertiesComponent"><![CDATA[{ "keyToString": { "RunOnceActivity.OpenProjectViewOnStart": "true", "RunOnceActivity.ShowReadmeOnStart": "true", "RunOnceActivity.cidr.known.project.marker": "true", "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", "settings.editor.selected.configurable": "vcs.Git" <component name="PropertiesComponent">{ "keyToString": { "RunOnceActivity.OpenProjectViewOnStart": "true", "RunOnceActivity.ShowReadmeOnStart": "true", "RunOnceActivity.cidr.known.project.marker": "true", "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", "settings.editor.selected.configurable": "vcs.Git" } }]]></component> }</component> <component name="RecentsManager"> <key name="CreateClassDialog.RecentsKey"> <recent name="com.example.aritetrisburg" /> Loading Loading
.gradle/7.5/executionHistory/executionHistory.lock (17 B) File changed.No diff preview for this file type. View original file View changed file
.gradle/7.5/fileHashes/fileHashes.bin −52.2 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
.gradle/buildOutputCleanup/buildOutputCleanup.lock (17 B) File changed.No diff preview for this file type. View original file View changed file
.idea/workspace.xml +19 −23 Original line number Diff line number Diff line Loading @@ -9,23 +9,14 @@ <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="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$/.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$/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" /> Loading @@ -33,7 +24,7 @@ <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\Pixel_6_Pro_API_33.avd]" /> <component name="ExternalProjectsData"> <projectState path="$PROJECT_DIR$"> <ProjectState /> Loading Loading @@ -86,6 +77,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"> Loading @@ -100,18 +96,18 @@ <option name="hideEmptyMiddlePackages" value="true" /> <option name="showLibraryContents" value="true" /> </component> <component name="PropertiesComponent"><![CDATA[{ "keyToString": { "RunOnceActivity.OpenProjectViewOnStart": "true", "RunOnceActivity.ShowReadmeOnStart": "true", "RunOnceActivity.cidr.known.project.marker": "true", "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", "settings.editor.selected.configurable": "vcs.Git" <component name="PropertiesComponent">{ "keyToString": { "RunOnceActivity.OpenProjectViewOnStart": "true", "RunOnceActivity.ShowReadmeOnStart": "true", "RunOnceActivity.cidr.known.project.marker": "true", "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", "settings.editor.selected.configurable": "vcs.Git" } }]]></component> }</component> <component name="RecentsManager"> <key name="CreateClassDialog.RecentsKey"> <recent name="com.example.aritetrisburg" /> Loading