UI changes (0.5.6)

HenriDellal · Mar 10, 2018 · 6403e90 · 6403e90
1 parent eed02c3
commit 6403e90
Show file tree

Hide file tree

Showing 21 changed files with 195 additions and 199 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      android:versionCode="32"
-      android:versionName="0.5.5" package="ru.henridellal.emerald"
+      android:versionCode="33"
+      android:versionName="0.5.6" package="ru.henridellal.emerald"
       >
 
     <!--android:configChanges="keyboard|keyboardHidden|orientation|screenSize"-->

diff --git a/res/layout/main_bar.xml b/res/layout/main_bar.xml
@@ -20,10 +20,12 @@
 			android:onClick="onMyClick"
 			android:background="@drawable/menu_bg"
 			android:layout_alignParentLeft="true" />
-		<Spinner
-			android:id="@+id/category"
+		<Button
+			android:id="@+id/category_button"
 			android:layout_width="0dp"
 			android:layout_height="40dp"
+			android:onClick="onMyClick"
+			android:background="@drawable/button_background"
 			android:layout_toLeftOf="@+id/searchButton"
 			android:layout_toRightOf="@id/menuButton"
 			android:layout_marginLeft="5dp"

diff --git a/res/layout/oneline.xml b/res/layout/oneline.xml
@@ -22,7 +22,7 @@ android:gravity="left|center_vertical"
     android:paddingLeft="4sp"
 
     android:shadowColor="#333333"
-android:shadowRadius="1"
+android:shadowRadius="2"
 android:shadowDx="1"
 android:shadowDy="1"
 />

diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="set_as_default">Установить лаунчером по умолчанию</string>
 	<string name="appearancePrefs">Настройки вида</string>
 	<string name="portraitPrefs">Настройки портретного режима</string>
 	<string name="landscapePrefs">Настройки ландшафтного режима</string>
 
 	<string name="categoryManager">Управление категориями</string>
+
+	<string name="category_all">Все приложения</string>
+	<string name="category_unclassified">Несортированное</string>
+	<string name="category_history">История</string>
+	<string name="category_hidden">Скрытые</string>
+
 	<string name="appShortcut">Вид ярлыка</string>
 	<string name="iconSize">Размер иконок</string>
 	<string name="textSize">Размер текста</string>

diff --git a/res/values-v11/styles.xml b/res/values-v11/styles.xml
@@ -11,23 +11,10 @@
 	<style name="AppTheme.Dark.Wallpaper" parent="AppTheme.Dark">
 		<item name="android:windowBackground">@android:color/transparent</item>
 		<item name="android:windowShowWallpaper">true</item>
-		<item name="android:spinnerDropDownItemStyle">@style/spinnerDropDownItem</item>
-		<item name="android:spinnerItemStyle">@style/spinnerItem.Dark</item>
 	</style>
 	<style name="AppTheme.Light.Wallpaper" parent="AppTheme.Light">
 		<item name="android:windowBackground">@android:color/transparent</item>
 		<item name="android:windowShowWallpaper">true</item>
-		<item name="android:spinnerItemStyle">@style/spinnerItem</item>
-	</style>
-	<style name="spinnerItem" parent="@android:style/Widget.Holo.Light.TextView.SpinnerItem">
-		<item name="android:textColor">#FFF</item>
-	</style>
-	<style name="spinnerDropDownItem" parent="@android:style/Widget.Holo.DropDownItem.Spinner">
-		<item name="android:textColor">@color/dropdownTextColor</item>
-		<item name="android:background">@color/dropdownBackground</item>
-	</style>
-	<style name="spinnerItem.Dark" parent="@android:style/Widget.Holo.TextView.SpinnerItem">
-		<item name="android:textColor">#000</item>
 	</style>
 	<style name="AppTheme.Default" parent="AppTheme.Light.Wallpaper">
 	</style>

diff --git a/res/values-v19/styles.xml b/res/values-v19/styles.xml
@@ -11,23 +11,10 @@
 	<style name="AppTheme.Dark.Wallpaper" parent="AppTheme.Dark">
 		<item name="android:windowBackground">@android:color/transparent</item>
 		<item name="android:windowShowWallpaper">true</item>
-		<item name="android:spinnerDropDownItemStyle">@style/spinnerDropDownItem</item>
-		<item name="android:spinnerItemStyle">@style/spinnerItem.Dark</item>
 	</style>
 	<style name="AppTheme.Light.Wallpaper" parent="AppTheme.Light">
 		<item name="android:windowBackground">@android:color/transparent</item>
 		<item name="android:windowShowWallpaper">true</item>
