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

arics update pt 2

parent a144c2c1

.gradle/7.5/fileHashes/fileHashes.bin

+1000 B (130 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

.idea/workspace.xml

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

  </component>

  <component name="ChangeListManager">

    <list default="true" id="8333e8ef-d99f-4734-9d8f-4661acd87ba6" name="Changes" comment="aric's update" />

    <list default="true" id="8333e8ef-d99f-4734-9d8f-4661acd87ba6" name="Changes" comment="aric's update">

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

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

  <component name="ExternalProjectsData">

    <projectState path="$PROJECT_DIR$">

      <ProjectState />
@@ -82,21 +85,21 @@ 
    <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/group3project",

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

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

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

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

  <component name="PropertiesComponent">{

  &quot;keyToString&quot;: {

    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,

    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,

    &quot;RunOnceActivity.cidr.known.project.marker&quot;: &quot;true&quot;,

    &quot;android-custom-viewC:/Users/peng_/AppData/Local/Android/Sdk/sources/android-33/android/widget/Button.java_SELECTED&quot;: &quot;Button&quot;,

    &quot;cidr.known.project.marker&quot;: &quot;true&quot;,

    &quot;last_directory_selection&quot;: &quot;C:/Users/Jilin/Desktop/group3project/app/src/main/res/drawable&quot;,

    &quot;last_opened_file_path&quot;: &quot;C:/Users/peng_/AndroidStudioProjects/group3project&quot;,

    &quot;project.structure.last.edited&quot;: &quot;Modules&quot;,

    &quot;project.structure.proportion&quot;: &quot;0.17&quot;,

    &quot;project.structure.side.proportion&quot;: &quot;0.2&quot;,

    &quot;settings.editor.selected.configurable&quot;: &quot;vcs.Git&quot;

  }

}]]></component>

}</component>

  <component name="PsdUISettings">

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

  </component>