Skip to content

Commit

Permalink
Merge branch 'release/0.0.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
jhbruhn committed Jun 14, 2014
2 parents 561f74e + 0786a3d commit 82f4603
Show file tree
Hide file tree
Showing 13 changed files with 207 additions and 27 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
*.keystore
/build
.gradle
/local.properties
.idea
Expand Down
25 changes: 25 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
language: android
android:
components:
- build-tools-19.1.0
before_script:
- openssl aes-256-cbc -k "$KEYSTORE_FILE_PASSWORD" -in release.keystore.enc -d -a
-out release.keystore
script:
- "./gradlew build"
- if [ "$TRAVIS_BRANCH" = "develop" ]; then ./gradlew testfairyRelease; fi;
env:
global:
- secure: WR7j7bQVR5IAvn4fR9xT5IyQglUxmmDj3ohzrSVmTwDCuHEo/QuZX5QxpJHIciSNUBDEiAIQYmtvYredIdoPk3W0s8d7PCYhMdiKgojs/dD65BfxiXDlEos7Y/seTO84m4M10MN0nnwTf8owzlO9FMQioLbDFzJUTQU9d3/wdCo=
- secure: Tk776qT+UkyaWF2h3jSSoCLYBKFTekTJLnPwMg+XBj41ChjeUppvjwlYV5uRpRi9s+4CGW/FT1odafofGrJ7TfgKj49C/6DbaNHSCgEdLKvAdn2BjirlaYzJtf7vBy+VD1u7/13m849EO4o16xrWgHzRBJXJ9pZmYeHt5nUGk3I=
- secure: g/LSBmGJMqtgbe+GXZMlAbyMQSkpy7sih7e+3JgfyoyCO84fyos4otZlLgmEwleiYYxBOBAgEBnQfANnbL6cN9YXVowRVSw8bzOr/nqjWfJ7OtWQUOwz6KtKIeOvWAALzivGxU7LCagGuvmpUNKmbrHKzUQFGUxpokGvy66uYh4=
deploy:
provider: releases
skip_cleanup: false
api_key:
secure: FGUpXcIJLqZTKg57W/UqiGuEEykA6yJuUaifxNr0LzA0WhqMvLYJV20p9QtGiS30/qKPC8MqoUjGlwzQpmtwOz5XYcLhxYXTAG42/ZTIwfn1B4mERfGZ0KthWXVfvz+sXUEAM9tM8uWaySOmalZTAQ4cfmGvf1qJubABcDm3VDg=
file: "./app/build/outputs/apk/app-release.apk"
on:
tags: true
all_branches: false
repo: HappyCarl/geotown.android
44 changes: 22 additions & 22 deletions app/app.iml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="GeoTown" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="geotown.android" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
Expand All @@ -22,19 +22,19 @@
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/classes/debug" />
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/build/source/r/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/source/aidl/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/source/buildConfig/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/source/rs/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/res/rs/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/source/r/test/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/source/aidl/test/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/source/buildConfig/test/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/source/rs/test/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/res/rs/test/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
Expand All @@ -56,20 +56,20 @@
<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" />
<excludeFolder url="file://$MODULE_DIR$/build/apk" />
<excludeFolder url="file://$MODULE_DIR$/build/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/bundles" />
<excludeFolder url="file://$MODULE_DIR$/build/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/libs" />
<excludeFolder url="file://$MODULE_DIR$/build/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/res" />
<excludeFolder url="file://$MODULE_DIR$/build/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="jsr305-1.3.9" level="project" />
<orderEntry type="library" exported="" name="google-api-client-1.18.0-rc" level="project" />
<orderEntry type="library" exported="" name="systembartint-1.0.3" level="project" />
<orderEntry type="library" exported="" name="geotown-v1-1.18.0-rc-SNAPSHOT" level="project" />
<orderEntry type="library" exported="" name="google-oauth-client-1.18.0-rc" level="project" />
<orderEntry type="library" exported="" name="butterknife-5.1.0" level="project" />
<orderEntry type="library" exported="" name="google-http-client-1.18.0-rc" level="project" />
<orderEntry type="library" exported="" name="otto-1.3.5" level="project" />
</component>
</module>

50 changes: 47 additions & 3 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,28 +1,72 @@
apply plugin: 'android'
apply plugin: 'testfairy'


