Merge lp:~openerp-dev/openerp-mobile/trunk-tablet-landscape-support-dpr into lp:openerp-mobile

[Dharmang Soni (OpenERP)]

Hello,

Landscape support added for tablet devices.

Thanks,
Dharmang Soni

=== added file 'res/drawable-hdpi/caret_grey.9.png'
Binary files res/drawable-hdpi/caret_grey.9.png	1970-01-01 00:00:00 +0000 and res/drawable-hdpi/caret_grey.9.png	2014-05-06 09:00:02 +0000 differ
=== added directory 'res/drawable-land'
=== added file 'res/drawable-land/listitem_pressed.xml'
--- res/drawable-land/listitem_pressed.xml	1970-01-01 00:00:00 +0000
+++ res/drawable-land/listitem_pressed.xml	2014-05-06 09:00:02 +0000
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item>
+        <shape>
+            <gradient
+                android:angle="270"
+                android:endColor="#8bd7f0"
+                android:startColor="#8bd7f0" />
+        </shape>
+    </item>
+    <item android:drawable="@drawable/caret_grey"/>
+
+</layer-list>
\ No newline at end of file

=== added file 'res/drawable-land/oe_listview_background_selector.xml'
--- res/drawable-land/oe_listview_background_selector.xml	1970-01-01 00:00:00 +0000
+++ res/drawable-land/oe_listview_background_selector.xml	2014-05-06 09:00:02 +0000
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/listitem_pressed" android:state_activated="false" android:state_pressed="true"/>
+    <item android:drawable="@drawable/listitem_focused" android:state_activated="true"/>
+    <item android:drawable="@drawable/listitem_pressed" android:state_selected="true"/>
+
+</selector>
\ No newline at end of file

=== added file 'res/drawable-mdpi/caret_grey.9.png'
Binary files res/drawable-mdpi/caret_grey.9.png	1970-01-01 00:00:00 +0000 and res/drawable-mdpi/caret_grey.9.png	2014-05-06 09:00:02 +0000 differ
=== added file 'res/drawable-xhdpi/caret_grey.9.png'
Binary files res/drawable-xhdpi/caret_grey.9.png	1970-01-01 00:00:00 +0000 and res/drawable-xhdpi/caret_grey.9.png	2014-05-06 09:00:02 +0000 differ
=== added file 'res/drawable-xxhdpi/caret_grey.9.png'
Binary files res/drawable-xxhdpi/caret_grey.9.png	1970-01-01 00:00:00 +0000 and res/drawable-xxhdpi/caret_grey.9.png	2014-05-06 09:00:02 +0000 differ
=== added file 'res/drawable/two_pane_shadow.xml'
--- res/drawable/two_pane_shadow.xml	1970-01-01 00:00:00 +0000
+++ res/drawable/two_pane_shadow.xml	2014-05-06 09:00:02 +0000
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item>
+        <shape android:shape="rectangle" >
+            <solid android:color="#d1d1d1" />
+        </shape>
+    </item>
+    <item android:left="1dp">
+        <shape android:shape="rectangle" >
+            <solid android:color="#ffffff" />
+        </shape>
+    </item>
+
+</layer-list>
\ No newline at end of file

=== added directory 'res/layout-land'
=== added file 'res/layout-land/activity_main.xml'
--- res/layout-land/activity_main.xml	1970-01-01 00:00:00 +0000
+++ res/layout-land/activity_main.xml	2014-05-06 09:00:02 +0000
@@ -0,0 +1,42 @@
+<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/drawer_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#ffffff" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:baselineAligned="false"
+        android:divider="?android:attr/dividerHorizontal"
+        android:orientation="horizontal"
+        android:showDividers="middle" >
+
+        <FrameLayout
+            android:id="@+id/fragment_container"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="0.8"
+            android:background="#ffffff" />
+
+        <FrameLayout
+            android:id="@+id/fragment_detail_container"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1.2"
+            android:background="#ffffff" />
+    </LinearLayout>
+
+    <ListView
+        android:id="@+id/left_drawer"
+        android:layout_width="280dp"
+        android:layout_height="match_parent"
+        android:layout_gravity="start|bottom"
+        android:layout_marginTop="?android:attr/actionBarSize"
+        android:background="#ffffff"
+        android:choiceMode="singleChoice"
+        android:divider="#E3E9E3"
+        android:dividerHeight="1dp"
+        android:smoothScrollbar="true" />
+
+</android.support.v4.widget.DrawerLayout>
\ No newline at end of file

