commit 7e15a3d9c143ed0dded97ed618563fa6e7a7d14d Author: JG-Cody Date: Thu Mar 4 21:18:38 2021 +0100 hi diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..aa724b7 --- /dev/null +++ b/.gitignore @@ -0,0 +1,15 @@ +*.iml +.gradle +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +/build +/captures +.externalNativeBuild +.cxx +local.properties diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..61a9130 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..23a89bb --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,22 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..a5f05cd --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..d5d35ec --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..f92d574 --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,42 @@ +plugins { + id 'com.android.application' +} + +android { + compileSdkVersion 29 + + defaultConfig { + applicationId "de.jg_cody.Terraplex" + minSdkVersion 16 + targetSdkVersion 29 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +dependencies { + + implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'com.google.android.material:material:1.3.0' + implementation 'androidx.constraintlayout:constraintlayout:2.0.4' + implementation 'androidx.navigation:navigation-fragment:2.3.3' + implementation 'androidx.navigation:navigation-ui:2.3.3' + implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.3.0' + implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.0' + testImplementation 'junit:junit:4.+' + androidTestImplementation 'androidx.test.ext:junit:1.1.2' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' +} \ No newline at end of file diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/app/src/androidTest/java/de/jg_cody/Terraplex/ExampleInstrumentedTest.java b/app/src/androidTest/java/de/jg_cody/Terraplex/ExampleInstrumentedTest.java new file mode 100644 index 0000000..2f817dd --- /dev/null +++ b/app/src/androidTest/java/de/jg_cody/Terraplex/ExampleInstrumentedTest.java @@ -0,0 +1,26 @@ +package de.jg_cody.Terraplex; + +import android.content.Context; + +import androidx.test.platform.app.InstrumentationRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import static org.junit.Assert.*; + +/** + * Instrumented test, which will execute on an Android device. + * + * @see Testing documentation + */ +@RunWith(AndroidJUnit4.class) +public class ExampleInstrumentedTest { + @Test + public void useAppContext() { + // Context of the app under test. + Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); + assertEquals("de.jg_cody.Terraplex", appContext.getPackageName()); + } +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..f761d57 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..15d59c1 Binary files /dev/null and b/app/src/main/ic_launcher-playstore.png differ diff --git a/app/src/main/java/de/jg_cody/Terraplex/MainActivity.java b/app/src/main/java/de/jg_cody/Terraplex/MainActivity.java new file mode 100644 index 0000000..100bd82 --- /dev/null +++ b/app/src/main/java/de/jg_cody/Terraplex/MainActivity.java @@ -0,0 +1,60 @@ +package de.jg_cody.Terraplex; + +import android.os.Bundle; +import android.view.View; +import android.view.Menu; + +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.snackbar.Snackbar; +import com.google.android.material.navigation.NavigationView; + +import androidx.navigation.NavController; +import androidx.navigation.Navigation; +import androidx.navigation.ui.AppBarConfiguration; +import androidx.navigation.ui.NavigationUI; +import androidx.drawerlayout.widget.DrawerLayout; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; + +public class MainActivity extends AppCompatActivity { + + private AppBarConfiguration mAppBarConfiguration; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + Toolbar toolbar = findViewById(R.id.toolbar); + setSupportActionBar(toolbar); + FloatingActionButton fab = findViewById(R.id.fab); + fab.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { } + }); + DrawerLayout drawer = findViewById(R.id.drawer_layout); + NavigationView navigationView = findViewById(R.id.nav_view); + // Passing each menu ID as a set of Ids because each + // menu should be considered as top level destinations. + mAppBarConfiguration = new AppBarConfiguration.Builder( + R.id.nav_home, R.id.nav_badezimmer, R.id.nav_kueche, R.id.nav_wohnzimmer, R.id.nav_schlafzimmer, R.id.nav_flur, R.id.nav_toilette) + .setDrawerLayout(drawer) + .build(); + NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment); + NavigationUI.setupActionBarWithNavController(this, navController, mAppBarConfiguration); + NavigationUI.setupWithNavController(navigationView, navController); + } + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + // Inflate the menu; this adds items to the action bar if it is present. + getMenuInflater().inflate(R.menu.main, menu); + return true; + } + + @Override + public boolean onSupportNavigateUp() { + NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment); + return NavigationUI.navigateUp(navController, mAppBarConfiguration) + || super.onSupportNavigateUp(); + } +} \ No newline at end of file diff --git a/app/src/main/java/de/jg_cody/Terraplex/MovableFloatingActionButton.java b/app/src/main/java/de/jg_cody/Terraplex/MovableFloatingActionButton.java new file mode 100644 index 0000000..6261fd7 --- /dev/null +++ b/app/src/main/java/de/jg_cody/Terraplex/MovableFloatingActionButton.java @@ -0,0 +1,133 @@ +package de.jg_cody.Terraplex; + + +import android.content.Context; +import android.util.AttributeSet; +import android.view.MotionEvent; +import android.view.View; +import android.view.ViewGroup; +import android.view.animation.OvershootInterpolator; + +import com.google.android.material.floatingactionbutton.FloatingActionButton; + +public class MovableFloatingActionButton extends FloatingActionButton implements View.OnTouchListener { + CustomClickListener customClickListener; + + private final static float CLICK_DRAG_TOLERANCE = 10; // Often, there will be a slight, unintentional, drag when the user taps the FAB, so we need to account for this. + + private float downRawX, downRawY; + private float dX, dY; + + int viewWidth; + int viewHeight; + + int parentWidth; + int parentHeight; + + float newX; + float newY; + + public MovableFloatingActionButton(Context context) { + super(context); + init(); + } + + public MovableFloatingActionButton(Context context, AttributeSet attrs) { + super(context, attrs); + init(); + } + + public MovableFloatingActionButton(Context context, AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + init(); + } + + private void init() { + setOnTouchListener(this); + } + + @Override + public boolean onTouch(View view, MotionEvent motionEvent) { + + ViewGroup.MarginLayoutParams layoutParams = (ViewGroup.MarginLayoutParams) view.getLayoutParams(); + + int action = motionEvent.getAction(); + if (action == MotionEvent.ACTION_DOWN) { + + downRawX = motionEvent.getRawX(); + downRawY = motionEvent.getRawY(); + dX = view.getX() - downRawX; + dY = view.getY() - downRawY; + + return false; // not Consumed for ripple effect + + } else if (action == MotionEvent.ACTION_MOVE) { + + viewWidth = view.getWidth(); + viewHeight = view.getHeight(); + + View viewParent = (View) view.getParent(); + parentWidth = viewParent.getWidth(); + parentHeight = viewParent.getHeight(); + + newX = motionEvent.getRawX() + dX; + newX = Math.max(layoutParams.leftMargin, newX); // Don't allow the FAB past the left hand side of the parent + newX = Math.min(parentWidth - viewWidth - layoutParams.rightMargin, newX); // Don't allow the FAB past the right hand side of the parent + + newY = motionEvent.getRawY() + dY; + newY = Math.max(layoutParams.topMargin, newY); // Don't allow the FAB past the top of the parent + newY = Math.min(parentHeight - viewHeight - layoutParams.bottomMargin, newY); // Don't allow the FAB past the bottom of the parent + + view.animate() + .x(newX) + .y(newY) + .setDuration(0) + .start(); + + return true; // Consumed + + } else if (action == MotionEvent.ACTION_UP) { + + float upRawX = motionEvent.getRawX(); + float upRawY = motionEvent.getRawY(); + + float upDX = upRawX - downRawX; + float upDY = upRawY - downRawY; + + if (newX > ((parentWidth - viewWidth - layoutParams.rightMargin) / 2)) { + newX = parentWidth - viewWidth - layoutParams.rightMargin; + } else { + newX = layoutParams.leftMargin; + } + + view.animate() + .x(newX) + .y(newY) + .setInterpolator(new OvershootInterpolator()) + .setDuration(600) + .start(); + + if (Math.abs(upDX) < CLICK_DRAG_TOLERANCE && Math.abs(upDY) < CLICK_DRAG_TOLERANCE) { // A click + if (customClickListener != null) { + customClickListener.onClick(view); + } + return false;// not Consumed for ripple effect + } else { // A drag + return false; // not Consumed for ripple effect + } + + } else { + return super.onTouchEvent(motionEvent); + } + + } + + public void setCustomClickListener(CustomClickListener customClickListener) { + this.customClickListener = customClickListener; + } + + public interface CustomClickListener { + void onClick(View view); + } + +} \ No newline at end of file diff --git a/app/src/main/java/de/jg_cody/Terraplex/ui/Flur/FlurFragment.java b/app/src/main/java/de/jg_cody/Terraplex/ui/Flur/FlurFragment.java new file mode 100644 index 0000000..9fd6bb0 --- /dev/null +++ b/app/src/main/java/de/jg_cody/Terraplex/ui/Flur/FlurFragment.java @@ -0,0 +1,35 @@ +package de.jg_cody.Terraplex.ui.Flur; + +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import de.jg_cody.Terraplex.R; + +public class FlurFragment extends Fragment { + + private FlurViewModel flurViewModel; + + public View onCreateView(@NonNull LayoutInflater inflater, + ViewGroup container, Bundle savedInstanceState) { + flurViewModel = + new ViewModelProvider(this).get(FlurViewModel.class); + View root = inflater.inflate(R.layout.fragment_flur, container, false); + final TextView textView = root.findViewById(R.id.text_flur); + flurViewModel.getText().observe(getViewLifecycleOwner(), new Observer() { + @Override + public void onChanged(@Nullable String s) { + textView.setText(s); + } + }); + return root; + } +} \ No newline at end of file diff --git a/app/src/main/java/de/jg_cody/Terraplex/ui/Flur/FlurViewModel.java b/app/src/main/java/de/jg_cody/Terraplex/ui/Flur/FlurViewModel.java new file mode 100644 index 0000000..4d15f1e --- /dev/null +++ b/app/src/main/java/de/jg_cody/Terraplex/ui/Flur/FlurViewModel.java @@ -0,0 +1,19 @@ +package de.jg_cody.Terraplex.ui.Flur; + +import androidx.lifecycle.LiveData; +import androidx.lifecycle.MutableLiveData; +import androidx.lifecycle.ViewModel; + +public class FlurViewModel extends ViewModel { + + private MutableLiveData mText; + + public FlurViewModel() { + mText = new MutableLiveData<>(); + mText.setValue("Flur"); + } + + public LiveData getText() { + return mText; + } +} \ No newline at end of file diff --git a/app/src/main/java/de/jg_cody/Terraplex/ui/Schlafzimmer/SchlafzimmerFragment.java b/app/src/main/java/de/jg_cody/Terraplex/ui/Schlafzimmer/SchlafzimmerFragment.java new file mode 100644 index 0000000..7abdb57 --- /dev/null +++ b/app/src/main/java/de/jg_cody/Terraplex/ui/Schlafzimmer/SchlafzimmerFragment.java @@ -0,0 +1,35 @@ +package de.jg_cody.Terraplex.ui.Schlafzimmer; + +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import de.jg_cody.Terraplex.R; + +public class SchlafzimmerFragment extends Fragment { + + private SchlafzimmerViewModel schlafzimmerViewModel; + + public View onCreateView(@NonNull LayoutInflater inflater, + ViewGroup container, Bundle savedInstanceState) { + schlafzimmerViewModel = + new ViewModelProvider(this).get(SchlafzimmerViewModel.class); + View root = inflater.inflate(R.layout.fragment_schlafzimmer, container, false); + final TextView textView = root.findViewById(R.id.text_schlafzimmer); + schlafzimmerViewModel.getText().observe(getViewLifecycleOwner(), new Observer() { + @Override + public void onChanged(@Nullable String s) { + textView.setText(s); + } + }); + return root; + } +} \ No newline at end of file diff --git a/app/src/main/java/de/jg_cody/Terraplex/ui/Schlafzimmer/SchlafzimmerViewModel.java b/app/src/main/java/de/jg_cody/Terraplex/ui/Schlafzimmer/SchlafzimmerViewModel.java new file mode 100644 index 0000000..31fe329 --- /dev/null +++ b/app/src/main/java/de/jg_cody/Terraplex/ui/Schlafzimmer/SchlafzimmerViewModel.java @@ -0,0 +1,19 @@ +package de.jg_cody.Terraplex.ui.Schlafzimmer; + +import androidx.lifecycle.LiveData; +import androidx.lifecycle.MutableLiveData; +import androidx.lifecycle.ViewModel; + +public class SchlafzimmerViewModel extends ViewModel { + + private MutableLiveData mText; + + public SchlafzimmerViewModel() { + mText = new MutableLiveData<>(); + mText.setValue("Schlafzimmer"); + } + + public LiveData getText() { + return mText; + } +} \ No newline at end of file diff --git a/app/src/main/java/de/jg_cody/Terraplex/ui/Toilette/ToiletteFragment.java b/app/src/main/java/de/jg_cody/Terraplex/ui/Toilette/ToiletteFragment.java new file mode 100644 index 0000000..cd9372a --- /dev/null +++ b/app/src/main/java/de/jg_cody/Terraplex/ui/Toilette/ToiletteFragment.java @@ -0,0 +1,35 @@ +package de.jg_cody.Terraplex.ui.Toilette; + +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import de.jg_cody.Terraplex.R; + +public class ToiletteFragment extends Fragment { + + private ToiletteViewModel toiletteViewModel; + + public View onCreateView(@NonNull LayoutInflater inflater, + ViewGroup container, Bundle savedInstanceState) { + toiletteViewModel = + new ViewModelProvider(this).get(ToiletteViewModel.class); + View root = inflater.inflate(R.layout.fragment_toilette, container, false); + final TextView textView = root.findViewById(R.id.text_toilette); + toiletteViewModel.getText().observe(getViewLifecycleOwner(), new Observer() { + @Override + public void onChanged(@Nullable String s) { + textView.setText(s); + } + }); + return root; + } +} \ No newline at end of file diff --git a/app/src/main/java/de/jg_cody/Terraplex/ui/Toilette/ToiletteViewModel.java b/app/src/main/java/de/jg_cody/Terraplex/ui/Toilette/ToiletteViewModel.java new file mode 100644 index 0000000..233cdc6 --- /dev/null +++ b/app/src/main/java/de/jg_cody/Terraplex/ui/Toilette/ToiletteViewModel.java @@ -0,0 +1,19 @@ +package de.jg_cody.Terraplex.ui.Toilette; + +import androidx.lifecycle.LiveData; +import androidx.lifecycle.MutableLiveData; +import androidx.lifecycle.ViewModel; + +public class ToiletteViewModel extends ViewModel { + + private MutableLiveData mText; + + public ToiletteViewModel() { + mText = new MutableLiveData<>(); + mText.setValue("Toilette"); + } + + public LiveData getText() { + return mText; + } +} \ No newline at end of file diff --git a/app/src/main/java/de/jg_cody/Terraplex/ui/badezimmer/BadezimmerFragment.java b/app/src/main/java/de/jg_cody/Terraplex/ui/badezimmer/BadezimmerFragment.java new file mode 100644 index 0000000..e421937 --- /dev/null +++ b/app/src/main/java/de/jg_cody/Terraplex/ui/badezimmer/BadezimmerFragment.java @@ -0,0 +1,35 @@ +package de.jg_cody.Terraplex.ui.badezimmer; + +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import de.jg_cody.Terraplex.R; + +public class BadezimmerFragment extends Fragment { + + private BadezimmerViewModel badezimmerViewModel; + + public View onCreateView(@NonNull LayoutInflater inflater, + ViewGroup container, Bundle savedInstanceState) { + badezimmerViewModel = + new ViewModelProvider(this).get(BadezimmerViewModel.class); + View root = inflater.inflate(R.layout.fragment_badezimmer, container, false); + final TextView textView = root.findViewById(R.id.text_badezimmer); + badezimmerViewModel.getText().observe(getViewLifecycleOwner(), new Observer() { + @Override + public void onChanged(@Nullable String s) { + textView.setText(s); + } + }); + return root; + } +} \ No newline at end of file diff --git a/app/src/main/java/de/jg_cody/Terraplex/ui/badezimmer/BadezimmerViewModel.java b/app/src/main/java/de/jg_cody/Terraplex/ui/badezimmer/BadezimmerViewModel.java new file mode 100644 index 0000000..83a8d71 --- /dev/null +++ b/app/src/main/java/de/jg_cody/Terraplex/ui/badezimmer/BadezimmerViewModel.java @@ -0,0 +1,19 @@ +package de.jg_cody.Terraplex.ui.badezimmer; + +import androidx.lifecycle.LiveData; +import androidx.lifecycle.MutableLiveData; +import androidx.lifecycle.ViewModel; + +public class BadezimmerViewModel extends ViewModel { + + private MutableLiveData mText; + + public BadezimmerViewModel() { + mText = new MutableLiveData<>(); + mText.setValue("Badezimmer"); + } + + public LiveData getText() { + return mText; + } +} \ No newline at end of file diff --git a/app/src/main/java/de/jg_cody/Terraplex/ui/home/HomeFragment.java b/app/src/main/java/de/jg_cody/Terraplex/ui/home/HomeFragment.java new file mode 100644 index 0000000..7840ec8 --- /dev/null +++ b/app/src/main/java/de/jg_cody/Terraplex/ui/home/HomeFragment.java @@ -0,0 +1,35 @@ +package de.jg_cody.Terraplex.ui.home; + +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import de.jg_cody.Terraplex.R; + +public class HomeFragment extends Fragment { + + private HomeViewModel homeViewModel; + + public View onCreateView(@NonNull LayoutInflater inflater, + ViewGroup container, Bundle savedInstanceState) { + homeViewModel = + new ViewModelProvider(this).get(HomeViewModel.class); + View root = inflater.inflate(R.layout.fragment_home, container, false); + final TextView textView = root.findViewById(R.id.text_home); + homeViewModel.getText().observe(getViewLifecycleOwner(), new Observer() { + @Override + public void onChanged(@Nullable String s) { + textView.setText(s); + } + }); + return root; + } +} \ No newline at end of file diff --git a/app/src/main/java/de/jg_cody/Terraplex/ui/home/HomeViewModel.java b/app/src/main/java/de/jg_cody/Terraplex/ui/home/HomeViewModel.java new file mode 100644 index 0000000..f0c057e --- /dev/null +++ b/app/src/main/java/de/jg_cody/Terraplex/ui/home/HomeViewModel.java @@ -0,0 +1,19 @@ +package de.jg_cody.Terraplex.ui.home; + +import androidx.lifecycle.LiveData; +import androidx.lifecycle.MutableLiveData; +import androidx.lifecycle.ViewModel; + +public class HomeViewModel extends ViewModel { + + private MutableLiveData mText; + + public HomeViewModel() { + mText = new MutableLiveData<>(); + mText.setValue("Willkommen in Ihrer Homeautomation-App"); + } + + public LiveData getText() { + return mText; + } +} \ No newline at end of file diff --git a/app/src/main/java/de/jg_cody/Terraplex/ui/kueche/KuecheFragment.java b/app/src/main/java/de/jg_cody/Terraplex/ui/kueche/KuecheFragment.java new file mode 100644 index 0000000..642313c --- /dev/null +++ b/app/src/main/java/de/jg_cody/Terraplex/ui/kueche/KuecheFragment.java @@ -0,0 +1,35 @@ +package de.jg_cody.Terraplex.ui.kueche; + +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import de.jg_cody.Terraplex.R; + +public class KuecheFragment extends Fragment { + + private KuecheViewModel kuecheViewModel; + + public View onCreateView(@NonNull LayoutInflater inflater, + ViewGroup container, Bundle savedInstanceState) { + kuecheViewModel = + new ViewModelProvider(this).get(KuecheViewModel.class); + View root = inflater.inflate(R.layout.fragment_kueche, container, false); + final TextView textView = root.findViewById(R.id.text_kueche); + kuecheViewModel.getText().observe(getViewLifecycleOwner(), new Observer() { + @Override + public void onChanged(@Nullable String s) { + textView.setText(s); + } + }); + return root; + } +} \ No newline at end of file diff --git a/app/src/main/java/de/jg_cody/Terraplex/ui/kueche/KuecheViewModel.java b/app/src/main/java/de/jg_cody/Terraplex/ui/kueche/KuecheViewModel.java new file mode 100644 index 0000000..ad5efb3 --- /dev/null +++ b/app/src/main/java/de/jg_cody/Terraplex/ui/kueche/KuecheViewModel.java @@ -0,0 +1,19 @@ +package de.jg_cody.Terraplex.ui.kueche; + +import androidx.lifecycle.LiveData; +import androidx.lifecycle.MutableLiveData; +import androidx.lifecycle.ViewModel; + +public class KuecheViewModel extends ViewModel { + + private MutableLiveData mText; + + public KuecheViewModel() { + mText = new MutableLiveData<>(); + mText.setValue("Küche"); + } + + public LiveData getText() { + return mText; + } +} \ No newline at end of file diff --git a/app/src/main/java/de/jg_cody/Terraplex/ui/wohnzimmer/WohnzimmerFragment.java b/app/src/main/java/de/jg_cody/Terraplex/ui/wohnzimmer/WohnzimmerFragment.java new file mode 100644 index 0000000..9e5cac5 --- /dev/null +++ b/app/src/main/java/de/jg_cody/Terraplex/ui/wohnzimmer/WohnzimmerFragment.java @@ -0,0 +1,35 @@ +package de.jg_cody.Terraplex.ui.wohnzimmer; + +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import de.jg_cody.Terraplex.R; + +public class WohnzimmerFragment extends Fragment { + + private WohnzimmerViewModel wohnzimmerViewModel; + + public View onCreateView(@NonNull LayoutInflater inflater, + ViewGroup container, Bundle savedInstanceState) { + wohnzimmerViewModel = + new ViewModelProvider(this).get(WohnzimmerViewModel.class); + View root = inflater.inflate(R.layout.fragment_wohnzimmer, container, false); + final TextView textView = root.findViewById(R.id.text_wohnzimmer); + wohnzimmerViewModel.getText().observe(getViewLifecycleOwner(), new Observer() { + @Override + public void onChanged(@Nullable String s) { + textView.setText(s); + } + }); + return root; + } +} \ No newline at end of file diff --git a/app/src/main/java/de/jg_cody/Terraplex/ui/wohnzimmer/WohnzimmerViewModel.java b/app/src/main/java/de/jg_cody/Terraplex/ui/wohnzimmer/WohnzimmerViewModel.java new file mode 100644 index 0000000..45cd04e --- /dev/null +++ b/app/src/main/java/de/jg_cody/Terraplex/ui/wohnzimmer/WohnzimmerViewModel.java @@ -0,0 +1,19 @@ +package de.jg_cody.Terraplex.ui.wohnzimmer; + +import androidx.lifecycle.LiveData; +import androidx.lifecycle.MutableLiveData; +import androidx.lifecycle.ViewModel; + +public class WohnzimmerViewModel extends ViewModel { + + private MutableLiveData mText; + + public WohnzimmerViewModel() { + mText = new MutableLiveData<>(); + mText.setValue("Wohnzimmer"); + } + + public LiveData getText() { + return mText; + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable-v21/ic_menu_camera.xml b/app/src/main/res/drawable-v21/ic_menu_camera.xml new file mode 100644 index 0000000..634fe92 --- /dev/null +++ b/app/src/main/res/drawable-v21/ic_menu_camera.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable-v21/ic_menu_gallery.xml b/app/src/main/res/drawable-v21/ic_menu_gallery.xml new file mode 100644 index 0000000..03c7709 --- /dev/null +++ b/app/src/main/res/drawable-v21/ic_menu_gallery.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable-v21/ic_menu_slideshow.xml b/app/src/main/res/drawable-v21/ic_menu_slideshow.xml new file mode 100644 index 0000000..5e9e163 --- /dev/null +++ b/app/src/main/res/drawable-v21/ic_menu_slideshow.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/background.jpg b/app/src/main/res/drawable/background.jpg new file mode 100644 index 0000000..18368eb Binary files /dev/null and b/app/src/main/res/drawable/background.jpg differ diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..07d5da9 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/jg_cody_white.png b/app/src/main/res/drawable/jg_cody_white.png new file mode 100644 index 0000000..9d7c9fb Binary files /dev/null and b/app/src/main/res/drawable/jg_cody_white.png differ diff --git a/app/src/main/res/drawable/side_nav_bar.xml b/app/src/main/res/drawable/side_nav_bar.xml new file mode 100644 index 0000000..6d81870 --- /dev/null +++ b/app/src/main/res/drawable/side_nav_bar.xml @@ -0,0 +1,9 @@ + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000..1848abb --- /dev/null +++ b/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,27 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml new file mode 100644 index 0000000..fc77fef --- /dev/null +++ b/app/src/main/res/layout/app_bar_main.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml new file mode 100644 index 0000000..04b67fd --- /dev/null +++ b/app/src/main/res/layout/content_main.xml @@ -0,0 +1,20 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_badezimmer.xml b/app/src/main/res/layout/fragment_badezimmer.xml new file mode 100644 index 0000000..b2848b3 --- /dev/null +++ b/app/src/main/res/layout/fragment_badezimmer.xml @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_flur.xml b/app/src/main/res/layout/fragment_flur.xml new file mode 100644 index 0000000..444073e --- /dev/null +++ b/app/src/main/res/layout/fragment_flur.xml @@ -0,0 +1,22 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml new file mode 100644 index 0000000..191a78c --- /dev/null +++ b/app/src/main/res/layout/fragment_home.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + +