sem/Next-Location
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

Develop #5

Merged
SemvdH merged 62 commits from develop into main 2021-01-14 10:55:23 +00:00
Conversation 0 Commits 62 Files Changed 46 +17 -8
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b110d25549 - Show all commits

25
app/src/main/java/com/a1/nextlocation/MainActivity.java
View File

@@ -12,8 +12,10 @@ import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentManager;
import com.a1.nextlocation.data.Route;
import com.a1.nextlocation.fragments.HelpPopup; import com.a1.nextlocation.fragments.HelpPopup;
import com.a1.nextlocation.fragments.HomeFragment; import com.a1.nextlocation.fragments.HomeFragment;
import com.a1.nextlocation.fragments.LocationFragment;
import com.a1.nextlocation.fragments.Refreshable; import com.a1.nextlocation.fragments.Refreshable;
import com.a1.nextlocation.fragments.RouteFragment; import com.a1.nextlocation.fragments.RouteFragment;
import com.a1.nextlocation.fragments.SettingsFragment; import com.a1.nextlocation.fragments.SettingsFragment;
@@ -29,6 +31,11 @@ public class MainActivity extends AppCompatActivity implements Refreshable {
private static final String TAG = MainActivity.class.getName(); private static final String TAG = MainActivity.class.getName();
private BottomNavigationView bottomNav; private BottomNavigationView bottomNav;
private ImageButton infoButton; private ImageButton infoButton;
private HomeFragment homeFragment = new HomeFragment();
private RouteFragment routeFragment = new RouteFragment();
private StatisticFragment statisticFragment = new StatisticFragment();
private SettingsFragment settingsFragment = new SettingsFragment();
/** /**
* onCreate method that creates the main activity * onCreate method that creates the main activity
@@ -61,7 +68,7 @@ public class MainActivity extends AppCompatActivity implements Refreshable {
RouteListManager.INSTANCE.load(); RouteListManager.INSTANCE.load();
if (savedInstanceState == null) { if (savedInstanceState == null) {
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, new HomeFragment()).commit(); getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, homeFragment).commit();
} }
} }
@@ -91,24 +98,26 @@ public class MainActivity extends AppCompatActivity implements Refreshable {
private final BottomNavigationView.OnNavigationItemSelectedListener navListener = item -> { private final BottomNavigationView.OnNavigationItemSelectedListener navListener = item -> {
Fragment selectedFragment = null; Fragment selectedFragment = null;
switch (item.getItemId()) { switch (item.getItemId()) {
case R.id.locations: case R.id.locations:
selectedFragment = new HomeFragment(); selectedFragment = homeFragment;
break; break;
case R.id.routes: case R.id.routes:
selectedFragment = new RouteFragment(); selectedFragment = routeFragment;
break; break;
case R.id.statistics: case R.id.statistics:
selectedFragment = new StatisticFragment(); selectedFragment = statisticFragment;
break; break;
case R.id.settings: case R.id.settings:
selectedFragment = new SettingsFragment(); selectedFragment = settingsFragment;
break; break;
} }
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, selectedFragment).commit(); if (!selectedFragment.isVisible() && selectedFragment != null){
return true; getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, selectedFragment).commit();
return true;
}
return false;
}; };
/** /**