=== modified file 'res/layout/fragment_idea.xml'
--- res/layout/fragment_idea.xml	2014-04-23 05:20:53 +0000
+++ res/layout/fragment_idea.xml	2014-05-06 09:00:02 +0000
@@ -5,14 +5,10 @@
     android:orientation="vertical"
     android:paddingTop="?android:attr/actionBarSize" >
 
-    <TextView
-        android:id="@+id/txvIdeaFragment"
+    <ListView
+        android:id="@+id/listview"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fontFamily="sans-sarif-light"
-        android:gravity="center"
-        android:text="Idea Fragment"
-        android:textAppearance="?android:attr/textAppearanceLarge"
-        android:textStyle="bold" />
+        android:layout_height="match_parent" >
+    </ListView>
 
 </LinearLayout>
\ No newline at end of file

=== added file 'res/layout/fragment_idea_list_item.xml'
--- res/layout/fragment_idea_list_item.xml	1970-01-01 00:00:00 +0000
+++ res/layout/fragment_idea_list_item.xml	2014-05-06 09:00:02 +0000
@@ -0,0 +1,16 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/oe_listview_background_selector"
+    android:padding="15dp" >
+
+    <TextView
+        android:id="@+id/txvIdeaName"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fontFamily="sans-sarif-light"
+        android:text="Idea Fragment"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:textStyle="bold" />
+
+</LinearLayout>
\ No newline at end of file

=== modified file 'src/com/openerp/MainActivity.java'
--- src/com/openerp/MainActivity.java	2014-04-22 13:11:23 +0000
+++ src/com/openerp/MainActivity.java	2014-05-06 09:00:02 +0000
@@ -89,6 +89,7 @@
 	String mDrawerSubtitle = "";
 	int mDrawerItemSelectedPosition = -1;
 	ListView mDrawerListView = null;
+	boolean mNewFragment = false;
 
 	FragmentManager mFragment = null;
 
@@ -99,7 +100,7 @@
 	private CharSequence mTitle;
 	private OETouchListener mTouchAttacher;
 	private OnBackButtonPressedListener backPressed = null;
-	private boolean mLandscape = false;
+	private boolean mTwoPane;
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
@@ -112,10 +113,11 @@
 		}
 		mContext = this;
 		mFragment = getSupportFragmentManager();
-		if (findViewById(R.id.fragment_container) != null) {
-			mLandscape = false;
-		} else {
-			mLandscape = true;
+		if (findViewById(R.id.fragment_detail_container) != null) {
+			findViewById(R.id.fragment_detail_container).setVisibility(
+					View.GONE);
+
+			mTwoPane = true;
 		}
 		init();
 	}
@@ -696,8 +698,19 @@
 	@Override
 	public void startMainFragment(Fragment fragment, boolean addToBackState) {
 		Log.d(TAG, "MainActivity->FragmentListener->startMainFragment()");
+		int container_id = R.id.fragment_container;
+
+		if (isTwoPane()) {
+			findViewById(R.id.fragment_detail_container).setVisibility(
+					View.GONE);
+			Fragment detail = mFragment.findFragmentByTag("detail_fragment");
+			if (detail != null && !mNewFragment && !detail.isInLayout()) {
+				startDetailFragment(recreateFragment(detail));
+			}
+
+		}
 		FragmentTransaction tran = mFragment.beginTransaction().replace(
-				R.id.fragment_container, fragment);
+				container_id, fragment, "main_fragment");
 		if (addToBackState) {
 			tran.addToBackStack(null);
 		}
