mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-25 06:35:48 +03:00
Code Issues Projects Releases Packages Wiki Activity

[DEV] Remove actionbarsherlock , replace it with Android Support Library (v7)

Browse source
This commit is contained in:
masensio 2015-05-15 11:24:14 +02:00
parent efefb3bf2d
commit d43fbbac6b
5 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build.gradle
View file

@ -18,14 +18,12 @@ repositories {
}
}
artifacts.add("default", file('libs/actionbarsherlock.aar'))
dependencies {
compile name: 'touch-image-view'
compile 'com.android.support:support-v4:19.1.0'
compile project('libs/actionbarsherlock_lib')
compile project(':owncloud-android-library')
compile 'com.jakewharton:disklrucache:2.0.2'
compile 'com.android.support:appcompat-v7:22.1.1'
}
android {

2
libs/actionbarsherlock_lib/build.gradle
View file

@ -1,2 +0,0 @@
configurations.create("default")
artifacts.add("default", file('library-4.1.0.aar'))

BIN
libs/actionbarsherlock_lib/library-4.1.0.aar
View file

Binary file not shown.

13
res/values/styles.xml
View file

@ -21,7 +21,7 @@
<style name="Animations" />
<!-- General ownCloud app style -->
<style name="Theme.ownCloud" parent="style/Theme.Sherlock.Light.DarkActionBar">
<style name="Theme.ownCloud" parent="style/Theme.AppCompat.Light.DarkActionBar">
<item name="android:actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
<item name="actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
<item name="android:buttonStyle">@style/Theme.ownCloud.ButtonStyle</item>
@ -29,7 +29,7 @@
<item name="android:actionDropDownStyle">@style/Theme.ownCloud.DropDownStyle</item>
</style>
<style name="Theme.ownCloud.noActionBar" parent="style/Theme.Sherlock.Light.NoActionBar">
<style name="Theme.ownCloud.noActionBar" parent="style/Theme.AppCompat.Light.NoActionBar">
<item name="android:actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
<item name="actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
<item name="android:buttonStyle">@style/Theme.ownCloud.ButtonStyle</item>
@ -37,7 +37,7 @@
<item name="android:actionDropDownStyle">@style/Theme.ownCloud.DropDownStyle</item>
</style>
<style name="Theme.ownCloud.Fullscreen" parent="style/Theme.Sherlock.NoActionBar">
<style name="Theme.ownCloud.Fullscreen" parent="style/Theme.AppCompat.NoActionBar">
<item name="android:actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
<item name="actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
<item name="android:windowFullscreen">true</item>
@ -46,7 +46,8 @@
</style>
<style name="Theme.ownCloud.Widget.ActionBar" parent="style/Widget.Sherlock.Light.ActionBar.Solid.Inverse">
<style name="Theme.ownCloud.Widget.ActionBar"
parent="style/Widget.AppCompat.Light.ActionBar.Solid.Inverse">
<item name="android:background">@drawable/main_header_bg</item>
<item name="background">@drawable/main_header_bg</item>
<item name="android:textColor">#ffffff</item>
@ -54,7 +55,9 @@
<item name="android:shadowRadius">1</item>
<item name="android:shadowDy">1</item>
<item name="android:backgroundSplit">@drawable/split_action_bg</item>
<item name="android:indeterminateProgressStyle">@style/Theme.ownCloud.IndeterminateStyle</item>
<item name="android:indeterminateProgressStyle">
@style/Theme.ownCloud.IndeterminateStyle
</item>
<item name="indeterminateProgressStyle">@style/Theme.ownCloud.IndeterminateStyle</item>
</style>

8
res/values/versioned_styles.xml
View file

@ -8,12 +8,12 @@
</style>
<!-- DropDown -->
<style name="Theme.ownCloud.DropDownStyle" parent="style/Widget.Sherlock.Spinner.DropDown.ActionBar">
<item name="android:background">@drawable/abs__spinner_ab_holo_dark</item>
<style name="Theme.ownCloud.DropDownStyle" parent="style/Widget.AppCompat.Spinner.DropDown.ActionBar">
<!-- <item name="android:background">@drawable/abs__spinner_ab_holo_dark</item> -->
</style>
<style name="Theme.ownCloud.IndeterminateStyle" parent="style/Widget.Sherlock.ProgressBar">
<item name="android:indeterminateDrawable">@drawable/abs__progress_medium_holo</item>
<style name="Theme.ownCloud.IndeterminateStyle" parent="style/Widget.AppCompat.ProgressBar">
<!-- <item name="android:indeterminateDrawable">@drawable/abs__progress_medium_holo</item> -->
</style>
<!-- Notifications -->