-		<item name="android:spinnerItemStyle">@style/spinnerItem</item>
-	</style>
-	<style name="spinnerItem" parent="@android:style/Widget.Holo.Light.TextView.SpinnerItem">
-		<item name="android:textColor">#FFF</item>
-	</style>
-	<style name="spinnerDropDownItem" parent="@android:style/Widget.Holo.DropDownItem.Spinner">
-		<item name="android:textColor">@color/dropdownTextColor</item>
-		<item name="android:background">@color/dropdownBackground</item>
-	</style>
-	<style name="spinnerItem.Dark" parent="@android:style/Widget.Holo.TextView.SpinnerItem">
-		<item name="android:textColor">#000</item>
 	</style>
 	<style name="AppTheme.Default" parent="AppTheme.Light.Wallpaper">
 	</style>

diff --git a/res/values-v21/styles.xml b/res/values-v21/styles.xml
@@ -16,8 +16,6 @@
 		<item name="android:statusBarColor">@android:color/transparent</item>
 		<item name="android:navigationBarColor">@android:color/transparent</item>
 		<item name="android:windowShowWallpaper">true</item>
-		<item name="android:spinnerDropDownItemStyle">@style/spinnerDropDownItem</item>
-		<item name="android:spinnerItemStyle">@style/spinnerItem.Dark</item>
 	</style>
 	<style name="AppTheme.Light.Wallpaper" parent="AppTheme.Light">
 		<item name="android:windowDrawsSystemBarBackgrounds">true</item>
@@ -27,17 +25,6 @@
 		<item name="android:statusBarColor">@android:color/transparent</item>
 		<item name="android:navigationBarColor">@android:color/transparent</item>
 		<item name="android:windowShowWallpaper">true</item>
-		<item name="android:spinnerItemStyle">@style/spinnerItem</item>
-	</style>
-	<style name="spinnerItem" parent="@android:style/Widget.Material.Light.TextView.SpinnerItem">
-		<item name="android:textColor">#FFF</item>
-	</style>
-	<style name="spinnerDropDownItem" parent="@android:style/Widget.Material.DropDownItem.Spinner">
-		<item name="android:textColor">@color/dropdownTextColor</item>
-		<item name="android:background">@color/dropdownBackground</item>
-	</style>
-	<style name="spinnerItem.Dark" parent="@android:style/Widget.Material.TextView.SpinnerItem">
-		<item name="android:textColor">#000</item>
 	</style>
 	<style name="AppTheme.Default" parent="AppTheme.Light.Wallpaper">
 	</style>

diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<string name="app_name">Emerald Launcher</string>
-	<string name="set_as_default">Set as default launcher</string>
 	<string name="appearancePrefs">Appearance preferences</string>
 	<string name="portraitPrefs">Portrait mode preferences</string>
 	<string name="landscapePrefs">Landscape mode preferences</string>
 
 	<string name="home_button">Home button behaviour</string>
 	<string name="categoryManager">Category manager</string>
+	<string name="category_all">All apps</string>
+	<string name="category_unclassified">Unclassified</string>
+	<string name="category_history">History</string>
+	<string name="category_hidden">Hidden</string>
 	<string name="appShortcut">App shortcut</string>
 	<string name="iconSize">Icon size</string>
 	<string name="textSize">Text size</string>
@@ -124,6 +127,11 @@
 \nLicensed under the Apache License 2.0.
 \nhttps://github.com/commonsguy/cwac-colormixer
 \n
+\nHayai Launcher
+\nCopyright 2015 Hayai Software
+\nLicensed under the Apache License 2.0.
+\nhttps://github.com/seizonsenryaku/HayaiLauncher
+\n
 \nFont-Awesome
 \nThe font licensed under the SIL OFL 1.1.
 \nhttp://fontawesome.io/</string>

diff --git a/res/xml/options.xml b/res/xml/options.xml
@@ -78,7 +78,7 @@
 	    	android:defaultValue="false"
 	    	android:key="scrollbar"/>
 	    <ListPreference
-	        android:defaultValue="1"
+	        android:defaultValue="2"
 	        android:entries="@array/orientationTypes"
 	        android:entryValues="@array/orientationValues"
 	        android:title="@string/orientation"