diff --git a/.gradle/2.8/taskArtifacts/cache.properties.lock b/.gradle/2.8/taskArtifacts/cache.properties.lock index f72e97d76a43bdfe7e712238b1fdee4005713722..eceda2c7f4883ce979405799a62e6470090dffb1 100644 Binary files a/.gradle/2.8/taskArtifacts/cache.properties.lock and b/.gradle/2.8/taskArtifacts/cache.properties.lock differ diff --git a/.gradle/2.8/taskArtifacts/fileHashes.bin b/.gradle/2.8/taskArtifacts/fileHashes.bin index 67a286f899524c5ecb0ee7da8fad6d78fa44fc31..5eff48063c763f7807e120dea4101e90ba0d832e 100644 Binary files a/.gradle/2.8/taskArtifacts/fileHashes.bin and b/.gradle/2.8/taskArtifacts/fileHashes.bin differ diff --git a/.gradle/2.8/taskArtifacts/fileSnapshots.bin b/.gradle/2.8/taskArtifacts/fileSnapshots.bin index c4a7ca8204fbc6b96ff834c49552d1b95f9c3fee..39a17ed17d443adcf715d43cc4e5f74fe18263d5 100644 Binary files a/.gradle/2.8/taskArtifacts/fileSnapshots.bin and b/.gradle/2.8/taskArtifacts/fileSnapshots.bin differ diff --git a/.gradle/2.8/taskArtifacts/outputFileStates.bin b/.gradle/2.8/taskArtifacts/outputFileStates.bin index d357fd664cc07867466fe658c5bcbfb4e2819f13..56462431b6920778e2b80dd1e7eb60b333423f37 100644 Binary files a/.gradle/2.8/taskArtifacts/outputFileStates.bin and b/.gradle/2.8/taskArtifacts/outputFileStates.bin differ diff --git a/.gradle/2.8/taskArtifacts/taskArtifacts.bin b/.gradle/2.8/taskArtifacts/taskArtifacts.bin index 99218b3e90068009e51f23a4b61ae12777ffae63..e07af30bfe21be418e53ced84778fdd7dde7c9d3 100644 Binary files a/.gradle/2.8/taskArtifacts/taskArtifacts.bin and b/.gradle/2.8/taskArtifacts/taskArtifacts.bin differ diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 3b640de03220b2bc74825589331791c8e3eb5619..775c63ef603d732700117ac6086b2b80d27cb601 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -42,7 +42,7 @@ <file leaf-file-name="AndroidManifest.xml" pinned="false" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.30981067"> + <state vertical-scroll-proportion="0.20477815"> <caret line="10" column="0" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" /> <folding /> </state> @@ -51,15 +51,15 @@ </file> <file leaf-file-name="activity_main.xml" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml"> + <provider editor-type-id="android-designer"> + <state /> + </provider> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" /> <folding /> </state> </provider> - <provider editor-type-id="android-designer"> - <state /> - </provider> </entry> </file> <file leaf-file-name="MainActivity.java" pinned="false" current-in-tab="false"> @@ -124,6 +124,10 @@ </file> </leaf> </component> + <component name="GenerateSignedApkSettings"> + <option name="KEY_STORE_PATH" value="$USER_HOME$/.AndroidStudio1.5/key.jks" /> + <option name="KEY_ALIAS" value="chiave1" /> + </component> <component name="GradleLocalSettings"> <option name="availableProjects"> <map> @@ -1704,9 +1708,7 @@ <sortByType /> </navigator> <panes> - <pane id="Scope" /> <pane id="ProjectPane" /> - <pane id="Scratches" /> <pane id="AndroidView"> <subPane> <PATH> @@ -1814,6 +1816,8 @@ </subPane> </pane> <pane id="PackagesPane" /> + <pane id="Scope" /> + <pane id="Scratches" /> </panes> </component> <component name="PropertiesComponent"> @@ -1824,6 +1828,9 @@ <property name="FullScreen" value="false" /> <property name="last_opened_file_path" value="$PROJECT_DIR$/../ICEcons - Yellow" /> <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_AVD" value="Nexus_5_API_23_2" /> + <property name="ExportApk.ApkPath" value="$PROJECT_DIR$/app" /> + <property name="ExportApk.Flavors" value="" /> + <property name="ExportApk.BuildType" value="release" /> </component> <component name="RunManager" selected="Android Application.app"> <configuration default="true" type="AndroidNativeRunConfigurationType" factoryName="Android Native"> @@ -2047,7 +2054,7 @@ </todo-panel> </component> <component name="ToolWindowManager"> - <frame x="0" y="0" width="1920" height="1047" extended-state="6" /> + <frame x="0" y="0" width="1920" height="1047" extended-state="7" /> <editor active="false" /> <layout> <window_info id="Palette	" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> @@ -2055,7 +2062,7 @@ <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3289183" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Android Model" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" /> <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> - <window_info id="Android Monitor" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3289183" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> + <window_info id="Android Monitor" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3289183" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Captures" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> @@ -2101,21 +2108,96 @@ <entry file="file://$PROJECT_DIR$/app/src/main/res/xml/appfilter.xml"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> - <caret line="264" column="94" selection-start-line="264" selection-start-column="94" selection-end-line="264" selection-end-column="94" /> + <caret line="355" column="85" selection-start-line="355" selection-start-column="85" selection-end-line="355" selection-end-column="85" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="10" column="0" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" /> <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml"> + <provider editor-type-id="android-designer"> + <state /> + </provider> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" /> <folding /> </state> </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/MainActivity.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="22" column="0" selection-start-line="22" selection-start-column="0" selection-end-line="22" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/src/main/res/values/strings.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/src/main/res/values/styles.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="5" column="53" selection-start-line="5" selection-start-column="53" selection-end-line="5" selection-end-column="53" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/src/main/res/values/colors.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="6" column="0" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/src/main/res/xml/drawable.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="109" column="21" selection-start-line="109" selection-start-column="21" selection-end-line="109" selection-end-column="21" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/src/main/res/values/iconpack.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="108" column="15" selection-start-line="108" selection-start-column="15" selection-end-line="108" selection-end-column="15" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/src/main/res/xml/appfilter.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="264" column="94" selection-start-line="264" selection-start-column="94" selection-end-line="264" selection-end-column="94" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml"> <provider editor-type-id="android-designer"> <state /> </provider> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" /> + <folding /> + </state> + </provider> </entry> <entry file="file://$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/MainActivity.java"> <provider selected="true" editor-type-id="text-editor"> @@ -2174,15 +2256,15 @@ </provider> </entry> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml"> + <provider editor-type-id="android-designer"> + <state /> + </provider> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" /> <folding /> </state> </provider> - <provider editor-type-id="android-designer"> - <state /> - </provider> </entry> <entry file="file://$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/MainActivity.java"> <provider selected="true" editor-type-id="text-editor"> @@ -2317,15 +2399,15 @@ </provider> </entry> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml"> + <provider editor-type-id="android-designer"> + <state /> + </provider> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" /> <folding /> </state> </provider> - <provider editor-type-id="android-designer"> - <state /> - </provider> </entry> <entry file="file://$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/MainActivity.java"> <provider selected="true" editor-type-id="text-editor"> @@ -2369,7 +2451,7 @@ </entry> <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.30981067"> + <state vertical-scroll-proportion="0.20477815"> <caret line="10" column="0" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" /> <folding /> </state> diff --git a/build/intermediates/dex-cache/cache.xml b/build/intermediates/dex-cache/cache.xml index fba8db89fe63019a522cb871f7d4ffd430d79e79..faadf418c794036cfbcb9aca6645545b3b63a059 100644 --- a/build/intermediates/dex-cache/cache.xml +++ b/build/intermediates/dex-cache/cache.xml @@ -1,2 +1,33 @@ <?xml version="1.0" encoding="utf-8"?> -<items version="2" /> +<items version="2" > + + <item + jar="/home/riccardo/Documents/ICEcons/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.1/jars/classes.jar" + jumboMode="false" + revision="23.0.2" + sha1="5c5699834e9722f1c288fea2de82725d078ba127"> + <dex dex="/home/riccardo/Documents/ICEcons/app/build/intermediates/pre-dexed/release/com.android.support-appcompat-v7-23.1.1_8da176bd4ea84d4e391e2d3eb62a55aaf7cb36d7.jar" /> + </item> + <item + jar="/home/riccardo/.androidsdk/Sdk/extras/android/m2repository/com/android/support/support-annotations/23.1.1/support-annotations-23.1.1.jar" + jumboMode="false" + revision="23.0.2" + sha1="8d680ba5a623724d1fb0e81c36a790f023a6cede"> + <dex dex="/home/riccardo/Documents/ICEcons/app/build/intermediates/pre-dexed/release/support-annotations-23.1.1_c4e7ad89ca55dd9a7164e390b19a80d280c39194.jar" /> + </item> + <item + jar="/home/riccardo/Documents/ICEcons/app/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars/libs/internal_impl-23.1.1.jar" + jumboMode="false" + revision="23.0.2" + sha1="a4de9c81ae239414e1ed0f86441b02abaf29bca9"> + <dex dex="/home/riccardo/Documents/ICEcons/app/build/intermediates/pre-dexed/release/internal_impl-23.1.1_b7fc3c933320b556eb72f9f530dd63533f51bd6c.jar" /> + </item> + <item + jar="/home/riccardo/Documents/ICEcons/app/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars/classes.jar" + jumboMode="false" + revision="23.0.2" + sha1="6cbc7773921fcfedbe55657578f0cbfe614778dc"> + <dex dex="/home/riccardo/Documents/ICEcons/app/build/intermediates/pre-dexed/release/com.android.support-support-v4-23.1.1_57c62fc22500dbcacde544092e6aeb4a98b76c7c.jar" /> + </item> + +</items> diff --git a/screenshots/screenshots.png b/screenshots/screenshots.png new file mode 100644 index 0000000000000000000000000000000000000000..110b02a27b0041cfd8b45d22018117dc89a6e05d Binary files /dev/null and b/screenshots/screenshots.png differ