diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a5db226..f226625 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3,10 +3,11 @@
package="fr.unix_experience.owncloud_sms"
android:versionCode="17"
android:versionName="0.16.1" >
-
+
+
@@ -19,8 +20,8 @@
-
-
+
+
@@ -35,13 +36,13 @@
android:theme="@style/AppTheme" >
-
-
-
+ android:process=":sync" >
@@ -53,10 +54,10 @@
+ android:authorities="@string/account_authority"
+ android:label="@string/pref_title_sync" >
-
+
+
-
+
@@ -89,15 +91,14 @@
android:resource="@xml/owncloud_account_authenticator" />
-
-
-
-
-
-
-
+
-
+
+
+
+
+
+
@@ -106,9 +107,18 @@
android:label="@string/title_activity_login" >
+
+
+
+
+
+
+
diff --git a/res/layout/activity_login.xml b/res/layout/activity_login.xml
index 96086a3..ff4d7be 100644
--- a/res/layout/activity_login.xml
+++ b/res/layout/activity_login.xml
@@ -1,6 +1,6 @@
+
+
diff --git a/res/layout/fragment_mainactivity_gotosettings.xml b/res/layout/fragment_mainactivity_gotosettings.xml
new file mode 100644
index 0000000..e3c91dc
--- /dev/null
+++ b/res/layout/fragment_mainactivity_gotosettings.xml
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/layout/fragment_mainactivity_main.xml b/res/layout/fragment_mainactivity_main.xml
new file mode 100644
index 0000000..86ed403
--- /dev/null
+++ b/res/layout/fragment_mainactivity_main.xml
@@ -0,0 +1,61 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/layout/fragment_mainactivity_thanks_note.xml b/res/layout/fragment_mainactivity_thanks_note.xml
new file mode 100644
index 0000000..5c3e204
--- /dev/null
+++ b/res/layout/fragment_mainactivity_thanks_note.xml
@@ -0,0 +1,87 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/menu/main.xml b/res/menu/main.xml
index 30213a9..570ca32 100644
--- a/res/menu/main.xml
+++ b/res/menu/main.xml
@@ -8,6 +8,5 @@
android:orderInCategory="100"
android:title="@string/action_settings"
app:showAsAction="never"/>
-
diff --git a/res/values/strings.xml b/res/values/strings.xml
index adcabad..51fe822 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -26,22 +26,22 @@
*/
-->
-
- 3
-
+
+ 3
+
+
ownCloud-SMSfr.unix_experience.owncloud_smsfr.unix_experience.owncloud_sms.datasync.providerfr.unix_experience.owncloud_sms.datasync.slowsync_provider
-
fr.unix_experience.owncloud_smsLogin logo
-
+
ownCloudSMSPrefslast_message_date
-
+
SMS - Fast
@@ -51,17 +51,14 @@
SettingsSynchronize nowSynchronization
-
- General preferences
- Sync options
- Notifications
-
+ General preferences
+ Sync options
+ NotificationsData & sync
-
- General Settings
+ General Settings
- 5 minutes
+ 5 minutes15 minutes30 minutes1 hour
@@ -72,7 +69,7 @@
Never
- 5
+ 5153060
@@ -82,7 +79,6 @@
1440-1
-
1 hour3 hours
@@ -91,7 +87,6 @@
24 hoursNever
-
60180
@@ -100,7 +95,7 @@
1440-1
-
+
Sign in
@@ -115,18 +110,17 @@
Invalid server addressConnection failed, ensure this is the right serverUnable to perform a HTTP connection. Please ensure there is a web server
-
+
- https://
+ https://http://
-
+
Sync processSync in progress...Fatal error !
-
-
+
Error #1: Invalid data received from server when getting previous messagesError #2: Error while crafting HTTP request
@@ -143,5 +137,10 @@
Error #14: Unable to parse server responseError #15: Unable to parse server responseError #16: No data connection available
-
+ MainActivity
+ Section 1
+ Section 2
+ Section 3
+ Hello world!
+
diff --git a/src/fr/unix_experience/owncloud_sms/MainActivity.java b/src/fr/unix_experience/owncloud_sms/MainActivity.java
new file mode 100644
index 0000000..788b6d5
--- /dev/null
+++ b/src/fr/unix_experience/owncloud_sms/MainActivity.java
@@ -0,0 +1,164 @@
+package fr.unix_experience.owncloud_sms;
+
+/*
+ * Copyright (c) 2014-2015, Loic Blot
+ * All rights reserved.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+import java.util.List;
+import java.util.Vector;
+
+import android.support.v7.app.ActionBarActivity;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentPagerAdapter;
+import android.os.Bundle;
+import android.support.v4.view.ViewPager;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+
+public class MainActivity extends ActionBarActivity {
+
+ /**
+ * The {@link android.support.v4.view.PagerAdapter} that will provide
+ * fragments for each of the sections. We use a {@link FragmentPagerAdapter}
+ * derivative, which will keep every loaded fragment in memory. If this
+ * becomes too memory intensive, it may be best to switch to a
+ * {@link android.support.v4.app.FragmentStatePagerAdapter}.
+ */
+ MainPagerAdapter mPagerAdapter;
+
+ /**
+ * The {@link ViewPager} that will host the section contents.
+ */
+ ViewPager mViewPager;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_main);
+
+ // Create the adapter that will return a fragment for each of the three
+ // primary sections of the activity.
+
+ List fragments = new Vector();
+
+ /*
+ * Add the Main tabs here
+ */
+
+ fragments.add(Fragment.instantiate(this,StarterFragment.class.getName()));
+ fragments.add(Fragment.instantiate(this,SecondTestFragment.class.getName()));
+ fragments.add(Fragment.instantiate(this,ThanksAndRateFragment.class.getName()));
+
+ mPagerAdapter = new MainPagerAdapter(getSupportFragmentManager(), fragments);
+
+ // Set up the ViewPager with the sections adapter.
+ mViewPager = (ViewPager) findViewById(R.id.pager);
+ mViewPager.setAdapter(mPagerAdapter);
+ }
+
+ @Override
+ public boolean onCreateOptionsMenu(Menu menu) {
+ // Inflate the menu; this adds items to the action bar if it is present.
+ getMenuInflater().inflate(R.menu.main, menu);
+ return true;
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ // Handle action bar item clicks here. The action bar will
+ // automatically handle clicks on the Home/Up button, so long
+ // as you specify a parent activity in AndroidManifest.xml.
+ int id = item.getItemId();
+ if (id == R.id.action_settings) {
+ return true;
+ }
+ return super.onOptionsItemSelected(item);
+ }
+
+ /**
+ * A {@link FragmentPagerAdapter} that returns a fragment corresponding to
+ * one of the sections/tabs/pages.
+ */
+ public class MainPagerAdapter extends FragmentPagerAdapter {
+
+ private final List mFragments;
+
+ public MainPagerAdapter(FragmentManager fm, List fragments) {
+ super(fm);
+ mFragments = fragments;
+ }
+
+ @Override
+ public Fragment getItem(int position) {
+ // getItem is called to instantiate the fragment for the given page.
+ // Return a PlaceholderFragment (defined as a static inner class
+ // below).
+ return mFragments.get(position);
+ }
+
+ @Override
+ public int getCount() {
+ // Show 3 total pages.
+ return mFragments.size();
+ }
+ }
+
+ /**
+ * Fragments for activity must be there
+ */
+ public static class StarterFragment extends Fragment {
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container,
+ Bundle savedInstanceState) {
+ View rootView = inflater.inflate(R.layout.fragment_mainactivity_main, container,
+ false);
+ return rootView;
+ }
+ }
+
+ public static class SecondTestFragment extends Fragment {
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container,
+ Bundle savedInstanceState) {
+ View rootView = inflater.inflate(R.layout.fragment_mainactivity_gotosettings, container,
+ false);
+ return rootView;
+ }
+ }
+
+ public static class ThanksAndRateFragment extends Fragment {
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container,
+ Bundle savedInstanceState) {
+ View rootView = inflater.inflate(R.layout.fragment_mainactivity_thanks_note, container,
+ false);
+ return rootView;
+ }
+ }
+
+}