From 919f76fd3d904cef660cc7f4fe3318e32ccb8551 Mon Sep 17 00:00:00 2001 From: Pierre Date: Sat, 11 Nov 2017 18:40:50 +0100 Subject: [PATCH] Added fragments interaction --- .../android/comunic/client/MainActivity.java | 98 +++++++++++++----- .../client/fragments/FriendsListFragment.java | 30 ++++++ .../client/fragments/UserInfosFragment.java | 29 ++++++ .../main/res/drawable/ic_menu_allfriends.png | Bin 0 -> 4627 bytes app/src/main/res/drawable/ic_menu_home.png | Bin 0 -> 3868 bytes app/src/main/res/layout/activity_main.xml | 37 +++---- .../main/res/layout/fragment_friendslist.xml | 11 ++ .../main/res/layout/fragment_userinfos.xml | 11 ++ .../main/res/menu/main_bottom_navigation.xml | 15 +++ app/src/main/res/values/strings.xml | 2 + 10 files changed, 184 insertions(+), 49 deletions(-) create mode 100644 app/src/main/java/org/communiquons/android/comunic/client/fragments/FriendsListFragment.java create mode 100644 app/src/main/java/org/communiquons/android/comunic/client/fragments/UserInfosFragment.java create mode 100644 app/src/main/res/drawable/ic_menu_allfriends.png create mode 100644 app/src/main/res/drawable/ic_menu_home.png create mode 100644 app/src/main/res/layout/fragment_friendslist.xml create mode 100644 app/src/main/res/layout/fragment_userinfos.xml create mode 100644 app/src/main/res/menu/main_bottom_navigation.xml diff --git a/app/src/main/java/org/communiquons/android/comunic/client/MainActivity.java b/app/src/main/java/org/communiquons/android/comunic/client/MainActivity.java index 854de19..c20cc57 100644 --- a/app/src/main/java/org/communiquons/android/comunic/client/MainActivity.java +++ b/app/src/main/java/org/communiquons/android/comunic/client/MainActivity.java @@ -1,22 +1,23 @@ package org.communiquons.android.comunic.client; import android.app.AlertDialog; +import android.app.FragmentManager; +import android.app.FragmentTransaction; import android.content.DialogInterface; import android.content.Intent; -import android.support.v7.app.AppCompatActivity; import android.os.Bundle; +import android.support.annotation.NonNull; +import android.support.design.widget.BottomNavigationView; +import android.support.v7.app.AppCompatActivity; import android.view.Menu; import android.view.MenuItem; -import android.widget.ImageView; import android.widget.Toast; import org.communiquons.android.comunic.client.api.APIRequestTask; import org.communiquons.android.comunic.client.data.Account.Account; import org.communiquons.android.comunic.client.data.Account.AccountUtils; -import org.communiquons.android.comunic.client.data.DatabaseHelper; -import org.communiquons.android.comunic.client.data.ImageLoadTask; -import org.communiquons.android.comunic.client.data.UsersInfo.GetUsersInfos; -import org.communiquons.android.comunic.client.data.UsersInfo.UserInfo; +import org.communiquons.android.comunic.client.fragments.FriendsListFragment; +import org.communiquons.android.comunic.client.fragments.UserInfosFragment; /** @@ -41,6 +42,9 @@ public class MainActivity extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); + //Enable bottom navigation menu + init_bottom_menu(); + //Check for connectivity if(!APIRequestTask.isAPIavailable(this)){ Toast.makeText(this, R.string.err_no_internet_connection, Toast.LENGTH_SHORT).show(); @@ -48,28 +52,11 @@ public class MainActivity extends AppCompatActivity { //Initialize account objects account = new Account(this); - aUtils = new AccountUtils(this); - //DEVELOPMENT : Try to get information about a user over the network - GetUsersInfos uInfos = new GetUsersInfos(this, new DatabaseHelper(this)); - final ImageView imageView = (ImageView) findViewById(R.id.test_img); - - //Get infos... about me! :) - final int uID = aUtils.get_current_user_id(); - uInfos.get(uID, new GetUsersInfos.getUserInfosCallback() { - @Override - public void callback(UserInfo info) { - if(info == null) - Toast.makeText(MainActivity.this, "Failure !", Toast.LENGTH_SHORT).show(); - else { - Toast.makeText(MainActivity.this, uID + " is " + info.getFullName() + "!", Toast.LENGTH_SHORT).show(); - - new ImageLoadTask(MainActivity.this, info.getAcountImageURL(), imageView).execute(); - - - } - } - }); + //If it is the first time the application is launched, started the user friends tab + if(savedInstanceState == null){ + openFriendsFragment(); + } } @Override @@ -84,7 +71,7 @@ public class MainActivity extends AppCompatActivity { } /** - * Menu creation + * Top menu creation */ @Override public boolean onCreateOptionsMenu(Menu menu) { @@ -108,6 +95,37 @@ public class MainActivity extends AppCompatActivity { } + /** + * Bottom menu creation + */ + void init_bottom_menu(){ + BottomNavigationView navigation = + (BottomNavigationView) findViewById(R.id.main_bottom_navigation); + navigation.setOnNavigationItemSelectedListener(new BottomNavigationView.OnNavigationItemSelectedListener() { + @Override + public boolean onNavigationItemSelected(@NonNull MenuItem item) { + + //Check which option was selected + switch (item.getItemId()) { + + //If the user clicked to show the friends list + case R.id.main_bottom_navigation_friends_list: + openFriendsFragment(); + return true; + + //If the user choosed to show informations about him + case R.id.main_bottom_navigation_me_view: + openUserInfosFragment(); + return true; + + } + + //Selected element not found + return false; + } + }); + } + /** * Ask user to confirm if he really what to sign out or not */ @@ -139,4 +157,28 @@ public class MainActivity extends AppCompatActivity { //Show popup .create().show(); } + + /** + * Open the friends list fragment + */ + void openFriendsFragment(){ + + FriendsListFragment friendsListFragment = new FriendsListFragment(); + FragmentTransaction transaction = getFragmentManager().beginTransaction(); + transaction.replace(R.id.main_fragment, friendsListFragment); + transaction.addToBackStack(null); + transaction.commit(); + + } + + /** + * Open the user information fragment + */ + void openUserInfosFragment(){ + UserInfosFragment userInfosFragment = new UserInfosFragment(); + FragmentTransaction transaction = getFragmentManager().beginTransaction(); + transaction.replace(R.id.main_fragment, userInfosFragment); + transaction.addToBackStack(null); + transaction.commit(); + } } diff --git a/app/src/main/java/org/communiquons/android/comunic/client/fragments/FriendsListFragment.java b/app/src/main/java/org/communiquons/android/comunic/client/fragments/FriendsListFragment.java new file mode 100644 index 0000000..5492993 --- /dev/null +++ b/app/src/main/java/org/communiquons/android/comunic/client/fragments/FriendsListFragment.java @@ -0,0 +1,30 @@ +package org.communiquons.android.comunic.client.fragments; + +import android.app.Fragment; +import android.os.Bundle; +import android.support.annotation.Nullable; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import org.communiquons.android.comunic.client.R; + +/** + * Friends list fragment + * + * @author Pierre HUBERT + * Created by pierre on 11/11/17. + */ + +public class FriendsListFragment extends Fragment { + + @Nullable + @Override + public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, + Bundle savedInstanceState) { + + //Inflate the layout for this fragment + return inflater.inflate(R.layout.fragment_friendslist, container, false); + + } +} diff --git a/app/src/main/java/org/communiquons/android/comunic/client/fragments/UserInfosFragment.java b/app/src/main/java/org/communiquons/android/comunic/client/fragments/UserInfosFragment.java new file mode 100644 index 0000000..3932e79 --- /dev/null +++ b/app/src/main/java/org/communiquons/android/comunic/client/fragments/UserInfosFragment.java @@ -0,0 +1,29 @@ +package org.communiquons.android.comunic.client.fragments; + + +import android.app.Fragment; +import android.os.Bundle; +import android.support.annotation.Nullable; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import org.communiquons.android.comunic.client.R; + +/** + * User informations fragment + * + * This fragment display informations about the user + * + * @author Pierre HUBERT + * Created by pierre on 11/11/17. + */ + +public class UserInfosFragment extends Fragment { + + @Nullable + @Override + public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) { + return inflater.inflate(R.layout.fragment_userinfos, container, false); + } +} diff --git a/app/src/main/res/drawable/ic_menu_allfriends.png b/app/src/main/res/drawable/ic_menu_allfriends.png new file mode 100644 index 0000000000000000000000000000000000000000..c07a7c7dc60a6c665d6a2b0ad1c1d23cae65d8b4 GIT binary patch literal 4627 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 DiFU5n literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 207fb94..6b10d73 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,28 +1,23 @@ - + xmlns:app="http://schemas.android.com/apk/res-auto" + android:orientation="vertical"> - + + + android:layout_gravity="bottom" + android:background="?android:attr/windowBackground" + app:menu="@menu/main_bottom_navigation" /> - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_friendslist.xml b/app/src/main/res/layout/fragment_friendslist.xml new file mode 100644 index 0000000..0f29d86 --- /dev/null +++ b/app/src/main/res/layout/fragment_friendslist.xml @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_userinfos.xml b/app/src/main/res/layout/fragment_userinfos.xml new file mode 100644 index 0000000..f0d1576 --- /dev/null +++ b/app/src/main/res/layout/fragment_userinfos.xml @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/main_bottom_navigation.xml b/app/src/main/res/menu/main_bottom_navigation.xml new file mode 100644 index 0000000..6ecd4e8 --- /dev/null +++ b/app/src/main/res/menu/main_bottom_navigation.xml @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8e7377d..3d2c924 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -14,4 +14,6 @@ Are you sure do you want to sign out ? Sign out Cancel + Friends + Me