android {
compileSdkVersion 19
buildToolsVersion "19.0.3"
buildToolsVersion "19.1.0"

project.ext.vCode = 1
try {
project.ext.vCode = Integer.valueOf(System.getenv("TRAVIS_BUILD_NUMBER"))
} catch(e) {}

project.ext.vName = System.getenv("TRAVIS_TAG")
if(!project.ext.vName) {
project.ext.vName = "1.0.0"
} else {
project.ext.vName = project.ext.vName.replace("v", "")
}

defaultConfig {
minSdkVersion 14
targetSdkVersion 19
versionCode 1
versionName "1.0"
versionCode project.ext.vCode
versionName project.ext.vName
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7
}

signingConfigs {
release {
storeFile file("../release.keystore")
storePassword System.getenv("KEYSTORE_PASSWORD")
keyAlias System.getenv("KEYSTORE_ALIAS")
keyPassword System.getenv("KEYSTORE_PASSWORD")
}
}

buildTypes {
release {
runProguard false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
signingConfig signingConfigs.release
}
debug {
signingConfig signingConfigs.release
}
}

testfairyConfig {
apiKey "$System.env.TESTFAIRY_KEY"
metrics "cpu,memory,network,logcat"
video "wifi"
videoRate "0.5"
videoQuality "low"
maxDuration "15m"
notify true
maxDuration "1h"
autoUpdate true
}
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.appspot.drive_log:geotown:v1-1.18.0-rc-SNAPSHOT'
compile 'com.readystatesoftware.systembartint:systembartint:1.0.3'
compile 'com.squareup:otto:1.3.5'
compile 'com.jakewharton:butterknife:5.1.0'
}
1 change: 1 addition & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
android:theme="@style/AppTheme" >
<activity
android:name="de.happycarl.geotown.app.StartActivity"
android:windowTranslucentStatus="true"
android:label="@string/app_name" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand Down
27 changes: 27 additions & 0 deletions app/src/main/java/de/happycarl/geotown/app/StartActivity.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
package de.happycarl.geotown.app;

import android.annotation.TargetApi;
import android.app.Activity;
import android.os.Build;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuItem;
import android.view.Window;
import android.view.WindowManager;

import com.readystatesoftware.systembartint.SystemBarTintManager;


public class StartActivity extends Activity {
Expand All @@ -12,8 +18,29 @@ public class StartActivity extends Activity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_start);

if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
setTranslucentStatus(true);
}

SystemBarTintManager tintManager = new SystemBarTintManager(this);
tintManager.setStatusBarTintEnabled(true);
tintManager.setNavigationBarTintEnabled(true);
tintManager.setStatusBarTintResource(R.color.actionbar_background_color);
}

@TargetApi(19)
private void setTranslucentStatus(boolean on) {
Window win = getWindow();
WindowManager.LayoutParams winParams = win.getAttributes();
final int bits = WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS;
if (on) {
winParams.flags |= bits;
} else {
winParams.flags &= ~bits;
}
win.setAttributes(winParams);
}

@Override
public boolean onCreateOptionsMenu(Menu menu) {
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/activity_start.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:paddingBottom="@dimen/activity_vertical_margin"
android:fitsSystemWindows="true"
tools:context="de.happycarl.geotown.app.StartActivity">

<TextView
Expand Down
5 changes: 5 additions & 0 deletions app/src/main/res/values/colors.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="actionbar_background_color">#FF1919</color>
<color name="actionbar_color">#ffffff</color>
</resources>
12 changes: 11 additions & 1 deletion app/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,17 @@

<!-- Base application theme. -->
<style name="AppTheme" parent="android:Theme.Holo.Light">
<!-- Customize your theme here. -->
<item name="android:actionBarStyle">@style/GeoTown.ActionBarStyle</item>
</style>

<style name="GeoTown.ActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar">
<item name="android:background">@color/actionbar_background_color</item>
<item name="android:titleTextStyle">@style/GeoTown.ActionBar.TitleTextStyle</item>
</style>

<style name="GeoTown.ActionBar.TitleTextStyle" parent="@android:style/TextAppearance.Holo.Widget.ActionBar.Title">
<item name="android:textColor">@color/actionbar_color</item>
</style>


</resources>
7 changes: 6 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,19 @@
buildscript {
repositories {
mavenCentral()
maven { url 'https://www.testfairy.com/maven' }
}
dependencies {
classpath 'com.android.tools.build:gradle:0.9.+'
classpath 'com.android.tools.build:gradle:0.11.+'
classpath 'com.testfairy.plugins.gradle:testfairy:1.+'
}
}

allprojects {
repositories {
mavenCentral()
maven {
url "https://raw.github.com/HappyCarl/mvn-repo/master/snapshots"
}
}
}
12 changes: 12 additions & 0 deletions geotown.android.iml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
</content>
<orderEntry type="jdk" jdkName="JDK" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

Empty file modified gradlew
100644 → 100755
Empty file.
48 changes: 48 additions & 0 deletions release.keystore.enc
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
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

0 comments on commit 82f4603

Please sign in to comment.