diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..400abd6 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + { + "associatedIndex": 2 +} + + + + + + + + + 1713352368380 + + + + + + \ No newline at end of file diff --git a/documentation/docs/brainstorm/mindmap.md b/documentation/docs/brainstorm/mindmap.md new file mode 100644 index 0000000..e69de29 diff --git a/src/.idea/.gitignore b/src/.idea/.gitignore deleted file mode 100644 index 26d3352..0000000 --- a/src/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/src/.idea/.name b/src/.idea/.name new file mode 100644 index 0000000..9a7766c --- /dev/null +++ b/src/.idea/.name @@ -0,0 +1 @@ +Fitbot \ No newline at end of file diff --git a/src/.idea/misc.xml b/src/.idea/misc.xml index 6199cc2..b691e65 100644 --- a/src/.idea/misc.xml +++ b/src/.idea/misc.xml @@ -1,5 +1,13 @@ + + + diff --git a/src/app/build.gradle b/src/app/build.gradle index 3537156..82f916c 100644 --- a/src/app/build.gradle +++ b/src/app/build.gradle @@ -6,8 +6,8 @@ android { compileSdk 34 defaultConfig { - applicationId "com.fitbot" - minSdk 27 + applicationId "com.fitbot.fitbot" + minSdk 23 targetSdk 34 versionCode 1 versionName "1.0" @@ -25,18 +25,12 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } - buildFeatures { - viewBinding true - } } dependencies { implementation 'androidx.appcompat:appcompat:1.3.0' implementation 'com.google.android.material:material:1.4.0' - implementation 'androidx.constraintlayout:constraintlayout:2.0.4' - implementation 'androidx.navigation:navigation-fragment:2.3.5' - implementation 'androidx.navigation:navigation-ui:2.3.5' testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.3' androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' diff --git a/src/app/src/androidTest/java/com/fitbot/ExampleInstrumentedTest.java b/src/app/src/androidTest/java/com/fitbot/fitbot/ExampleInstrumentedTest.java similarity index 86% rename from src/app/src/androidTest/java/com/fitbot/ExampleInstrumentedTest.java rename to src/app/src/androidTest/java/com/fitbot/fitbot/ExampleInstrumentedTest.java index 5b12e2a..d02ca19 100644 --- a/src/app/src/androidTest/java/com/fitbot/ExampleInstrumentedTest.java +++ b/src/app/src/androidTest/java/com/fitbot/fitbot/ExampleInstrumentedTest.java @@ -1,4 +1,4 @@ -package com.fitbot; +package com.fitbot.fitbot; import android.content.Context; @@ -21,6 +21,6 @@ public class ExampleInstrumentedTest { public void useAppContext() { // Context of the app under test. Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); - assertEquals("com.fitbot", appContext.getPackageName()); + assertEquals("com.fitbot.fitbot", appContext.getPackageName()); } } \ No newline at end of file diff --git a/src/app/src/main/AndroidManifest.xml b/src/app/src/main/AndroidManifest.xml index ea80679..0a552c4 100644 --- a/src/app/src/main/AndroidManifest.xml +++ b/src/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="com.fitbot.fitbot"> - - - - - - - - + android:theme="@style/Theme.Fitbot" /> \ No newline at end of file diff --git a/src/app/src/main/java/com/fitbot/FirstFragment.java b/src/app/src/main/java/com/fitbot/FirstFragment.java deleted file mode 100644 index a371d37..0000000 --- a/src/app/src/main/java/com/fitbot/FirstFragment.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.fitbot; - -import android.os.Bundle; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.NonNull; -import androidx.fragment.app.Fragment; -import androidx.navigation.fragment.NavHostFragment; - -import com.fitbot.databinding.FragmentFirstBinding; - -public class FirstFragment extends Fragment { - - private FragmentFirstBinding binding; - - @Override - public View onCreateView( - LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState - ) { - - binding = FragmentFirstBinding.inflate(inflater, container, false); - return binding.getRoot(); - - } - - public void onViewCreated(@NonNull View view, Bundle savedInstanceState) { - super.onViewCreated(view, savedInstanceState); - - binding.buttonFirst.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - NavHostFragment.findNavController(FirstFragment.this) - .navigate(R.id.action_FirstFragment_to_SecondFragment); - } - }); - } - - @Override - public void onDestroyView() { - super.onDestroyView(); - binding = null; - } - -} \ No newline at end of file diff --git a/src/app/src/main/java/com/fitbot/MainActivity.java b/src/app/src/main/java/com/fitbot/MainActivity.java deleted file mode 100644 index 5b081c9..0000000 --- a/src/app/src/main/java/com/fitbot/MainActivity.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.fitbot; - -import android.os.Bundle; - -import com.google.android.material.snackbar.Snackbar; - -import androidx.appcompat.app.AppCompatActivity; - -import android.view.View; - -import androidx.navigation.NavController; -import androidx.navigation.Navigation; -import androidx.navigation.ui.AppBarConfiguration; -import androidx.navigation.ui.NavigationUI; - -import com.fitbot.databinding.ActivityMainBinding; - -import android.view.Menu; -import android.view.MenuItem; - -public class MainActivity extends AppCompatActivity { - - private AppBarConfiguration appBarConfiguration; - private ActivityMainBinding binding; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - binding = ActivityMainBinding.inflate(getLayoutInflater()); - setContentView(binding.getRoot()); - - setSupportActionBar(binding.toolbar); - - NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment_content_main); - appBarConfiguration = new AppBarConfiguration.Builder(navController.getGraph()).build(); - NavigationUI.setupActionBarWithNavController(this, navController, appBarConfiguration); - - binding.fab.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG) - .setAction("Action", null).show(); - } - }); - } - - @Override - public boolean onCreateOptionsMenu(Menu menu) { - // Inflate the menu; this adds items to the action bar if it is present. - getMenuInflater().inflate(R.menu.menu_main, menu); - return true; - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - // Handle action bar item clicks here. The action bar will - // automatically handle clicks on the Home/Up button, so long - // as you specify a parent activity in AndroidManifest.xml. - int id = item.getItemId(); - - //noinspection SimplifiableIfStatement - if (id == R.id.action_settings) { - return true; - } - - return super.onOptionsItemSelected(item); - } - - @Override - public boolean onSupportNavigateUp() { - NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment_content_main); - return NavigationUI.navigateUp(navController, appBarConfiguration) - || super.onSupportNavigateUp(); - } -} \ No newline at end of file diff --git a/src/app/src/main/java/com/fitbot/SecondFragment.java b/src/app/src/main/java/com/fitbot/SecondFragment.java deleted file mode 100644 index 39be0a3..0000000 --- a/src/app/src/main/java/com/fitbot/SecondFragment.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.fitbot; - -import android.os.Bundle; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.NonNull; -import androidx.fragment.app.Fragment; -import androidx.navigation.fragment.NavHostFragment; - -import com.fitbot.databinding.FragmentSecondBinding; - -public class SecondFragment extends Fragment { - - private FragmentSecondBinding binding; - - @Override - public View onCreateView( - LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState - ) { - - binding = FragmentSecondBinding.inflate(inflater, container, false); - return binding.getRoot(); - - } - - public void onViewCreated(@NonNull View view, Bundle savedInstanceState) { - super.onViewCreated(view, savedInstanceState); - - binding.buttonSecond.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - NavHostFragment.findNavController(SecondFragment.this) - .navigate(R.id.action_SecondFragment_to_FirstFragment); - } - }); - } - - @Override - public void onDestroyView() { - super.onDestroyView(); - binding = null; - } - -} \ No newline at end of file diff --git a/src/app/src/main/res/layout/activity_main.xml b/src/app/src/main/res/layout/activity_main.xml deleted file mode 100644 index 0e2d816..0000000 --- a/src/app/src/main/res/layout/activity_main.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/app/src/main/res/layout/content_main.xml b/src/app/src/main/res/layout/content_main.xml deleted file mode 100644 index 4f68632..0000000 --- a/src/app/src/main/res/layout/content_main.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/app/src/main/res/layout/fragment_first.xml b/src/app/src/main/res/layout/fragment_first.xml deleted file mode 100644 index fb44a3d..0000000 --- a/src/app/src/main/res/layout/fragment_first.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - -