diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c521f3d2ddf7053eae527cea6e0e516b1259bdd7..5b48cb8b1175a640e63917e399c30f61d5613ba7 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -10,18 +10,22 @@
</component>
<component name="ChangeListManager">
<list default="true" id="465ea6dc-8a6c-4c2f-9b3c-de0cba274c5a" name="Default" comment="">
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/WallpaperActivity.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/WallpaperSetActivity.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_wallpaper.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_wallpaper_set.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/res/xml/theme_wallpapers.xml" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_wallpaper.xml" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_wallpaper_set.xml" afterPath="" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/drawable-nodpi/bush_thumb.jpg" afterPath="$PROJECT_DIR$/app/src/main/res/drawable-nodpi/bush_thumb.jpg" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/drawable-nodpi/clovers_thumb.jpg" afterPath="$PROJECT_DIR$/app/src/main/res/drawable-nodpi/clovers_thumb.jpg" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/drawable-nodpi/daisy_thumb.jpg" afterPath="$PROJECT_DIR$/app/src/main/res/drawable-nodpi/daisy_thumb.jpg" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/drawable-nodpi/ivy_thumb.jpg" afterPath="$PROJECT_DIR$/app/src/main/res/drawable-nodpi/ivy_thumb.jpg" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/drawable-nodpi/rock_thumb.jpg" afterPath="$PROJECT_DIR$/app/src/main/res/drawable-nodpi/rock_thumb.jpg" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/drawable-nodpi/wall_thumb.jpg" afterPath="$PROJECT_DIR$/app/src/main/res/drawable-nodpi/wall_thumb.jpg" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/app.iml" afterPath="$PROJECT_DIR$/app/app.iml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" afterPath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/MainActivity.java" afterPath="$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/MainActivity.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/values/colors.xml" afterPath="$PROJECT_DIR$/app/src/main/res/values/colors.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/intermediates/dex-cache/cache.xml" afterPath="$PROJECT_DIR$/build/intermediates/dex-cache/cache.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/WallpaperActivity.java" afterPath="$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/WallpaperActivity.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/WallpaperSetActivity.java" afterPath="$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/WallpaperSetActivity.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/values/styles.xml" afterPath="$PROJECT_DIR$/app/src/main/res/values/styles.xml" />
</list>
<ignored path="ICEcons.iws" />
<ignored path=".idea/workspace.xml" />
@@ -49,93 +53,60 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
- <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 selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-0.3272727">
- <caret line="1" column="18" selection-start-line="1" selection-start-column="18" selection-end-line="1" selection-end-column="18" />
- <folding>
- <element signature="e#270#303#0" expanded="true" />
- <element signature="e#328#363#0" expanded="true" />
- <element signature="e#389#424#0" expanded="true" />
- <element signature="e#448#481#0" expanded="true" />
- </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">
<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="28" column="0" selection-start-line="28" selection-start-column="0" selection-end-line="28" selection-end-column="0" />
+ <caret line="33" column="71" selection-start-line="33" selection-start-column="71" selection-end-line="34" selection-end-column="47" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="activity_wallpaper.xml" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_wallpaper.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-4.2545457">
- <caret line="13" column="57" selection-start-line="13" selection-start-column="57" selection-end-line="13" selection-end-column="57" />
- <folding />
- </state>
- </provider>
- <provider editor-type-id="android-designer">
- <state />
- </provider>
- </entry>
- </file>
- <file leaf-file-name="WallpaperActivity.java" pinned="false" current-in-tab="true">
+ <file leaf-file-name="WallpaperActivity.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/WallpaperActivity.java">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="1.3846154">
- <caret line="95" column="64" selection-start-line="95" selection-start-column="64" selection-end-line="95" selection-end-column="64" />
+ <state vertical-scroll-proportion="0.0">
+ <caret line="40" column="108" selection-start-line="40" selection-start-column="12" selection-end-line="40" selection-end-column="108" />
<folding>
- <element signature="e#2620#2819#0" expanded="true" />
- <element signature="e#2818#2819#0" expanded="true" />
- <element signature="e#3350#3549#0" expanded="true" />
- <element signature="e#3548#3549#0" expanded="true" />
+ <element signature="e#3437#3638#0" expanded="true" />
+ <element signature="e#3637#3638#0" expanded="true" />
+ <element signature="e#4180#4381#0" expanded="true" />
+ <element signature="e#4380#4381#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="activity_wallpaper_set.xml" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_wallpaper_set.xml">
+ <file leaf-file-name="WallpaperSetActivity.java" pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/WallpaperSetActivity.java">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-3.6">
- <caret line="11" column="14" selection-start-line="11" selection-start-column="14" selection-end-line="11" selection-end-column="14" />
- <folding />
+ <state vertical-scroll-proportion="0.14900662">
+ <caret line="5" column="37" selection-start-line="5" selection-start-column="37" selection-end-line="5" selection-end-column="37" />
+ <folding>
+ <element signature="e#3056#3200#0" expanded="true" />
+ <element signature="e#3199#3200#0" expanded="true" />
+ </folding>
</state>
</provider>
- <provider editor-type-id="android-designer">
- <state />
- </provider>
</entry>
</file>
- <file leaf-file-name="WallpaperSetActivity.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/WallpaperSetActivity.java">
+ <file leaf-file-name="AndroidManifest.xml" pinned="false" current-in-tab="false">
+ <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="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
+ <state vertical-scroll-proportion="-6.6666665">
+ <caret line="10" column="40" selection-start-line="10" selection-start-column="40" selection-end-line="10" selection-end-column="40" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="AndroidManifest.xml" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
+ <file leaf-file-name="colors.xml" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/app/src/main/res/values/colors.xml">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-2.6666667">
- <caret line="4" column="71" selection-start-line="4" selection-start-column="71" selection-end-line="4" selection-end-column="71" />
- <folding>
- <element signature="e#330#348#0" expanded="true" />
- </folding>
+ <state vertical-scroll-proportion="-1.3333334">
+ <caret line="2" column="38" selection-start-line="2" selection-start-column="38" selection-end-line="2" selection-end-column="38" />
+ <folding />
</state>
</provider>
</entry>
@@ -143,7 +114,7 @@
<file leaf-file-name="appfilter.xml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/res/xml/appfilter.xml">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-17.703703">
+ <state vertical-scroll-proportion="-5.5185184">
<caret line="472" column="107" selection-start-line="472" selection-start-column="107" selection-end-line="472" selection-end-column="107" />
<folding />
</state>
@@ -166,6 +137,7 @@
<option name="RECENT_TEMPLATES">
<list>
<option value="resourceFile" />
+ <option value="Class" />
</list>
</option>
</component>
@@ -1665,13 +1637,15 @@
<option value="$PROJECT_DIR$/app/src/main/res/xml/appfilter.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/xml/wallpaper.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" />
- <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_wallpaper.xml" />
- <option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_wallpaper_set.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/values/colors.xml" />
+ <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_wallpaper.xml" />
+ <option value="$PROJECT_DIR$/app/src/main/res/values/styles.xml" />
+ <option value="$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/MainActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/WallpaperActivity.java" />
+ <option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
+ <option value="$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/App.java" />
<option value="$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/WallpaperSetActivity.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/MainActivity.java" />
</list>
</option>
</component>
@@ -1683,9 +1657,8 @@
</option>
</component>
<component name="ProjectFrameBounds">
- <option name="x" value="-1" />
- <option name="width" value="1922" />
- <option name="height" value="1048" />
+ <option name="width" value="1920" />
+ <option name="height" value="1047" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true">
<OptionsSetting value="true" id="Add" />
@@ -1712,6 +1685,10 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
+ <pane id="Scope" />
+ <pane id="PackagesPane" />
+ <pane id="ProjectPane" />
+ <pane id="Scratches" />
<pane id="AndroidView">
<subPane>
<PATH>
@@ -1737,60 +1714,6 @@
<option name="myItemId" value="res" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidResFolderNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="xml" />
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidResFolderTypeNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="ICEcons" />
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="app" />
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="res" />
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidResFolderNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="values" />
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidResFolderTypeNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="ICEcons" />
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="app" />
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="res" />
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidResFolderNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="ICEcons" />
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="app" />
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="res" />
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidResFolderNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="layout" />
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidResFolderTypeNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -1840,10 +1763,6 @@
</PATH>
</subPane>
</pane>
- <pane id="ProjectPane" />
- <pane id="PackagesPane" />
- <pane id="Scratches" />
- <pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -2199,8 +2118,8 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="-1" y="0" width="1922" height="1048" extended-state="6" />
- <editor active="true" />
+ <frame x="0" y="0" width="1920" height="1047" extended-state="6" />
+ <editor active="false" />
<layout>
<window_info id="Palette	" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -2208,11 +2127,11 @@
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" 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" show_stripe_button="true" 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" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Android Monitor" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2640884" sideWeight="0.5" order="7" 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" show_stripe_button="true" weight="0.30276242" 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" show_stripe_button="true" weight="0.32960597" 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" show_stripe_button="true" 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" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
- <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+ <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32928178" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Gradle Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@@ -2222,7 +2141,7 @@
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3289183" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24973376" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.15388711" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.29801324" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.20773481" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
@@ -2250,6 +2169,41 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/WallpaperSetActivity.java">
+ <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>
+ <element signature="e#3056#3200#0" expanded="true" />
+ <element signature="e#3199#3200#0" expanded="true" />
+ </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="4" column="71" selection-start-line="4" selection-start-column="71" selection-end-line="4" selection-end-column="71" />
+ <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="472" column="107" selection-start-line="472" selection-start-column="107" selection-end-line="472" selection-end-column="107" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/res/xml/theme_wallpapers.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.0">
+ <caret line="14" column="0" selection-start-line="14" selection-start-column="0" selection-end-line="14" 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">
@@ -2270,7 +2224,6 @@
<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>
@@ -2290,22 +2243,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml">
- <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>
- <element signature="e#270#303#0" expanded="true" />
- <element signature="e#328#363#0" expanded="true" />
- <element signature="e#389#424#0" expanded="true" />
- <element signature="e#448#481#0" expanded="true" />
- </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">
<state vertical-scroll-proportion="0.0">
@@ -2342,7 +2279,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="84" column="28" selection-start-line="84" selection-start-column="28" selection-end-line="84" selection-end-column="28" />
- <folding />
</state>
</provider>
</entry>
@@ -2362,22 +2298,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml">
- <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>
- <element signature="e#270#303#0" expanded="true" />
- <element signature="e#328#363#0" expanded="true" />
- <element signature="e#389#424#0" expanded="true" />
- <element signature="e#448#481#0" expanded="true" />
- </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">
<state vertical-scroll-proportion="0.0">
@@ -2414,7 +2334,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="72" column="34" selection-start-line="72" selection-start-column="34" selection-end-line="72" selection-end-column="34" />
- <folding />
</state>
</provider>
</entry>
@@ -2438,7 +2357,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="72" column="34" selection-start-line="72" selection-start-column="34" selection-end-line="72" selection-end-column="34" />
- <folding />
</state>
</provider>
</entry>
@@ -2462,7 +2380,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="72" column="34" selection-start-line="72" selection-start-column="34" selection-end-line="72" selection-end-column="34" />
- <folding />
</state>
</provider>
</entry>
@@ -2507,14 +2424,6 @@
<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.16216215">
- <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$/gradle/wrapper/gradle-wrapper.properties">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
@@ -2526,7 +2435,6 @@
<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>
@@ -2534,7 +2442,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.041002277">
<caret line="2" column="9" selection-start-line="2" selection-start-column="9" selection-end-line="2" selection-end-column="9" />
- <folding />
</state>
</provider>
</entry>
@@ -2550,137 +2457,84 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-0.6666667">
<caret line="1" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="151" selection-end-column="0" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_wallpaper.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>
- <provider editor-type-id="android-designer">
- <state />
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_wallpaper_set.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>
- <provider editor-type-id="android-designer">
- <state />
- </provider>
</entry>
<entry file="jar://$USER_HOME$/.androidsdk/Sdk/extras/android/m2repository/com/android/support/appcompat-v7/23.1.1/appcompat-v7-23.1.1-sources.jar!/android/support/v7/app/AppCompatActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.3321859">
<caret line="57" column="19" selection-start-line="57" selection-start-column="19" selection-end-line="57" selection-end-column="19" />
- <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="-17.703703">
- <caret line="472" column="107" selection-start-line="472" selection-start-column="107" selection-end-line="472" selection-end-column="107" />
- <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/xml/theme_wallpapers.xml">
+ <entry file="file://$PROJECT_DIR$/app/src/main/res/values/styles.xml">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-9.333333">
- <caret line="14" column="0" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
+ <state vertical-scroll-proportion="0.24657534">
+ <caret line="7" column="23" selection-start-line="7" selection-start-column="23" selection-end-line="7" selection-end-column="23" />
<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="-2.6666667">
- <caret line="4" column="71" selection-start-line="4" selection-start-column="71" selection-end-line="4" selection-end-column="71" />
- <folding>
- <element signature="e#330#348#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/WallpaperSetActivity.java">
+ <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="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
+ <caret line="33" column="71" selection-start-line="33" selection-start-column="71" selection-end-line="34" selection-end-column="47" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/MainActivity.java">
+ <entry file="file://$PROJECT_DIR$/app/src/main/res/xml/theme_wallpapers.xml">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="28" column="0" selection-start-line="28" selection-start-column="0" selection-end-line="28" selection-end-column="0" />
+ <state vertical-scroll-proportion="-9.333333">
+ <caret line="14" column="0" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
<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.05882353">
+ <state vertical-scroll-proportion="-1.3333334">
<caret line="2" column="38" selection-start-line="2" selection-start-column="38" selection-end-line="2" selection-end-column="38" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml">
+ <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-0.3272727">
- <caret line="1" column="18" selection-start-line="1" selection-start-column="18" selection-end-line="1" selection-end-column="18" />
- <folding>
- <element signature="e#270#303#0" expanded="true" />
- <element signature="e#328#363#0" expanded="true" />
- <element signature="e#389#424#0" expanded="true" />
- <element signature="e#448#481#0" expanded="true" />
- </folding>
+ <state vertical-scroll-proportion="-6.6666665">
+ <caret line="10" column="40" selection-start-line="10" selection-start-column="40" selection-end-line="10" selection-end-column="40" />
+ <folding />
</state>
</provider>
- <provider editor-type-id="android-designer">
- <state />
- </provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_wallpaper_set.xml">
+ <entry file="file://$PROJECT_DIR$/app/src/main/res/xml/appfilter.xml">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-3.6">
- <caret line="11" column="14" selection-start-line="11" selection-start-column="14" selection-end-line="11" selection-end-column="14" />
+ <state vertical-scroll-proportion="-5.5185184">
+ <caret line="472" column="107" selection-start-line="472" selection-start-column="107" selection-end-line="472" selection-end-column="107" />
<folding />
</state>
</provider>
- <provider editor-type-id="android-designer">
- <state />
- </provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_wallpaper.xml">
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/WallpaperActivity.java">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-4.2545457">
- <caret line="13" column="57" selection-start-line="13" selection-start-column="57" selection-end-line="13" selection-end-column="57" />
- <folding />
+ <state vertical-scroll-proportion="0.0">
+ <caret line="40" column="108" selection-start-line="40" selection-start-column="12" selection-end-line="40" selection-end-column="108" />
+ <folding>
+ <element signature="e#3437#3638#0" expanded="true" />
+ <element signature="e#3637#3638#0" expanded="true" />
+ <element signature="e#4180#4381#0" expanded="true" />
+ <element signature="e#4380#4381#0" expanded="true" />
+ </folding>
</state>
</provider>
- <provider editor-type-id="android-designer">
- <state />
- </provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/WallpaperActivity.java">
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/WallpaperSetActivity.java">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="1.3846154">
- <caret line="95" column="64" selection-start-line="95" selection-start-column="64" selection-end-line="95" selection-end-column="64" />
+ <state vertical-scroll-proportion="0.14900662">
+ <caret line="5" column="37" selection-start-line="5" selection-start-column="37" selection-end-line="5" selection-end-column="37" />
<folding>
- <element signature="e#2620#2819#0" expanded="true" />
- <element signature="e#2818#2819#0" expanded="true" />
- <element signature="e#3350#3549#0" expanded="true" />
- <element signature="e#3548#3549#0" expanded="true" />
+ <element signature="e#3056#3200#0" expanded="true" />
+ <element signature="e#3199#3200#0" expanded="true" />
</folding>
</state>
</provider>
diff --git a/app/app.iml b/app/app.iml
index 3019ad1ab5a58e1eb7fe6c2f3ba1c560e4ef27e7..f27c5b907eeb2d4ab99d704c89be05938c05098c 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -61,13 +61,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -75,6 +68,13 @@
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 450419a854b01592835cb0bf4b4c0aaf01ca228f..694983ea2d0f94d83071e5bbcae8f0caf9d6a2b9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,6 +3,7 @@
package="ovh.ice.icecons">
<uses-permission android:name="android.permission.SET_WALLPAPER" />
+ <uses-permission android:name="android.permission.SET_WALLPAPER_HINTS" />
<application
android:allowBackup="true"
diff --git a/app/src/main/java/ovh/ice/icecons/MainActivity.java b/app/src/main/java/ovh/ice/icecons/MainActivity.java
index cf570898fc7ef6dfc2be0f083b70c9d85ebb3fa8..6e20646ce9884e565ec7e0431b40a68e6efb4a9c 100644
--- a/app/src/main/java/ovh/ice/icecons/MainActivity.java
+++ b/app/src/main/java/ovh/ice/icecons/MainActivity.java
@@ -1,33 +1,99 @@
package ovh.ice.icecons;
-import android.app.WallpaperManager;
import android.content.Intent;
+import android.content.res.ColorStateList;
+import android.content.res.Resources;
import android.net.Uri;
+import android.support.v4.content.ContextCompat;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
+import android.view.Gravity;
import android.view.View;
-
-import java.io.IOException;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.LinearLayout;
+import android.widget.TextView;
public class MainActivity extends AppCompatActivity {
@Override
- protected void onCreate(Bundle savedInstanceState) {
+ protected void onCreate( Bundle savedInstanceState ) {
+
+ super.onCreate( savedInstanceState );
+ createLayout();
+ }
+
+ private void createLayout() {
+
+ LinearLayout.LayoutParams smallLayoutParams = new LinearLayout.LayoutParams( LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT, 1f );
+ ViewGroup.LayoutParams buttonParams = new ViewGroup.LayoutParams( 256, 256 );
+
+ LinearLayout baseLayout = new LinearLayout( this );
+ baseLayout.setOrientation( LinearLayout.VERTICAL );
+ baseLayout.setLayoutParams( new LinearLayout.LayoutParams( LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT ) );
+ baseLayout.setBackgroundResource( R.drawable.menu_background );
+ baseLayout.setPadding( 16, 36, 16, 0 );
+ setContentView( baseLayout );
+
+ LinearLayout wallpaperLayout = new LinearLayout( this );
+ wallpaperLayout.setOrientation( LinearLayout.HORIZONTAL );
+ wallpaperLayout.setLayoutParams( smallLayoutParams );
+ wallpaperLayout.setGravity( Gravity.CENTER );
+ baseLayout.addView( wallpaperLayout );
+
+ Button wallpaperButton = new Button( this );
+ wallpaperButton.setLayoutParams( buttonParams );
+ wallpaperButton.setBackgroundResource( R.drawable.ic_wallpaper_button );
+ wallpaperLayout.addView( wallpaperButton );
+ wallpaperButton.setOnClickListener( new View.OnClickListener() {
+ @Override
+ public void onClick( View v ) {
+ wallpaperPicker( v );
+ }
+ });
+
+ TextView wallpaperText = new TextView( this );
+ wallpaperText.setText( "wallpapers" );
+ wallpaperText.setTextSize( 24 );
+ wallpaperText.setTextColor( ContextCompat.getColor( getApplicationContext(), R.color.colorPrimaryDark) );
+ wallpaperText.setPadding( 64, 64, 64, 64 );
+ wallpaperLayout.addView( wallpaperText );
+
+ LinearLayout sourceLayout = new LinearLayout( this );
+ sourceLayout.setOrientation( LinearLayout.HORIZONTAL );
+ sourceLayout.setLayoutParams( smallLayoutParams );
+ sourceLayout.setGravity( Gravity.CENTER );
+ baseLayout.addView( sourceLayout );
+
+ TextView sourceText = new TextView( this );
+ sourceText.setText( "source code" );
+ sourceText.setTextSize( 24 );
+ sourceText.setTextColor( ContextCompat.getColor( getApplicationContext(), R.color.colorPrimaryDark) );
+ sourceText.setPadding(64, 64, 64, 64);
+ sourceLayout.addView( sourceText );
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_main);
+ Button sourceButton = new Button( this );
+ sourceButton.setLayoutParams( buttonParams );
+ sourceButton.setBackgroundResource( R.drawable.ic_source_button );
+ sourceLayout.addView( sourceButton );
+ sourceButton.setOnClickListener( new View.OnClickListener() {
+ @Override
+ public void onClick( View v ) {
+ gitLink( v );
+ }
+ });
}
- public void gitLink(View v) {
+ public void gitLink( View v ) {
- Uri uri = Uri.parse("https://github.com/1C3/ICEcons");
- Intent intent = new Intent(Intent.ACTION_VIEW, uri);
- startActivity(intent);
+ Uri uri = Uri.parse( "https://github.com/1C3/ICEcons" );
+ Intent intent = new Intent( Intent.ACTION_VIEW, uri );
+ startActivity( intent );
}
- public void wallpaperPicker(View v) {
+ public void wallpaperPicker( View v ) {
- Intent intent = new Intent(this, WallpaperActivity.class);
- startActivity(intent);
+ Intent intent = new Intent( this, WallpaperActivity.class );
+ startActivity( intent );
}
}
diff --git a/app/src/main/java/ovh/ice/icecons/WallpaperActivity.java b/app/src/main/java/ovh/ice/icecons/WallpaperActivity.java
index 73a21d92d6f67133206d981e6ddf5e90e883e0dd..a0b942440d968bfc226994e5e80225fb9661b391 100644
--- a/app/src/main/java/ovh/ice/icecons/WallpaperActivity.java
+++ b/app/src/main/java/ovh/ice/icecons/WallpaperActivity.java
@@ -1,107 +1,118 @@
package ovh.ice.icecons;
-import android.app.WallpaperManager;
-import android.content.Context;
import android.content.Intent;
-import android.graphics.drawable.Drawable;
+import android.content.res.Configuration;
+import android.graphics.Bitmap;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
+import android.util.Config;
+import android.view.Gravity;
import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.BaseAdapter;
-import android.widget.GridView;
import android.widget.ImageView;
import android.widget.LinearLayout;
-import android.widget.Toast;
+import android.widget.ScrollView;
-import java.io.IOException;
import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
public class WallpaperActivity extends AppCompatActivity {
private Integer[] mImages = {
R.drawable.bush, R.drawable.clovers,
R.drawable.daisy, R.drawable.ivy,
- R.drawable.rock, R.drawable.wall
+ R.drawable.rock, R.drawable.wall,
+ R.drawable.foam, R.drawable.night
};
private Integer[] mThumbnails = {
R.drawable.bush_thumb, R.drawable.clovers_thumb,
R.drawable.daisy_thumb, R.drawable.ivy_thumb,
- R.drawable.rock_thumb, R.drawable.wall_thumb
+ R.drawable.rock_thumb, R.drawable.wall_thumb,
+ R.drawable.foam_thumb, R.drawable.night_thumb
};
private ArrayList<LinearLayout> layoutList = new ArrayList<>();
private ArrayList<ImageView> imageList = new ArrayList<>();
@Override
- protected void onCreate(Bundle savedInstanceState) {
+ protected void onCreate( Bundle savedInstanceState ) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_wallpaper);
+ super.onCreate( savedInstanceState );
- createLayout();
+ if( getResources().getDisplayMetrics().widthPixels > getResources().getDisplayMetrics().heightPixels ) {
+ createLayout(3);
+ } else {
+ createLayout(2);
+ }
}
- private void createLayout() {
+ private void createLayout( int width ) {
- LinearLayout.LayoutParams containerParams = new LinearLayout.LayoutParams( LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT );
+ LinearLayout.LayoutParams baseParams = new LinearLayout.LayoutParams( LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT );
+ LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams( LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.MATCH_PARENT );
+ LinearLayout.LayoutParams containerParams = new LinearLayout.LayoutParams( LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT );
LinearLayout.LayoutParams imageParams = new LinearLayout.LayoutParams( LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT, 1f );
+ ScrollView baseScroller = new ScrollView( this );
+ baseScroller.setLayoutParams( baseParams );
+ setContentView( baseScroller );
+
+ LinearLayout baseLayout = new LinearLayout( this );
+ baseLayout.setOrientation( LinearLayout.VERTICAL );
+ baseLayout.setLayoutParams( layoutParams );
+ baseScroller.addView( baseLayout );
+
for( int i =0; i < mThumbnails.length; i++ ) {
- if( ( i%2 ) == 0 ) {
+ if( ( i%width ) == 0 ) {
- layoutList.add( (i/2), new LinearLayout(this) );
- layoutList.get(i/2).setOrientation( LinearLayout.HORIZONTAL );
- layoutList.get(i/2).setLayoutParams( containerParams );
+ layoutList.add( ( i / width ), new LinearLayout( this ) );
+ layoutList.get( i / width ).setOrientation( LinearLayout.HORIZONTAL );
+ layoutList.get( i / width ).setGravity( Gravity.LEFT );
+ layoutList.get( i / width ).setLayoutParams( containerParams );
- ( (LinearLayout)findViewById(R.id.wallpaperGridTop) ).addView( layoutList.get(i/2) );
+ baseLayout.addView( layoutList.get( i / width ) );
- imageList.add( i, new ImageView(this) );
+ imageList.add( i, new ImageView( this ) );
imageList.get(i).setLayoutParams( imageParams );
imageList.get(i).setScaleType( ImageView.ScaleType.CENTER_CROP );
imageList.get(i).setImageResource( mThumbnails[i] );
imageList.get(i).setAdjustViewBounds( true );
final Integer tempId = mImages[i];
- imageList.get(i).setOnClickListener(new View.OnClickListener() {
+ imageList.get(i).setOnClickListener( new View.OnClickListener() {
@Override
- public void onClick(View v) {
+ public void onClick( View v ) {
wallpaperView( v, tempId);
}
});
- layoutList.get(i/2).addView( imageList.get(i) );
+ layoutList.get( i / width ).addView( imageList.get(i) );
} else {
- imageList.add( i, new ImageView(this) );
+ imageList.add( i, new ImageView( this ) );
imageList.get(i).setLayoutParams( imageParams );
imageList.get(i).setScaleType( ImageView.ScaleType.CENTER_CROP );
imageList.get(i).setImageResource( mThumbnails[i] );
imageList.get(i).setAdjustViewBounds( true );
final Integer tempId = mImages[i];
- imageList.get(i).setOnClickListener(new View.OnClickListener() {
+ imageList.get(i).setOnClickListener( new View.OnClickListener() {
@Override
- public void onClick(View v) {
+ public void onClick( View v ) {
wallpaperView( v, tempId);
}
});
- layoutList.get(i/2).addView( imageList.get(i) );
+ layoutList.get( ( i - ( i % width ) ) / width ).addView( imageList.get(i) );
}
}
}
- public void wallpaperView(View v, Integer imageId) {
+ public void wallpaperView( View v, Integer imageId ) {
- Intent intent = new Intent(this, WallpaperSetActivity.class);
- intent.putExtra("image", imageId);
- startActivity(intent);
+ Intent intent = new Intent( this, WallpaperSetActivity.class );
+ intent.putExtra( "image", imageId );
+ startActivity( intent );
}
}
diff --git a/app/src/main/java/ovh/ice/icecons/WallpaperSetActivity.java b/app/src/main/java/ovh/ice/icecons/WallpaperSetActivity.java
index 4b8865f0a7a1a6d6123b7b125b00bf910de66767..e1455a0e88f2342a559b10cdfc3120a7185b2848 100644
--- a/app/src/main/java/ovh/ice/icecons/WallpaperSetActivity.java
+++ b/app/src/main/java/ovh/ice/icecons/WallpaperSetActivity.java
@@ -1,48 +1,147 @@
package ovh.ice.icecons;
import android.app.WallpaperManager;
+import android.content.Context;
import android.content.Intent;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.support.v4.content.ContextCompat;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
+import android.view.Display;
import android.view.Gravity;
import android.view.View;
import android.widget.ImageView;
+import android.widget.LinearLayout;
import android.widget.Toast;
import java.io.IOException;
public class WallpaperSetActivity extends AppCompatActivity {
- private Integer imageId;
+ private int imageId;
+ private boolean isPortrait;
+ private int screenWidth;
+ private int screenHeight;
+
+ Bitmap Wallpaper;
+
+ //Resources res = getResources();
@Override
- protected void onCreate(Bundle savedInstanceState) {
+ protected void onCreate( Bundle savedInstanceState ) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_wallpaper_set);
+ super.onCreate( savedInstanceState );
final Intent intent = getIntent();
- imageId = intent.getIntExtra("image", 0);
+ imageId = intent.getIntExtra( "image", 0 );
+ isPortrait = getResources().getDisplayMetrics().widthPixels < getResources().getDisplayMetrics().heightPixels;
+ screenWidth = isPortrait ? getResources().getDisplayMetrics().widthPixels : getResources().getDisplayMetrics().heightPixels;
+ screenHeight = isPortrait ? getResources().getDisplayMetrics().heightPixels : getResources().getDisplayMetrics().widthPixels;
+ Wallpaper = decodeSampledBitmapFromResource( getApplicationContext().getResources(), imageId, screenWidth, screenHeight );
+
+ createLayout();
+ }
+
+ private void createLayout() {
+
+ LinearLayout baseLayout = new LinearLayout( this );
+ baseLayout.setOrientation( LinearLayout.VERTICAL );
+ baseLayout.setLayoutParams( new LinearLayout.LayoutParams( LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT ) );
+ baseLayout.setGravity( Gravity.BOTTOM );
+ setContentView( baseLayout );
- findViewById(R.id.wallpaperSetView).setBackgroundResource(imageId);
- ( (ImageView)findViewById(R.id.wallpaperSetView) ).setScaleType( ImageView.ScaleType.CENTER_CROP );
+ ImageView wallPreview = new ImageView( this );
+ wallPreview.setLayoutParams( new LinearLayout.LayoutParams( LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT ) );
+ wallPreview.setScaleType( ImageView.ScaleType.CENTER_CROP );
+ wallPreview.setImageBitmap( Wallpaper );
+ baseLayout.addView( wallPreview );
+
+ LinearLayout buttonBar = new LinearLayout( this );
+ buttonBar.setOrientation( LinearLayout.HORIZONTAL );
+ buttonBar.setLayoutParams( new LinearLayout.LayoutParams( LinearLayout.LayoutParams.MATCH_PARENT, 256 ) );
+ baseLayout.setBackgroundColor( ContextCompat.getColor( getApplicationContext(), R.color.colorPrimary ) );
+ buttonBar.setGravity( Gravity.CENTER );
+ baseLayout.addView( buttonBar );
+
+ ImageView backButton = new ImageView( this );
+ backButton.setLayoutParams( new LinearLayout.LayoutParams( 0, 192, 1 ) );
+ backButton.setImageResource( R.drawable.ic_back );
+ buttonBar.addView( backButton );
+ backButton.setOnClickListener( new View.OnClickListener() {
+ @Override
+ public void onClick( View v ) {
+ finish();
+ }
+ });
+
+ ImageView applyButton = new ImageView( this );
+ applyButton.setLayoutParams( new LinearLayout.LayoutParams( 0, 192, 1 ) );
+ applyButton.setImageResource( R.drawable.ic_apply );
+ buttonBar.addView( applyButton );
+ applyButton.setOnClickListener( new View.OnClickListener() {
+ @Override
+ public void onClick( View v ) {
+ setWallpaper( v );
+ }
+ });
}
- public void setWallpaper(View v) {
+ public void setWallpaper( View v ) {
- WallpaperManager wallpaperManager = WallpaperManager.getInstance(getApplicationContext());
+ WallpaperManager wallpaperManager = WallpaperManager.getInstance( getApplicationContext() );
try {
- wallpaperManager.setResource(imageId);
+ wallpaperManager.setBitmap( Wallpaper );
- Toast toast = Toast.makeText(this, "Wallpaper Set", Toast.LENGTH_SHORT);
- toast.setGravity(Gravity.CENTER, 0, 0);
+ Toast toast = Toast.makeText( this, "Wallpaper Set", Toast.LENGTH_SHORT );
+ toast.setGravity( Gravity.CENTER, 0, 0 );
toast.show();
- } catch (IOException e) {
+ } catch ( IOException e ) {
e.printStackTrace();
}
}
+
+ private int calculateInSampleSize( BitmapFactory.Options options, int reqWidth, int reqHeight ) {
+
+ // Raw height and width of image
+ final int height = options.outHeight;
+ final int width = options.outWidth;
+ int inSampleSize = 1;
+
+ if (height > reqHeight || width > reqWidth) {
+
+ final int halfHeight = height / 2;
+ final int halfWidth = width / 2;
+
+ // Calculate the largest inSampleSize value that is a power of 2 and keeps both
+ // height and width larger than the requested height and width.
+ while ((halfHeight / inSampleSize) > reqHeight
+ && (halfWidth / inSampleSize) > reqWidth) {
+ inSampleSize *= 2;
+ }
+ }
+
+ return inSampleSize;
+ }
+
+ private Bitmap decodeSampledBitmapFromResource( Resources res, int resId, int reqWidth, int reqHeight ) {
+
+ // First decode with inJustDecodeBounds=true to check dimensions
+ final BitmapFactory.Options options = new BitmapFactory.Options();
+ options.inJustDecodeBounds = true;
+ BitmapFactory.decodeResource( res, resId, options );
+
+ // Calculate inSampleSize
+ options.inSampleSize = calculateInSampleSize(options, reqWidth, reqHeight);
+
+ // Decode bitmap with inSampleSize set
+ options.inJustDecodeBounds = false;
+ return BitmapFactory.decodeResource( res, resId, options);
+ }
}
+
diff --git a/app/src/main/res/drawable-nodpi/bush_thumb.jpg b/app/src/main/res/drawable-nodpi/bush_thumb.jpg
index afb09c8602323a6e118af239f0e023b8e0409954..fb0f2ab9833543dbff449ca31bd15501380e34bc 100644
Binary files a/app/src/main/res/drawable-nodpi/bush_thumb.jpg and b/app/src/main/res/drawable-nodpi/bush_thumb.jpg differ
diff --git a/app/src/main/res/drawable-nodpi/clovers_thumb.jpg b/app/src/main/res/drawable-nodpi/clovers_thumb.jpg
index 13f6e2a29a6f0f0ae6eeb5479637cd9c4c3f4230..38b589733a458166535b94f3d7f727e34ce76133 100644
Binary files a/app/src/main/res/drawable-nodpi/clovers_thumb.jpg and b/app/src/main/res/drawable-nodpi/clovers_thumb.jpg differ
diff --git a/app/src/main/res/drawable-nodpi/daisy_thumb.jpg b/app/src/main/res/drawable-nodpi/daisy_thumb.jpg
index 779e3daec15d0ddef229df1eca1e46ba519e1421..4a240cf076644046fc8cb1d63b24c803d42825c6 100644
Binary files a/app/src/main/res/drawable-nodpi/daisy_thumb.jpg and b/app/src/main/res/drawable-nodpi/daisy_thumb.jpg differ
diff --git a/app/src/main/res/drawable-nodpi/foam.jpg b/app/src/main/res/drawable-nodpi/foam.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..0dea9781156bc15ff7ae945d36fd23bfe3a59cab
Binary files /dev/null and b/app/src/main/res/drawable-nodpi/foam.jpg differ
diff --git a/app/src/main/res/drawable-nodpi/foam_thumb.jpg b/app/src/main/res/drawable-nodpi/foam_thumb.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..78bab80cf4f69094ad6232f922a2bfb8d5ae6489
Binary files /dev/null and b/app/src/main/res/drawable-nodpi/foam_thumb.jpg differ
diff --git a/app/src/main/res/drawable-nodpi/ic_apply.png b/app/src/main/res/drawable-nodpi/ic_apply.png
new file mode 100644
index 0000000000000000000000000000000000000000..d59b3aeff10520eef558101c3624382a56978209
Binary files /dev/null and b/app/src/main/res/drawable-nodpi/ic_apply.png differ
diff --git a/app/src/main/res/drawable-nodpi/ic_back.png b/app/src/main/res/drawable-nodpi/ic_back.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f851fad93bce8ed2b9929e35a9708ded96ad05b
Binary files /dev/null and b/app/src/main/res/drawable-nodpi/ic_back.png differ
diff --git a/app/src/main/res/drawable-nodpi/ic_source_button.png b/app/src/main/res/drawable-nodpi/ic_source_button.png
new file mode 100644
index 0000000000000000000000000000000000000000..06307858d6b1119146d4a11fa5fbacfe006f9f48
Binary files /dev/null and b/app/src/main/res/drawable-nodpi/ic_source_button.png differ
diff --git a/app/src/main/res/drawable-nodpi/ic_wallpaper_button.png b/app/src/main/res/drawable-nodpi/ic_wallpaper_button.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d8bf3f56a02738bdf6591a1b1ecbd9c31ccb813
Binary files /dev/null and b/app/src/main/res/drawable-nodpi/ic_wallpaper_button.png differ
diff --git a/app/src/main/res/drawable-nodpi/ivy_thumb.jpg b/app/src/main/res/drawable-nodpi/ivy_thumb.jpg
index bcc95ba6580bb850f87a648513d9929b8e5be046..9993ec34f358202a8cee1780e5b3696279a27f45 100644
Binary files a/app/src/main/res/drawable-nodpi/ivy_thumb.jpg and b/app/src/main/res/drawable-nodpi/ivy_thumb.jpg differ
diff --git a/app/src/main/res/drawable-nodpi/menu_background.jpg b/app/src/main/res/drawable-nodpi/menu_background.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..9cb185bdb9107e4139e242043126c88bb6afb787
Binary files /dev/null and b/app/src/main/res/drawable-nodpi/menu_background.jpg differ
diff --git a/app/src/main/res/drawable-nodpi/night.jpg b/app/src/main/res/drawable-nodpi/night.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..082831f9bcf5e956ac94d655efe0a2bc57fb578c
Binary files /dev/null and b/app/src/main/res/drawable-nodpi/night.jpg differ
diff --git a/app/src/main/res/drawable-nodpi/night_thumb.jpg b/app/src/main/res/drawable-nodpi/night_thumb.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..b8d6019aa04a711e771c773907e09c6c0658efbd
Binary files /dev/null and b/app/src/main/res/drawable-nodpi/night_thumb.jpg differ
diff --git a/app/src/main/res/drawable-nodpi/rock_thumb.jpg b/app/src/main/res/drawable-nodpi/rock_thumb.jpg
index f0cb590781223b2e5eebbec50bb74ad7bd249cc2..46dbe29b641f2908f8951b51354e355fdabc5bca 100644
Binary files a/app/src/main/res/drawable-nodpi/rock_thumb.jpg and b/app/src/main/res/drawable-nodpi/rock_thumb.jpg differ
diff --git a/app/src/main/res/drawable-nodpi/wall_thumb.jpg b/app/src/main/res/drawable-nodpi/wall_thumb.jpg
index 62fa8eec5b762289beac2c4b803be7853e1e94bf..d9974a8bf89b97b09c8dadda3d6f255ddf3b57eb 100644
Binary files a/app/src/main/res/drawable-nodpi/wall_thumb.jpg and b/app/src/main/res/drawable-nodpi/wall_thumb.jpg differ
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
deleted file mode 100644
index ab7a68d4e0702c042f148fa4c8c2188e363ea3ef..0000000000000000000000000000000000000000
--- a/app/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:paddingBottom="@dimen/activity_vertical_margin"
- android:paddingLeft="@dimen/activity_horizontal_margin"
- android:paddingRight="@dimen/activity_horizontal_margin"
- android:paddingTop="@dimen/activity_vertical_margin"
- tools:context="ovh.ice.icecons.MainActivity"
- android:orientation="vertical">
-
- <Button
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="source code"
- android:onClick="gitLink"/>
-
- <Button
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="set wallpaper"
- android:onClick="wallpaperPicker"/>
-
-</LinearLayout>
diff --git a/app/src/main/res/layout/activity_wallpaper.xml b/app/src/main/res/layout/activity_wallpaper.xml
deleted file mode 100644
index ba20b4bf15199662fb5315523c527aee8a595637..0000000000000000000000000000000000000000
--- a/app/src/main/res/layout/activity_wallpaper.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- tools:context="ovh.ice.icecons.WallpaperActivity"
- android:orientation="vertical">
-
- <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:id="@+id/wallpaperGridTop"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- tools:context="ovh.ice.icecons.WallpaperActivity"
- android:orientation="vertical">
-
- </LinearLayout>
-
-</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_wallpaper_set.xml b/app/src/main/res/layout/activity_wallpaper_set.xml
deleted file mode 100644
index 5d5fed28995892fec727d7e8b698524ace3d7f2b..0000000000000000000000000000000000000000
--- a/app/src/main/res/layout/activity_wallpaper_set.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:paddingBottom="0dp"
- android:paddingLeft="0dp"
- android:paddingRight="0dp"
- android:paddingTop="0dp"
- tools:context="ovh.ice.icecons.WallpaperSetActivity">
-
- <ImageView
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:id="@+id/wallpaperSetView"
- android:layout_alignParentTop="true"
- android:layout_centerHorizontal="true"
- android:layout_marginTop="0dp" />
-
-</RelativeLayout>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 5885930df6d10edf3d6df40d6556297d11f953da..5e404d91d4f0049491920c10141e038d697d0e4c 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
<resources>
<!-- Base application theme. -->
- <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+ <style name="AppTheme" parent="Theme.AppCompat.NoActionBar">
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>