Merge branch 'cosmote' of https://git.warp.ly/open-source/warply_android_sdk_mav…

…en_plugin into cosmote

@@ -5,6 +5,7 @@ import android.view.MenuItem;
 
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
 
 import com.google.android.material.bottomnavigation.BottomNavigationView;
 import com.google.android.material.navigation.NavigationBarView;
@@ -49,11 +50,17 @@ public class MainActivity extends BaseActivity implements NavigationBarView.OnIt
         switch (item.getItemId()) {
             case R.id.menu_loyalty:
                 mFragmentToSet = LoyaltyFragment.newInstance();
-                getSupportFragmentManager().beginTransaction().replace(R.id.fl_fragment, mFragmentToSet).commit();
+                getSupportFragmentManager().beginTransaction()
+                        .replace(R.id.fl_fragment, mFragmentToSet)
+                        .addToBackStack(null)
+                        .commit();
                 return true;
             case R.id.menu_home:
                 mFragmentToSet = HomeFragment.newInstance();
-                getSupportFragmentManager().beginTransaction().replace(R.id.fl_fragment, mFragmentToSet).commit();
+                getSupportFragmentManager().beginTransaction()
+                        .replace(R.id.fl_fragment, mFragmentToSet)
+                        .addToBackStack(null)
+                        .commit();
                 return true;
         }
         return false;

@@ -101,7 +101,7 @@
                     android:id="@+id/cl_recycler_inner"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="32dp"
+                    android:layout_marginTop="36dp"
                     android:background="@color/white_tr"
                     android:paddingBottom="4dp"
                     app:layout_constraintLeft_toLeftOf="parent"