From: masensio <masensio@solidgear.es>
Date: Fri, 15 May 2015 09:24:14 +0000 (+0200)
Subject: [DEV] Remove actionbarsherlock , replace it with Android Support Library (v7)
X-Git-Tag: test~9
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/d43fbbac6b997e0adcc72d3f029c22f286400f68

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

diff --git a/build.gradle b/build.gradle
index 57ec86e5..cd25c8f9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -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 {
diff --git a/libs/actionbarsherlock_lib/build.gradle b/libs/actionbarsherlock_lib/build.gradle
deleted file mode 100644
index 58172e2c..00000000
--- a/libs/actionbarsherlock_lib/build.gradle
+++ /dev/null
@@ -1,2 +0,0 @@
-configurations.create("default")
-artifacts.add("default", file('library-4.1.0.aar'))
diff --git a/libs/actionbarsherlock_lib/library-4.1.0.aar b/libs/actionbarsherlock_lib/library-4.1.0.aar
deleted file mode 100644
index f340e011..00000000
Binary files a/libs/actionbarsherlock_lib/library-4.1.0.aar and /dev/null differ
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 5996281f..8156a644 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -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>
 
diff --git a/res/values/versioned_styles.xml b/res/values/versioned_styles.xml
index 5faa6b2a..c06ec9c3 100644
--- a/res/values/versioned_styles.xml
+++ b/res/values/versioned_styles.xml
@@ -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 -->