Skip to content
This repository was archived by the owner on Dec 8, 2022. It is now read-only.

Commit 7824ae7

Browse files
author
Nikolay Elenkov
committed
merged dev
2 parents b70ff47 + 0245107 commit 7824ae7

File tree

209 files changed

+935
-782
lines changed

Some content is hidden

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

209 files changed

+935
-782
lines changed

‎.gitignore

100755100644
File mode changed.

‎AndroidManifest.xml

100755100644
Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
xmlns:tools="http://schemas.android.com/tools"
44
package="com.github.andlyticsproject"
55
android:installLocation="auto"
6-
android:versionCode="262"
7-
android:versionName="2.7.4" >
6+
android:versionCode="264"
7+
android:versionName="2.8.0-BETA1" >
88

99
<uses-permission android:name="android.permission.INTERNET" />
1010
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -31,6 +31,7 @@
3131
android:theme="@style/Theme.Andlytics" >
3232
<activity
3333
android:name=".LoginActivity"
34+
android:theme="@style/Theme.Andlytics.ActionBar"
3435
android:label="@string/app_name" >
3536
<intent-filter>
3637
<action android:name="android.intent.action.MAIN" />
@@ -40,11 +41,11 @@
4041
</activity>
4142
<activity
4243
android:name=".Main"
43-
android:label="@string/app_name"
44-
android:uiOptions="splitActionBarWhenNarrow" >
44+
android:label="@string/app_name">
4545
</activity>
4646
<activity
4747
android:name=".AppInfoActivity"
48+
android:theme="@style/Theme.Andlytics.ActionBar"
4849
android:label="@string/appinfo" >
4950
</activity>
5051
<activity
@@ -54,7 +55,10 @@
5455
android:theme="@android:style/Theme.Dialog" />
5556
<activity
5657
android:name=".AndlyticsPreferenceActivity"
58+
android:theme="@style/Theme.Andlytics.ColoredStatusBar"
5759
android:label="@string/preferences" >
60+
<meta-data android:name="android.support.PARENT_ACTIVITY"
61+
android:value=".Main" />
5862
<intent-filter>
5963
<action android:name="com.github.andlyticsproject.PREFERENCES" />
6064

@@ -63,17 +67,24 @@
6367
</activity>
6468
<activity
6569
android:name=".NotificationPreferenceActivity"
70+
android:theme="@style/Theme.Andlytics.ColoredStatusBar"
6671
android:label="@string/notifications" >
72+
<meta-data android:name="android.support.PARENT_ACTIVITY"
73+
android:value=".AndlyticsPreferenceActivity" />
6774
<action android:name="android.intent.action.MAIN" />
6875

6976
<category android:name="android.intent.category.NOTIFICATION_PREFERENCES" />
7077
</activity>
7178
<activity
7279
android:name=".AccountSpecificPreferenceActivity"
80+
android:theme="@style/Theme.Andlytics.ColoredStatusBar"
7381
android:label="@string/notifications" >
82+
<meta-data android:name="android.support.PARENT_ACTIVITY"
83+
android:value=".AndlyticsPreferenceActivity" />
7484
</activity>
7585
<activity
7686
android:name=".ImportActivity"
87+
android:theme="@style/Theme.Andlytics.ActionBar"
7788
android:label="@string/statistics_import"
7889
tools:ignore="ExportedActivity" >
7990
<intent-filter>
@@ -100,15 +111,20 @@
100111
</activity>
101112
<activity
102113
android:name=".ExportActivity"
114+
android:theme="@style/Theme.Andlytics.ActionBar"
103115
android:label="@string/statistics_export" >
104116
</activity>
105117
<activity
106118
android:name=".about.AboutActivity"
119+
android:theme="@style/Theme.Andlytics.ActionBar"
107120
android:label="@string/about_title" >
108121
</activity>
109122
<activity
110123
android:name=".DetailsActivity"
124+
android:theme="@style/Theme.Andlytics.ActionBar"
111125
android:label="@string/app_name" >
126+
<meta-data android:name="android.support.PARENT_ACTIVITY"
127+
android:value=".Main" />
112128
</activity>
113129

