Merge pull request #35 from HackForEquality/texture_view

Yeah, I'm just doing this. :D
HackForEquality · May 8, 2015 · ac06a6c · ac06a6c
2 parents cab7a4b + 97da64a
commit ac06a6c
Show file tree

Hide file tree

Showing 118 changed files with 1,696 additions and 938 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,6 @@
 .DS_Store
 /build
 /captures
-*.iml
+*.iml
+release.keystore
+yesequality.properties
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.1.0'
+        classpath 'com.android.tools.build:gradle:1.2.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/debug.keystore b/debug.keystore
diff --git a/mobile/build.gradle b/mobile/build.gradle
@@ -1,20 +1,45 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion "21.1.2"
+    compileSdkVersion 22
+    buildToolsVersion "22.0.1"
 
     defaultConfig {
         applicationId "ie.yesequality.yesequality"
         minSdkVersion 15
-        targetSdkVersion 21
+        targetSdkVersion 22
         versionCode 1
-        versionName "1.0"
+        versionName "1.0.0"
     }
+
+    Properties props = new Properties()
+    props.load(new FileInputStream(file("../yesequality.properties")))
+
+    signingConfigs {
+        debug {
+            storeFile file("../debug.keystore")
+            storePassword "android"
+            keyAlias "androiddebugkey"
+            keyPassword "android"
+        }
+
+        release {
+            storeFile file(props['keystore'])
+            storePassword props['keystore.password']
+            keyAlias props['keyAlias']
+            keyPassword props['keyPassword']
+        }
+    }
+
     buildTypes {
+        debug {
+            signingConfig signingConfigs.debug
+        }
+
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.release
         }
     }
     // Configuration for ButterKnife
@@ -29,8 +54,8 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     wearApp project(':wear')
-    compile 'com.android.support:appcompat-v7:21.0.3'
-    compile 'com.google.android.gms:play-services:6.5.87'
+    compile 'com.android.support:appcompat-v7:22.1.1'
+    compile 'com.android.support:cardview-v7:22.1.1'
     compile 'com.jakewharton:butterknife:6.1.0'
     compile 'com.viewpagerindicator:library:2.4.1@aar'
 

diff --git a/mobile/src/main/AndroidManifest.xml b/mobile/src/main/AndroidManifest.xml
@@ -3,52 +3,83 @@
     package="ie.yesequality.yesequality"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <uses-feature android:name="android.hardware.camera" />
-    <uses-feature android:name="android.hardware.camera.front" />
+    <uses-feature android:name="android.hardware.camera"/>
+    <uses-feature android:name="android.hardware.camera.front"/>
 
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.CAMERA"/>
+
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+
+    <!-- Required to act as a custom watch face. -->
+    <uses-permission android:name="com.google.android.permission.PROVIDE_BACKGROUND"/>
+    <uses-permission android:name="android.permission.WAKE_LOCK"/>
 
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/AppTheme">
+        <activity
+            android:name=".SplashScreen"
+            android:label="@string/title_activity_splash_screen"
+            android:screenOrientation="portrait">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+
+
         <activity
-            android:name=".CameraMainActivity"
+            android:name=".CameraMainActivityTest"
             android:label="@string/title_activity_camera_main"
-            android:screenOrientation="portrait" >
+            android:screenOrientation="portrait"
+            android:theme="@style/AppTheme.Camera">
+        </activity>
+
+        <activity
+            android:name=".PhotoActivity"
+            android:label="Share Photo"
+            android:parentActivityName=".CameraMainActivityTest"
+            android:screenOrientation="portrait">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".CameraMainActivityTest"/>
         </activity>
         <activity
             android:name=".MainActivity"
             android:label="@string/title_activity_main"
-            android:screenOrientation="portrait" >
+            android:parentActivityName=".CameraMainActivityTest"
+            android:screenOrientation="portrait"
+            android:theme="@style/AppThemeDarkAction">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".CameraMainActivityTest"/>
         </activity>
-        <activity
-            android:name=".SplashScreen"
-            android:label="@string/title_activity_splash_screen" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
         <activity
             android:name=".NotificationActivity"
-            android:label="@string/title_activity_notification" >
+            android:label="@string/title_activity_notification"
+            android:parentActivityName=".CameraMainActivityTest"
+            android:screenOrientation="portrait"
+            android:theme="@style/AppThemeDarkAction">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".CameraMainActivityTest"/>
         </activity>
 
         <receiver
             android:name=".broadcastreceivers.NotificationReceiver"
             android:enabled="true"
-            android:exported="false" >
+            android:exported="false">
         </receiver>
         <receiver
             android:name=".broadcastreceivers.BootReceiver"
             android:enabled="true"
-            android:exported="false" >
+            android:exported="false">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED"/>
             </intent-filter>