@@ -707,12 +720,33 @@
 	@Override
 	public void startDetailFragment(Fragment fragment) {
 		Log.d(TAG, "MainActivity->FragmentListener->startDetailFragment()");
+		int container_id = (isTwoPane()) ? R.id.fragment_detail_container
+				: R.id.fragment_container;
 		FragmentTransaction tran = mFragment.beginTransaction().replace(
-				R.id.fragment_container, fragment);
-		if (!mLandscape) {
+				container_id, fragment, "detail_fragment");
+		if (!isTwoPane()) {
 			tran.addToBackStack(null);
-		}
-		tran.commit();
+			tran.commit();
+		} else {
+			findViewById(R.id.fragment_detail_container).setVisibility(
+					View.VISIBLE);
+			tran.commitAllowingStateLoss();
+		}
+	}
+
+	private Fragment recreateFragment(Fragment fragment) {
+		Log.d(TAG, "recreateFragment()");
+		Fragment newInstance = null;
+		try {
+			Fragment.SavedState savedState = mFragment
+					.saveFragmentInstanceState(fragment);
+
+			newInstance = fragment.getClass().newInstance();
+			newInstance.setInitialSavedState(savedState);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return newInstance;
 	}
 
 	@Override
@@ -721,4 +755,9 @@
 		getIntent().putExtra("create_new_account", false);
 		init();
 	}
+
+	@Override
+	public boolean isTwoPane() {
+		return mTwoPane;
+	}
 }

=== modified file 'src/com/openerp/addons/idea/Idea.java'
--- src/com/openerp/addons/idea/Idea.java	2014-04-23 07:29:00 +0000
+++ src/com/openerp/addons/idea/Idea.java	2014-05-06 09:00:02 +0000
@@ -25,11 +25,18 @@
 import android.content.Context;
 import android.os.Bundle;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.ArrayAdapter;
+import android.widget.ListView;
+import android.widget.TextView;
 
 import com.openerp.R;
+import com.openerp.orm.OEDataRow;
 import com.openerp.support.BaseFragment;
 import com.openerp.support.fragment.FragmentListener;
 import com.openerp.util.drawer.DrawerItem;
@@ -37,32 +44,43 @@
 /**
  * The Class Idea.
  */
-public class Idea extends BaseFragment {
+public class Idea extends BaseFragment implements OnItemClickListener {
+
+	List<String> mItems = new ArrayList<String>();
+	ListView mListView = null;
 
 	public View onCreateView(LayoutInflater inflater, ViewGroup container,
 			Bundle savedInstanceState) {
+		setHasOptionsMenu(true);
 		View rootView = inflater.inflate(R.layout.fragment_idea, container,
 				false);
-		// Res_PartnerDBHelper partner = new Res_PartnerDBHelper(getActivity());
-		// boolean flag = partner.getOEInstance().syncWithServer();
-		// OELog.log("Synced: " + flag);
-
-		// DrawerListener drawer = (DrawerListener) getActivity();
-		// drawer.refreshDrawer("idea");
-		 IdeaDemoRecords rec = new IdeaDemoRecords(getActivity());
-		 rec.createDemoRecords();
-		 rec.selectAll();
-		rootView.findViewById(R.id.txvIdeaFragment).setOnClickListener(
-				new OnClickListener() {
-
-					@Override
-					public void onClick(View v) {
-
-						FragmentListener frag = (FragmentListener) getActivity();
-						frag.startDetailFragment(new IdeaDetail());
-
-					}
-				});
+
+		if (db().isEmptyTable()) {
+			IdeaDemoRecords rec = new IdeaDemoRecords(getActivity());
+			rec.createDemoRecords();
+		}
+
+		mItems.clear();
+		for (OEDataRow row : db().select()) {
+			mItems.add(row.getString("name"));
+		}
+
+		mListView = (ListView) rootView.findViewById(R.id.listview);
+		mListView.setAdapter(new ArrayAdapter<String>(getActivity(),
+				R.layout.fragment_idea_list_item, mItems) {
+			@Override
+			public View getView(int position, View convertView, ViewGroup parent) {
+				View mView = convertView;
+				if (mView == null)
+					mView = getActivity().getLayoutInflater().inflate(
+							R.layout.fragment_idea_list_item, parent, false);
+				TextView txv = (TextView) mView.findViewById(R.id.txvIdeaName);
+				txv.setText(mItems.get(position));
+				return mView;
+			}
+
+		});
+		mListView.setOnItemClickListener(this);
 		return rootView;
 	}
 
@@ -83,4 +101,20 @@
 		return menu;
 	}
 
+	@Override
+	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+		inflater.inflate(R.menu.menu_fragment_account, menu);
+	}
+
+	@Override
+	public void onItemClick(AdapterView<?> parent, View view, int position,
+			long id) {
+		view.setSelected(true);
+		IdeaDetail detail = new IdeaDetail();
+		Bundle args = new Bundle();
+		args.putString("name", mItems.get(position));
+		detail.setArguments(args);
+		FragmentListener frag = (FragmentListener) getActivity();
+		frag.startDetailFragment(detail);
+	}
 }

