diff --git a/.idea/workspace.xml b/.idea/workspace.xml index c1e3f271bd65c3a8f5c47c84b7d05db717aa504d..598fa0fa3c3d2c6b3f722b7d7d8c0ff97c101d85 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -10,12 +10,7 @@ </component> <component name="ChangeListManager"> <list default="true" id="92eeab65-885e-4873-8c3f-1e2cdc70020e" name="Default Changelist" comment=""> - <change beforePath="$PROJECT_DIR$/.gradle/5.1.1/executionHistory/executionHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.1.1/executionHistory/executionHistory.bin" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/.gradle/5.1.1/executionHistory/executionHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.1.1/executionHistory/executionHistory.lock" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/.gradle/5.1.1/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.1.1/fileHashes/fileHashes.bin" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/.gradle/5.1.1/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.1.1/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$/src/main/res/layout/activity_terms.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/res/layout/activity_terms.xml" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/ReportProblem.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/ReportProblem.java" afterDir="false" /> </list> <ignored path="$PROJECT_DIR$/build/generated/not_namespaced_r_class_sources/" /> <ignored path="$PROJECT_DIR$/build/generated/source/r/" /> @@ -132,11 +127,11 @@ <provider editor-type-id="android-designer2" /> </entry> </file> - <file pinned="false" current-in-tab="true"> + <file pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/res/layout/activity_terms.xml"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="270"> - <caret line="19" column="12" lean-forward="true" selection-start-line="18" selection-start-column="4" selection-end-line="20" selection-end-column="40" /> + <caret line="19" column="12" selection-start-line="18" selection-start-column="4" selection-end-line="20" selection-end-column="40" /> <folding> <element signature="e#951#972#0" expanded="true" /> <element signature="e#1532#1547#0" expanded="true" /> @@ -151,6 +146,27 @@ <provider editor-type-id="android-designer2" /> </entry> </file> + <file pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Rating.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="604"> + <caret line="174" column="26" selection-start-line="174" selection-start-column="26" selection-end-line="174" selection-end-column="26" /> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + <file pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/ReportProblem.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="708"> + <caret line="141" column="3" selection-start-line="141" selection-start-column="3" selection-end-line="141" selection-end-column="3" /> + </state> + </provider> + </entry> + </file> <file pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/res/values/strings.xml"> <provider selected="true" editor-type-id="text-editor"> @@ -187,24 +203,6 @@ <provider editor-type-id="android-designer2" /> </entry> </file> - <file pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Driver_Register.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="765"> - <caret line="90" column="16" selection-start-line="90" selection-start-column="16" selection-end-line="91" selection-end-column="37" /> - </state> - </provider> - </entry> - </file> - <file pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Driver_Profile.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="15"> - <caret line="224" selection-start-line="224" selection-end-line="224" /> - </state> - </provider> - </entry> - </file> </leaf> </component> <component name="FileTemplateManagerImpl"> @@ -263,7 +261,6 @@ <option value="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Route.java" /> <option value="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Settings.java" /> <option value="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Driver_Main.java" /> - <option value="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/ReportProblem.java" /> <option value="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Rating.java" /> <option value="$PROJECT_DIR$/src/main/res/layout/activity_driver_register.xml" /> <option value="$PROJECT_DIR$/src/main/res/layout/activity_user_register.xml" /> @@ -274,6 +271,7 @@ <option value="$PROJECT_DIR$/src/main/res/layout/activity_report_problem.xml" /> <option value="$PROJECT_DIR$/src/main/res/values/strings.xml" /> <option value="$PROJECT_DIR$/src/main/res/layout/activity_terms.xml" /> + <option value="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/ReportProblem.java" /> </list> </option> </component> @@ -510,7 +508,7 @@ <layout> <window_info id="Captures" order="0" side_tool="true" weight="0.25" /> <window_info id="Designer" order="1" /> - <window_info content_ui="combo" id="Project" order="2" visible="true" weight="0.32978722" /> + <window_info active="true" content_ui="combo" id="Project" order="2" visible="true" weight="0.32978722" /> <window_info id="Structure" order="3" side_tool="true" /> <window_info id="Build Variants" order="4" side_tool="true" /> <window_info id="Image Layers" order="5" /> @@ -521,7 +519,7 @@ <window_info anchor="bottom" id="TODO" order="1" sideWeight="0.49924013" weight="0.329582" /> <window_info anchor="bottom" id="Android Profiler" order="2" weight="0.329582" /> <window_info anchor="bottom" id="Debug" order="3" /> - <window_info active="true" anchor="bottom" id="Terminal" order="4" visible="true" weight="0.32717043" /> + <window_info anchor="bottom" id="Terminal" order="4" visible="true" weight="0.32717043" /> <window_info anchor="bottom" id="Event Log" order="5" sideWeight="0.10030395" side_tool="true" weight="0.329582" /> <window_info anchor="bottom" id="Find" order="6" weight="0.329582" /> <window_info anchor="bottom" id="Version Control" order="7" /> @@ -658,37 +656,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/ReportProblem.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="798"> - <caret line="145" column="54" selection-start-line="145" selection-start-column="54" selection-end-line="145" selection-end-column="54" /> - <folding> - <element signature="e#3368#5920#0" expanded="true" /> - <element signature="e#5919#5920#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Rating.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="604"> - <caret line="174" column="26" lean-forward="true" selection-start-line="174" selection-start-column="26" selection-end-line="174" selection-end-column="26" /> - <folding> - <element signature="imports" expanded="true" /> - <element signature="e#3918#3931#0" expanded="true" /> - <element signature="e#3932#3946#0" expanded="true" /> - <element signature="e#4185#6739#0" expanded="true" /> - <element signature="e#6738#6739#0" expanded="true" /> - <element signature="e#6789#6790#0" expanded="true" /> - <element signature="e#6821#6822#0" expanded="true" /> - <element signature="e#6865#6866#0" expanded="true" /> - <element signature="e#6898#6899#0" expanded="true" /> - <element signature="e#8196#9755#0" expanded="true" /> - <element signature="e#9754#9755#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/main/res/layout/activity_settings.xml"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="701"> @@ -923,7 +890,7 @@ <entry file="file://$PROJECT_DIR$/src/main/res/layout/activity_terms.xml"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="270"> - <caret line="19" column="12" lean-forward="true" selection-start-line="18" selection-start-column="4" selection-end-line="20" selection-end-column="40" /> + <caret line="19" column="12" selection-start-line="18" selection-start-column="4" selection-end-line="20" selection-end-column="40" /> <folding> <element signature="e#951#972#0" expanded="true" /> <element signature="e#1532#1547#0" expanded="true" /> @@ -937,5 +904,22 @@ </provider> <provider editor-type-id="android-designer2" /> </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Rating.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="604"> + <caret line="174" column="26" selection-start-line="174" selection-start-column="26" selection-end-line="174" selection-end-column="26" /> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/ReportProblem.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="708"> + <caret line="141" column="3" selection-start-line="141" selection-start-column="3" selection-end-line="141" selection-end-column="3" /> + </state> + </provider> + </entry> </component> </project> \ No newline at end of file diff --git a/src/main/java/com/example/liliyayankova/unirides/ReportProblem.java b/src/main/java/com/example/liliyayankova/unirides/ReportProblem.java index db70b78921f30740fb5ae67b16dd396a967afa0c..dc45235f73b35210d1aa31e61d1a16744819b38a 100644 --- a/src/main/java/com/example/liliyayankova/unirides/ReportProblem.java +++ b/src/main/java/com/example/liliyayankova/unirides/ReportProblem.java @@ -139,7 +139,7 @@ public class ReportProblem extends AppCompatActivity { } }); } - +// //Override for the user_toolbar menu items @Override public boolean onCreateOptionsMenu(Menu menu) {