From 0e44e91310eb2c6c7ef72688d996193ac25bb356 Mon Sep 17 00:00:00 2001
From: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
Date: Wed, 20 Nov 2013 09:24:50 -0500
Subject: [PATCH] style: added background to app theme
---
res/layout/activity_holder.xml | 3 ++-
res/layout/activity_sflphone_home.xml | 10 +++++++---
res/layout/frag_about.xml | 1 -
res/layout/frag_dialing.xml | 11 +++++------
res/values-v14/styles.xml | 3 ++-
res/values/styles.xml | 4 +++-
src/org/sflphone/fragments/MenuFragment.java | 11 -----------
7 files changed, 19 insertions(+), 24 deletions(-)
diff --git a/res/layout/activity_holder.xml b/res/layout/activity_holder.xml
index 872c1128b..7700b733a 100644
--- a/res/layout/activity_holder.xml
+++ b/res/layout/activity_holder.xml
@@ -3,6 +3,7 @@
android:id="@+id/frag_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
- tools:context=".ActivityHolder" >
+ tools:context=".ActivityHolder"
+ android:background="@drawable/bg_72" >
</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/activity_sflphone_home.xml b/res/layout/activity_sflphone_home.xml
index d84349ce9..946c05bed 100644
--- a/res/layout/activity_sflphone_home.xml
+++ b/res/layout/activity_sflphone_home.xml
@@ -34,8 +34,7 @@ as that of the covered work.
xmlns:app="http://schemas.android.com/apk/res/org.sflphone"
android:id="@+id/drawer_layout"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@color/sfl_dark_blue" >
+ android:layout_height="match_parent" >
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
@@ -44,6 +43,12 @@ as that of the covered work.
android:layout_height="match_parent"
android:orientation="vertical" >
+ <ImageView
+ android:layout_width="match_parent"
+ android:layout_height="?android:attr/actionBarSize"
+ android:layout_alignParentTop="true"
+ android:background="@color/sfl_dark_blue" />
+
<org.sflphone.views.PagerSlidingTabStrip
android:id="@+id/pts_main"
android:layout_width="match_parent"
@@ -59,7 +64,6 @@ as that of the covered work.
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/pts_main"
- android:background="@drawable/bg_72"
android:paddingBottom="@dimen/contact_drawer_handle_height" />
<ImageView
diff --git a/res/layout/frag_about.xml b/res/layout/frag_about.xml
index 95d45b2fa..d0720de00 100644
--- a/res/layout/frag_about.xml
+++ b/res/layout/frag_about.xml
@@ -7,7 +7,6 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_gravity="center"
android:orientation="vertical" >
<ImageView
diff --git a/res/layout/frag_dialing.xml b/res/layout/frag_dialing.xml
index 1d69463d1..327dd9bee 100644
--- a/res/layout/frag_dialing.xml
+++ b/res/layout/frag_dialing.xml
@@ -1,17 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginLeft="15dp"
- android:layout_marginRight="15dp"
- android:layout_marginTop="15dp"
- android:padding="5dp" >
+ android:layout_height="wrap_content" >
<org.sflphone.views.ClearableEditText
android:id="@+id/textField"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_alignParentTop="true" />
+ android:layout_alignParentTop="true"
+ android:layout_marginLeft="10dp"
+ android:layout_marginRight="10dp"
+ android:layout_marginTop="10dp" />
<RelativeLayout
android:layout_width="match_parent"
diff --git a/res/values-v14/styles.xml b/res/values-v14/styles.xml
index 51be5e0d6..ae4cf7491 100644
--- a/res/values-v14/styles.xml
+++ b/res/values-v14/styles.xml
@@ -4,8 +4,9 @@
<item name="android:actionBarStyle">@style/MyActionBar</item>
<item name="android:actionMenuTextAppearance">@style/MyActionBar.MenuTextStyle</item>
<item name="android:windowActionBarOverlay">true</item>
+ <item name="android:windowBackground">@drawable/bg_72</item>
</style>
-
+
<style name="AppThemeWithoutOverlay" parent="android:Theme.Holo.Light">
<item name="android:actionBarStyle">@style/MyActionBar</item>
<item name="android:actionMenuTextAppearance">@style/MyActionBar.MenuTextStyle</item>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 2cc23c5c7..7bab26fae 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -32,7 +32,9 @@ as that of the covered work.
<resources>
- <style name="AppTheme" parent="android:Theme.Light" />
+ <style name="AppTheme" parent="android:Theme.Light" >
+ <item name="android:background">@drawable/bg_72</item>
+ </style>
<style name="AccountFormContainer">
<item name="android:layout_width">match_parent</item>
diff --git a/src/org/sflphone/fragments/MenuFragment.java b/src/org/sflphone/fragments/MenuFragment.java
index 00d729d25..b2aceed4b 100644
--- a/src/org/sflphone/fragments/MenuFragment.java
+++ b/src/org/sflphone/fragments/MenuFragment.java
@@ -125,17 +125,6 @@ public class MenuFragment extends Fragment implements LoaderCallbacks<Bundle>, A
mAdapter = new MenuAdapter(getActivity());
accountReceiver = new AccountsReceiver(this);
-
- String[] categories = getResources().getStringArray(R.array.menu_categories);
- // ArrayAdapter<String> paramAdapter = new ArrayAdapter<String>(getActivity(), R.layout.item_menu, getResources().getStringArray(
- // R.array.menu_items_param));
- // ArrayAdapter<String> helpAdapter = new ArrayAdapter<String>(getActivity(), R.layout.item_menu, getResources().getStringArray(
- // R.array.menu_items_help));
-
- // Add Sections
- // mAdapter.addSection(categories[0], paramAdapter);
- // mAdapter.addSection(categories[1], helpAdapter);
-
}
public void onResume() {
--
GitLab