Skip to content

Commit cd77f8c

Browse files
seanmonstarseanmonstar
committed
QUANTITIES!
1 parent 7740de8 commit cd77f8c

19 files changed

+489
-23
lines changed

‎.gitignore

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
11
bin/*
2-
gen/*
2+
gen/*
3+
.gradle
4+
.idea
5+
build/
6+
gradle/

‎AndroidManifest.xml

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.monstarlab.servicedroid" android:versionName="2.0.2-dev" android:versionCode="19">
3+
package="com.monstarlab.servicedroid" android:versionName="2.0.2.4" android:versionCode="19">
44

55
<uses-sdk android:minSdkVersion="7" android:targetSdkVersion="17" />
66
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
77
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
88

99
<application android:icon="@drawable/icon" android:label="@string/app_name"
1010
android:backupAgent=".model.ServiceDroidBackupAgent"
11-
android:theme="@style/Theme.Sherlock.Light.DarkActionBar"
11+
android:theme="@style/ServiceDroid"
1212
android:installLocation="auto">
1313

1414
<meta-data android:name="com.google.android.backup.api_key"
@@ -47,14 +47,13 @@
4747
</activity>
4848

4949
<provider android:name=".model.ServiceProvider"
50-
android:authorities="com.monstarlab.servicedroid">
51-
</provider>
50+
android:authorities="com.monstarlab.servicedroid"/>
5251

53-
<service android:name=".service.ReminderService"></service>
54-
<service android:name=".service.TimerService"></service>
55-
<service android:name=".service.BackupService"></service>
52+
<service android:name=".service.ReminderService"/>
53+
<service android:name=".service.TimerService"/>
54+
<service android:name=".service.BackupService"/>
5655

57-
<receiver android:name=".receiver.NotificationReceiver"></receiver>
56+
<receiver android:name=".receiver.NotificationReceiver"/>
5857
<receiver android:name=".receiver.BootReceiver"
5958
android:permission="android.permission.RECEIVE_BOOT_COMPLETED">
6059
<intent-filter>

‎ServiceDroid.iml

+77
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
<?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" type="JAVA_MODULE" version="4">
3+
<component name="FacetManager">
4+
<facet type="android" name="Android">
5+
<configuration>
6+
<option name="SELECTED_BUILD_VARIANT" value="debug" />
7+
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
8+
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugJava" />
9+
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
10+
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
11+
<option name="ALLOW_USER_CONFIGURATION" value="false" />
12+
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/res" />
13+
</configuration>
14+
</facet>
15+
<facet type="android-gradle" name="Android-Gradle">
16+
<configuration>
17+
<option name="GRADLE_PROJECT_PATH" value=":" />
18+
</configuration>
19+
</facet>
20+
</component>
21+
<component name="NewModuleRootManager" inherit-compiler-output="false">
22+
<output url="file://$MODULE_DIR$/build/classes/debug" />
23+
<exclude-output />
24+
<content url="file://$MODULE_DIR$">
25+
<sourceFolder url="file://$MODULE_DIR$/build/source/r/debug" isTestSource="false" generated="true" />
26+
<sourceFolder url="file://$MODULE_DIR$/build/source/aidl/debug" isTestSource="false" generated="true" />
27+
<sourceFolder url="file://$MODULE_DIR$/build/source/buildConfig/debug" isTestSource="false" generated="true" />
28+
<sourceFolder url="file://$MODULE_DIR$/build/source/rs/debug" isTestSource="false" generated="true" />
29+
<sourceFolder url="file://$MODULE_DIR$/build/res/rs/debug" type="java-resource" />
30+
<sourceFolder url="file://$MODULE_DIR$/build/source/r/test/debug" isTestSource="true" />
31+
<sourceFolder url="file://$MODULE_DIR$/build/source/aidl/test/debug" isTestSource="true" />
32+
<sourceFolder url="file://$MODULE_DIR$/build/source/buildConfig/test/debug" isTestSource="true" />
33+
<sourceFolder url="file://$MODULE_DIR$/build/source/rs/test/debug" isTestSource="true" />
34+
<sourceFolder url="file://$MODULE_DIR$/build/res/rs/test/debug" type="java-test-resource" />
35+
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
36+
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" isTestSource="false" />
37+
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
38+
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
39+
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
40+
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
41+
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
42+
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
43+
<sourceFolder url="file://$MODULE_DIR$/assets" isTestSource="false" />
44+
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
45+
<sourceFolder url="file://$MODULE_DIR$/res" type="java-resource" />
46+
<sourceFolder url="file://$MODULE_DIR$/src" type="java-resource" />
47+
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/aidl" isTestSource="true" />
48+
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/assets" isTestSource="true" />
49+
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/java" isTestSource="true" />
50+
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/jni" isTestSource="true" />
51+
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/rs" isTestSource="true" />
52+
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/res" type="java-test-resource" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/resources" type="java-test-resource" />
54+
<excludeFolder url="file://$MODULE_DIR$/.git" />
55+
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
56+
<excludeFolder url="file://$MODULE_DIR$/.idea" />
57+
<excludeFolder url="file://$MODULE_DIR$/.settings" />
58+
<excludeFolder url="file://$MODULE_DIR$/build/apk" />
59+
<excludeFolder url="file://$MODULE_DIR$/build/assets" />
60+
<excludeFolder url="file://$MODULE_DIR$/build/bundles" />
61+
<excludeFolder url="file://$MODULE_DIR$/build/classes" />
62+
<excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
63+
<excludeFolder url="file://$MODULE_DIR$/build/incremental" />
64+
<excludeFolder url="file://$MODULE_DIR$/build/libs" />
65+
<excludeFolder url="file://$MODULE_DIR$/build/manifests" />
66+
<excludeFolder url="file://$MODULE_DIR$/build/res" />
67+
<excludeFolder url="file://$MODULE_DIR$/build/symbols" />
68+
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
69+
</content>
70+
<orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
71+
<orderEntry type="sourceFolder" forTests="false" />
72+
<orderEntry type="library" exported="" name="support-v4-19.0.0" level="project" />
73+
<orderEntry type="library" exported="" name="ComActionbarsherlockActionbarsherlock440.aar" level="project" />
74+
<orderEntry type="library" exported="" name="android-numberpicker-1.0.0" level="project" />
75+
</component>
76+
</module>
77+

‎build.gradle

+136
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,136 @@
1+
import java.util.regex.Pattern
2+
3+
buildscript {
4+
repositories {
5+
mavenCentral()
6+
//maven { url 'http://download.crashlytics.com/maven' }
7+
8+
}
9+
dependencies {
10+
classpath 'com.android.tools.build:gradle:0.7.+'
11+
//classpath 'com.crashlytics.tools.gradle:crashlytics-gradle:1.+'
12+
13+
}
14+
}
15+
apply plugin: 'android'
16+
//apply plugin: 'crashlytics'
17+
18+
repositories {
19+
mavenCentral()
20+
//maven { url 'http://download.crashlytics.com/maven' }
21+
22+
}
23+
24+
dependencies {
25+
26+
//compile 'com.crashlytics.android:crashlytics:1.+'
27+
compile 'com.actionbarsherlock:actionbarsherlock:4.4.0@aar'
28+
compile 'com.android.support:support-v4:19.+'
29+
30+
//instrumentTestCompile files('libs/espresso-1.0-SNAPSHOT-bundled.jar')
31+
32+
}
33+
34+
android {
35+
compileSdkVersion 19
36+
buildToolsVersion "19.0.1"
37+
38+
defaultConfig {
39+
minSdkVersion 7
40+
targetSdkVersion 19
41+
42+
//testInstrumentationRunner "com.google.android.apps.common.testing.testrunner.GoogleInstrumentationTestRunner"
43+
}
44+
45+
compileOptions {
46+
sourceCompatibility JavaVersion.VERSION_1_7
47+
targetCompatibility JavaVersion.VERSION_1_7
48+
}
49+
50+
sourceSets {
51+
main {
52+
manifest.srcFile 'AndroidManifest.xml'
53+
java.srcDirs = ['src']
54+
55+
resources.srcDirs = ['src']
56+
aidl.srcDirs = ['src']
57+
58+
renderscript.srcDirs = ['src']
59+
60+
res.srcDirs = ['res']
61+
assets.srcDirs = ['assets']
62+
63+
}
64+
}
65+
66+
signingConfigs {
67+
debug {
68+
storeFile file("C:\\Users\\Sean\\.android\\debug.keystore")
69+
}
70+
release {
71+
storeFile file("D:\\Users\\Sean\\Dropbox\\android\\keystore\\sean_android_key.keystore")
72+
storePassword "boo"
73+
keyAlias "sean_android_key"
74+
keyPassword "boo"
75+
}
76+
}
77+
78+
buildTypes {
79+
debug {
80+
versionNameSuffix "-dev"
81+
zipAlign = true
82+
}
83+
release {
84+
//runProguard true
85+
//proguardFile file('proguard-project.txt')
86+
signingConfig signingConfigs.release
87+
}
88+
}
89+
}
90+
91+
task('increaseVersionName') << {
92+
def manifestFile = file('AndroidManifest.xml')
93+
def patternBuildNumber = Pattern.compile("versionName=\"(\\d+\\.\\d+\\.\\d+\\.)(\\d+)(-.+)?\"")
94+
def manifestText = manifestFile.getText()
95+
def matcherBuilderNumber = patternBuildNumber.matcher(manifestText)
96+
matcherBuilderNumber.find()
97+
def versionName = matcherBuilderNumber.group(1)
98+
def buildNumber = Integer.parseInt(matcherBuilderNumber.group(2))
99+
def buildType = matcherBuilderNumber.group(3)
100+
def manifestContent = matcherBuilderNumber.replaceAll("versionName=\"" + versionName + (++buildNumber) + ((buildType == null) ? "" : buildType) + "\"");
101+
manifestFile.write(manifestContent)
102+
}
103+
104+
task('increaseVersionCode') << {
105+
def manifestFile = file('AndroidManifest.xml')
106+
def patternBuildNumber = Pattern.compile("versionCode=\"(\\d+)\"")
107+
def manifestText = manifestFile.getText()
108+
def matcherBuilderNumber = patternBuildNumber.matcher(manifestText)
109+
matcherBuilderNumber.find()
110+
def versionCode = Integer.parseInt(matcherBuilderNumber.group(1)) + 1;
111+
def manifestContent = matcherBuilderNumber.replaceAll("versionCode=\"${versionCode}\"");
112+
manifestFile.write(manifestContent)
113+
}
114+
115+
task('askForPasswords') << {
116+
// Must create String because System.readPassword() returns char[]
117+
// (and assigning that below fails silently)
118+
def storePw = new String(System.console().readPassword("Keystore password: "))
119+
def keyPw = new String(System.console().readPassword("Key password: "))
120+
121+
android.signingConfigs.release.storePassword = storePw
122+
android.signingConfigs.release.keyPassword = keyPw
123+
}
124+
125+
android.applicationVariants.all { variant ->
126+
variant.generateBuildConfig.dependsOn "increaseVersionName"
127+
if (variant.buildType.name == 'release' || variant.buildType.name == 'beta') {
128+
variant.generateBuildConfig.dependsOn "increaseVersionCode"
129+
}
130+
}
131+
132+
tasks.whenTaskAdded { theTask ->
133+
if (theTask.name.equals("packageRelease")) {
134+
theTask.dependsOn "askForPasswords"
135+
}
136+
}

‎gradlew.bat

+90
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
@if "%DEBUG%" == "" @echo off
2+
@rem ##########################################################################
3+
@rem
4+
@rem Gradle startup script for Windows
5+
@rem
6+
@rem ##########################################################################
7+
8+
@rem Set local scope for the variables with windows NT shell
9+
if "%OS%"=="Windows_NT" setlocal
10+
11+
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
12+
set DEFAULT_JVM_OPTS=
13+
14+
set DIRNAME=%~dp0
15+
if "%DIRNAME%" == "" set DIRNAME=.
16+
set APP_BASE_NAME=%~n0
17+
set APP_HOME=%DIRNAME%
18+
19+
@rem Find java.exe
20+
if defined JAVA_HOME goto findJavaFromJavaHome
21+
22+
set JAVA_EXE=java.exe
23+
%JAVA_EXE% -version >NUL 2>&1
24+
if "%ERRORLEVEL%" == "0" goto init
25+
26+
echo.
27+
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
28+
echo.
29+
echo Please set the JAVA_HOME variable in your environment to match the
30+
echo location of your Java installation.
31+
32+
goto fail
33+
34+
:findJavaFromJavaHome
35+
set JAVA_HOME=%JAVA_HOME:"=%
36+
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
37+
38+
if exist "%JAVA_EXE%" goto init
39+
40+
echo.
41+
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
42+
echo.
43+
echo Please set the JAVA_HOME variable in your environment to match the
44+
echo location of your Java installation.
45+
46+
goto fail
47+
48+
:init
49+
@rem Get command-line arguments, handling Windowz variants
50+
51+
if not "%OS%" == "Windows_NT" goto win9xME_args
52+
if "%@eval[2+2]" == "4" goto 4NT_args
53+
54+
:win9xME_args
55+
@rem Slurp the command line arguments.
56+
set CMD_LINE_ARGS=
57+
set _SKIP=2
58+
59+
:win9xME_args_slurp
60+
if "x%~1" == "x" goto execute
61+
62+
set CMD_LINE_ARGS=%*
63+
goto execute
64+
65+
:4NT_args
66+
@rem Get arguments from the 4NT Shell from JP Software
67+
set CMD_LINE_ARGS=%$
68+
69+
:execute
70+
@rem Setup the command line
71+
72+
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
73+
74+
@rem Execute Gradle
75+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
76+
77+
:end
78+
@rem End local scope for the variables with windows NT shell
79+
if "%ERRORLEVEL%"=="0" goto mainEnd
80+
81+
:fail
82+
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
83+
rem the _cmd.exe /c_ return code!
84+
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
85+
exit /b 1
86+
87+
:mainEnd
88+
if "%OS%"=="Windows_NT" endlocal
89+
90+
:omega

‎local.properties

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
## This file is automatically generated by Android Studio.
2+
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
3+
#
4+
# This file must *NOT* be checked into Version Control Systems,
5+
# as it contains information specific to your local configuration.
6+
#
7+
# Location of the SDK. This is only used by Gradle.
8+
# For customization when using a Version Control System, please read the
9+
# header note.
10+
#Fri Nov 29 20:52:39 PST 2013
11+
sdk.dir=D\:/Users/Sean/AppData/Local/Android/android-studio/sdk

‎project.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
# Indicates whether an apk should be generated for each density.
1414
split.density=false
1515
# Project target.
16-
target=android-17
17-
android.library.reference.1=../../../Downloads/JakeWharton-ActionBarSherlock-4.2.0-0-g90939dc/JakeWharton-ActionBarSherlock-e5c2d1c/library
16+
target=android-19
17+

0 commit comments

Comments
 (0)