Skip to content

Commit ac06a6c

Browse files
AnkhwatcherAnkhwatcher
committed
Merge pull request #35 from HackForEquality/texture_view
Yeah, I'm just doing this. :D
2 parents cab7a4b + 97da64a commit ac06a6c

File tree

118 files changed

+1696
-938
lines changed

Some content is hidden

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

118 files changed

+1696
-938
lines changed

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,6 @@
44
.DS_Store
55
/build
66
/captures
7-
*.iml
7+
*.iml
8+
release.keystore
9+
yesequality.properties

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
jcenter()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:1.1.0'
10+
classpath 'com.android.tools.build:gradle:1.2.3'
1111

1212
// NOTE: Do not place your application dependencies here; they belong
1313
// in the individual module build.gradle files

‎debug.keystore‎

1.99 KB
Binary file not shown.

‎mobile/build.gradle‎

Lines changed: 31 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,45 @@
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
defaultConfig {
88
applicationId "ie.yesequality.yesequality"
99
minSdkVersion 15
10-
targetSdkVersion 21
10+
targetSdkVersion 22
1111
versionCode 1
12-
versionName "1.0"
12+
versionName "1.0.0"
1313
}
14+
15+
Properties props = new Properties()
16+
props.load(new FileInputStream(file("../yesequality.properties")))
17+
18+
signingConfigs {
19+
debug {
20+
storeFile file("../debug.keystore")
21+
storePassword "android"
22+
keyAlias "androiddebugkey"
23+
keyPassword "android"
24+
}
25+
26+
release {
27+
storeFile file(props['keystore'])
28+
storePassword props['keystore.password']
29+
keyAlias props['keyAlias']
30+
keyPassword props['keyPassword']
31+
}
32+
}
33+
1434
buildTypes {
35+
debug {
36+
signingConfig signingConfigs.debug
37+
}
38+
1539
release {
1640
minifyEnabled false
1741
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
42+
signingConfig signingConfigs.release
1843
}
1944
}
2045
// Configuration for ButterKnife
@@ -29,8 +54,8 @@ android {
2954
dependencies {
3055
compile fileTree(dir: 'libs', include: ['*.jar'])
3156
wearApp project(':wear')
32-
compile 'com.android.support:appcompat-v7:21.0.3'
33-
compile 'com.google.android.gms:play-services:6.5.87'
57+
compile 'com.android.support:appcompat-v7:22.1.1'
58+
compile 'com.android.support:cardview-v7:22.1.1'
3459
compile 'com.jakewharton:butterknife:6.1.0'
3560
compile 'com.viewpagerindicator:library:2.4.1@aar'
3661

‎mobile/src/main/AndroidManifest.xml‎

Lines changed: 52 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,52 +3,83 @@
33
package="ie.yesequality.yesequality"
44
xmlns:android="http://schemas.android.com/apk/res/android">
55

6-
<uses-feature android:name="android.hardware.camera" />
7-
<uses-feature android:name="android.hardware.camera.front" />
6+
<uses-feature android:name="android.hardware.camera"/>
7+
<uses-feature android:name="android.hardware.camera.front"/>
88

9-
<uses-permission android:name="android.permission.CAMERA" />
10-
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
11-
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
12-
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
9+
<uses-permission android:name="android.permission.CAMERA"/>
10+
11+
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
12+
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
13+
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
14+
15+
<!-- Required to act as a custom watch face. -->
16+
<uses-permission android:name="com.google.android.permission.PROVIDE_BACKGROUND"/>
17+
<uses-permission android:name="android.permission.WAKE_LOCK"/>
1318

1419
<application
1520
android:allowBackup="true"
1621
android:icon="@mipmap/ic_launcher"
1722
android:label="@string/app_name"
18-
android:theme="@style/AppTheme" >
23+
android:theme="@style/AppTheme">
24+
<activity
25+
android:name=".SplashScreen"
26+
android:label="@string/title_activity_splash_screen"
27+
android:screenOrientation="portrait">
28+
<intent-filter>
29+
<action android:name="android.intent.action.MAIN"/>
30+
31+
<category android:name="android.intent.category.LAUNCHER"/>
32+
</intent-filter>
33+
</activity>
34+
35+
1936
<activity
20-
android:name=".CameraMainActivity"
37+
android:name=".CameraMainActivityTest"
2138
android:label="@string/title_activity_camera_main"
22-
android:screenOrientation="portrait" >
39+
android:screenOrientation="portrait"
40+
android:theme="@style/AppTheme.Camera">
41+
</activity>
42+
43+
<activity
44+
android:name=".PhotoActivity"
45+
android:label="Share Photo"
46+
android:parentActivityName=".CameraMainActivityTest"
47+
android:screenOrientation="portrait">
48+
<meta-data
49+
android:name="android.support.PARENT_ACTIVITY"
50+
android:value=".CameraMainActivityTest"/>
2351
</activity>
2452
<activity
2553
android:name=".MainActivity"
2654
android:label="@string/title_activity_main"
27-
android:screenOrientation="portrait" >
55+
android:parentActivityName=".CameraMainActivityTest"
56+
android:screenOrientation="portrait"
57+
android:theme="@style/AppThemeDarkAction">
58+
<meta-data
59+
android:name="android.support.PARENT_ACTIVITY"
60+
android:value=".CameraMainActivityTest"/>
2861
</activity>
29-
<activity
30-
android:name=".SplashScreen"
31-
android:label="@string/title_activity_splash_screen" >
32-
<intent-filter>
33-
<action android:name="android.intent.action.MAIN" />
3462

35-
<category android:name="android.intent.category.LAUNCHER" />
36-
</intent-filter>
37-
</activity>
3863
<activity
3964
android:name=".NotificationActivity"
40-
android:label="@string/title_activity_notification" >
65+
android:label="@string/title_activity_notification"
66+
android:parentActivityName=".CameraMainActivityTest"
67+
android:screenOrientation="portrait"
68+
android:theme="@style/AppThemeDarkAction">
69+
<meta-data
70+
android:name="android.support.PARENT_ACTIVITY"
71+
android:value=".CameraMainActivityTest"/>
4172
</activity>
4273

4374
<receiver
4475
android:name=".broadcastreceivers.NotificationReceiver"
4576
android:enabled="true"
46-
android:exported="false" >
77+
android:exported="false">
4778
</receiver>
4879
<receiver
4980
android:name=".broadcastreceivers.BootReceiver"
5081
android:enabled="true"
51-
android:exported="false" >
82+
android:exported="false">
5283
<intent-filter>
5384
<action android:name="android.intent.action.BOOT_COMPLETED"/>
5485
</intent-filter>

0 commit comments

Comments
 (0)