From bbfd08690e7bdea0a803bdc02263f1ca781464d6 Mon Sep 17 00:00:00 2001
From: Vincent KHERBACHE <vincent@kherbache.fr>
Date: Mon, 2 Feb 2015 00:55:56 +0100
Subject: [PATCH] =?UTF-8?q?2=20activit=C3=A9s=20s=C3=A9par=C3=A9s=20pour?=
 =?UTF-8?q?=20les=20param=C3=A8tres=20(config+param)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

+ jniLibs replaced by original libs generated by tesseract
+ home page update: new Background !, updated texviews and co
---
 app/src/main/AndroidManifest.xml              |   9 +
 .../fr/android/pointspermis/MainActivity.java | 167 +++++++-----------
 .../NavigationDrawerFragment.java             |  19 +-
 .../settings/DossierDialogPreference.java     |  15 +-
 .../settings/SettingsActivity.java            |  62 +------
 app/src/main/jniLibs/armeabi-v7a/gdb.setup    |   3 -
 app/src/main/jniLibs/armeabi/gdb.setup        |   3 -
 app/src/main/jniLibs/mips/gdb.setup           |   3 -
 app/src/main/jniLibs/x86/gdb.setup            |   3 -
 app/src/main/res/layout/dossier_dialog.xml    |   3 +
 app/src/main/res/layout/fragment_main.xml     |  39 ++--
 .../res/layout/fragment_navigation_drawer.xml |   2 +-
 app/src/main/res/menu/global.xml              |   4 -
 app/src/main/res/menu/main.xml                |   5 +-
 app/src/main/res/values/strings.xml           |  12 +-
 .../res/values/strings_activity_settings.xml  |  15 +-
 tesseract/build.gradle                        |  11 +-
 17 files changed, 154 insertions(+), 221 deletions(-)
 delete mode 100644 app/src/main/jniLibs/armeabi-v7a/gdb.setup
 delete mode 100644 app/src/main/jniLibs/armeabi/gdb.setup
 delete mode 100644 app/src/main/jniLibs/mips/gdb.setup
 delete mode 100644 app/src/main/jniLibs/x86/gdb.setup
 delete mode 100644 app/src/main/res/menu/global.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8d6e6e8..297ed1b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -19,6 +19,15 @@
                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
        </activity>
+       <activity
+           android:name=".settings.ConfigActivity"
+           android:label="@string/title_activity_config"
+           android:parentActivityName=".MainActivity" >
+           <!-- The meta-data element is needed for versions lower than 4.1 -->
+           <meta-data
+               android:name="android.support.PARENT_ACTIVITY"
+               android:value=".MainActivity" />
+       </activity>
        <activity
            android:name=".settings.SettingsActivity"
            android:label="@string/title_activity_settings"
diff --git a/app/src/main/java/fr/android/pointspermis/MainActivity.java b/app/src/main/java/fr/android/pointspermis/MainActivity.java
index 35a1817..6bb919c 100644
--- a/app/src/main/java/fr/android/pointspermis/MainActivity.java
+++ b/app/src/main/java/fr/android/pointspermis/MainActivity.java
@@ -24,6 +24,7 @@ import java.io.File;
 import java.util.List;
 
 import fr.android.pointspermis.captcha.Captcha;
+import fr.android.pointspermis.settings.ConfigActivity;
 import fr.android.pointspermis.settings.SettingsActivity;
 import fr.android.pointspermis.tools.AssetsTools;
 import fr.android.pointspermis.web.WebTask;
@@ -32,8 +33,14 @@ import fr.android.pointspermis.web.WebTask;
 public class MainActivity extends Activity
         implements NavigationDrawerFragment.NavigationDrawerCallbacks {
 
+    public final static String SOLDE_KEY = "solde";
+    public final static String USERNAME_KEY = "username";
+    public final static String BIRTHDAY_KEY = "birthday";
+
     private final Context context = this;
 
+    private ActionBar actionBar;
+
     private WebTask webform;
 
     private SharedPreferences prefs;
@@ -43,17 +50,14 @@ public class MainActivity extends Activity
     private String username;
     private String birthday;
 
+
     /**
      * Fragment managing the behaviors, interactions and presentation of the navigation drawer.
      */
+    private FragmentManager fragmentManager;
     private NavigationDrawerFragment mNavigationDrawerFragment;
-
     private PlaceholderFragment mPlaceholderFrament;
 
-    /**
-     * Used to store the last screen title. For use in {@link #restoreActionBar()}.
-     */
-    private CharSequence mTitle;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -69,23 +73,36 @@ public class MainActivity extends Activity
         // Copy tesseract data to app-specific internal storage (language stuff)
         copyTesseractData();
 
-        mNavigationDrawerFragment = (NavigationDrawerFragment)
-                getFragmentManager().findFragmentById(R.id.navigation_drawer);
-        mTitle = getTitle();
+        // Get actionBar
+        actionBar = getActionBar();
+
+        // Get fragment manager
+        fragmentManager = getFragmentManager();
 
         // Set up the drawer.
+        mNavigationDrawerFragment = (NavigationDrawerFragment)
+                fragmentManager.findFragmentById(R.id.navigation_drawer);
         mNavigationDrawerFragment.setUp(
                 R.id.navigation_drawer,
-                (DrawerLayout) findViewById(R.id.drawer_layout));
-
+                (DrawerLayout) findViewById(R.id.drawer_layout)
+        );
         // Load prefs
         prefs = getSharedPreferences("fr.android.pointspermis", MODE_PRIVATE);
         editor = prefs.edit();
 
         // Try to get saved values
