From 2b370f03f198be7cd73853a70e80b7ae32343ca4 Mon Sep 17 00:00:00 2001
From: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
Date: Thu, 6 Sep 2012 16:06:01 -0400
Subject: [PATCH] #15273: Add Fragment for account management in preference
---
res/layout/account_management_layout.xml | 59 +++++++++++++++
res/layout/test_layout.xml | 2 +-
.../client/AccountManagementFragment.java | 71 +++++++++++++++++++
.../client/SFLPhonePreferenceActivity.java | 16 ++++-
4 files changed, 146 insertions(+), 2 deletions(-)
create mode 100644 res/layout/account_management_layout.xml
create mode 100644 src/com/savoirfairelinux/sflphone/client/AccountManagementFragment.java
diff --git a/res/layout/account_management_layout.xml b/res/layout/account_management_layout.xml
new file mode 100644
index 000000000..bc5611982
--- /dev/null
+++ b/res/layout/account_management_layout.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2004-2012 Savoir-Faire Linux Inc.
+
+Author: Adrien Beraud <adrien.beraud@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+Additional permission under GNU GPL version 3 section 7:
+
+If you modify this program, or any covered work, by linking or
+combining it with the OpenSSL project's OpenSSL library (or a
+modified version of that library), containing parts covered by the
+terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+grants you additional permission to convey the resulting work.
+Corresponding Source for a non-source form of such a combination
+shall include the source code for the parts of OpenSSL used as well
+as that of the covered work.
+ -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_height="match_parent"
+ android:layout_width="match_parent"
+ android:orientation="vertical"
+ android:gravity="center_horizontal"
+ android:layout_below="@+id/editTo"
+ android:id="@+id/accountManagementLayout"
+ android:weightSum="1.0"
+ android:paddingLeft="8dp"
+ android:paddingRight="8dp" >
+
+ <Button
+ android:id="@+id/buttonAddAccount"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
+ android:onClick="onClick"
+ android:text="Add Account" />
+
+ <Button
+ android:id="@+id/buttonRemoveAccount"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
+ android:onClick="onClick"
+ android:text="Remove Account" />
+
+</LinearLayout>
diff --git a/res/layout/test_layout.xml b/res/layout/test_layout.xml
index 974b26db5..c6027d659 100644
--- a/res/layout/test_layout.xml
+++ b/res/layout/test_layout.xml
@@ -172,4 +172,4 @@ as that of the covered work.
android:onClick="onClick"
android:text="GetDataString" />
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/src/com/savoirfairelinux/sflphone/client/AccountManagementFragment.java b/src/com/savoirfairelinux/sflphone/client/AccountManagementFragment.java
new file mode 100644
index 000000000..a954cef72
--- /dev/null
+++ b/src/com/savoirfairelinux/sflphone/client/AccountManagementFragment.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2004-2012 Savoir-Faire Linux Inc.
+ *
+ * Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Additional permission under GNU GPL version 3 section 7:
+ *
+ * If you modify this program, or any covered work, by linking or
+ * combining it with the OpenSSL project's OpenSSL library (or a
+ * modified version of that library), containing parts covered by the
+ * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+ * grants you additional permission to convey the resulting work.
+ * Corresponding Source for a non-source form of such a combination
+ * shall include the source code for the parts of OpenSSL used as well
+ * as that of the covered work.
+ */
+
+package com.savoirfairelinux.sflphone.client;
+
+import android.app.Fragment;
+import android.os.Bundle;
+import android.util.Log;
+import android.widget.Button;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.savoirfairelinux.sflphone.R;
+
+public class AccountManagementFragment extends Fragment
+{
+ static final String TAG = "AccountManagementFragment";
+ Button buttonAddAccount, buttonRemoveAccount;
+
+ public AccountManagementFragment()
+ {
+ }
+
+ @Override
+ public void onCreate(Bundle savedInstanceState)
+ {
+ super.onCreate(savedInstanceState);
+
+ Log.i(TAG, "Create Account Management");
+
+ buttonAddAccount = (Button) getActivity().findViewById(R.id.buttonAddAccount);
+ buttonRemoveAccount = (Button) getActivity().findViewById(R.id.buttonRemoveAccount);
+ }
+
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup parent, Bundle savedInstanceState)
+ {
+ Log.i(TAG, "Create Account Management View");
+
+ return inflater.inflate(R.layout.account_management_layout, parent, false);
+ }
+}
diff --git a/src/com/savoirfairelinux/sflphone/client/SFLPhonePreferenceActivity.java b/src/com/savoirfairelinux/sflphone/client/SFLPhonePreferenceActivity.java
index 11c46d6bc..93ef56037 100644
--- a/src/com/savoirfairelinux/sflphone/client/SFLPhonePreferenceActivity.java
+++ b/src/com/savoirfairelinux/sflphone/client/SFLPhonePreferenceActivity.java
@@ -123,7 +123,21 @@ public class SFLPhonePreferenceActivity extends Activity implements ActionBar.Ta
@Override
public Fragment getItem(int position)
{
- return ArrayListFragment.newInstance(position);
+ Fragment fragment;
+
+ switch (position) {
+ case 0:
+ fragment = new AccountManagementFragment();
+ break;
+ case 1:
+ fragment = ArrayListFragment.newInstance(position);
+ break;
+ default:
+ Log.i(TAG, "Get new fragment " + position + " is null");
+ return null;
+ }
+
+ return fragment;
}
@Override
--
GitLab