From 9ce1f288c0b34b64545d71471b10c202b3207d58 Mon Sep 17 00:00:00 2001
From: Yahor Berdnikau <egorr.berd@gmail.com>
Date: Sat, 4 Feb 2017 23:18:02 +0100
Subject: [PATCH] Change app theme to Theme.AppCompat.

This changes main app theme to Material theme from support library.

Signed-off-by: Yahor Berdnikau <egorr.berd@gmail.com>
---
 dependencies.gradle                           |  7 +++---
 ultrasonic/build.gradle                       |  3 +++
 ultrasonic/src/main/AndroidManifest.xml       |  5 +----
 .../ultrasonic/activity/HelpActivity.java     | 14 ++++++------
 .../ultrasonic/activity/ResultActivity.java   |  3 ++-
 .../activity/SubsonicTabActivity.java         | 22 +++++++++----------
 ultrasonic/src/main/res/values/styles.xml     |  6 ++---
 ultrasonic/src/main/res/values/themes.xml     |  4 ++--
 8 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/dependencies.gradle b/dependencies.gradle
index b0066103..e7c117f0 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -3,10 +3,10 @@ ext.versions = [
         targetSdk            : 22,
         compileSdk           : 22,
 
-        buildTools           : "25.0.2",
+        buildTools           : "22.0.1",
         androidTools         : "2.2.3",
 
-        androidSupport       : "25.1.0",
+        androidSupport       : "22.2.1",
 ]
 
 ext.gradlePlugins = [
@@ -14,5 +14,6 @@ ext.gradlePlugins = [
 ]
 
 ext.androidSupport = [
-        support : "com.android.support:support-v4:$versions.androidSupport"
+        support : "com.android.support:support-v4:$versions.androidSupport",
+        design  : "com.android.support:design:$versions.androidSupport"
 ]
\ No newline at end of file
diff --git a/ultrasonic/build.gradle b/ultrasonic/build.gradle
index 5287aeb9..17f7b5f1 100644
--- a/ultrasonic/build.gradle
+++ b/ultrasonic/build.gradle
@@ -22,4 +22,7 @@ dependencies {
     compile project(':menudrawer')
     compile project(':pulltorefresh')
     compile project(':library')
+
+    compile androidSupport.support
+    compile androidSupport.design
 }
diff --git a/ultrasonic/src/main/AndroidManifest.xml b/ultrasonic/src/main/AndroidManifest.xml
index 7757a028..5b0b9cd3 100644
--- a/ultrasonic/src/main/AndroidManifest.xml
+++ b/ultrasonic/src/main/AndroidManifest.xml
@@ -15,10 +15,6 @@
     <uses-permission a:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
     <uses-permission a:name="android.permission.BLUETOOTH"/>
 
-    <uses-sdk
-        a:minSdkVersion="14"
-        a:targetSdkVersion="19"/>
-
     <supports-screens
         a:anyDensity="true"
         a:largeScreens="true"
@@ -29,6 +25,7 @@
     <application
         a:allowBackup="false"
         a:icon="@drawable/ic_launcher"
+        a:theme="@style/Theme.AppCompat"
         a:label="@string/common.appname">
         <activity
             a:name=".activity.MainActivity"
diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/activity/HelpActivity.java b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/HelpActivity.java
index 874fe118..994faf16 100644
--- a/ultrasonic/src/main/java/org/moire/ultrasonic/activity/HelpActivity.java
+++ b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/HelpActivity.java
@@ -19,9 +19,9 @@
 
 package org.moire.ultrasonic.activity;
 
-import android.app.ActionBar;
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.v7.app.ActionBar;
 import android.view.KeyEvent;
 import android.view.MenuItem;
 import android.view.View;
@@ -32,13 +32,13 @@ import android.webkit.WebViewClient;
 import android.widget.Button;
 import android.widget.ImageView;
 
+import net.simonvt.menudrawer.MenuDrawer;
+import net.simonvt.menudrawer.Position;
+
 import org.moire.ultrasonic.R;
 import org.moire.ultrasonic.util.Constants;
 import org.moire.ultrasonic.util.Util;
 
-import net.simonvt.menudrawer.MenuDrawer;
-import net.simonvt.menudrawer.Position;
-
 /**
  * An HTML-based help screen with Back and Done buttons at the bottom.
  *
@@ -65,8 +65,8 @@ public final class HelpActivity extends ResultActivity implements OnClickListene
 	protected void onCreate(Bundle bundle)
 	{
 		applyTheme();
+        getWindow().requestFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
 		super.onCreate(bundle);
-		getWindow().requestFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
 
 		setContentView(R.layout.help);
 
@@ -96,7 +96,7 @@ public final class HelpActivity extends ResultActivity implements OnClickListene
 		aboutMenuItem.setOnClickListener(this);
 		findViewById(R.id.menu_exit).setOnClickListener(this);
 
-		ActionBar actionBar = getActionBar();
+		ActionBar actionBar = getSupportActionBar();
 
 		if (actionBar != null)
 		{
@@ -318,7 +318,7 @@ public final class HelpActivity extends ResultActivity implements OnClickListene
 			setProgressBarIndeterminateVisibility(false);
 			String versionName = Util.getVersionName(HelpActivity.this);
 			String title = String.format("%s (%s)", view.getTitle(), versionName);
-			ActionBar actionBar = getActionBar();
+			ActionBar actionBar = getSupportActionBar();
 
 			if (actionBar != null)
 			{
diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/activity/ResultActivity.java b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/ResultActivity.java
index 26a57c2a..4d956892 100644
--- a/ultrasonic/src/main/java/org/moire/ultrasonic/activity/ResultActivity.java
+++ b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/ResultActivity.java
@@ -2,6 +2,7 @@ package org.moire.ultrasonic.activity;
 
 import android.app.Activity;
 import android.content.Intent;
+import android.support.v7.app.AppCompatActivity;
 
 import org.moire.ultrasonic.util.Constants;
 import org.moire.ultrasonic.util.Util;
@@ -9,7 +10,7 @@ import org.moire.ultrasonic.util.Util;
 /**
  * Created by Joshua Bahnsen on 12/30/13.
  */
-public class ResultActivity extends Activity
+public class ResultActivity extends AppCompatActivity
 {
 	@Override
 	protected void onActivityResult(int requestCode, int resultCode, Intent data)
diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/activity/SubsonicTabActivity.java b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/SubsonicTabActivity.java
index 3756c76a..3189aae2 100644
--- a/ultrasonic/src/main/java/org/moire/ultrasonic/activity/SubsonicTabActivity.java
+++ b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/SubsonicTabActivity.java
@@ -19,7 +19,6 @@
 package org.moire.ultrasonic.activity;
 
 import android.annotation.SuppressLint;
-import android.app.ActionBar;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.Notification;
@@ -36,6 +35,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
+import android.support.v7.app.ActionBar;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
@@ -52,6 +52,9 @@ import android.widget.ImageView;
 import android.widget.RemoteViews;
 import android.widget.TextView;
 
+import net.simonvt.menudrawer.MenuDrawer;
+import net.simonvt.menudrawer.Position;
+
 import org.moire.ultrasonic.R;
 import org.moire.ultrasonic.domain.MusicDirectory;
 import org.moire.ultrasonic.domain.MusicDirectory.Entry;
@@ -75,9 +78,6 @@ import org.moire.ultrasonic.util.TimeSpanPicker;
 import org.moire.ultrasonic.util.Util;
 import org.moire.ultrasonic.util.VideoPlayerType;
 
-import net.simonvt.menudrawer.MenuDrawer;
-import net.simonvt.menudrawer.Position;
-
 import java.io.File;
 import java.io.PrintWriter;
 import java.util.ArrayList;
@@ -1276,7 +1276,7 @@ public class SubsonicTabActivity extends ResultActivity implements OnClickListen
 
 	protected void setActionBarDisplayHomeAsUp(boolean enabled)
 	{
-		ActionBar actionBar = getActionBar();
+		ActionBar actionBar = getSupportActionBar();
 
 		if (actionBar != null)
 		{
@@ -1286,7 +1286,7 @@ public class SubsonicTabActivity extends ResultActivity implements OnClickListen
 
 	protected void setActionBarTitle(CharSequence title)
 	{
-		ActionBar actionBar = getActionBar();
+		ActionBar actionBar = getSupportActionBar();
 
 		if (actionBar != null)
 		{
@@ -1296,7 +1296,7 @@ public class SubsonicTabActivity extends ResultActivity implements OnClickListen
 
 	protected void setActionBarTitle(int id)
 	{
-		ActionBar actionBar = getActionBar();
+		ActionBar actionBar = getSupportActionBar();
 
 		if (actionBar != null)
 		{
@@ -1306,7 +1306,7 @@ public class SubsonicTabActivity extends ResultActivity implements OnClickListen
 
 	protected CharSequence getActionBarTitle()
 	{
-		ActionBar actionBar = getActionBar();
+		ActionBar actionBar = getSupportActionBar();
 		CharSequence title = null;
 
 		if (actionBar != null)
@@ -1319,7 +1319,7 @@ public class SubsonicTabActivity extends ResultActivity implements OnClickListen
 
 	protected void setActionBarSubtitle(CharSequence title)
 	{
-		ActionBar actionBar = getActionBar();
+		ActionBar actionBar = getSupportActionBar();
 
 		if (actionBar != null)
 		{
@@ -1329,7 +1329,7 @@ public class SubsonicTabActivity extends ResultActivity implements OnClickListen
 
 	protected void setActionBarSubtitle(int id)
 	{
-		ActionBar actionBar = getActionBar();
+		ActionBar actionBar = getSupportActionBar();
 
 		if (actionBar != null)
 		{
@@ -1339,7 +1339,7 @@ public class SubsonicTabActivity extends ResultActivity implements OnClickListen
 
 	protected CharSequence getActionBarSubtitle()
 	{
-		ActionBar actionBar = getActionBar();
+		ActionBar actionBar = getSupportActionBar();
 		CharSequence subtitle = null;
 
 		if (actionBar != null)
diff --git a/ultrasonic/src/main/res/values/styles.xml b/ultrasonic/src/main/res/values/styles.xml
index f8589503..deb1d19e 100644
--- a/ultrasonic/src/main/res/values/styles.xml
+++ b/ultrasonic/src/main/res/values/styles.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="listselect" parent="android:style/Widget.ListView">
+    <style name="listselect" parent="Widget.AppCompat.ListView">
         <item name="android:listSelector">@drawable/list_selector_holo_dark</item>
     </style>
 
-    <style name="listselectlight" parent="android:style/Widget.ListView.White">
+    <style name="listselectlight" parent="Widget.AppCompat.ListView">
         <item name="android:listSelector">@drawable/list_selector_holo_light</item>
     </style>
 
-    <style name="customprogress" parent="android:style/Widget.ProgressBar.Horizontal">
+    <style name="customprogress" parent="Widget.AppCompat.ProgressBar.Horizontal">
         <item name="android:progressDrawable">@drawable/progress_horizontal_holo_dark</item>
     </style>
 
diff --git a/ultrasonic/src/main/res/values/themes.xml b/ultrasonic/src/main/res/values/themes.xml
index 0c3dae13..8eaafcd7 100644
--- a/ultrasonic/src/main/res/values/themes.xml
+++ b/ultrasonic/src/main/res/values/themes.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="UltraSonicTheme" parent="@android:style/Theme.Holo">
+    <style name="UltraSonicTheme" parent="Theme.AppCompat">
         <item name="color_background">@color/background_color_dark</item>
         <item name="star_hollow">@drawable/ic_star_hollow_dark</item>
         <item name="star_full">@drawable/ic_star_full_dark</item>
@@ -46,7 +46,7 @@
         <item name="button_check_custom">@drawable/btn_check_custom_dark</item>
     </style>
 
-    <style name="UltraSonicTheme.Light" parent="@android:style/Theme.Holo.Light">
+    <style name="UltraSonicTheme.Light" parent="Theme.AppCompat.Light">
         <item name="color_background">@color/background_color_light</item>
         <item name="star_hollow">@drawable/ic_star_hollow_light</item>
         <item name="star_full">@drawable/ic_star_full_light</item>