Skip to content

Commit 5410c84

Browse files
Merge pull request #368 from owncloud/dev
Material Design update and bug fixes
2 parents 40f0be4 + 5f0ddef commit 5410c84

File tree

143 files changed

+2389
-3777
lines changed

Some content is hidden

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

143 files changed

+2389
-3777
lines changed

β€Ž.gitmodulesβ€Ž

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
[submodule "ownCloud-Account-Importer"]
55
path = ownCloud-Account-Importer
66
url = https://github.com/David-Development/ownCloud-Account-Importer.git
7-
[submodule "ShowcaseView"]
8-
path = ShowcaseView
9-
url = https://github.com/amlcurran/ShowcaseView.git
107
[submodule "custom-tabs-client"]
118
path = custom-tabs-client
129
url = https://github.com/GoogleChrome/custom-tabs-client

β€ŽNews-Android-App/build.gradleβ€Ž

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,16 @@ dependencies {
4747
// compile 'com.google.android.gms:play-services:4.2.42'
4848
compile project(':Changeloglib:ChangeLogLibrary')
4949
compile project(':ownCloud-Account-Importer')
50-
compile project(':ShowcaseView:library')
5150
compile project(':customtabs')
5251
compile 'com.android.support:support-v4:22.2.0'
5352
compile 'com.android.support:appcompat-v7:22.2.0'
5453
compile 'com.android.support:design:22.2.0'
54+
compile 'com.android.support:palette-v7:22.2.0'
55+
compile 'com.android.support:recyclerview-v7:22.2.0'
5556
compile 'de.mrmaffen:holocircularprogressbar:1.0.1'
57+
compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.4'
5658
compile 'com.google.code.gson:gson:2.3.1'
5759
compile 'com.jakewharton:butterknife:5.1.+'
58-
compile 'com.squareup.picasso:picasso:2.3.1@jar'
5960
compile 'com.sothree.slidinguppanel:library:+'
6061
compile 'de.greenrobot:eventbus:2.2.1'
6162
compile 'de.greenrobot:greendao:1.3.7@jar'

β€ŽNews-Android-App/src/main/AndroidManifest.xmlβ€Ž

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
android:allowBackup="true"
2424
android:icon="@drawable/ic_launcher"
2525
android:label="@string/app_name"
26-
android:theme="@style/AppTheme">
26+
android:theme="@style/AppTheme"
27+
android:name=".NewsReaderApplication">
2728
<activity
2829
android:name=".NewsReaderListActivity"
2930
android:label="@string/app_name"
-161 KB
Binary file not shown.
Binary file not shown.
-160 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
Β (0)