ChildGuard/child_guard
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rca/fix UI #15

Merged
r-ca merged 30 commits from rca/fix_ui into main 2024-01-17 10:27:28 +00:00
Conversation 0 Commits 30 Files Changed 11 +3 -3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b8caf9abf4 - Show all commits

6
app/src/main/java/com/example/childguard/MainActivity.java
View File

@ -110,16 +110,19 @@ public class MainActivity extends AppCompatActivity {
{ {
if (v.getItemId() == findViewById(R.id.navigation_home).getId()) { if (v.getItemId() == findViewById(R.id.navigation_home).getId()) {
findViewById(R.id.fab_scan_qr_code).setVisibility(FrameLayout.VISIBLE);
getSupportFragmentManager().beginTransaction() getSupportFragmentManager().beginTransaction()
.replace(findViewById(R.id.fragmentContainerView).getId(), this.homeFragment) .replace(findViewById(R.id.fragmentContainerView).getId(), this.homeFragment)
.addToBackStack(null) .addToBackStack(null)
.commit(); .commit();
} else if (v.getItemId() == findViewById(R.id.navigation_notification).getId()) { } else if (v.getItemId() == findViewById(R.id.navigation_notification).getId()) {
findViewById(R.id.fab_scan_qr_code).setVisibility(FrameLayout.VISIBLE);
getSupportFragmentManager().beginTransaction() getSupportFragmentManager().beginTransaction()
.replace(findViewById(R.id.fragmentContainerView).getId(), NotificationFragment.newInstance("test", "test")) .replace(findViewById(R.id.fragmentContainerView).getId(), NotificationFragment.newInstance("test", "test"))
.addToBackStack(null) .addToBackStack(null)
.commit(); .commit();
} else if (v.getItemId() == findViewById(R.id.navigation_settings).getId()) { } else if (v.getItemId() == findViewById(R.id.navigation_settings).getId()) {
findViewById(R.id.fab_scan_qr_code).setVisibility(FrameLayout.GONE);
getSupportFragmentManager().beginTransaction() getSupportFragmentManager().beginTransaction()
.replace(findViewById(R.id.fragmentContainerView).getId(), SettingFragment.newInstance()) .replace(findViewById(R.id.fragmentContainerView).getId(), SettingFragment.newInstance())
.addToBackStack(null) .addToBackStack(null)
@ -203,9 +206,6 @@ public class MainActivity extends AppCompatActivity {
E.apply(); E.apply();
} }
HomeFragment fragment = new HomeFragment();
getSupportFragmentManager().beginTransaction().replace(R.id.fragmentContainerView, fragment).commit();
homeFragment.onEvent(!isInCar); homeFragment.onEvent(!isInCar);
} }
} }