From d2cd7b687e945b9f0c7497bfc728c90b903dd8a7 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Fri, 6 Jan 2017 23:28:03 +0100
Subject: [PATCH] remove some styles

---
 .../musicplayer/activities/SimpleActivity.kt  |  3 --
 app/src/main/res/layout/activity_main.xml     |  6 +--
 app/src/main/res/layout/widget_controls.xml   |  8 +--
 app/src/main/res/values-v21/styles.xml        |  7 ---
 app/src/main/res/values/styles.xml            | 52 +------------------
 app/src/main/res/xml/widget_info.xml          | 19 +++----
 6 files changed, 18 insertions(+), 77 deletions(-)
 delete mode 100644 app/src/main/res/values-v21/styles.xml

diff --git a/app/src/main/kotlin/com/simplemobiletools/musicplayer/activities/SimpleActivity.kt b/app/src/main/kotlin/com/simplemobiletools/musicplayer/activities/SimpleActivity.kt
index 601b535a..86083983 100644
--- a/app/src/main/kotlin/com/simplemobiletools/musicplayer/activities/SimpleActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/musicplayer/activities/SimpleActivity.kt
@@ -3,16 +3,13 @@ package com.simplemobiletools.musicplayer.activities
 import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
 import android.view.MenuItem
-
 import com.simplemobiletools.musicplayer.helpers.Config
-import com.simplemobiletools.musicplayer.R
 
 open class SimpleActivity : AppCompatActivity() {
     lateinit var mConfig: Config
 
     override fun onCreate(savedInstanceState: Bundle?) {
         mConfig = Config.newInstance(applicationContext)
-        setTheme(if (mConfig.isDarkTheme) R.style.AppTheme_Dark else R.style.AppTheme)
         super.onCreate(savedInstanceState)
     }
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 9388a13c..dc473ccd 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -17,7 +17,7 @@
 
         <ImageView
             android:id="@+id/previous_btn"
-            style="@style/MyButton"
+            style="@style/MyTransparentButton"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_weight="1"
@@ -28,7 +28,7 @@
 
         <ImageView
             android:id="@+id/play_pause_btn"
-            style="@style/MyButton"
+            style="@style/MyTransparentButton"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_weight="1"
@@ -38,7 +38,7 @@
 
         <ImageView
             android:id="@+id/next_btn"
-            style="@style/MyButton"
+            style="@style/MyTransparentButton"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_weight="1"
diff --git a/app/src/main/res/layout/widget_controls.xml b/app/src/main/res/layout/widget_controls.xml
index 8980110e..916b1594 100644
--- a/app/src/main/res/layout/widget_controls.xml
+++ b/app/src/main/res/layout/widget_controls.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
-    android:id="@+id/main_controls"
     xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/main_controls"
     android:layout_width="match_parent"
     android:layout_height="@dimen/controls_row_height"
     android:orientation="horizontal">
 
     <ImageView
         android:id="@+id/previous_btn"
-        style="@style/MyButton"
+        style="@style/MyTransparentButton"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_weight="1"
@@ -18,7 +18,7 @@
 
     <ImageView
         android:id="@+id/play_pause_btn"
-        style="@style/MyButton"
+        style="@style/MyTransparentButton"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_weight="1"
@@ -28,7 +28,7 @@
 
     <ImageView
         android:id="@+id/next_btn"
-        style="@style/MyButton"
+        style="@style/MyTransparentButton"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_weight="1"
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
deleted file mode 100644
index d632c85e..00000000
--- a/app/src/main/res/values-v21/styles.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<resources>
-
-    <style name="MyButton">
-        <item name="android:background">?android:attr/selectableItemBackgroundBorderless</item>
-    </style>
-
-</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index fb07c968..5b3a9af8 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,54 +1,4 @@
 <resources>
 
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-        <item name="actionBarStyle">@style/AppTheme.ActionBarStyle</item>
-        <item name="android:textSize">@dimen/normal_text_size</item>
-        <item name="android:spinnerItemStyle">@style/SpinnerItem</item>
-        <item name="spinnerDropDownItemStyle">@style/SpinnerItem.DropDownItem</item>
-        <item name="android:spinnerDropDownItemStyle">@style/SpinnerItem.DropDownItem</item>
-    </style>
-
-    <style name="AppTheme.Dark" parent="Theme.AppCompat">
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-        <item name="actionBarStyle">@style/AppTheme.ActionBarStyle</item>
-        <item name="android:textSize">@dimen/normal_text_size</item>
-        <item name="android:spinnerItemStyle">@style/SpinnerItem</item>
-        <item name="spinnerDropDownItemStyle">@style/SpinnerItem.DropDownItem</item>
-        <item name="android:spinnerDropDownItemStyle">@style/SpinnerItem.DropDownItem</item>
-        <item name="android:windowBackground">@android:color/black</item>
-    </style>
-
-    <style name="MyWidgetConfigTheme" parent="@style/AppTheme">
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:windowShowWallpaper">true</item>
-    </style>
-
-    <style name="MyButton">
-        <item name="android:background">@drawable/selector</item>
-    </style>
-
-    <style name="AppTheme.ActionBarStyle" parent="@style/Base.Widget.AppCompat.ActionBar">
-        <item name="background">@color/colorPrimary</item>
-        <item name="titleTextStyle">@style/AppTheme.ActionBar.TitleTextStyle</item>
-    </style>
-
-    <style name="AppTheme.ActionBar.TitleTextStyle" parent="@android:style/TextAppearance.Holo.Widget.ActionBar.Title">
-        <item name="android:textSize">20sp</item>
-    </style>
-
-    <style name="SpinnerItem" parent="@android:style/Widget.TextView">
-        <item name="android:gravity">right</item>
-        <item name="android:paddingRight">@dimen/spinner_padding_right</item>
-    </style>
-
-    <style name="SpinnerItem.DropDownItem" parent="@android:style/Widget.TextView">
-        <item name="android:gravity">center_vertical</item>
-        <item name="android:paddingLeft">@dimen/activity_margin</item>
-        <item name="android:paddingRight">@dimen/activity_margin</item>
-    </style>
+    <style name="AppTheme" parent="AppTheme.Base"/>
 </resources>
diff --git a/app/src/main/res/xml/widget_info.xml b/app/src/main/res/xml/widget_info.xml
index afcf2bbe..f977b14c 100644
--- a/app/src/main/res/xml/widget_info.xml
+++ b/app/src/main/res/xml/widget_info.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
-                    android:configure="com.simplemobiletools.musicplayer.activities.WidgetConfigureActivity"
-                    android:initialLayout="@layout/widget"
-                    android:minHeight="110dp"
-                    android:minResizeHeight="30dp"
-                    android:minWidth="250dp"
-                    android:previewImage="@mipmap/widget_preview"
-                    android:resizeMode="vertical|horizontal"
-                    android:widgetCategory="keyguard|home_screen"/>
+<appwidget-provider
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:configure="com.simplemobiletools.musicplayer.activities.WidgetConfigureActivity"
+    android:initialLayout="@layout/widget"
+    android:minHeight="110dp"
+    android:minResizeHeight="30dp"
+    android:minWidth="250dp"
+    android:previewImage="@mipmap/widget_preview"
+    android:resizeMode="vertical|horizontal"
+    android:widgetCategory="keyguard|home_screen"/>