=== modified file 'src/com/openerp/addons/idea/IdeaDetail.java'
--- src/com/openerp/addons/idea/IdeaDetail.java	2014-05-01 05:47:22 +0000
+++ src/com/openerp/addons/idea/IdeaDetail.java	2014-05-06 09:00:02 +0000
@@ -25,6 +25,7 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.TextView;
 
 import com.openerp.R;
 import com.openerp.support.BaseFragment;
@@ -37,6 +38,10 @@
 			Bundle savedInstanceState) {
 		View mView = inflater.inflate(R.layout.fragment_idea_detail, container,
 				false);
+		Bundle args = getArguments();
+		TextView txv = (TextView) mView.findViewById(R.id.textView1);
+		if (args != null && args.containsKey("name"))
+			txv.setText(args.getString("name"));
 		return mView;
 	}
 

=== modified file 'src/com/openerp/config/ModulesConfig.java'
--- src/com/openerp/config/ModulesConfig.java	2014-04-23 05:20:53 +0000
+++ src/com/openerp/config/ModulesConfig.java	2014-05-06 09:00:02 +0000
@@ -18,6 +18,8 @@
  */
 package com.openerp.config;
 
+import com.openerp.addons.idea.Idea;
+import com.openerp.support.Module;
 import com.openerp.support.ModulesConfigHelper;
 
 /**
@@ -30,6 +32,7 @@
 	 */
 	public ModulesConfig() {
 		/* application modules */
-		//add(new Module("module_idea", "Idea", new Idea(), 0), true);
+
+		add(new Module("module_idea", "Idea", new Idea(), 0), true);
 	}
 }

=== modified file 'src/com/openerp/support/fragment/FragmentListener.java'
--- src/com/openerp/support/fragment/FragmentListener.java	2014-03-20 11:27:48 +0000
+++ src/com/openerp/support/fragment/FragmentListener.java	2014-05-06 09:00:02 +0000
@@ -26,4 +26,6 @@
 	public void startDetailFragment(Fragment fragment);
 
 	public void restart();
+
+	public boolean isTwoPane();
 }

=== modified file 'src/com/openerp/util/OEDate.java'
--- src/com/openerp/util/OEDate.java	2014-04-23 09:28:32 +0000
+++ src/com/openerp/util/OEDate.java	2014-05-06 09:00:02 +0000
@@ -50,6 +50,7 @@
 		if (date.equals("false")) {
 			return date;
 		}
+
 		Calendar cal = Calendar.getInstance();
 		Date originalDate = convertToDate(date);
 		cal.setTime(originalDate);

=== modified file 'src/com/openerp/util/PreferenceManager.java'
--- src/com/openerp/util/PreferenceManager.java	2014-03-20 11:27:48 +0000
+++ src/com/openerp/util/PreferenceManager.java	2014-05-06 09:00:02 +0000
@@ -32,4 +32,5 @@
 	public int getInt(String key, int default_value) {
 		return Integer.parseInt(mPref.getString(key, default_value + ""));
 	}
+
 }