Skip to content

Commit ae6fb6a

Browse files
author
David Graeff
committed
Refactor PluginService -> DataService
1 parent e42d40b commit ae6fb6a

File tree

331 files changed

+9207
-7438
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

331 files changed

+9207
-7438
lines changed

‎NetPowerctrl.iml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.id="NetPowerctrl" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="java-gradle" name="Java-Gradle">
55
<configuration>
66
<option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
7+
<option name="BUILDABLE" value="false" />
78
</configuration>
89
</facet>
910
</component>
@@ -15,5 +16,4 @@
1516
<orderEntry type="inheritedJdk" />
1617
<orderEntry type="sourceFolder" forTests="false" />
1718
</component>
18-
</module>
19-
19+
</module>

‎app/app.iml‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="NetPowerctrl" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="NetPowerctrl" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
@@ -12,9 +12,10 @@
1212
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
1313
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1414
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
15-
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
1615
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
17-
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
16+
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
17+
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
18+
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
1819
<option name="ALLOW_USER_CONFIGURATION" value="false" />
1920
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
2021
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@@ -25,7 +26,7 @@
2526
</component>
2627
<component name="NewModuleRootManager" inherit-compiler-output="false">
2728
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
28-
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
29+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
2930
<exclude-output />
3031
<content url="file://$MODULE_DIR$">
3132
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
@@ -34,12 +35,12 @@
3435
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
3536
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
3637
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
37-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
38-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
39-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
40-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
41-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
42-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/debug" type="java-test-resource" />
38+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
39+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
40+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
41+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
42+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
43+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
4344
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4445
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
4546
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -84,26 +85,25 @@
8485
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
8586
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
8687
</content>
87-
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
88+
<orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
8889
<orderEntry type="sourceFolder" forTests="false" />
89-
<orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
90-
<orderEntry type="library" exported="" name="palette-v7-21.0.3" level="project" />
91-
<orderEntry type="library" exported="" name="support-v13-21.0.3" level="project" />
92-
<orderEntry type="library" exported="" name="cardview-v7-21.0.3" level="project" />
93-
<orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
94-
<orderEntry type="library" exported="" name="acra-4.6.0RC2" level="project" />
90+
<orderEntry type="library" exported="" name="appcompat-v7-22.0.0" level="project" />
91+
<orderEntry type="library" exported="" name="recyclerview-animators-1.2.0" level="project" />
92+
<orderEntry type="library" exported="" name="material-1.1.0" level="project" />
93+
<orderEntry type="library" exported="" name="recyclerview-v7-22.0.0" level="project" />
94+
<orderEntry type="library" exported="" name="support-v4-22.0.0" level="project" />
95+
<orderEntry type="library" exported="" name="palette-v7-22.0.0" level="project" />
96+
<orderEntry type="library" exported="" name="acra-4.6.2" level="project" />
97+
<orderEntry type="library" exported="" name="support-annotations-22.0.0" level="project" />
9598
<orderEntry type="library" exported="" name="ndeftools-1.2.4" level="project" />
9699
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
97100
<orderEntry type="library" exported="" name="zip4j-1.3.2" level="project" />
98101
<orderEntry type="library" exported="" name="library-1.5.1" level="project" />
99-
<orderEntry type="library" exported="" name="recyclerview-v7-21.0.3" level="project" />
100-
<orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
102+
<orderEntry type="library" exported="" name="support-v13-22.0.0" level="project" />
101103
<orderEntry type="library" exported="" name="flowlayout-0.3.4" level="project" />
102104
<orderEntry type="library" exported="" scope="TEST" name="junit-4.11" level="project" />
103105
<orderEntry type="library" exported="" name="ndeftools-util-1.2.4" level="project" />
104-
<orderEntry type="module" module-name="library" exported="" />
106+
<orderEntry type="library" exported="" name="cardview-v7-22.0.0" level="project" />
105107
<orderEntry type="module" module-name="Donations" exported="" />
106-
<orderEntry type="module" module-name="device_base" exported="" />
107108
</component>
108-
</module>
109-
109+
</module>

‎app/build.gradle‎

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 21
5-
buildToolsVersion "21.1.2"
4+
compileSdkVersion 22
5+
buildToolsVersion "22.0.1"
66

