Some inline editing work
Change-Id: I3d83f7407dd28605e9ea780f1d488fd291ac77ce
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 307b6cc..57fc5ad 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -400,7 +400,8 @@
<!-- Edit and insert details for a contact -->
<activity
android:name=".activities.ContactEditorActivity"
- android:theme="@style/TallTitleBarTheme">
+ android:theme="@style/TallTitleBarTheme"
+ android:windowSoftInputMode="adjustResize">
<intent-filter android:label="@string/editContactDescription">
<action android:name="android.intent.action.EDIT" />
diff --git a/res/layout/contact_editor_fragment.xml b/res/layout/contact_editor_fragment.xml
index 3324d35..3fb7c2e 100644
--- a/res/layout/contact_editor_fragment.xml
+++ b/res/layout/contact_editor_fragment.xml
@@ -25,11 +25,23 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
+
+<!-- If we need the real ListView again, this is how to do it
<ListView android:id="@android:id/list"
android:layout_width="match_parent"
android:layout_height="0px"
android:layout_weight="1"
android:background="@drawable/title_bar_shadow"
- />
+ /> -->
+ <ScrollView
+ android:layout_width="match_parent"
+ android:layout_height="0px"
+ android:layout_weight="1">
+ <com.android.contacts.views.editor.MyListView android:id="@android:id/list"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@drawable/title_bar_shadow"
+ />
+ </ScrollView>
</LinearLayout>
diff --git a/res/layout/list_edit_item_field_and_type.xml b/res/layout/list_edit_item_field_and_type.xml
new file mode 100644
index 0000000..ac43ceb
--- /dev/null
+++ b/res/layout/list_edit_item_field_and_type.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright 2009, The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+
+<com.android.contacts.views.editor.view.FieldAndTypeView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:minHeight="?android:attr/listPreferredItemHeight"
+ android:orientation="horizontal"
+ android:paddingLeft="9dip"
+ android:gravity="center_vertical"
+ android:background="@drawable/edit_rawcontact_bg"
+>
+
+ <TextView android:id="@+id/caption"
+ android:layout_width="60dip"
+ android:layout_height="wrap_content"
+ />
+
+ <EditText android:id="@+id/field"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ />
+
+ <Button android:id="@+id/type"
+ android:layout_width="100dip"
+ android:layout_height="wrap_content"
+ />
+
+</com.android.contacts.views.editor.view.FieldAndTypeView>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 29a39df..90f8df6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1230,5 +1230,5 @@
<string name="edit_delete_rawcontact">Delete</string>
<!-- Shown in a Toast to indicate an error while trying to save the Data -->
- <string name="edit_error_saving"></string>
+ <string name="edit_error_saving">Error saving</string>
</resources>
diff --git a/src/com/android/contacts/views/ContactLoader.java b/src/com/android/contacts/views/ContactLoader.java
index f03d269..87c3a34 100644
--- a/src/com/android/contacts/views/ContactLoader.java
+++ b/src/com/android/contacts/views/ContactLoader.java
@@ -458,6 +458,7 @@
mContact = result;
mLookupUri = result.getLookupUri();
if (result != null) {
+ unregisterObserver();
if (mObserver == null) {
mObserver = new ForceLoadContentObserver();
}
@@ -472,6 +473,13 @@
}
}
+ private void unregisterObserver() {
+ if (mObserver != null) {
+ getContext().getContentResolver().unregisterContentObserver(mObserver);
+ mObserver = null;
+ }
+ }
+
public ContactLoader(Context context, Uri lookupUri) {
super(context);
mLookupUri = lookupUri;
@@ -495,9 +503,6 @@
@Override
public void stopLoading() {
mContact = null;
- if (mObserver != null) {
- getContext().getContentResolver().unregisterContentObserver(mObserver);
- }
}
@Override
diff --git a/src/com/android/contacts/views/editor/ContactEditorFragment.java b/src/com/android/contacts/views/editor/ContactEditorFragment.java
index 094b7bb..384fa23 100644
--- a/src/com/android/contacts/views/editor/ContactEditorFragment.java
+++ b/src/com/android/contacts/views/editor/ContactEditorFragment.java
@@ -25,11 +25,12 @@
import com.android.contacts.ui.EditContactActivity;
import com.android.contacts.util.DataStatus;
import com.android.contacts.views.ContactLoader;
+import com.android.contacts.views.editor.view.ViewTypes;
import com.android.contacts.views.editor.viewModel.BaseViewModel;
import com.android.contacts.views.editor.viewModel.DataViewModel;
+import com.android.contacts.views.editor.viewModel.EmailViewModel;
import com.android.contacts.views.editor.viewModel.FooterViewModel;
-import com.android.contacts.views.editor.viewModel.HeaderViewModel;
-import com.android.contacts.views.editor.viewModel.ViewModelTypes;
+import com.android.contacts.views.editor.viewModel.PhoneViewModel;
import android.app.Activity;
import android.app.AlertDialog;
@@ -75,12 +76,11 @@
import android.widget.BaseAdapter;
import android.widget.ListView;
import android.widget.Toast;
-import android.widget.AdapterView.OnItemClickListener;
import java.util.ArrayList;
public class ContactEditorFragment extends LoaderManagingFragment<ContactLoader.Result>
- implements OnCreateContextMenuListener, OnItemClickListener {
+ implements OnCreateContextMenuListener {
private static final String TAG = "ContactEditorFragment";
private static final String BUNDLE_RAW_CONTACT_ID = "rawContactId";
@@ -95,7 +95,7 @@
private ContactLoader.Result mContactData;
private ContactEditorHeaderView mHeaderView;
- private ListView mListView;
+ private MyListView mListView;
private ViewAdapter mAdapter;
private int mReadOnlySourcesCnt;
@@ -129,10 +129,11 @@
mHeaderView = (ContactEditorHeaderView) view.findViewById(R.id.contact_header_widget);
- mListView = (ListView) view.findViewById(android.R.id.list);
+ mListView = (MyListView) view.findViewById(android.R.id.list);
mListView.setOnCreateContextMenuListener(this);
mListView.setScrollBarStyle(ListView.SCROLLBARS_OUTSIDE_OVERLAY);
mListView.setOnItemClickListener(this);
+ mListView.setItemsCanFocus(true);
return view;
}
@@ -260,6 +261,21 @@
ContactsSource.LEVEL_MIMETYPES);
if (kind == null) continue;
+ if (Phone.CONTENT_ITEM_TYPE.equals(mimeType)) {
+ final PhoneViewModel itemEditor = PhoneViewModel.createForExisting(mContext,
+ rawContact, dataId, entryValues, kind.titleRes);
+ rawContact.getFields().add(itemEditor);
+ continue;
+ }
+
+ if (Email.CONTENT_ITEM_TYPE.equals(mimeType)) {
+ final EmailViewModel itemEditor = EmailViewModel.createForExisting(mContext,
+ rawContact, dataId, entryValues, kind.titleRes);
+ rawContact.getFields().add(itemEditor);
+ continue;
+ }
+
+
final DataViewModel entry = new DataViewModel(mContext, mimeType, kind,
rawContact, dataId, entryValues);
@@ -356,7 +372,7 @@
continue;
}
- final ArrayList<DataViewModel> fields = rawContact.getFields();
+ final ArrayList<BaseViewModel> fields = rawContact.getFields();
// +1 for header, +1 for footer
final int fieldCount = fields.size() + 2;
if (position == fieldCount - 1) {
@@ -373,7 +389,7 @@
@Override
public int getViewTypeCount() {
- return ViewModelTypes._COUNT;
+ return ViewTypes._COUNT;
}
@Override
@@ -509,23 +525,19 @@
}
}
- public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
- if (mListener == null) return;
- final BaseViewModel baseEntry = mAdapter.getEntry(position);
- if (baseEntry == null) return;
-
- if (baseEntry instanceof HeaderViewModel) {
- // Toggle rawcontact visibility
- final HeaderViewModel entry = (HeaderViewModel) baseEntry;
- entry.setCollapsed(!entry.isCollapsed());
- mAdapter.notifyDataSetChanged();
- } else if (baseEntry instanceof DataViewModel) {
- final DataViewModel entry = (DataViewModel) baseEntry;
- final Intent intent = entry.intent;
- if (intent == null) return;
- mListener.onEditorRequested(intent);
- }
- }
+ // This was the ListView based code to expand/collapse sections.
+// public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+// if (mListener == null) return;
+// final BaseViewModel baseEntry = mAdapter.getEntry(position);
+// if (baseEntry == null) return;
+//
+// if (baseEntry instanceof HeaderViewModel) {
+// // Toggle rawcontact visibility
+// final HeaderViewModel entry = (HeaderViewModel) baseEntry;
+// entry.setCollapsed(!entry.isCollapsed());
+// mAdapter.notifyDataSetChanged();
+// }
+// }
private final DialogInterface.OnClickListener mDeleteListener =
new DialogInterface.OnClickListener() {
diff --git a/src/com/android/contacts/views/editor/DisplayRawContact.java b/src/com/android/contacts/views/editor/DisplayRawContact.java
index f7baf74..0e6564b 100644
--- a/src/com/android/contacts/views/editor/DisplayRawContact.java
+++ b/src/com/android/contacts/views/editor/DisplayRawContact.java
@@ -17,7 +17,7 @@
package com.android.contacts.views.editor;
import com.android.contacts.model.ContactsSource;
-import com.android.contacts.views.editor.viewModel.DataViewModel;
+import com.android.contacts.views.editor.viewModel.BaseViewModel;
import com.android.contacts.views.editor.viewModel.FooterViewModel;
import com.android.contacts.views.editor.viewModel.HeaderViewModel;
@@ -32,7 +32,7 @@
private boolean mWritable;
private final HeaderViewModel mHeader;
private final FooterViewModel mFooter;
- private final ArrayList<DataViewModel> mFields = new ArrayList<DataViewModel>();
+ private final ArrayList<BaseViewModel> mFields = new ArrayList<BaseViewModel>();
public DisplayRawContact(Context context, ContactsSource source, String accountName, long id,
boolean writable, FooterViewModel.Listener footerListener) {
@@ -60,7 +60,7 @@
return mWritable;
}
- public ArrayList<DataViewModel> getFields() {
+ public ArrayList<BaseViewModel> getFields() {
return mFields;
}
diff --git a/src/com/android/contacts/views/editor/MyListView.java b/src/com/android/contacts/views/editor/MyListView.java
new file mode 100644
index 0000000..12651c1
--- /dev/null
+++ b/src/com/android/contacts/views/editor/MyListView.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.contacts.views.editor;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.BaseAdapter;
+import android.widget.LinearLayout;
+
+/**
+ * Compatibility pseudo-ListView. This just renders everything into a LinearLayout using a ListView
+ * adapter. If this turns out to be fast enough, we can keep using this. This view will be removed
+ * once the decision has been made
+ */
+public class MyListView extends LinearLayout {
+ public MyListView(Context context) {
+ super(context);
+ }
+
+ public MyListView(Context context, AttributeSet attrs) {
+ super(context, attrs);
+ }
+
+ public MyListView(Context context, AttributeSet attrs, int defStyle) {
+ super(context, attrs, defStyle);
+ }
+
+ @Override
+ protected void onFinishInflate() {
+ super.onFinishInflate();
+ setOrientation(VERTICAL);
+ }
+
+ public void setOnItemClickListener(ContactEditorFragment contactEditorFragment) {
+ // Keep compatibility with ListView
+ }
+
+ public void setItemsCanFocus(boolean value) {
+ // Keep compatibility with ListView
+ }
+
+ public void setAdapter(BaseAdapter adapter) {
+ removeAllViews();
+ for (int i = 0; i < adapter.getCount(); i++) {
+ final View childView = adapter.getView(i, null, this);
+ addView(childView);
+ }
+ }
+}
diff --git a/src/com/android/contacts/views/editor/view/DataView.java b/src/com/android/contacts/views/editor/view/DataView.java
index 934371b..e4cd1de 100644
--- a/src/com/android/contacts/views/editor/view/DataView.java
+++ b/src/com/android/contacts/views/editor/view/DataView.java
@@ -52,7 +52,8 @@
public static DataView inflate(LayoutInflater inflater, ViewGroup parent,
boolean attachToRoot) {
- return (DataView) inflater.inflate(R.layout.list_edit_item_text_icons, parent, attachToRoot);
+ return (DataView) inflater.inflate(R.layout.list_edit_item_text_icons, parent,
+ attachToRoot);
}
@Override
diff --git a/src/com/android/contacts/views/editor/view/FieldAndTypeView.java b/src/com/android/contacts/views/editor/view/FieldAndTypeView.java
new file mode 100644
index 0000000..69e35b3
--- /dev/null
+++ b/src/com/android/contacts/views/editor/view/FieldAndTypeView.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.contacts.views.editor.view;
+
+import com.android.contacts.R;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+public class FieldAndTypeView extends LinearLayout {
+ private TextView mCaptionTextView;
+ private EditText mFieldEditText;
+ private Button mTypeButton;
+ private Listener mListener;
+ private boolean mHasFocus;
+
+ public FieldAndTypeView(Context context) {
+ super(context);
+ }
+
+ public FieldAndTypeView(Context context, AttributeSet attrs) {
+ super(context, attrs);
+ }
+
+ public FieldAndTypeView(Context context, AttributeSet attrs, int defStyle) {
+ super(context, attrs, defStyle);
+ }
+
+ public static FieldAndTypeView inflate(LayoutInflater inflater, ViewGroup parent,
+ boolean attachToRoot) {
+ return (FieldAndTypeView) inflater.inflate(R.layout.list_edit_item_field_and_type,
+ parent, attachToRoot);
+ }
+
+ public void setListener(Listener value) {
+ mListener = value;
+ }
+
+ @Override
+ protected void onFinishInflate() {
+ super.onFinishInflate();
+
+ mCaptionTextView = (TextView) findViewById(R.id.caption);
+ mFieldEditText = (EditText) findViewById(R.id.field);
+ mFieldEditText.setOnFocusChangeListener(mFieldEditTextFocusChangeListener);
+ mTypeButton = (Button) findViewById(R.id.type);
+ }
+
+ public void setLabelText(int resId) {
+ mCaptionTextView.setText(resId);
+ }
+
+ public void setFieldValue(CharSequence value) {
+ mFieldEditText.setText(value);
+ }
+
+ public CharSequence getFieldValue() {
+ return mFieldEditText.getText();
+ }
+
+ public void setTypeDisplayLabel(CharSequence type) {
+ mTypeButton.setText(type);
+ }
+
+ private OnFocusChangeListener mFieldEditTextFocusChangeListener = new OnFocusChangeListener() {
+ public void onFocusChange(View v, boolean hasFocus) {
+ if (mHasFocus && !hasFocus && mListener != null) {
+ mListener.onFocusLost(FieldAndTypeView.this);
+ }
+ mHasFocus = hasFocus;
+ }
+ };
+
+ public interface Listener {
+ void onFocusLost(FieldAndTypeView view);
+ }
+}
diff --git a/src/com/android/contacts/views/editor/viewModel/ViewModelTypes.java b/src/com/android/contacts/views/editor/view/ViewTypes.java
similarity index 67%
rename from src/com/android/contacts/views/editor/viewModel/ViewModelTypes.java
rename to src/com/android/contacts/views/editor/view/ViewTypes.java
index ff142e7..7cd2702 100644
--- a/src/com/android/contacts/views/editor/viewModel/ViewModelTypes.java
+++ b/src/com/android/contacts/views/editor/view/ViewTypes.java
@@ -14,13 +14,13 @@
* limitations under the License
*/
-package com.android.contacts.views.editor.viewModel;
+package com.android.contacts.views.editor.view;
-public interface ViewModelTypes {
- /** Possible Item Types */
+public interface ViewTypes {
public static final int DATA = 0;
- public static final int PHOTO = 1;
- public static final int RAW_CONTACT_HEADER = 2;
- public static final int RAW_CONTACT_FOOTER = 3;
- public static final int _COUNT = 4;
+ public static final int FIELD_AND_TYPE = 1;
+ public static final int PHOTO = 2;
+ public static final int RAW_CONTACT_HEADER = 3;
+ public static final int RAW_CONTACT_FOOTER = 4;
+ public static final int _COUNT = 5;
}
diff --git a/src/com/android/contacts/views/editor/viewModel/BaseViewModel.java b/src/com/android/contacts/views/editor/viewModel/BaseViewModel.java
index 6bef3ca..0a324ca 100644
--- a/src/com/android/contacts/views/editor/viewModel/BaseViewModel.java
+++ b/src/com/android/contacts/views/editor/viewModel/BaseViewModel.java
@@ -24,6 +24,7 @@
import android.view.ViewGroup;
public abstract class BaseViewModel {
+ // TODO: Consider just storing the Id of the RawContact. Would prevent some cyclic references
private final DisplayRawContact mRawContact;
private final Context mContext;
diff --git a/src/com/android/contacts/views/editor/viewModel/DataViewModel.java b/src/com/android/contacts/views/editor/viewModel/DataViewModel.java
index 8bd87cc..fb1c4c5 100644
--- a/src/com/android/contacts/views/editor/viewModel/DataViewModel.java
+++ b/src/com/android/contacts/views/editor/viewModel/DataViewModel.java
@@ -21,6 +21,7 @@
import com.android.contacts.views.editor.DisplayRawContact;
import com.android.contacts.views.editor.view.DataView;
import com.android.contacts.views.editor.view.PhotoView;
+import com.android.contacts.views.editor.view.ViewTypes;
import android.content.ContentUris;
import android.content.ContentValues;
@@ -38,7 +39,6 @@
import android.view.ViewGroup;
public class DataViewModel extends BaseViewModel {
- private Context mContext;
public String label;
public String data;
public Uri uri;
@@ -59,7 +59,6 @@
public DataViewModel(Context context, String mimeType, DataKind kind,
DisplayRawContact rawContact, long dataId, ContentValues values) {
super(context, rawContact);
- mContext = context;
id = dataId;
uri = ContentUris.withAppendedId(Data.CONTENT_URI, id);
mimetype = mimeType;
@@ -70,7 +69,7 @@
@Override
public int getEntryType() {
- return Photo.CONTENT_ITEM_TYPE.equals(mimetype) ? ViewModelTypes.PHOTO : ViewModelTypes.DATA;
+ return Photo.CONTENT_ITEM_TYPE.equals(mimetype) ? ViewTypes.PHOTO : ViewTypes.DATA;
}
@Override
@@ -112,7 +111,7 @@
result.setPrimary(isPrimary);
// Set the action icon
- result.setPrimaryIntent(intent, mContext.getResources(), actionIcon);
+ result.setPrimaryIntent(intent, getContext().getResources(), actionIcon);
// Set the secondary action button
// TODO: Change this to our new form
diff --git a/src/com/android/contacts/views/editor/viewModel/EmailViewModel.java b/src/com/android/contacts/views/editor/viewModel/EmailViewModel.java
new file mode 100644
index 0000000..70bb8ea
--- /dev/null
+++ b/src/com/android/contacts/views/editor/viewModel/EmailViewModel.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.contacts.views.editor.viewModel;
+
+import com.android.contacts.views.editor.DisplayRawContact;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.provider.ContactsContract.CommonDataKinds.Email;
+
+public class EmailViewModel extends FieldAndTypeViewModel {
+ private EmailViewModel(Context context, DisplayRawContact rawContact, long dataId,
+ ContentValues contentValues, int titleResId) {
+ super(context, rawContact, dataId, contentValues, titleResId, Email.ADDRESS, Email.TYPE,
+ Email.LABEL);
+ }
+
+ public static EmailViewModel createForExisting(Context context, DisplayRawContact rawContact,
+ long dataId, ContentValues contentValues, int titleResId) {
+ return new EmailViewModel(context, rawContact, dataId, contentValues, titleResId);
+ }
+
+ @Override
+ protected CharSequence getTypeDisplayLabel() {
+ return Email.getTypeLabel(getContext().getResources(), getType(), getLabel());
+ }
+}
diff --git a/src/com/android/contacts/views/editor/viewModel/FieldAndTypeViewModel.java b/src/com/android/contacts/views/editor/viewModel/FieldAndTypeViewModel.java
new file mode 100644
index 0000000..e6468c6
--- /dev/null
+++ b/src/com/android/contacts/views/editor/viewModel/FieldAndTypeViewModel.java
@@ -0,0 +1,172 @@
+/*
+ * Copyright (C) 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.contacts.views.editor.viewModel;
+
+import com.android.contacts.views.ContactSaveService;
+import com.android.contacts.views.editor.DisplayRawContact;
+import com.android.contacts.views.editor.view.FieldAndTypeView;
+import com.android.contacts.views.editor.view.ViewTypes;
+import com.android.internal.util.ArrayUtils;
+
+import android.content.ContentProviderOperation;
+import android.content.ContentResolver;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ContentProviderOperation.Builder;
+import android.net.Uri;
+import android.provider.ContactsContract.Data;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import java.util.ArrayList;
+
+public abstract class FieldAndTypeViewModel extends BaseViewModel {
+ private static final String TAG = "FieldAndTypeViewModel";
+
+ private final long mDataId;
+ private final ContentValues mContentValues;
+ private final int mLabelResId;
+ private final Uri mDataUri;
+ private final String mFieldColumn;
+ private final String mLabelColumn;
+ private final String mTypeColumn;
+
+ protected FieldAndTypeViewModel(Context context, DisplayRawContact rawContact,
+ long dataId, ContentValues contentValues, int labelResId, String fieldColumn,
+ String typeColumn, String labelColumn) {
+ super(context, rawContact);
+ mDataId = dataId;
+ mDataUri = ContentUris.withAppendedId(Data.CONTENT_URI, mDataId);
+ mContentValues = contentValues;
+ mLabelResId = labelResId;
+
+ mFieldColumn = fieldColumn;
+ mTypeColumn = typeColumn;
+ mLabelColumn = labelColumn;
+ }
+
+ @Override
+ public int getEntryType() {
+ return ViewTypes.FIELD_AND_TYPE;
+ }
+
+ @Override
+ public FieldAndTypeView getView(LayoutInflater inflater, View convertView, ViewGroup parent) {
+ final FieldAndTypeView result = convertView != null
+ ? (FieldAndTypeView) convertView
+ : FieldAndTypeView.inflate(inflater, parent, false);
+
+ result.setListener(mViewListener);
+ result.setLabelText(mLabelResId);
+ result.setFieldValue(getFieldValue());
+ result.setTypeDisplayLabel(getTypeDisplayLabel());
+
+ return result;
+ }
+
+ public long getDataId() {
+ return mDataId;
+ }
+
+ public ContentValues getContentValues() {
+ return mContentValues;
+ }
+
+ private void saveData() {
+ final ContentResolver resolver = getContext().getContentResolver();
+
+ final ArrayList<ContentProviderOperation> operations =
+ new ArrayList<ContentProviderOperation>();
+
+ final Builder builder;
+// if (getDataUri() == null) {
+// // INSERT
+// builder = ContentProviderOperation.newInsert(Data.CONTENT_URI);
+// builder.withValue(Data.MIMETYPE, mMimeType);
+// builder.withValue(Data.RAW_CONTACT_ID, getRawContactId());
+// writeToBuilder(builder);
+// } else {
+ // UPDATE
+ builder = ContentProviderOperation.newUpdate(mDataUri);
+ writeToBuilder(builder);
+// }
+ operations.add(builder.build());
+
+ // Tell the Service to save
+ final Intent serviceIntent = new Intent();
+ final ContentProviderOperation[] operationsArray =
+ operations.toArray(ArrayUtils.emptyArray(ContentProviderOperation.class));
+ serviceIntent.putExtra(ContactSaveService.EXTRA_OPERATIONS, operationsArray);
+ serviceIntent.setClass(getContext().getApplicationContext(), ContactSaveService.class);
+
+ getContext().startService(serviceIntent);
+ }
+
+ private void writeToBuilder(final Builder builder) {
+ builder.withValue(mFieldColumn, getFieldValue());
+ builder.withValue(mTypeColumn, getType());
+ builder.withValue(mLabelColumn, getLabel());
+ }
+
+ protected String getFieldValue() {
+ return getContentValues().getAsString(mFieldColumn);
+ }
+
+ private void putFieldValue(String value) {
+ getContentValues().put(mFieldColumn, value);
+ }
+
+ public int getType() {
+ return getContentValues().getAsInteger(mTypeColumn).intValue();
+ }
+
+ private void putType(int value) {
+ getContentValues().put(mTypeColumn, value);
+ }
+
+ public String getLabel() {
+ return getContentValues().getAsString(mLabelColumn);
+ }
+
+ private void putLabel(String value) {
+ getContentValues().put(mLabelColumn, value);
+ }
+
+ protected abstract CharSequence getTypeDisplayLabel();
+
+ private FieldAndTypeView.Listener mViewListener = new FieldAndTypeView.Listener() {
+ public void onFocusLost(FieldAndTypeView view) {
+ Log.v(TAG, "Received FocusLost. Checking for changes");
+ boolean hasChanged = false;
+
+ final String oldValue = getFieldValue();
+ final String newValue = view.getFieldValue().toString();
+ if (!oldValue.equals(newValue)) {
+ putFieldValue(newValue);
+ hasChanged = true;
+ }
+ if (hasChanged) {
+ Log.v(TAG, "Found changes. Updating DB");
+ saveData();
+ }
+ }
+ };
+}
diff --git a/src/com/android/contacts/views/editor/viewModel/FooterViewModel.java b/src/com/android/contacts/views/editor/viewModel/FooterViewModel.java
index 2dc761f..9277a8b 100644
--- a/src/com/android/contacts/views/editor/viewModel/FooterViewModel.java
+++ b/src/com/android/contacts/views/editor/viewModel/FooterViewModel.java
@@ -18,6 +18,7 @@
import com.android.contacts.views.editor.DisplayRawContact;
import com.android.contacts.views.editor.view.FooterView;
+import com.android.contacts.views.editor.view.ViewTypes;
import android.content.Context;
import android.view.LayoutInflater;
@@ -35,7 +36,7 @@
@Override
public int getEntryType() {
- return ViewModelTypes.RAW_CONTACT_FOOTER;
+ return ViewTypes.RAW_CONTACT_FOOTER;
}
@Override
diff --git a/src/com/android/contacts/views/editor/viewModel/HeaderViewModel.java b/src/com/android/contacts/views/editor/viewModel/HeaderViewModel.java
index ef21bb9..dca3a06 100644
--- a/src/com/android/contacts/views/editor/viewModel/HeaderViewModel.java
+++ b/src/com/android/contacts/views/editor/viewModel/HeaderViewModel.java
@@ -19,6 +19,7 @@
import com.android.contacts.R;
import com.android.contacts.views.editor.DisplayRawContact;
import com.android.contacts.views.editor.view.HeaderView;
+import com.android.contacts.views.editor.view.ViewTypes;
import android.content.Context;
import android.text.TextUtils;
@@ -43,7 +44,7 @@
@Override
public int getEntryType() {
- return ViewModelTypes.RAW_CONTACT_HEADER;
+ return ViewTypes.RAW_CONTACT_HEADER;
}
@Override
diff --git a/src/com/android/contacts/views/editor/viewModel/PhoneViewModel.java b/src/com/android/contacts/views/editor/viewModel/PhoneViewModel.java
new file mode 100644
index 0000000..496bf2a
--- /dev/null
+++ b/src/com/android/contacts/views/editor/viewModel/PhoneViewModel.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.contacts.views.editor.viewModel;
+
+import com.android.contacts.views.editor.DisplayRawContact;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.provider.ContactsContract.CommonDataKinds.Phone;
+
+public class PhoneViewModel extends FieldAndTypeViewModel {
+ private PhoneViewModel(Context context, DisplayRawContact rawContact, long dataId,
+ ContentValues contentValues, int titleResId) {
+ super(context, rawContact, dataId, contentValues, titleResId, Phone.NUMBER, Phone.TYPE,
+ Phone.LABEL);
+ }
+
+ public static PhoneViewModel createForExisting(Context context, DisplayRawContact rawContact,
+ long dataId, ContentValues contentValues, int titleResId) {
+ return new PhoneViewModel(context, rawContact, dataId, contentValues, titleResId);
+ }
+
+ @Override
+ protected CharSequence getTypeDisplayLabel() {
+ return Phone.getTypeLabel(getContext().getResources(), getType(), getLabel());
+ }
+}