aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/res')
-rw-r--r--src/main/res/drawable/actionbar_space_between_icon_and_title.xml8
-rw-r--r--src/main/res/layout/title.xml15
-rw-r--r--src/main/res/values-land/dimens.xml4
-rw-r--r--src/main/res/values/dimens.xml1
-rw-r--r--src/main/res/values/themes.xml11
5 files changed, 23 insertions, 16 deletions
diff --git a/src/main/res/drawable/actionbar_space_between_icon_and_title.xml b/src/main/res/drawable/actionbar_space_between_icon_and_title.xml
deleted file mode 100644
index 53285bc0..00000000
--- a/src/main/res/drawable/actionbar_space_between_icon_and_title.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list
- xmlns:android="http://schemas.android.com/apk/res/android">
- <item
- android:drawable="@android:color/transparent"
- android:right="58dp"
- android:id="@+id/icon_placeholder"/>
-</layer-list> \ No newline at end of file
diff --git a/src/main/res/layout/title.xml b/src/main/res/layout/title.xml
new file mode 100644
index 00000000..17ff1a5b
--- /dev/null
+++ b/src/main/res/layout/title.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@android:color/transparent"
+ android:orientation="vertical">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text=""
+ android:id="@+id/conversationsTitle"
+ android:textSize="@dimen/action_bar_title_text_size"
+ android:textColor="@color/primaryTextOnDark"/>
+</LinearLayout> \ No newline at end of file
diff --git a/src/main/res/values-land/dimens.xml b/src/main/res/values-land/dimens.xml
new file mode 100644
index 00000000..411fd575
--- /dev/null
+++ b/src/main/res/values-land/dimens.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <dimen name="action_bar_title_text_size">16dp</dimen> <!-- redefinition here, because no access to original from android -->
+</resources> \ No newline at end of file
diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml
index d5d4aad4..99a292fd 100644
--- a/src/main/res/values/dimens.xml
+++ b/src/main/res/values/dimens.xml
@@ -9,4 +9,5 @@
<dimen name="ambilwarna_hsvWidth">240dp</dimen>
<dimen name="ambilwarna_hueWidth">30dp</dimen>
<dimen name="ambilwarna_spacer">8dp</dimen>
+ <dimen name="action_bar_title_text_size">18dp</dimen> <!-- redefinition here, because no access to original from android -->
</resources>
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index a157084f..0deb3a6e 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -44,16 +44,11 @@
</style>
<style name="ConversationsActionBar" parent="@android:style/Widget.Holo.Light.ActionBar.Solid.Inverse">
- <item name="android:background">@android:color/transparent</item>
- <!--item name="android:backgroundStacked">@color/primary_dark</item-->
+ <item name="android:background">@color/primary</item>
+ <item name="android:backgroundStacked">@color/primary_dark</item>
<item name="android:displayOptions">showHome|homeAsUp|showTitle</item>
- <item name="android:icon">@drawable/actionbar_space_between_icon_and_title</item>
+ <item name="android:icon">@android:color/transparent</item>
<item name="android:windowActionBarOverlay">true</item>
- <item name="android:titleTextStyle">@style/ConversationsPlusTitleTextStyle</item>
- </style>
-
- <style name="ConversationsPlusTitleTextStyle" parent="@android:style/TextAppearance.Holo.Widget.ActionBar.Title.Inverse">
- <item name="android:textSize">12sp</item>
</style>
<style name="ConversationsActionBarWidget" parent="android:Theme.Holo.Light">