77
// productFlavors {
88
// //noinspection GroovyMissingReturnStatement
@@ -14,8 +14,8 @@ android {
1414
def appID = "oly.netpowerctrl"
1515

1616
defaultConfig {
17-
minSdkVersion 14
18-
targetSdkVersion 21
17+
minSdkVersion 17
18+
targetSdkVersion 22
1919
versionCode 117
2020
versionName "7.1"
2121
applicationId appID
@@ -62,6 +62,12 @@ android {
6262
}
6363
}
6464

65+
allprojects {
66+
tasks.withType(JavaCompile) {
67+
options.compilerArgs << "-Xlint:deprecation"
68+
}
69+
}
70+
6571
// splits {
6672
// density {
6773
// enable true
@@ -86,23 +92,28 @@ dependencies {
8692
//compile fileTree(dir: 'libs', include: ['*.jar']) :5.2.08 5.0.89
8793
//compile 'com.google.android.gms:play-services:5.2.08'
8894
compile project(':libraries:Donations')
89-
compile project(':libraries:device_base')
90-
compile project(':libraries:SlidingMenu:library')
9195
//noinspection GradleDependency
92-
compile('com.android.support:appcompat-v7:21.0.3')
93-
compile('com.android.support:support-v13:21.0.3')
94-
compile('com.android.support:recyclerview-v7:21.0.3')
95-
compile('com.android.support:palette-v7:21.0.3')
96-
compile('com.android.support:cardview-v7:21.0.3')
96+
compile 'com.android.support:appcompat-v7:22.0.0'
97+
compile 'com.android.support:support-v13:22.0.0'
98+
compile 'com.android.support:recyclerview-v7:22.0.0'
99+
compile 'com.android.support:palette-v7:22.0.0'
100+
compile 'com.android.support:cardview-v7:22.0.0'
101+
compile('com.github.rey5137:material:1.1.0') {
102+
exclude group: 'com.google.android'
103+
exclude group: 'com.android.support'
104+
}
97105
compile('com.wefika:flowlayout:0.3.4') {
98106
exclude group: 'com.google.android'
99107
exclude group: 'com.android.support'
100108
}
101-
//compile('com.github.eluleci:flatui:3.0.0') { exclude group: 'com.google.android' }
109+
compile('jp.wasabeef:recyclerview-animators:1.2.0@aar') {
110+
exclude group: 'com.google.android'
111+
exclude group: 'com.android.support'
112+
}
102113
compile('com.github.gabrielemariotti.changeloglib:library:1.5.1') {
103114
exclude group: 'com.google.android'; exclude group: 'com.android.support'
104115
}
105-
compile('ch.acra:acra:4.6.0RC2') {
116+
compile('ch.acra:acra:4.6.2') {
106117
exclude group: 'com.google.android'; exclude group: 'org.json';
107118
exclude group: 'com.android.support'
108119
}

‎app/manifest-merger-release-report.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ data
208208
ADDED from AndroidManifest.xml:92:17
209209
android:mimeType
210210
ADDED from AndroidManifest.xml:92:23
211-
activity#oly.netpowerctrl.widget.WidgetConfigActivity
211+
activity#oly.netpowerctrl.widget.ConfigExecutableActivity
212212
ADDED from AndroidManifest.xml:96:9
213213
android:label
214214
ADDED from AndroidManifest.xml:101:13
@@ -266,7 +266,7 @@ action#android.intent.action.CREATE_SHORTCUT
266266
ADDED from AndroidManifest.xml:126:17
267267
android:name
268268
ADDED from AndroidManifest.xml:126:25
269-
receiver#oly.netpowerctrl.widget.DeviceWidgetProvider
269+
receiver#oly.netpowerctrl.widget.ProviderExecutable
270270
ADDED from AndroidManifest.xml:132:9
271271
android:label
272272
ADDED from AndroidManifest.xml:135:13

‎app/proguard-rules-debug.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,7 @@
55
-verbose
66

77
-assumenosideeffects class oly.netpowerctrl.plugin.** { *; }
8+
9+
-keep class oly.netpowerctrl.debug.* {
10+
*;
11+
}

‎app/proguard-rules.txt‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,17 @@
2121
*;
2222
}
2323

24+
-keep oly.netpowerctrl.debug {
25+
*;
26+
}
27+
2428
# keep this around for some enums that ACRA needs
2529
-keep class org.acra.ReportingInteractionMode {
2630
*;
2731
}
2832

2933
-assumenosideeffects class oly.netpowerctrl.plugin.** { *; }
3034

31-
-assumenosideeffects class oly.netpowerctrl.device_base.Device {
32-
private void test_checkLock();
33-
private void test_checkDevicePortLock();
34-
}
35-
3635
-assumenosideeffects class oly.netpowerctrl.consistency_tests.** { *; }
3736

3837
-keepnames class org.acra.sender.HttpSender$** {

‎app/src/main/AndroidManifest.xml‎

Lines changed: 44 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,9 @@
3131

3232
<uses-sdk />
3333

34-
<!-- isNotIceCreamSandwich: bug fix for android 4.0.3 and 4.0.4 -->
3534
<application
3635
android:name=".main.App"
3736
android:allowBackup="true"
38-
android:hardwareAccelerated="@bool/isNotIceCreamSandwich"
3937
android:icon="@drawable/netpowerctrl"
4038
android:label="@string/app_name"
4139
android:supportsRtl="true">
@@ -95,13 +93,16 @@
9593
</activity>
9694

9795
<activity
98-
android:name=".widget.WidgetConfigActivity"
99-
android:configChanges="orientation|screenSize|keyboardHidden|layoutDirection"
100-
android:description="@string/app_name_widget"
101-
android:icon="@drawable/netpowerctrl"
102-
android:label="@string/app_name"
103-
android:noHistory="true"
104-
android:theme="@style/Theme.AppCompat.Translucent">
96+
android:name="oly.netpowerctrl.widget.ConfigExecutableActivity"
97+
android:configChanges="orientation|screenSize|keyboardHidden|layoutDirection">
98+
<intent-filter>
99+
<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
100+
</intent-filter>
101+
</activity>
102+
103+
<activity
104+
android:name="oly.netpowerctrl.widget.ConfigGroupActivity"
105+
android:configChanges="orientation|screenSize|keyboardHidden|layoutDirection">
105106
<intent-filter>
106107
<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
107108
</intent-filter>
@@ -110,17 +111,28 @@
110111
<activity
111112
android:name=".main.NfcTagWriterActivity"
112113
android:configChanges="orientation|screenSize|keyboardHidden|layoutDirection"
113-
android:description="@string/app_name_widget"
114-
android:icon="@drawable/netpowerctrl"
115-
android:label="@string/app_name"
116114
android:theme="@style/Theme.AppCompat.Translucent" />
117115

118116
<activity
119117
android:name=".main.EditActivity"
120118
android:configChanges="orientation|screenSize|keyboardHidden|layoutDirection"
121-
android:description="@string/app_name_shortcut_desc"
119+
android:description="@string/shortcut_new_scene_desc"
120+
android:icon="@drawable/netpowerctrl"
121+
android:label="@string/shortcut_new_scene"
122+
android:theme="@style/Theme.StartTheme"
123+
android:windowSoftInputMode="stateHidden">
124+
<intent-filter>
125+
<action android:name="android.intent.action.CREATE_SHORTCUT" />
126+
<category android:name="android.intent.category.DEFAULT" />
127+
</intent-filter>
128+
</activity>
129+
130+
<activity
131+
android:name=".main.SelectExistingExecutableActivity"
132+
android:configChanges="orientation|screenSize|keyboardHidden|layoutDirection"
133+
android:description="@string/shortcut_existing_executable_desc"
122134
android:icon="@drawable/netpowerctrl"
123-
android:label="@string/app_name_shortcut"
135+
android:label="@string/shortcut_existing_executable"
124136
android:theme="@style/Theme.StartTheme"
125137
android:windowSoftInputMode="stateHidden">
126138
<intent-filter>
@@ -131,7 +143,7 @@
131143

132144
<!-- Widget -->
133145
<receiver
134-
android:name="oly.netpowerctrl.widget.DeviceWidgetProvider"
146+
android:name=".widget.ProviderExecutable"
135147
android:icon="@drawable/netpowerctrl"
136148
android:label="@string/app_name_widget">
137149
<intent-filter>
@@ -140,20 +152,33 @@
140152

141153
<meta-data
142154
android:name="android.appwidget.provider"
143-
android:resource="@xml/appwidget_provider" />
155+
android:resource="@xml/widget_executable_provider" />
156+
</receiver>
157+
<receiver
158+
android:name=".widget.ProviderGroup"
159+
android:icon="@drawable/netpowerctrl"
160+
android:label="@string/app_name_widget_group">
161+
<intent-filter>
162+
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
163+
</intent-filter>
164+
165+
<meta-data
166+
android:name="android.appwidget.provider"
167+
android:resource="@xml/widget_group_provider" />
144168
</receiver>
145169

146170
<service
147-
android:name=".pluginservice.PluginService"
171+
android:name=".data.DataService"
148172
android:exported="true"
149173
android:permission="oly.netpowerctrl.permission.PLUGINS" />
150174

151175
<service
152176
android:name=".widget.WidgetUpdateService"
153-
android:exported="false" />
177+
android:exported="false"
178+
android:permission="android.permission.BIND_REMOTEVIEWS" />
154179

155180
<service
156-
android:name=".utils.statusbar_and_speech.AndroidStatusBarService"
181+
android:name=".status_bar.AndroidStatusBarService"
157182
android:exported="false" />
158183

159184
<receiver

0 commit comments

Comments
 (0)