open-source / warply_android_sdk_maven_plugin

Go to a project
Toggle navigation Toggle navigation pinning
thkouk00
3871e94f 2 parents 2c37a978 c538f429

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

…en_plugin into cosmote
Inline Side-by-side
Showing 2 changed files with 10 additions and 3 deletions
...@@ -5,6 +5,7 @@ import android.view.MenuItem; ...@@ -5,6 +5,7 @@ import android.view.MenuItem;
5 5
6 import androidx.annotation.NonNull; 6 import androidx.annotation.NonNull;
7 import androidx.fragment.app.Fragment; 7 import androidx.fragment.app.Fragment;
8 +import androidx.fragment.app.FragmentTransaction;
8 9
9 import com.google.android.material.bottomnavigation.BottomNavigationView; 10 import com.google.android.material.bottomnavigation.BottomNavigationView;
10 import com.google.android.material.navigation.NavigationBarView; 11 import com.google.android.material.navigation.NavigationBarView;
...@@ -49,11 +50,17 @@ public class MainActivity extends BaseActivity implements NavigationBarView.OnIt ...@@ -49,11 +50,17 @@ public class MainActivity extends BaseActivity implements NavigationBarView.OnIt
49 switch (item.getItemId()) { 50 switch (item.getItemId()) {
50 case R.id.menu_loyalty: 51 case R.id.menu_loyalty:
51 mFragmentToSet = LoyaltyFragment.newInstance(); 52 mFragmentToSet = LoyaltyFragment.newInstance();
52 - getSupportFragmentManager().beginTransaction().replace(R.id.fl_fragment, mFragmentToSet).commit(); 53 + getSupportFragmentManager().beginTransaction()
54 + .replace(R.id.fl_fragment, mFragmentToSet)
55 + .addToBackStack(null)
56 + .commit();
53 return true; 57 return true;
54 case R.id.menu_home: 58 case R.id.menu_home:
55 mFragmentToSet = HomeFragment.newInstance(); 59 mFragmentToSet = HomeFragment.newInstance();
56 - getSupportFragmentManager().beginTransaction().replace(R.id.fl_fragment, mFragmentToSet).commit(); 60 + getSupportFragmentManager().beginTransaction()
61 + .replace(R.id.fl_fragment, mFragmentToSet)
62 + .addToBackStack(null)
63 + .commit();
57 return true; 64 return true;
58 } 65 }
59 return false; 66 return false;
......
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
101 android:id="@+id/cl_recycler_inner" 101 android:id="@+id/cl_recycler_inner"
102 android:layout_width="match_parent" 102 android:layout_width="match_parent"
103 android:layout_height="wrap_content" 103 android:layout_height="wrap_content"
104 - android:layout_marginTop="32dp" 104 + android:layout_marginTop="36dp"
105 android:background="@color/white_tr" 105 android:background="@color/white_tr"
106 android:paddingBottom="4dp" 106 android:paddingBottom="4dp"
107 app:layout_constraintLeft_toLeftOf="parent" 107 app:layout_constraintLeft_toLeftOf="parent"
......