diff --git a/DailyHelper/app/src/main/AndroidManifest.xml b/DailyHelper/app/src/main/AndroidManifest.xml index 3c7099d..0c67ca2 100644 --- a/DailyHelper/app/src/main/AndroidManifest.xml +++ b/DailyHelper/app/src/main/AndroidManifest.xml @@ -10,7 +10,7 @@ android:supportsRtl="true" android:theme="@style/AppTheme"> diff --git a/DailyHelper/app/src/main/java/at/fhj/swd/dailyhelper/MainActivity.java b/DailyHelper/app/src/main/java/at/fhj/swd/dailyhelper/ui/activity/MainActivity.java similarity index 57% rename from DailyHelper/app/src/main/java/at/fhj/swd/dailyhelper/MainActivity.java rename to DailyHelper/app/src/main/java/at/fhj/swd/dailyhelper/ui/activity/MainActivity.java index 6b0039a..0138352 100644 --- a/DailyHelper/app/src/main/java/at/fhj/swd/dailyhelper/MainActivity.java +++ b/DailyHelper/app/src/main/java/at/fhj/swd/dailyhelper/ui/activity/MainActivity.java @@ -1,8 +1,9 @@ -package at.fhj.swd.dailyhelper; +package at.fhj.swd.dailyhelper.ui.activity; import android.os.Bundle; import android.support.design.widget.FloatingActionButton; import android.support.design.widget.Snackbar; +import android.support.v4.app.FragmentTransaction; import android.view.View; import android.support.v4.view.GravityCompat; import android.support.v7.app.ActionBarDrawerToggle; @@ -14,15 +15,41 @@ import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; import android.view.Menu; +import at.fhj.swd.dailyhelper.R; +import at.fhj.swd.dailyhelper.ui.fragemnt.HomeFragment; +import at.fhj.swd.dailyhelper.ui.fragemnt.LevelFragment; +import at.fhj.swd.dailyhelper.ui.fragemnt.MapFragment; +import at.fhj.swd.dailyhelper.ui.fragemnt.WeatherFragment; + public class MainActivity extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener { + + private static final String HOME = "home"; + private static final String WEATHER = "weather"; + private static final String MAP = "map"; + private static final String LEVEL = "level"; + + + private HomeFragment homeFragment; + private LevelFragment levelFragment; + private MapFragment mapFragment; + private WeatherFragment weatherFragment; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + + setContentView(R.layout.activity_main); Toolbar toolbar = findViewById(R.id.toolbar); setSupportActionBar(toolbar); + + homeFragment = new HomeFragment(); + levelFragment = new LevelFragment(); + mapFragment = new MapFragment(); + weatherFragment = new WeatherFragment(); + FloatingActionButton fab = findViewById(R.id.fab); fab.setOnClickListener(new View.OnClickListener() { @Override @@ -37,6 +64,17 @@ public class MainActivity extends AppCompatActivity this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close); drawer.addDrawerListener(toggle); toggle.syncState(); + + FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); + transaction.add(R.id.flFragmentContainer, homeFragment); + transaction.add(R.id.flFragmentContainer, levelFragment); + transaction.add(R.id.flFragmentContainer, mapFragment); + transaction.add(R.id.flFragmentContainer, weatherFragment); + + transaction.commit(); + + setSelectedFragment(HOME); + navigationView.setNavigationItemSelectedListener(this); } @@ -79,17 +117,42 @@ public class MainActivity extends AppCompatActivity int id = item.getItemId(); if (id == R.id.nav_home) { - // Handle the camera action + setSelectedFragment(HOME); } else if (id == R.id.nav_weather) { - + setSelectedFragment(WEATHER); } else if (id == R.id.nav_map) { - - } else if (id == R.id.nav_level) { - + setSelectedFragment(MAP); + // } else if (id == R.id.nav_level) { + // setSelectedFragment(LEVEL); } DrawerLayout drawer = findViewById(R.id.drawer_layout); drawer.closeDrawer(GravityCompat.START); return true; } + + private void setSelectedFragment (String fragmentName) { + FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); + + transaction.hide(homeFragment); + transaction.hide(levelFragment); + transaction.hide(mapFragment); + transaction.hide(weatherFragment); + System.out.println(fragmentName); + switch (fragmentName) { + case HOME: + transaction.show(homeFragment); + break; + case LEVEL: + transaction.show(levelFragment); + break; + case MAP: + transaction.show(mapFragment); + break; + case WEATHER: + transaction.show(weatherFragment); + break; + } + transaction.commit(); + } } diff --git a/DailyHelper/app/src/main/java/at/fhj/swd/dailyhelper/ui/fragemnt/HomeFragment.java b/DailyHelper/app/src/main/java/at/fhj/swd/dailyhelper/ui/fragemnt/HomeFragment.java new file mode 100644 index 0000000..86f7ca0 --- /dev/null +++ b/DailyHelper/app/src/main/java/at/fhj/swd/dailyhelper/ui/fragemnt/HomeFragment.java @@ -0,0 +1,22 @@ +package at.fhj.swd.dailyhelper.ui.fragemnt; + +import android.os.Bundle; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.v4.app.Fragment; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import at.fhj.swd.dailyhelper.R; + +public class HomeFragment extends Fragment { + + @Nullable + @Override + public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { + View view = inflater.inflate(R.layout.fragment_home, container, false); + + return view; + } +} diff --git a/DailyHelper/app/src/main/java/at/fhj/swd/dailyhelper/ui/fragemnt/LevelFragment.java b/DailyHelper/app/src/main/java/at/fhj/swd/dailyhelper/ui/fragemnt/LevelFragment.java new file mode 100644 index 0000000..c8d812a --- /dev/null +++ b/DailyHelper/app/src/main/java/at/fhj/swd/dailyhelper/ui/fragemnt/LevelFragment.java @@ -0,0 +1,22 @@ +package at.fhj.swd.dailyhelper.ui.fragemnt; + +import android.os.Bundle; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.v4.app.Fragment; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import at.fhj.swd.dailyhelper.R; + +public class LevelFragment extends Fragment { + + @Nullable + @Override + public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { + View view = inflater.inflate(R.layout.fragment_level, container, false); + + return view; + } +} diff --git a/DailyHelper/app/src/main/java/at/fhj/swd/dailyhelper/ui/fragemnt/MapFragment.java b/DailyHelper/app/src/main/java/at/fhj/swd/dailyhelper/ui/fragemnt/MapFragment.java new file mode 100644 index 0000000..8044eb6 --- /dev/null +++ b/DailyHelper/app/src/main/java/at/fhj/swd/dailyhelper/ui/fragemnt/MapFragment.java @@ -0,0 +1,25 @@ +package at.fhj.swd.dailyhelper.ui.fragemnt; + + +import android.os.Bundle; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.v4.app.Fragment; +import android.support.v7.widget.LinearLayoutManager; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import at.fhj.swd.dailyhelper.R; + +public class MapFragment extends Fragment { + + + @Nullable + @Override + public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { + View view = inflater.inflate(R.layout.fragment_map, container, false); + + return view; + } +} diff --git a/DailyHelper/app/src/main/java/at/fhj/swd/dailyhelper/ui/fragemnt/WeatherFragment.java b/DailyHelper/app/src/main/java/at/fhj/swd/dailyhelper/ui/fragemnt/WeatherFragment.java new file mode 100644 index 0000000..32f081c --- /dev/null +++ b/DailyHelper/app/src/main/java/at/fhj/swd/dailyhelper/ui/fragemnt/WeatherFragment.java @@ -0,0 +1,23 @@ +package at.fhj.swd.dailyhelper.ui.fragemnt; + +import android.os.Bundle; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.v4.app.Fragment; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import at.fhj.swd.dailyhelper.R; + +public class WeatherFragment extends Fragment { + + @Nullable + @Override + public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { + View view = inflater.inflate(R.layout.fragment_weather, container, false); + + return view; + } + +} diff --git a/DailyHelper/app/src/main/res/layout/app_bar_main.xml b/DailyHelper/app/src/main/res/layout/app_bar_main.xml index eed4d89..c316817 100644 --- a/DailyHelper/app/src/main/res/layout/app_bar_main.xml +++ b/DailyHelper/app/src/main/res/layout/app_bar_main.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".MainActivity"> + tools:context=".ui.activity.MainActivity"> - + + + + + + + + \ No newline at end of file diff --git a/DailyHelper/app/src/main/res/layout/fragment_level.xml b/DailyHelper/app/src/main/res/layout/fragment_level.xml new file mode 100644 index 0000000..a82505b --- /dev/null +++ b/DailyHelper/app/src/main/res/layout/fragment_level.xml @@ -0,0 +1,20 @@ + + + + + + + \ No newline at end of file diff --git a/DailyHelper/app/src/main/res/layout/fragment_map.xml b/DailyHelper/app/src/main/res/layout/fragment_map.xml new file mode 100644 index 0000000..577f268 --- /dev/null +++ b/DailyHelper/app/src/main/res/layout/fragment_map.xml @@ -0,0 +1,20 @@ + + + + + + + \ No newline at end of file diff --git a/DailyHelper/app/src/main/res/layout/fragment_weather.xml b/DailyHelper/app/src/main/res/layout/fragment_weather.xml new file mode 100644 index 0000000..7819934 --- /dev/null +++ b/DailyHelper/app/src/main/res/layout/fragment_weather.xml @@ -0,0 +1,13 @@ + + + + + + + \ No newline at end of file diff --git a/DailyHelper/app/src/main/res/layout/nav_header_main.xml b/DailyHelper/app/src/main/res/layout/nav_header_main.xml index 0c2b718..c2c5400 100644 --- a/DailyHelper/app/src/main/res/layout/nav_header_main.xml +++ b/DailyHelper/app/src/main/res/layout/nav_header_main.xml @@ -1,6 +1,7 @@ - + android:title="@string/menu_level" /> --> diff --git a/DailyHelper/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/DailyHelper/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index eca70cf..0000000 --- a/DailyHelper/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/DailyHelper/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/DailyHelper/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index eca70cf..0000000 --- a/DailyHelper/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/DailyHelper/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/DailyHelper/app/src/main/res/mipmap-hdpi/ic_launcher_round.png index dffca36..cb89687 100644 Binary files a/DailyHelper/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/DailyHelper/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/DailyHelper/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/DailyHelper/app/src/main/res/mipmap-mdpi/ic_launcher_round.png index dae5e08..9cf70e3 100644 Binary files a/DailyHelper/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and b/DailyHelper/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/DailyHelper/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/DailyHelper/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png index 14ed0af..305fa5e 100644 Binary files a/DailyHelper/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and b/DailyHelper/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/DailyHelper/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/DailyHelper/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png index d8ae031..648811f 100644 Binary files a/DailyHelper/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/DailyHelper/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/DailyHelper/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/DailyHelper/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png index beed3cd..e379667 100644 Binary files a/DailyHelper/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/DailyHelper/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/DailyHelper/app/src/main/res/values/colors.xml b/DailyHelper/app/src/main/res/values/colors.xml index 69b2233..a99766e 100644 --- a/DailyHelper/app/src/main/res/values/colors.xml +++ b/DailyHelper/app/src/main/res/values/colors.xml @@ -1,6 +1,6 @@ #008577 - #00574B + #3F3F3F #D81B60 diff --git a/DailyHelper/app/src/main/res/values/strings.xml b/DailyHelper/app/src/main/res/values/strings.xml index 61fe946..a9d06e6 100644 --- a/DailyHelper/app/src/main/res/values/strings.xml +++ b/DailyHelper/app/src/main/res/values/strings.xml @@ -2,8 +2,8 @@ Daily Helper Open navigation drawer Close navigation drawer - Android Studio - android.studio@android.com + Daily Helper + Alles auf einen Blick! Navigation header Settings