114130
<service

‎README.md

Lines changed: 5 additions & 0 deletions

‎build.gradle

100755100644
Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ buildscript {
33
mavenCentral()
44
}
55
dependencies {
6-
classpath 'com.android.tools.build:gradle:1.2.3'
6+
classpath 'com.android.tools.build:gradle:2.1.2'
77
}
88
}
99

@@ -17,7 +17,7 @@ repositories {
1717
}
1818

1919
dependencies {
20-
compile 'com.android.support:support-v4:20.0.+'
20+
compile "com.android.support:design:22.2.1"
2121
compile "org.achartengine:achartengine:1.1.0"
2222
compile "ch.acra:acra:4.6.1"
2323
compile 'com.google.android.gms:play-services:4.0.30'
@@ -39,8 +39,8 @@ dependencies {
3939

4040
android {
4141

42-
compileSdkVersion 21
43-
buildToolsVersion "22.0.1"
42+
compileSdkVersion 22
43+
buildToolsVersion "23.0.3"
4444

4545
// lintOptions {
4646
// checkReleaseBuilds false
@@ -49,17 +49,30 @@ android {
4949

5050

5151
signingConfigs {
52-
release {
53-
storeFile file ("andlytics-release-key.keystore")
52+
if (rootProject.file('andlytics-release-key.keystore').exists()) {
53+
release {
54+
storeFile file ("andlytics-release-key.keystore")
55+
}
5456
}
5557
}
5658

5759
buildTypes {
5860
release {
59-
signingConfig signingConfigs.release
61+
if (rootProject.file('andlytics-release-key.keystore').exists()) {
62+
signingConfig signingConfigs.release
63+
}
64+
}
65+
releaseUnsigned.initWith(buildTypes.release)
66+
releaseUnsigned {
67+
signingConfig null
6068
}
6169
}
6270

71+
compileOptions {
72+
sourceCompatibility JavaVersion.VERSION_1_6
73+
targetCompatibility JavaVersion.VERSION_1_6
74+
}
75+
6376
sourceSets {
6477
main {
6578
manifest.srcFile 'AndroidManifest.xml'

‎gradle/wrapper/gradle-wrapper.jar

3.65 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

100755100644
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue Jun 30 13:16:45 JST 2015
1+
#Thu May 12 18:58:00 SGT 2016
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-all.zip

‎gradlew

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,6 @@ case "`uname`" in
4242
;;
4343
esac
4444

45-
# For Cygwin, ensure paths are in UNIX format before anything is touched.
46-
if $cygwin ; then
47-
[ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
48-
fi
49-
5045
# Attempt to set APP_HOME
5146
# Resolve links: $0 may be a link
5247
PRG="$0"
@@ -61,9 +56,9 @@ while [ -h "$PRG" ] ; do
6156
fi
6257
done
6358
SAVED="`pwd`"
64-
cd "`dirname \"$PRG\"`/" >&-
59+
cd "`dirname \"$PRG\"`/" >/dev/null
6560
APP_HOME="`pwd -P`"
66-
cd "$SAVED" >&-
61+
cd "$SAVED" >/dev/null
6762

6863
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
6964

@@ -114,6 +109,7 @@ fi
114109
if $cygwin ; then
115110
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
116111
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
112+
JAVACMD=`cygpath --unix "$JAVACMD"`
117113

118114
# We build the pattern for arguments to be converted via cygpath
119115
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`

‎gradlew.bat

Lines changed: 90 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -1,90 +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
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 Windows 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

‎libs/google-api-client-1.16.0-rc.jar

100755100644
File mode changed.

‎libs/google-api-client-android-1.16.0-rc.jar

100755100644
File mode changed.

0 commit comments

Comments
 (0)