Skip to content

Commit 17a57ad

Browse files
committed
Merge branch 'release/v1.0.0'
2 parents f5cca54 + cb720e1 commit 17a57ad

File tree

1,055 files changed

+939
-144
lines changed

Some content is hidden

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

1,055 files changed

+939
-144
lines changed

.idea/inspectionProfiles/Project_Default.xml

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ ext {
7272
okIOVersion = "1.11.+"
7373
okHttpVersion = "3.6.+"
7474
playServicesVersion = prepareToRelease ? "10.2.1" : "9.8.0"
75-
supportLibraryVersion = "25.3.0"
75+
supportLibraryVersion = "25.3.1"
7676
threetenabpVersion = "1.0.+"
7777

7878
testMockitoVersion = "2.7.+"
@@ -142,6 +142,7 @@ dependencies {
142142
compile "com.kyleduo.switchbutton:library:1.4.5"
143143
compile "jp.wasabeef:recyclerview-animators:2.2.5"
144144
compile "org.jsoup:jsoup:1.10.1"
145+
compile "com.github.chrisbanes:PhotoView:2.0.0"
145146

146147
testCompile "junit:junit:4.12"
147148
testCompile "com.jakewharton.threetenabp:threetenabp:$threetenabpVersion"

app/src/main/AndroidManifest.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
1010
<uses-permission android:name="android.permission.INTERNET" />
1111
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
12+
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
13+
<uses-permission android:name="android.permission.SET_WALLPAPER" />
1214
<uses-permission android:name="android.permission.WAKE_LOCK" />
1315

1416
<uses-permission android:name="com.android.vending.BILLING" />
@@ -51,6 +53,10 @@
5153
android:name=".ui.cards.CardActivity"
5254
android:screenOrientation="portrait"
5355
android:theme="@style/AppThemeTransparent" />
56+
<activity
57+
android:name=".ui.cards.CardFullArtActivity"
58+
android:screenOrientation="portrait"
59+
android:theme="@style/AppThemeTransparent" />
5460
<activity
5561
android:name=".ui.decks.DeckActivity"
5662
android:screenOrientation="portrait" />
28.6 KB
27.3 KB
36.7 KB
21.7 KB
26.6 KB
38.2 KB
43.2 KB

0 commit comments

Comments
 (0)