-        solde = prefs.getString("solde", "");
-        username = prefs.getString("username", "");
-        birthday = prefs.getString("birthday", "");
+        solde = prefs.getString(SOLDE_KEY, "            ");
+        username = prefs.getString(USERNAME_KEY, "");
+        birthday = prefs.getString(BIRTHDAY_KEY, "");
+
+        // Set the main fragment with args
+        mPlaceholderFrament = new PlaceholderFragment();
+        Bundle args = new Bundle();
+        args.putString(SOLDE_KEY, solde);
+        args.putString(USERNAME_KEY, username);
+        args.putString(BIRTHDAY_KEY, birthday);
+        mPlaceholderFrament.setArguments(args);
+        fragmentManager.beginTransaction().replace(R.id.container, mPlaceholderFrament).commit();
     }
 
     public void copyTesseractData() {
@@ -115,35 +132,30 @@ public class MainActivity extends Activity
 
     @Override
     public void onNavigationDrawerItemSelected(int position) {
-        // update the main content by replacing fragments
-        FragmentManager fragmentManager = getFragmentManager();
-
+        /* update the main content by replacing fragments
         mPlaceholderFrament = PlaceholderFragment.newInstance(position + 1);
+        fragmentManager.beginTransaction().replace(R.id.container, mPlaceholderFrament).commit();*/
 
-        fragmentManager.beginTransaction().replace(R.id.container, mPlaceholderFrament).commit();
-    }
-
-    public void onSectionAttached(int number) {
-        switch (number) {
-            case 1:
-                mTitle = getString(R.string.title_home);
-                break;
-            case 2:
-                mTitle = getString(R.string.title_settings);
-                Intent i = new Intent(this, SettingsActivity.class);
-                startActivity(i);
-                break;
+        // Manage actions on drawer's clicks
+        if (position == 0) {
+            Intent i = new Intent(this, ConfigActivity.class);
+            startActivity(i);
+        }
+        if (position == 1) {
+            Intent i = new Intent(this, SettingsActivity.class);
+            startActivity(i);
+        }
+        if (position == 2) {
+            quit();
         }
     }
 
     public void restoreActionBar() {
-        ActionBar actionBar = getActionBar();
         actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);
         actionBar.setDisplayShowTitleEnabled(true);
-        actionBar.setTitle(mTitle);
+        actionBar.setTitle(R.string.app_name);
     }
 
-
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         if (!mNavigationDrawerFragment.isDrawerOpen()) {
@@ -165,6 +177,12 @@ public class MainActivity extends Activity
         int id = item.getItemId();
 
         //noinspection SimplifiableIfStatement
+        if (id == R.id.action_config) {
+            Intent i = new Intent(this, ConfigActivity.class);
+            startActivity(i);
+            return true;
+        }
+
         if (id == R.id.action_settings) {
             Intent i = new Intent(this, SettingsActivity.class);
             startActivity(i);
@@ -175,10 +193,10 @@ public class MainActivity extends Activity
 
             // Initialize and execute the WebForm async task
             webform = new WebTask(context, MainActivity.this);
-            webform.execute(prefs.getString(SettingsActivity.DOSSIER1_KEY, ""),
-                    prefs.getString(SettingsActivity.DOSSIER2_KEY, ""),
-                    prefs.getString(SettingsActivity.DOSSIER3_KEY, ""),
-                    prefs.getString(SettingsActivity.CODE_KEY, "")
+            webform.execute(prefs.getString(ConfigActivity.DOSSIER1_KEY, ""),
+                    prefs.getString(ConfigActivity.DOSSIER2_KEY, ""),
+                    prefs.getString(ConfigActivity.DOSSIER3_KEY, ""),
+                    prefs.getString(ConfigActivity.CODE_KEY, "")
             );
             return true;
         }
@@ -190,67 +208,14 @@ public class MainActivity extends Activity
         return super.onOptionsItemSelected(item);
     }
 
-    /**
-     * A placeholder fragment containing a simple view.
-     */
-    public static class PlaceholderFragment extends Fragment {
-        /**
-         * The fragment argument representing the section number for this
-         * fragment.
-         */
-        private static final String ARG_SECTION_NUMBER = "section_number";
-
-        private TextView textViewSolde;
-        private TextView textViewUserName;
-        private TextView textViewBirthday;
-
-        /**
-         * Returns a new instance of this fragment for the given section
-         * number.
-         */
-        public static PlaceholderFragment newInstance(int sectionNumber) {
-            PlaceholderFragment fragment = new PlaceholderFragment();
-            Bundle args = new Bundle();
-            args.putInt(ARG_SECTION_NUMBER, sectionNumber);
-            fragment.setArguments(args);
-            return fragment;
-        }
-
-        public PlaceholderFragment() {
-        }
-
-        public void setInfos(List<String> infos) {
-
-            // Show values
-            textViewSolde.setText(infos.get(0));
-            textViewSolde.invalidate();
-            textViewUserName.setText(infos.get(1));
-            textViewUserName.invalidate();
-            textViewBirthday.setText(infos.get(2));
-            textViewBirthday.invalidate();
-        }
-
-        @Override
-        public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                                 Bundle savedInstanceState) {
-            View rootView = inflater.inflate(R.layout.fragment_main, container, false);
-
-            textViewSolde = (TextView) rootView.findViewById(R.id.textViewSolde);
-            textViewUserName = (TextView) rootView.findViewById(R.id.textViewUserName);
-            textViewBirthday = (TextView) rootView.findViewById(R.id.textViewBirthday);
-
-            return rootView;
-        }
+    public void setInfos(List<String> infos) {
 
-        @Override
-        public void onAttach(Activity activity) {
-            super.onAttach(activity);
-            ((MainActivity) activity).onSectionAttached(
-                    getArguments().getInt(ARG_SECTION_NUMBER));
-        }
-    }
+        // Store infos
+        solde = infos.get(0);
+        username = infos.get(1);
+        birthday = infos.get(2);
 
-    public void setInfos(List<String> infos) {
+        saveUserData();
 
         // Set infos to the fragment
         mPlaceholderFrament.setInfos(infos);
@@ -258,17 +223,17 @@ public class MainActivity extends Activity
 
     private void saveUserData() {
 
-        editor.putString("solde", solde);
-        editor.putString("username", username);
-        editor.putString("birthday", birthday);
+        editor.putString(SOLDE_KEY, solde);
+        editor.putString(USERNAME_KEY, username);
+        editor.putString(BIRTHDAY_KEY, birthday);
         editor.commit();
     }
 
     public void quit() {
         new AlertDialog.Builder(this)
-                .setMessage("Quitter ?")
+                .setMessage(getString(R.string.question_quit))
                 .setCancelable(false)
-                .setPositiveButton("Oui", new DialogInterface.OnClickListener() {
+                .setPositiveButton(getString(R.string.action_yes), new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int id) {
 
                         // Save user data
@@ -278,7 +243,7 @@ public class MainActivity extends Activity
                         MainActivity.this.finish();
                     }
                 })
-                .setNegativeButton("Non", new DialogInterface.OnClickListener() {
+                .setNegativeButton(getString(R.string.action_no), new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int id) {
                         dialog.dismiss();
                     }
diff --git a/app/src/main/java/fr/android/pointspermis/NavigationDrawerFragment.java b/app/src/main/java/fr/android/pointspermis/NavigationDrawerFragment.java
index 55fab66..e78b40f 100644
--- a/app/src/main/java/fr/android/pointspermis/NavigationDrawerFragment.java
+++ b/app/src/main/java/fr/android/pointspermis/NavigationDrawerFragment.java
@@ -4,6 +4,7 @@ package fr.android.pointspermis;
 import android.app.Activity;
 import android.app.ActionBar;
 import android.app.Fragment;
+import android.content.Intent;
 import android.support.v4.app.ActionBarDrawerToggle;
 import android.support.v4.view.GravityCompat;
 import android.support.v4.widget.DrawerLayout;
@@ -22,6 +23,8 @@ import android.widget.ArrayAdapter;
 import android.widget.ListView;
 import android.widget.Toast;
 
+import fr.android.pointspermis.settings.SettingsActivity;
+
 /**
  * Fragment used for managing interactions for and presentation of a navigation drawer.
  * See the <a href="https://developer.android.com/design/patterns/navigation-drawer.html#Interaction">
@@ -54,10 +57,13 @@ public class NavigationDrawerFragment extends Fragment {
     private ListView mDrawerListView;
     private View mFragmentContainerView;
 
-    private int mCurrentSelectedPosition = 0;
+    private int mCurrentSelectedPosition = -1;
     private boolean mFromSavedInstanceState;
     private boolean mUserLearnedDrawer;
 
+    private ActionBar actionBar;
+
+
     public NavigationDrawerFragment() {
     }
 
@@ -75,6 +81,9 @@ public class NavigationDrawerFragment extends Fragment {
             mFromSavedInstanceState = true;
         }
 
+        // Get action bar
+        actionBar = getActionBar();
+
         // Select either the default item (0) or the last selected item.
         selectItem(mCurrentSelectedPosition);
     }
@@ -102,8 +111,9 @@ public class NavigationDrawerFragment extends Fragment {
                 android.R.layout.simple_list_item_activated_1,
                 android.R.id.text1,
                 new String[]{
-                        getString(R.string.title_home),
-                        getString(R.string.title_settings),
+                        getString(R.string.title_activity_config),
+                        getString(R.string.title_activity_settings),
+                        getString(R.string.action_quit)
                 }));
         mDrawerListView.setItemChecked(mCurrentSelectedPosition, true);
         return mDrawerListView;
@@ -234,7 +244,7 @@ public class NavigationDrawerFragment extends Fragment {
         // If the drawer is open, show the global app actions in the action bar. See also
         // showGlobalContextActionBar, which controls the top-left area of the action bar.
         if (mDrawerLayout != null && isDrawerOpen()) {
-            inflater.inflate(R.menu.global, menu);
+            inflater.inflate(R.menu.main, menu);
             showGlobalContextActionBar();
         }
         super.onCreateOptionsMenu(menu, inflater);
@@ -259,7 +269,6 @@ public class NavigationDrawerFragment extends Fragment {
      * 'context', rather than just what's in the current screen.
      */
     private void showGlobalContextActionBar() {
-        ActionBar actionBar = getActionBar();
         actionBar.setDisplayShowTitleEnabled(true);
         actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);
         actionBar.setTitle(R.string.app_name);
diff --git a/app/src/main/java/fr/android/pointspermis/settings/DossierDialogPreference.java b/app/src/main/java/fr/android/pointspermis/settings/DossierDialogPreference.java
index 6287004..684c39e 100644
--- a/app/src/main/java/fr/android/pointspermis/settings/DossierDialogPreference.java
+++ b/app/src/main/java/fr/android/pointspermis/settings/DossierDialogPreference.java
@@ -10,6 +10,7 @@ import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 
+import fr.android.pointspermis.MainActivity;
 import fr.android.pointspermis.R;
 
 /**
@@ -36,9 +37,9 @@ public class DossierDialogPreference extends DialogPreference {
         editor = prefs.edit();
 
         // Try to get old saved values
-        dossier1 = prefs.getString(context.getString(R.string.pref_key_dossier1), "");
-        dossier2 = prefs.getString(context.getString(R.string.pref_key_dossier2), "");
-        dossier3 = prefs.getString(context.getString(R.string.pref_key_dossier3), "");
+        dossier1 = prefs.getString(ConfigActivity.DOSSIER1_KEY, "");
+        dossier2 = prefs.getString(ConfigActivity.DOSSIER2_KEY, "");
+        dossier3 = prefs.getString(ConfigActivity.DOSSIER3_KEY, "");
 
         // Update summary
         updateSummary();
@@ -83,10 +84,10 @@ public class DossierDialogPreference extends DialogPreference {
                 updateSummary();
 
                 // Save parameters
-                editor.putString(context.getString(R.string.pref_key_dossier1), dossier1);
-                editor.putString(context.getString(R.string.pref_key_dossier2), dossier2);
-                editor.putString(context.getString(R.string.pref_key_dossier3), dossier3);
-                editor.putString(context.getString(R.string.pref_key_dossier),
+                editor.putString(ConfigActivity.DOSSIER1_KEY, dossier1);
+                editor.putString(ConfigActivity.DOSSIER2_KEY, dossier2);
+                editor.putString(ConfigActivity.DOSSIER3_KEY, dossier3);
+                editor.putString(ConfigActivity.DOSSIER_KEY,
                         dossier1 + " " + dossier2 + " " + dossier3);
                 editor.commit();
 
diff --git a/app/src/main/java/fr/android/pointspermis/settings/SettingsActivity.java b/app/src/main/java/fr/android/pointspermis/settings/SettingsActivity.java
index dd1b04d..b329b3f 100644
--- a/app/src/main/java/fr/android/pointspermis/settings/SettingsActivity.java
+++ b/app/src/main/java/fr/android/pointspermis/settings/SettingsActivity.java
@@ -36,15 +36,10 @@ import fr.android.pointspermis.R;
  */
 public class SettingsActivity extends PreferenceActivity {
 
-    public static String DOSSIER_KEY;
-    public static String DOSSIER1_KEY;
-    public static String DOSSIER2_KEY;
-    public static String DOSSIER3_KEY;
-    public static String CODE_KEY;
-    public static String NOTIFICATION_KEY;
-    public static String FREQUENCY_KEY;
-    public static String RINGTONE_KEY;
-    public static String VIBRATE_KEY;
+    public final static String NOTIFICATION_KEY = "notifications";
+    public final static String FREQUENCY_KEY = "sync_frequency";
+    public final static String RINGTONE_KEY = "notifications_ringtone";
+    public final static String VIBRATE_KEY = "notifications_vibrate";
 
     /**
      * Determines whether to always show the simplified settings UI, where
@@ -66,17 +61,6 @@ public class SettingsActivity extends PreferenceActivity {
         // Shared prefs
         prefs = getSharedPreferences("fr.android.pointspermis", MODE_PRIVATE);
         editor = prefs.edit();
-
-        // Get the key name of settings elements
-        DOSSIER_KEY = getString(R.string.pref_key_dossier);
-        DOSSIER1_KEY = getString(R.string.pref_key_dossier1);
-        DOSSIER2_KEY = getString(R.string.pref_key_dossier2);
-        DOSSIER3_KEY = getString(R.string.pref_key_dossier3);
-        CODE_KEY = getString(R.string.pref_key_code);
-        NOTIFICATION_KEY = getString(R.string.pref_key_enable_notifications);
-        FREQUENCY_KEY = getString(R.string.pref_key_sync_frequency);
-        RINGTONE_KEY = getString(R.string.pref_key_ringtone);
-        VIBRATE_KEY = getString(R.string.pref_key_vibrate);
     }
 
     @Override
@@ -115,17 +99,12 @@ public class SettingsActivity extends PreferenceActivity {
         // In the simplified UI, fragments are not used at all and we instead
         // use the older PreferenceActivity APIs.
 
-        // Add 'connection' preferences.
-        addPreferencesFromResource(R.xml.pref_connection);
-
         // Add 'notifications' preferences, and a corresponding header.
         addPreferencesFromResource(R.xml.pref_notification);
 
         // Bind the summaries of EditText/List/Dialog/Ringtone preferences to
         // their values. When their values change, their summaries are updated
         // to reflect the new value, per the Android Design guidelines.
-        manageValueAndSummary(findPreference(DOSSIER_KEY));
-        manageValueAndSummary(findPreference(CODE_KEY));
         manageValueAndSummary(findPreference(NOTIFICATION_KEY));
         manageValueAndSummary(findPreference(FREQUENCY_KEY));
         manageValueAndSummary(findPreference(RINGTONE_KEY));
@@ -144,31 +123,6 @@ public class SettingsActivity extends PreferenceActivity {
 
                 String key = preference.getKey();
 
-                if (key.equals(DOSSIER_KEY)) {
-
-                    /* No need to save values or update the summary as this is already done in
-                    *  custom dialogPreference, but anyway we still do it ..
-                    */
-
-                    // Update the summary
-                    ((DossierDialogPreference) preference).updateSummary();
-
-                    // Get and save the dossier number
-                    String dossier1 = ((DossierDialogPreference) preference).getDossier1();
-                    String dossier2 = ((DossierDialogPreference) preference).getDossier2();
-                    String dossier3 = ((DossierDialogPreference) preference).getDossier3();
-                    editor.putString(DOSSIER1_KEY, dossier1);
-                    editor.putString(DOSSIER2_KEY, dossier2);
-                    editor.putString(DOSSIER3_KEY, dossier3);
-                    editor.putString(DOSSIER_KEY, dossier1 + " " + dossier2 + " " + dossier3);
-                }
-                if (key.equals(CODE_KEY)) {
-
-                    /* Do not change summary: code is private ! */
-
-                    // Save the value
-                    editor.putString(key, value.toString());
-                }
                 if (key.equals(NOTIFICATION_KEY)) {
 
                     // For checkbox, just save the value
@@ -286,14 +240,6 @@ public class SettingsActivity extends PreferenceActivity {
         @Override
         public void onCreate(Bundle savedInstanceState) {
             super.onCreate(savedInstanceState);
-            addPreferencesFromResource(R.xml.pref_connection);
-
-            // Bind the summaries of EditText/List/Dialog/Ringtone preferences
-            // to their values. When their values change, their summaries are
-            // updated to reflect the new value, per the Android Design
-            // guidelines.
-            manageValueAndSummary(findPreference(DOSSIER_KEY));
-            manageValueAndSummary(findPreference(CODE_KEY));
         }
     }
 
diff --git a/app/src/main/jniLibs/armeabi-v7a/gdb.setup b/app/src/main/jniLibs/armeabi-v7a/gdb.setup
deleted file mode 100644
index c912260..0000000
--- a/app/src/main/jniLibs/armeabi-v7a/gdb.setup
+++ /dev/null
@@ -1,3 +0,0 @@
-set solib-search-path /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/obj/local/armeabi-v7a
-source /opt/android/android-ndk-r10d/prebuilt/common/gdb/common.setup
-directory /opt/android/android-ndk-r10d/platforms/android-8/arch-arm/usr/include /opt/android/android-ndk-r10d/sources/cxx-stl/gnu-libstdc++ /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_leptonica_android /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_leptonica_android/src/src /opt/android/android-ndk-r10d/sources/cxx-stl/gnu-libstdc++/4.8/include /opt/android/android-ndk-r10d/sources/cxx-stl/gnu-libstdc++/4.8/libs/armeabi-v7a/include /opt/android/android-ndk-r10d/sources/cxx-stl/gnu-libstdc++/4.8/include/backward /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_tesseract_android/src/api /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_tesseract_android/src/ccmain /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_tesseract_android/src/ccstruct /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_tesseract_android/src/ccutil /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_tesseract_android/src/classify /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_tesseract_android/src/cube /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_tesseract_android/src/cutil /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_tesseract_android/src/dict /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_tesseract_android/src/opencl /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_tesseract_android/src/neural_networks/runtime /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_tesseract_android/src/textord /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_tesseract_android/src/viewer /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_tesseract_android/src/wordrec
diff --git a/app/src/main/jniLibs/armeabi/gdb.setup b/app/src/main/jniLibs/armeabi/gdb.setup
deleted file mode 100644
index b4d3684..0000000
--- a/app/src/main/jniLibs/armeabi/gdb.setup
+++ /dev/null
@@ -1,3 +0,0 @@
-set solib-search-path /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/obj/local/armeabi
-source /opt/android/android-ndk-r10d/prebuilt/common/gdb/common.setup
-directory /opt/android/android-ndk-r10d/platforms/android-8/arch-arm/usr/include /opt/android/android-ndk-r10d/sources/cxx-stl/gnu-libstdc++ /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_leptonica_android /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_leptonica_android/src/src /opt/android/android-ndk-r10d/sources/cxx-stl/gnu-libstdc++/4.8/include /opt/android/android-ndk-r10d/sources/cxx-stl/gnu-libstdc++/4.8/libs/armeabi/include /opt/android/android-ndk-r10d/sources/cxx-stl/gnu-libstdc++/4.8/include/backward /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_tesseract_android/src/api /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_tesseract_android/src/ccmain /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_tesseract_android/src/ccstruct /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_tesseract_android/src/ccutil /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_tesseract_android/src/classify /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_tesseract_android/src/cube /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_tesseract_android/src/cutil /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_tesseract_android/src/dict /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_tesseract_android/src/opencl /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_tesseract_android/src/neural_networks/runtime /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_tesseract_android/src/textord /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_tesseract_android/src/viewer /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_tesseract_android/src/wordrec
diff --git a/app/src/main/jniLibs/mips/gdb.setup b/app/src/main/jniLibs/mips/gdb.setup
deleted file mode 100644
index a736700..0000000
--- a/app/src/main/jniLibs/mips/gdb.setup
+++ /dev/null
@@ -1,3 +0,0 @@
-set solib-search-path /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/obj/local/mips
-source /opt/android/android-ndk-r10d/prebuilt/common/gdb/common.setup
-directory /opt/android/android-ndk-r10d/platforms/android-9/arch-mips/usr/include /opt/android/android-ndk-r10d/sources/cxx-stl/gnu-libstdc++ /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_leptonica_android /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_leptonica_android/src/src /opt/android/android-ndk-r10d/sources/cxx-stl/gnu-libstdc++/4.8/include /opt/android/android-ndk-r10d/sources/cxx-stl/gnu-libstdc++/4.8/libs/mips/include /opt/android/android-ndk-r10d/sources/cxx-stl/gnu-libstdc++/4.8/include/backward /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_tesseract_android/src/api /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_tesseract_android/src/ccmain /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_tesseract_android/src/ccstruct /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_tesseract_android/src/ccutil /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_tesseract_android/src/classify /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_tesseract_android/src/cube /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_tesseract_android/src/cutil /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_tesseract_android/src/dict /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_tesseract_android/src/opencl /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_tesseract_android/src/neural_networks/runtime /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_tesseract_android/src/textord /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_tesseract_android/src/viewer /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_tesseract_android/src/wordrec
diff --git a/app/src/main/jniLibs/x86/gdb.setup b/app/src/main/jniLibs/x86/gdb.setup
deleted file mode 100644
index 1841aab..0000000
--- a/app/src/main/jniLibs/x86/gdb.setup
+++ /dev/null
@@ -1,3 +0,0 @@
-set solib-search-path /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/obj/local/x86
-source /opt/android/android-ndk-r10d/prebuilt/common/gdb/common.setup
-directory /opt/android/android-ndk-r10d/platforms/android-9/arch-x86/usr/include /opt/android/android-ndk-r10d/sources/cxx-stl/gnu-libstdc++ /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_leptonica_android /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_leptonica_android/src/src /opt/android/android-ndk-r10d/sources/cxx-stl/gnu-libstdc++/4.8/include /opt/android/android-ndk-r10d/sources/cxx-stl/gnu-libstdc++/4.8/libs/x86/include /opt/android/android-ndk-r10d/sources/cxx-stl/gnu-libstdc++/4.8/include/backward /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_tesseract_android/src/api /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_tesseract_android/src/ccmain /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_tesseract_android/src/ccstruct /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_tesseract_android/src/ccutil /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_tesseract_android/src/classify /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_tesseract_android/src/cube /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_tesseract_android/src/cutil /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_tesseract_android/src/dict /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_tesseract_android/src/opencl /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_tesseract_android/src/neural_networks/runtime /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_tesseract_android/src/textord /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_tesseract_android/src/viewer /home/vins/AndroidStudioProjects/PointsPermis/tesseract/src/main/jni/com_googlecode_tesseract_android/src/wordrec
diff --git a/app/src/main/res/layout/dossier_dialog.xml b/app/src/main/res/layout/dossier_dialog.xml
index 401bf15..2935613 100644
--- a/app/src/main/res/layout/dossier_dialog.xml
+++ b/app/src/main/res/layout/dossier_dialog.xml
@@ -24,6 +24,7 @@
             android:focusableInTouchMode="true"
             android:windowSoftInputMode="stateAlwaysVisible"
             android:autoText="true"
+            android:maxLength="13"
             android:lines="1" />
 
         <EditText
@@ -40,6 +41,7 @@
             android:focusableInTouchMode="true"
             android:windowSoftInputMode="stateAlwaysVisible"
             android:autoText="true"
+            android:maxLength="3"
             android:lines="1" />
 
         <EditText
@@ -57,6 +59,7 @@
             android:focusableInTouchMode="true"
             android:windowSoftInputMode="stateAlwaysVisible"
             android:autoText="true"
+            android:maxLength="3"
             android:lines="1" />
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
index 318f5a6..9a78fc1 100644
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -5,33 +5,44 @@
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingBottom="@dimen/activity_vertical_margin"
     tools:context=".MainActivity$PlaceholderFragment"
-    android:id="@+id/layout_fragment_main">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/textViewBirthday"
-        android:layout_marginTop="110dp"
-        android:layout_below="@+id/textViewUserName"
-        android:layout_centerHorizontal="true" />
+    android:id="@+id/layout_fragment_main"
+    android:background="@drawable/background_home">
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:id="@+id/textViewSolde"
-        android:layout_below="@+id/textViewBirthday"
+        android:lines="1"
+        android:maxLines="1"
+        android:layout_marginBottom="50dp"
+        android:textSize="50dp"
+        android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
-        android:layout_marginTop="99dp" />
+        android:text="            "
+        android:background="@drawable/shape" />
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:id="@+id/textViewUserName"
+        android:layout_marginTop="23dp"
+        android:lines="1"
+        android:maxLines="1"
+        android:text="                  "
         android:layout_alignParentTop="true"
-        android:layout_alignLeft="@+id/textViewSolde"
-        android:layout_alignStart="@+id/textViewSolde"
-        android:layout_marginTop="34dp" />
+        android:layout_centerHorizontal="true" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:text="@string/show_solde"
+        android:id="@+id/textView"
+        android:layout_above="@+id/textViewSolde"
+        android:layout_centerHorizontal="true"
+        android:textStyle="bold"
+        android:layout_marginBottom="5dp" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_navigation_drawer.xml b/app/src/main/res/layout/fragment_navigation_drawer.xml
index c05742d..dab4f81 100644
--- a/app/src/main/res/layout/fragment_navigation_drawer.xml
+++ b/app/src/main/res/layout/fragment_navigation_drawer.xml
@@ -2,4 +2,4 @@
     xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
     android:layout_height="match_parent" android:choiceMode="singleChoice"
     android:divider="@android:color/transparent" android:dividerHeight="0dp"
-    android:background="#cccc" tools:context=".NavigationDrawerFragment" />
+    android:background="#ff000000" tools:context=".NavigationDrawerFragment" />
diff --git a/app/src/main/res/menu/global.xml b/app/src/main/res/menu/global.xml
deleted file mode 100644
index 184ad2b..0000000
--- a/app/src/main/res/menu/global.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/action_settings" android:title="@string/action_settings"
-        android:orderInCategory="100" android:showAsAction="never" />
-</menu>
diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml
index 7150601..1940764 100644
--- a/app/src/main/res/menu/main.xml
+++ b/app/src/main/res/menu/main.xml
@@ -5,7 +5,10 @@
         android:orderInCategory="100"
         android:icon="@drawable/ic_action_refresh"
         android:showAsAction="withText|ifRoom"
-        android:title="@string/action_example"/>
+        android:title="@string/action_refresh"/>
+
+    <item android:id="@+id/action_config" android:title="@string/action_config"
+        android:orderInCategory="100" android:showAsAction="never" />
 
     <item android:id="@+id/action_settings" android:title="@string/action_settings"
         android:orderInCategory="100" android:showAsAction="never" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3f91ca3..c3c8df3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,18 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+    <string name="show_solde"><u>Solde :</u></string>
     <string name="app_name">PointsPermis</string>
-    <string name="title_home">Accueil</string>
-    <string name="title_settings">Paramètres</string>
-    <string name="title_section3">Section 3</string>
     <string name="navigation_drawer_open">Ouvrir le volet de navigation</string>
     <string name="navigation_drawer_close">Fermer le volet de navigation</string>
-    <string name="action_example">Actualiser</string>
+    <string name="action_refresh">Actualiser</string>
     <string name="action_settings">Paramètres</string>
+    <string name="action_config">Configuration</string>
     <string name="action_valid">Valider</string>
+    <string name="question_quit">Êtes-vous sûr de vouloir quitter ?</string>
     <string name="action_quit">Quitter</string>
     <string name="action_cancel">Annuler</string>
     <string name="action_yes">Oui</string>
     <string name="action_no">Non</string>
 
+    <string name="key_solde">solde</string>
+    <string name="key_username">username</string>
+    <string name="key_birthday">birthday</string>
+
 </resources>
diff --git a/app/src/main/res/values/strings_activity_settings.xml b/app/src/main/res/values/strings_activity_settings.xml
index fbe6a93..1e68b22 100644
--- a/app/src/main/res/values/strings_activity_settings.xml
+++ b/app/src/main/res/values/strings_activity_settings.xml
@@ -1,28 +1,19 @@
 <resources>
 
-    <!-- Strings related to Settings -->
-
-
     <string name="title_activity_settings">Paramètres</string>
+    <string name="title_activity_config">Configuration</string>
 
     <!-- Connection settings -->
     <string name="pref_header_connection">Connexion</string>
     <string name="pref_descr_connection">Configuration de la connexion</string>
     <string name="pref_title_dossier">Numéro de dossier</string>
-    <string name="pref_key_dossier">dossier</string>
-    <string name="pref_key_dossier1">dossier1</string>
-    <string name="pref_key_dossier2">dossier2</string>
-    <string name="pref_key_dossier3">dossier3</string>
-    <string name="pref_title_code">Code confidentiel</string>
-    <string name="pref_key_code">code</string>
+    <string name="pref_title_code">Code personnel</string>
 
     <!-- Settings for Notification & Sync -->
     <string name="pref_header_notifications">Notifications</string>
     <string name="pref_descr_notifications">Configuration des notifications</string>
     <string name="pref_title_enable_notifications">Activer les notifications</string>
-    <string name="pref_key_enable_notifications">notifications</string>
     <string name="pref_title_sync_frequency">Fréquence de synchronisation</string>
-    <string name="pref_key_sync_frequency">sync_frequency</string>
     <string-array name="pref_sync_frequency_titles">
         <item>Mensuelle</item>
         <item>Bimensuelle</item>
@@ -36,9 +27,7 @@
         <item>1</item>
     </string-array>
     <string name="pref_title_ringtone">Sonnerie</string>
-    <string name="pref_key_ringtone">notifications_ringtone</string>
     <string name="pref_ringtone_silent">Silencieuse</string>
     <string name="pref_title_vibrate">Vibrer</string>
-    <string name="pref_key_vibrate">notifications_vibrate</string>
 
 </resources>
diff --git a/tesseract/build.gradle b/tesseract/build.gradle
index b0899ea..97d176d 100644
--- a/tesseract/build.gradle
+++ b/tesseract/build.gradle
@@ -12,8 +12,13 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
     }
-    //// This prevents the auto generation of Android.mk
+
+    // This prevents the auto generation of Android.mk
     sourceSets.main.jni.srcDirs = []
+
+    // Manually specify jniLibs directory (this prevents copying libs files to app dir)
+    sourceSets.main.jniLibs.srcDir 'src/main/libs'
+
     task buildNative(type: Exec, description: 'Compile JNI source via NDK') {
         def ndkDir = android.plugin.ndkFolder
         commandLine "$ndkDir/ndk-build",
@@ -28,14 +33,18 @@ android {
                 '-C', file('src/main/jni').absolutePath,
                 'clean'
     }
+
     clean.dependsOn 'cleanNative'
+
     tasks.withType(JavaCompile) {
         compileTask -> compileTask.dependsOn buildNative
     }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_7
         targetCompatibility JavaVersion.VERSION_1_7
     }
+
     productFlavors {
     }
 }