diff options
author | lado <herrlado@gmail.com> | 2016-03-16 23:53:08 +0100 |
---|---|---|
committer | lado <herrlado@gmail.com> | 2016-03-16 23:53:08 +0100 |
commit | c8564735643ebf0294c18d7ca4bb039827ab9a60 (patch) | |
tree | bb5af1666298e3930a3a56ddde8d2eda972c3494 /vdrmanager | |
parent | 39219007f025f4ade12b2883b90b9927d825f988 (diff) | |
download | vdr-manager-c8564735643ebf0294c18d7ca4bb039827ab9a60.tar.gz vdr-manager-c8564735643ebf0294c18d7ca4bb039827ab9a60.tar.bz2 |
moved to gradle deps
Diffstat (limited to 'vdrmanager')
-rw-r--r-- | vdrmanager/.idea/libraries/ormlite_android_4_47.xml | 9 | ||||
-rw-r--r-- | vdrmanager/.idea/libraries/ormlite_core_4_47.xml | 9 | ||||
-rw-r--r-- | vdrmanager/.idea/libraries/slf4j_android_1_6_1_RC1.xml | 9 | ||||
-rw-r--r-- | vdrmanager/.idea/libraries/svdrp4j_1_1_0_SNAPSHOT.xml | 9 | ||||
-rw-r--r-- | vdrmanager/.idea/workspace.xml | 214 | ||||
-rw-r--r-- | vdrmanager/app/app.iml | 10 | ||||
-rw-r--r-- | vdrmanager/app/build.gradle | 8 |
7 files changed, 102 insertions, 166 deletions
diff --git a/vdrmanager/.idea/libraries/ormlite_android_4_47.xml b/vdrmanager/.idea/libraries/ormlite_android_4_47.xml deleted file mode 100644 index db4b685..0000000 --- a/vdrmanager/.idea/libraries/ormlite_android_4_47.xml +++ /dev/null @@ -1,9 +0,0 @@ -<component name="libraryTable"> - <library name="ormlite-android-4.47"> - <CLASSES> - <root url="jar://$PROJECT_DIR$/app/libs/ormlite-android-4.47.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> -</component>
\ No newline at end of file diff --git a/vdrmanager/.idea/libraries/ormlite_core_4_47.xml b/vdrmanager/.idea/libraries/ormlite_core_4_47.xml deleted file mode 100644 index 8e963a8..0000000 --- a/vdrmanager/.idea/libraries/ormlite_core_4_47.xml +++ /dev/null @@ -1,9 +0,0 @@ -<component name="libraryTable"> - <library name="ormlite-core-4.47"> - <CLASSES> - <root url="jar://$PROJECT_DIR$/app/libs/ormlite-core-4.47.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> -</component>
\ No newline at end of file diff --git a/vdrmanager/.idea/libraries/slf4j_android_1_6_1_RC1.xml b/vdrmanager/.idea/libraries/slf4j_android_1_6_1_RC1.xml deleted file mode 100644 index c55581b..0000000 --- a/vdrmanager/.idea/libraries/slf4j_android_1_6_1_RC1.xml +++ /dev/null @@ -1,9 +0,0 @@ -<component name="libraryTable"> - <library name="slf4j-android-1.6.1-RC1"> - <CLASSES> - <root url="jar://$PROJECT_DIR$/app/libs/slf4j-android-1.6.1-RC1.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> -</component>
\ No newline at end of file diff --git a/vdrmanager/.idea/libraries/svdrp4j_1_1_0_SNAPSHOT.xml b/vdrmanager/.idea/libraries/svdrp4j_1_1_0_SNAPSHOT.xml deleted file mode 100644 index a0f45af..0000000 --- a/vdrmanager/.idea/libraries/svdrp4j_1_1_0_SNAPSHOT.xml +++ /dev/null @@ -1,9 +0,0 @@ -<component name="libraryTable"> - <library name="svdrp4j-1.1.0-SNAPSHOT"> - <CLASSES> - <root url="jar://$PROJECT_DIR$/app/libs/svdrp4j-1.1.0-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> -</component>
\ No newline at end of file diff --git a/vdrmanager/.idea/workspace.xml b/vdrmanager/.idea/workspace.xml index 2f49bda..eda564c 100644 --- a/vdrmanager/.idea/workspace.xml +++ b/vdrmanager/.idea/workspace.xml @@ -31,12 +31,8 @@ <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/ormlite_core_4_47.xml" afterPath="" /> <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/slf4j_android_1_6_1_RC1.xml" afterPath="" /> <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/svdrp4j_1_1_0_SNAPSHOT.xml" afterPath="" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/app-release.apk" afterPath="$PROJECT_DIR$/app/app-release.apk" /> - <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/app.iml" afterPath="$PROJECT_DIR$/app/app.iml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build.gradle" afterPath="$PROJECT_DIR$/build.gradle" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/build.gradle" afterPath="$PROJECT_DIR$/app/build.gradle" /> - <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$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> </list> @@ -66,11 +62,11 @@ </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="AndroidManifest.xml" pinned="false" current-in-tab="true"> + <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.09186603"> - <caret line="3" column="30" selection-start-line="3" selection-start-column="25" selection-end-line="3" selection-end-column="30" /> + <state vertical-scroll-proportion="0.0"> + <caret line="58" column="35" selection-start-line="58" selection-start-column="35" selection-end-line="58" selection-end-column="35" /> <folding /> </state> </provider> @@ -119,18 +115,18 @@ <file leaf-file-name="build.gradle" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/build.gradle"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="6" column="55" selection-start-line="6" selection-start-column="55" selection-end-line="6" selection-end-column="55" /> + <state vertical-scroll-proportion="-1.882353"> + <caret line="3" column="17" selection-start-line="3" selection-start-column="17" selection-end-line="3" selection-end-column="17" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="build.gradle" pinned="false" current-in-tab="false"> + <file leaf-file-name="build.gradle" pinned="false" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/app/build.gradle"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="27" column="5" selection-start-line="27" selection-start-column="5" selection-end-line="27" selection-end-column="5" /> + <state vertical-scroll-proportion="0.80517507"> + <caret line="50" column="42" selection-start-line="50" selection-start-column="42" selection-end-line="50" selection-end-column="42" /> <folding /> </state> </provider> @@ -139,7 +135,7 @@ <file leaf-file-name="LintOptions.groovy" pinned="false" current-in-tab="false"> <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/gradle-core/1.2.3/3e702e30815cc67650ed7641c7ff13725dc56f5d/gradle-core-1.2.3-sources.jar!/com/android/build/gradle/internal/dsl/LintOptions.groovy"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-8.588235"> + <state vertical-scroll-proportion="0.0"> <caret line="166" column="9" selection-start-line="166" selection-start-column="9" selection-end-line="166" selection-end-column="9" /> <folding /> </state> @@ -149,7 +145,7 @@ <file leaf-file-name="ProductFlavor.groovy" pinned="false" current-in-tab="false"> <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/gradle-core/1.2.3/3e702e30815cc67650ed7641c7ff13725dc56f5d/gradle-core-1.2.3-sources.jar!/com/android/build/gradle/internal/dsl/ProductFlavor.groovy"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-39.52941"> + <state vertical-scroll-proportion="0.0"> <caret line="109" column="16" selection-start-line="109" selection-start-column="16" selection-end-line="109" selection-end-column="16" /> <folding /> </state> @@ -159,7 +155,7 @@ <file leaf-file-name="gradle-wrapper.properties" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <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> @@ -1361,7 +1357,7 @@ </option> <option name="modificationStamps"> <map> - <entry key="$PROJECT_DIR$" value="4373321974609" /> + <entry key="$PROJECT_DIR$" value="4373540932029" /> </map> </option> <option name="projectBuildClasspath"> @@ -1579,13 +1575,14 @@ <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/intellij/annotations/12.0/annotations-12.0.jar" /> <option value="/opt/android-sdk-update-manager/extras/android/m2repository/com/android/support/support-v4/23.2.0/support-v4-23.2.0.aar" /> <option value="/opt/android-sdk-update-manager/extras/android/m2repository/com/android/support/appcompat-v7/23.2.0/appcompat-v7-23.2.0.aar" /> + <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.j256.ormlite/ormlite-android/4.48/afa06f539a4026c10b247386312aa67404b80a16/ormlite-android-4.48.jar" /> + <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.j256.ormlite/ormlite-core/4.48/e579bd2905d0399af5029aaaf9817d5fa0ca88a5/ormlite-core-4.48.jar" /> + <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-android/1.7.19/14a072521691836d9037de614c2c7d67c8f00d92/slf4j-android-1.7.19.jar" /> + <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hampelratte/svdrp4j/1.1.1/97190114a18bbace7ebe989c68ed8bf215c83b/svdrp4j-1.1.1.jar" /> <option value="/opt/android-sdk-update-manager/extras/android/m2repository/com/android/support/support-annotations/23.2.0/support-annotations-23.2.0.jar" /> <option value="/opt/android-sdk-update-manager/extras/android/m2repository/com/android/support/animated-vector-drawable/23.2.0/animated-vector-drawable-23.2.0.aar" /> <option value="/opt/android-sdk-update-manager/extras/android/m2repository/com/android/support/support-vector-drawable/23.2.0/support-vector-drawable-23.2.0.aar" /> - <option value="$MODULE_DIR$/libs/ormlite-android-4.47.jar" /> - <option value="$MODULE_DIR$/libs/ormlite-core-4.47.jar" /> - <option value="$MODULE_DIR$/libs/slf4j-android-1.6.1-RC1.jar" /> - <option value="$MODULE_DIR$/libs/svdrp4j-1.1.0-SNAPSHOT.jar" /> + <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.19/3bf03cd91f15d55330e916cff9a1ebe236725bdd/slf4j-api-1.7.19.jar" /> </list> </option> <option name="path" value="$PROJECT_DIR$/app" /> @@ -1765,9 +1762,9 @@ <option value="$PROJECT_DIR$/app/src/main/res/values-it/strings.xml" /> <option value="$PROJECT_DIR$/app/src/main/res/values-uk/strings.xml" /> <option value="$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/gui/EpgDetailsActivity.java" /> - <option value="$PROJECT_DIR$/app/build.gradle" /> - <option value="$PROJECT_DIR$/build.gradle" /> <option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" /> + <option value="$PROJECT_DIR$/build.gradle" /> + <option value="$PROJECT_DIR$/app/build.gradle" /> </list> </option> </component> @@ -1809,72 +1806,85 @@ <sortByType /> </navigator> <panes> - <pane id="Scope" /> - <pane id="ProjectPane"> + <pane id="AndroidView"> <subPane> <PATH> <PATH_ELEMENT> <option name="myItemId" value="vdrmanager" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" /> </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> <option name="myItemId" value="vdrmanager" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="vdrmanager" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + <option name="myItemId" value="app" /> + <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" /> </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> <option name="myItemId" value="vdrmanager" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="vdrmanager" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="gradle" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + <option name="myItemId" value="app" /> + <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="wrapper" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + <option name="myItemId" value="java" /> + <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidSourceTypeNode" /> </PATH_ELEMENT> </PATH> + </subPane> + </pane> + <pane id="Scope" /> + <pane id="Scratches" /> + <pane id="PackagesPane"> + <subPane> <PATH> <PATH_ELEMENT> <option name="myItemId" value="vdrmanager" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="app" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> </PATH_ELEMENT> + </PATH> + <PATH> <PATH_ELEMENT> <option name="myItemId" value="vdrmanager" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="build" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + <option name="myItemId" value="app" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="intermediates" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + <option name="myItemId" value="de.bjusystems.vdrmanager.gui" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> </PATH_ELEMENT> </PATH> + </subPane> + </pane> + <pane id="ProjectPane"> + <subPane> <PATH> <PATH_ELEMENT> <option name="myItemId" value="vdrmanager" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> + </PATH> + <PATH> <PATH_ELEMENT> <option name="myItemId" value="vdrmanager" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="app" /> + <option name="myItemId" value="vdrmanager" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -1888,83 +1898,52 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="app" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="src" /> + <option name="myItemId" value="gradle" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="main" /> + <option name="myItemId" value="wrapper" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> - </subPane> - </pane> - <pane id="PackagesPane"> - <subPane> <PATH> <PATH_ELEMENT> <option name="myItemId" value="vdrmanager" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="app" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> - </PATH> - <PATH> <PATH_ELEMENT> <option name="myItemId" value="vdrmanager" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> <option name="myItemId" value="app" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="de.bjusystems.vdrmanager.gui" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> - </subPane> - </pane> - <pane id="AndroidView"> - <subPane> <PATH> <PATH_ELEMENT> <option name="myItemId" value="vdrmanager" /> - <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> - </PATH> - <PATH> <PATH_ELEMENT> <option name="myItemId" value="vdrmanager" /> - <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> <option name="myItemId" value="app" /> - <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="vdrmanager" /> - <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="app" /> - <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" /> + <option name="myItemId" value="src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="java" /> - <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidSourceTypeNode" /> + <option name="myItemId" value="main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> </subPane> </pane> - <pane id="Scratches" /> </panes> </component> <component name="PropertiesComponent"> @@ -1977,7 +1956,7 @@ <property name="ExportApk.ApkPath" value="$PROJECT_DIR$/app" /> <property name="ExportApk.Flavors" value="" /> <property name="ExportApk.BuildType" value="release" /> - <property name="android.project.structure.last.selected" value="Project" /> + <property name="android.project.structure.last.selected" value="app" /> <property name="android.project.structure.proportion" value="0.15" /> <property name="OverrideImplement.combined" value="true" /> <property name="OverrideImplement.overriding.sorted" value="false" /> @@ -2180,20 +2159,20 @@ <editor active="true" /> <layout> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> - <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.26384366" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" /> + <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.26384366" sideWeight="0.49893618" order="11" side_tool="false" content_ui="tabs" /> <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.23031914" sideWeight="0.5076004" order="3" side_tool="true" content_ui="tabs" /> <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" /> <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="8" side_tool="false" content_ui="tabs" /> - <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" 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" weight="0.26384366" sideWeight="0.5010638" order="7" side_tool="true" content_ui="tabs" /> <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" /> <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" 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" weight="0.40988058" sideWeight="0.5" order="13" 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.40988058" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32899022" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32953313" sideWeight="0.5" order="14" 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.32969254" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" 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" weight="0.33" sideWeight="0.5" order="8" side_tool="true" content_ui="tabs" /> + <window_info id="Gradle Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.26384366" sideWeight="0.5010638" order="8" side_tool="true" content_ui="tabs" /> <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32765958" sideWeight="0.49239957" order="0" side_tool="false" content_ui="combo" /> <window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> @@ -2545,24 +2524,24 @@ </provider> </entry> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/epgdetails.xml"> + <provider selected="true" editor-type-id="android-designer"> + <state /> + </provider> <provider 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" /> </state> </provider> - <provider selected="true" editor-type-id="android-designer"> - <state /> - </provider> </entry> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/epg_detail.xml"> + <provider editor-type-id="android-designer"> + <state /> + </provider> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.53403693"> <caret line="171" column="28" selection-start-line="171" selection-start-column="28" selection-end-line="171" selection-end-column="28" /> </state> </provider> - <provider editor-type-id="android-designer"> - <state /> - </provider> </entry> <entry file="file:///opt/android-sdk-update-manager/sources/android-23/android/os/AsyncTask.java"> <provider selected="true" editor-type-id="text-editor"> @@ -2630,12 +2609,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="697" column="36" selection-start-line="697" selection-start-column="36" selection-end-line="697" selection-end-column="36" /> - <folding> - <element signature="e#2137#2138#0" expanded="true" /> - <element signature="e#2167#2168#0" expanded="true" /> - <element signature="e#5430#5431#0" expanded="true" /> - <element signature="e#5478#5479#0" expanded="true" /> - </folding> </state> </provider> </entry> @@ -2643,7 +2616,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="2" column="12" selection-start-line="2" selection-start-column="12" selection-end-line="2" selection-end-column="12" /> - <folding /> </state> </provider> </entry> @@ -2679,50 +2651,50 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties"> + <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/gradle-core/1.2.3/3e702e30815cc67650ed7641c7ff13725dc56f5d/gradle-core-1.2.3-sources.jar!/com/android/build/gradle/internal/dsl/ProductFlavor.groovy"> <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" /> + <caret line="109" column="16" selection-start-line="109" selection-start-column="16" selection-end-line="109" selection-end-column="16" /> <folding /> </state> </provider> </entry> - <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/gradle-core/1.2.3/3e702e30815cc67650ed7641c7ff13725dc56f5d/gradle-core-1.2.3-sources.jar!/com/android/build/gradle/internal/dsl/ProductFlavor.groovy"> + <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/gradle-core/1.2.3/3e702e30815cc67650ed7641c7ff13725dc56f5d/gradle-core-1.2.3-sources.jar!/com/android/build/gradle/internal/dsl/LintOptions.groovy"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-39.52941"> - <caret line="109" column="16" selection-start-line="109" selection-start-column="16" selection-end-line="109" selection-end-column="16" /> + <state vertical-scroll-proportion="0.0"> + <caret line="166" column="9" selection-start-line="166" selection-start-column="9" selection-end-line="166" selection-end-column="9" /> <folding /> </state> </provider> </entry> - <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/gradle-core/1.2.3/3e702e30815cc67650ed7641c7ff13725dc56f5d/gradle-core-1.2.3-sources.jar!/com/android/build/gradle/internal/dsl/LintOptions.groovy"> + <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-8.588235"> - <caret line="166" column="9" selection-start-line="166" selection-start-column="9" selection-end-line="166" selection-end-column="9" /> + <state vertical-scroll-proportion="0.0"> + <caret line="58" column="35" selection-start-line="58" selection-start-column="35" selection-end-line="58" selection-end-column="35" /> <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/build.gradle"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="6" column="55" selection-start-line="6" selection-start-column="55" selection-end-line="6" selection-end-column="55" /> + <state vertical-scroll-proportion="-1.882353"> + <caret line="3" column="17" selection-start-line="3" selection-start-column="17" selection-end-line="3" selection-end-column="17" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/app/build.gradle"> + <entry file="file://$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> - <caret line="27" column="5" selection-start-line="27" selection-start-column="5" selection-end-line="27" selection-end-column="5" /> + <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/AndroidManifest.xml"> + <entry file="file://$PROJECT_DIR$/app/build.gradle"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.09186603"> - <caret line="3" column="30" selection-start-line="3" selection-start-column="25" selection-end-line="3" selection-end-column="30" /> + <state vertical-scroll-proportion="0.80517507"> + <caret line="50" column="42" selection-start-line="50" selection-start-column="42" selection-end-line="50" selection-end-column="42" /> <folding /> </state> </provider> diff --git a/vdrmanager/app/app.iml b/vdrmanager/app/app.iml index 24cf4dc..a1c2d01 100644 --- a/vdrmanager/app/app.iml +++ b/vdrmanager/app/app.iml @@ -77,7 +77,6 @@ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" /> @@ -86,12 +85,13 @@ </content> <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="library" exported="" name="ormlite-android-4.47" level="project" /> - <orderEntry type="library" exported="" name="ormlite-core-4.47" level="project" /> + <orderEntry type="library" exported="" name="ormlite-android-4.48" level="project" /> + <orderEntry type="library" exported="" name="ormlite-core-4.48" level="project" /> + <orderEntry type="library" exported="" name="slf4j-android-1.7.19" level="project" /> + <orderEntry type="library" exported="" name="svdrp4j-1.1.1" level="project" /> <orderEntry type="library" exported="" name="support-v4-23.2.0" level="project" /> - <orderEntry type="library" exported="" name="svdrp4j-1.1.0-SNAPSHOT" level="project" /> + <orderEntry type="library" exported="" name="slf4j-api-1.7.19" level="project" /> <orderEntry type="library" exported="" name="support-annotations-23.2.0" level="project" /> - <orderEntry type="library" exported="" name="slf4j-android-1.6.1-RC1" level="project" /> <orderEntry type="library" exported="" name="appcompat-v7-23.2.0" level="project" /> <orderEntry type="library" exported="" name="animated-vector-drawable-23.2.0" level="project" /> <orderEntry type="library" exported="" name="support-vector-drawable-23.2.0" level="project" /> diff --git a/vdrmanager/app/build.gradle b/vdrmanager/app/build.gradle index c0ec540..d20c10d 100644 --- a/vdrmanager/app/build.gradle +++ b/vdrmanager/app/build.gradle @@ -43,10 +43,10 @@ android { } dependencies { - compile files('libs/ormlite-android-4.47.jar') - compile files('libs/ormlite-core-4.47.jar') - compile files('libs/slf4j-android-1.6.1-RC1.jar') - compile files('libs/svdrp4j-1.1.0-SNAPSHOT.jar') compile 'com.android.support:support-v4:23.2.0' compile 'com.android.support:appcompat-v7:23.2.0' + compile 'com.j256.ormlite:ormlite-android:4.48' + compile 'com.j256.ormlite:ormlite-core:4.48' + compile 'org.slf4j:slf4j-android:1.7.19' + compile 'org.hampelratte:svdrp4j:1.1.1' } |