Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/api
diff options
context:
space:
mode:
authorDmitry Kunin <dkunin@mapswith.me>2013-07-05 14:36:45 +0400
committerAlex Zolotarev <alex@maps.me>2015-09-23 01:58:03 +0300
commit9ccfbd0da984c53458a52f399807b437c8fcb4a0 (patch)
treec8cc368485c505f30986890d63aed543ad09b714 /api
parentc1603151513cf5f52a45c1ea449f5f5d04f9272f (diff)
[android] resources refactoring.
Diffstat (limited to 'api')
-rw-r--r--api/android/lib/res/drawable/btn_back_gray.xml24
-rw-r--r--api/android/lib/res/drawable/btn_back_gray_active.xml34
-rw-r--r--api/android/lib/res/drawable/btn_back_green.xml25
-rw-r--r--api/android/lib/res/drawable/btn_back_green_active.xml27
-rw-r--r--api/android/lib/res/drawable/gray.xml13
-rw-r--r--api/android/lib/res/drawable/green.xml15
-rw-r--r--api/android/lib/res/drawable/overflow.xml6
-rw-r--r--api/android/lib/res/drawable/shadow.xml13
-rw-r--r--api/android/lib/res/layout/dlg_install_mwm.xml6
9 files changed, 69 insertions, 94 deletions
diff --git a/api/android/lib/res/drawable/btn_back_gray.xml b/api/android/lib/res/drawable/btn_back_gray.xml
index 605891ffc5..445902c519 100644
--- a/api/android/lib/res/drawable/btn_back_gray.xml
+++ b/api/android/lib/res/drawable/btn_back_gray.xml
@@ -2,28 +2,12 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<!-- "background shadow" -->
- <item>
- <shape android:shape="rectangle" >
- <gradient
- android:angle="270"
- android:startColor="#44000000"
- android:endColor="#66000000"
- android:type="linear" />
-
- <corners android:radius="3dp" />
- </shape>
- </item>
-
+ <item android:drawable="@drawable/shadow"/>
<item
- android:bottom="2dp"
+ android:bottom="1dp"
android:left="1dp"
android:right="1dp"
- android:top="1dp">
- <shape android:shape="rectangle" >
- <solid android:color="#333" />
-
- <corners android:radius="3dp" />
- </shape>
- </item>
+ android:top="1dp"
+ android:drawable="@drawable/gray"/>
</layer-list> \ No newline at end of file
diff --git a/api/android/lib/res/drawable/btn_back_gray_active.xml b/api/android/lib/res/drawable/btn_back_gray_active.xml
index 17460d286c..a4d6310133 100644
--- a/api/android/lib/res/drawable/btn_back_gray_active.xml
+++ b/api/android/lib/res/drawable/btn_back_gray_active.xml
@@ -1,40 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<!-- "background shadow" -->
- <item>
- <shape android:shape="rectangle" >
- <gradient android:angle="270"
- android:startColor="#44000000"
- android:endColor="#66000000"
- android:type="linear"
- />
- <corners android:radius="3dp" />
- </shape>
- </item>
+ <item android:drawable="@drawable/shadow"/>
<item
android:bottom="2dp"
android:left="1dp"
android:right="1dp"
- android:top="1dp">
- <shape android:shape="rectangle" >
- <solid android:color="#333" />
+ android:top="1dp"
+ android:drawable="@drawable/gray"/>
- <stroke
- android:width="1dp"
- android:color="#40040404" />
-
- <corners android:radius="3dp"/>
- </shape>
- </item>
-
- <item>
- <shape android:shape="rectangle" >
- <solid android:color="#80FFFFFF" />
-
- <corners android:radius="3dp"/>
- </shape>
- </item>
+ <item android:drawable="@drawable/overflow"/>
</layer-list> \ No newline at end of file
diff --git a/api/android/lib/res/drawable/btn_back_green.xml b/api/android/lib/res/drawable/btn_back_green.xml
index 88ea2992e6..b64755185b 100644
--- a/api/android/lib/res/drawable/btn_back_green.xml
+++ b/api/android/lib/res/drawable/btn_back_green.xml
@@ -2,28 +2,13 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<!-- "background shadow" -->
- <item>
- <shape android:shape="rectangle" >
- <gradient
- android:angle="270"
- android:startColor="#44000000"
- android:endColor="#66000000"
- android:type="linear" />
+ <item android:drawable="@drawable/shadow"/>
- <corners android:radius="3dp" />
- </shape>
- </item>
-
- <item
- android:bottom="2dp"
+ <item
+ android:bottom="1dp"
android:left="1dp"
android:right="1dp"
- android:top="1dp">
- <shape android:shape="rectangle" >
- <solid android:color="#66CC33" />
-
- <corners android:radius="3dp" />
- </shape>
- </item>
+ android:top="1dp"
+ android:drawable="@drawable/green"/>
</layer-list> \ No newline at end of file
diff --git a/api/android/lib/res/drawable/btn_back_green_active.xml b/api/android/lib/res/drawable/btn_back_green_active.xml
index 260760fa29..49e849f8e4 100644
--- a/api/android/lib/res/drawable/btn_back_green_active.xml
+++ b/api/android/lib/res/drawable/btn_back_green_active.xml
@@ -2,34 +2,15 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<!-- "background shadow" -->
- <item>
- <shape android:shape="rectangle" >
- <gradient
- android:angle="270"
- android:startColor="#44000000"
- android:endColor="#66000000"
- android:type="linear" />
-
- <corners android:radius="3dp" />
- </shape>
- </item>
+ <item android:drawable="@drawable/shadow"/>
<item
android:bottom="2dp"
android:left="1dp"
android:right="1dp"
- android:top="1dp">
- <shape android:shape="rectangle" >
- <solid android:color="#66CC33" />
-
- <corners android:radius="3dp" />
- </shape>
- </item>
+ android:top="1dp"
+ android:drawable="@drawable/green"/>
- <item>
- <shape android:shape="rectangle" >
- <solid android:color="#80FFFFFF" />
- </shape>
- </item>
+ <item android:drawable="@drawable/overflow"/>
</layer-list> \ No newline at end of file
diff --git a/api/android/lib/res/drawable/gray.xml b/api/android/lib/res/drawable/gray.xml
new file mode 100644
index 0000000000..f3fda93007
--- /dev/null
+++ b/api/android/lib/res/drawable/gray.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle" >
+
+
+ <gradient android:type="linear"
+ android:angle="90"
+ android:startColor="#D00099CC"
+ android:centerColor="#D033B5E5"
+ android:endColor="#D00099CC"/>
+
+ <corners android:radius="4dp" />
+</shape> \ No newline at end of file
diff --git a/api/android/lib/res/drawable/green.xml b/api/android/lib/res/drawable/green.xml
new file mode 100644
index 0000000000..c7afb64a8a
--- /dev/null
+++ b/api/android/lib/res/drawable/green.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle" >
+ <!--
+ <solid android:color="#66CC33" /> -->
+
+ <gradient android:type="linear"
+ android:angle="90"
+ android:startColor="#D066CC33"
+ android:centerColor="#D099CC00"
+ android:endColor="#D066CC33"/>
+
+
+ <corners android:radius="4dp" />
+</shape> \ No newline at end of file
diff --git a/api/android/lib/res/drawable/overflow.xml b/api/android/lib/res/drawable/overflow.xml
new file mode 100644
index 0000000000..f507765b17
--- /dev/null
+++ b/api/android/lib/res/drawable/overflow.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle" >
+ <solid android:color="#80FFFFFF" />
+ <corners android:radius="3dp" />
+</shape> \ No newline at end of file
diff --git a/api/android/lib/res/drawable/shadow.xml b/api/android/lib/res/drawable/shadow.xml
new file mode 100644
index 0000000000..4c241c4cf3
--- /dev/null
+++ b/api/android/lib/res/drawable/shadow.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle" >
+ <gradient
+ android:angle="-90"
+ android:centerX="50%"
+ android:centerY="50%"
+ android:gradientRadius="400"
+ android:startColor="#44000000"
+ android:endColor="#88000000"
+ android:type="linear" />
+ <corners android:radius="4dp" />
+</shape> \ No newline at end of file
diff --git a/api/android/lib/res/layout/dlg_install_mwm.xml b/api/android/lib/res/layout/dlg_install_mwm.xml
index e2c71cca71..a074d57910 100644
--- a/api/android/lib/res/layout/dlg_install_mwm.xml
+++ b/api/android/lib/res/layout/dlg_install_mwm.xml
@@ -55,7 +55,8 @@
android:background="@drawable/btn_gray_selector"
android:padding="6dp"
android:text="@string/down_lite"
- android:textColor="@android:color/white" />
+ android:textColor="@android:color/white"
+ android:textStyle="bold" />
<Button
android:id="@+id/btn_pro"
@@ -67,7 +68,8 @@
android:background="@drawable/btn_green_selector"
android:padding="6dp"
android:text="@string/down_pro"
- android:textColor="@android:color/white" />
+ android:textColor="@android:color/white"
+ android:textStyle="bold"/>
</LinearLayout>
</ScrollView> \ No newline at end of file