diff --git a/src/Front-end/.gitignore b/src/Front-end/.gitignore deleted file mode 100644 index aa724b7..0000000 --- a/src/Front-end/.gitignore +++ /dev/null @@ -1,15 +0,0 @@ -*.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/src/Front-end/app/src/main/java/com/example/myapplication/ui/Buttonfragments/HazardGarbageFragment.java b/src/Front-end/app/src/main/java/com/example/myapplication/ui/Buttonfragments/HazardGarbageFragment.java deleted file mode 100644 index 0bb9743..0000000 --- a/src/Front-end/app/src/main/java/com/example/myapplication/ui/Buttonfragments/HazardGarbageFragment.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.example.myapplication.ui.Buttonfragments; - -public class HazardGarbageFragment { -} diff --git a/src/Front-end/app/src/main/java/com/example/myapplication/ui/Buttonfragments/KithchenGarbageFragment.java b/src/Front-end/app/src/main/java/com/example/myapplication/ui/Buttonfragments/KithchenGarbageFragment.java deleted file mode 100644 index 652406c..0000000 --- a/src/Front-end/app/src/main/java/com/example/myapplication/ui/Buttonfragments/KithchenGarbageFragment.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.example.myapplication.ui.Buttonfragments; - -public class KithchenGarbageFragment { -} diff --git a/src/Front-end/app/src/main/java/com/example/myapplication/ui/Buttonfragments/OtherGarbageFragment.java b/src/Front-end/app/src/main/java/com/example/myapplication/ui/Buttonfragments/OtherGarbageFragment.java deleted file mode 100644 index 4aa3ff0..0000000 --- a/src/Front-end/app/src/main/java/com/example/myapplication/ui/Buttonfragments/OtherGarbageFragment.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.example.myapplication.ui.Buttonfragments; - -public class OtherGarbageFragment { -} diff --git a/src/Front-end/app/src/main/java/com/example/myapplication/ui/home/HomeFragment.java b/src/Front-end/app/src/main/java/com/example/myapplication/ui/home/HomeFragment.java deleted file mode 100644 index 7683653..0000000 --- a/src/Front-end/app/src/main/java/com/example/myapplication/ui/home/HomeFragment.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.example.myapplication.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.fragment.app.Fragment; -import androidx.lifecycle.ViewModelProvider; - -import com.example.myapplication.databinding.FragmentHomeBinding; - -public class HomeFragment extends Fragment { - - private FragmentHomeBinding binding; - - public View onCreateView(@NonNull LayoutInflater inflater, - ViewGroup container, Bundle savedInstanceState) { - HomeViewModel homeViewModel = - new ViewModelProvider(this).get(HomeViewModel.class); - - binding = FragmentHomeBinding.inflate(inflater, container, false); - View root = binding.getRoot(); - - return root; - } - - @Override - public void onDestroyView() { - super.onDestroyView(); - binding = null; - } -} \ No newline at end of file diff --git a/src/Front-end/app/src/main/res/drawable/button.xml b/src/Front-end/app/src/main/res/drawable/button.xml deleted file mode 100644 index 4f39204..0000000 --- a/src/Front-end/app/src/main/res/drawable/button.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/Front-end/app/src/main/res/layout/fragment_home.xml b/src/Front-end/app/src/main/res/layout/fragment_home.xml deleted file mode 100644 index 662c10e..0000000 --- a/src/Front-end/app/src/main/res/layout/fragment_home.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/Front-end/app/src/main/res/layout/hazard_garbage.xml b/src/Front-end/app/src/main/res/layout/hazard_garbage.xml deleted file mode 100644 index b310efa..0000000 --- a/src/Front-end/app/src/main/res/layout/hazard_garbage.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - \ No newline at end of file diff --git a/src/Front-end/app/src/main/res/layout/kitchen_garbage.xml b/src/Front-end/app/src/main/res/layout/kitchen_garbage.xml deleted file mode 100644 index 77d9ef6..0000000 --- a/src/Front-end/app/src/main/res/layout/kitchen_garbage.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/Front-end/app/src/main/res/layout/other_garbage.xml b/src/Front-end/app/src/main/res/layout/other_garbage.xml deleted file mode 100644 index 77d9ef6..0000000 --- a/src/Front-end/app/src/main/res/layout/other_garbage.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/Front-end/app/src/main/res/layout/recycle_garbage.xml b/src/Front-end/app/src/main/res/layout/recycle_garbage.xml deleted file mode 100644 index 809051f..0000000 --- a/src/Front-end/app/src/main/res/layout/recycle_garbage.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - diff --git a/src/Front-end/build.gradle b/src/Front-end/build.gradle deleted file mode 100644 index f05eacf..0000000 --- a/src/Front-end/build.gradle +++ /dev/null @@ -1,5 +0,0 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. -plugins { - id 'com.android.application' version '7.4.2' apply false - id 'com.android.library' version '7.4.2' apply false -} \ No newline at end of file diff --git a/src/Front-end/chapter1/.gitignore b/src/Front-end/chapter1/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/src/Front-end/chapter1/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/src/Front-end/chapter1/build.gradle b/src/Front-end/chapter1/build.gradle deleted file mode 100644 index 2191b62..0000000 --- a/src/Front-end/chapter1/build.gradle +++ /dev/null @@ -1,40 +0,0 @@ -plugins { - id 'com.android.application' -} - -android { - namespace 'com.example.chapter1' - compileSdk 33 - - defaultConfig { - applicationId "com.example.chapter1" - minSdk 24 - targetSdk 33 - 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.4.1' - implementation 'com.google.android.material:material:1.5.0' - implementation 'androidx.constraintlayout:constraintlayout:2.1.3' - testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test.ext:junit:1.1.3' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' -} \ No newline at end of file diff --git a/src/Front-end/chapter1/proguard-rules.pro b/src/Front-end/chapter1/proguard-rules.pro deleted file mode 100644 index 481bb43..0000000 --- a/src/Front-end/chapter1/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# 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/src/Front-end/chapter1/src/androidTest/java/com/example/chapter1/ExampleInstrumentedTest.java b/src/Front-end/chapter1/src/androidTest/java/com/example/chapter1/ExampleInstrumentedTest.java deleted file mode 100644 index b705d73..0000000 --- a/src/Front-end/chapter1/src/androidTest/java/com/example/chapter1/ExampleInstrumentedTest.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.example.chapter1; - -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("com.example.chapter1", appContext.getPackageName()); - } -} \ No newline at end of file diff --git a/src/Front-end/chapter1/src/main/AndroidManifest.xml b/src/Front-end/chapter1/src/main/AndroidManifest.xml deleted file mode 100644 index e2d677a..0000000 --- a/src/Front-end/chapter1/src/main/AndroidManifest.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Front-end/chapter1/src/main/java/com/example/chapter1/MainActivity.java b/src/Front-end/chapter1/src/main/java/com/example/chapter1/MainActivity.java deleted file mode 100644 index 76ff921..0000000 --- a/src/Front-end/chapter1/src/main/java/com/example/chapter1/MainActivity.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.example.chapter1; - -import android.os.Bundle; -import android.view.View; - -import androidx.appcompat.app.AppCompatActivity; - -import com.google.android.material.floatingactionbutton.FloatingActionButton; - -public class MainActivity extends AppCompatActivity { - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setTheme(androidx.appcompat.R.style.Theme_AppCompat); - setContentView(R.layout.activity_main); - - - // 获取 FloatingActionButton 对象 - FloatingActionButton fab = findViewById(R.id.fab); - - // 添加 FloatingActionButton 的点击事件监听器 - fab.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - // 处理 FloatingActionButton 的点击事件 - } - }); - - // 其他初始化操作和逻辑处理 - } -} \ No newline at end of file diff --git a/src/Front-end/chapter1/src/main/java/com/example/chapter1/fragment/BlankFragment.java b/src/Front-end/chapter1/src/main/java/com/example/chapter1/fragment/BlankFragment.java deleted file mode 100644 index b9d90c1..0000000 --- a/src/Front-end/chapter1/src/main/java/com/example/chapter1/fragment/BlankFragment.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.example.chapter1.fragment; - -import android.os.Bundle; - -import androidx.fragment.app.Fragment; - -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -import com.example.chapter1.R; - -/** - * A simple {@link Fragment} subclass. - * Use the {@link BlankFragment#newInstance} factory method to - * create an instance of this fragment. - */ -public class BlankFragment extends Fragment { - - // TODO: Rename parameter arguments, choose names that match - // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER - private static final String ARG_PARAM1 = "param1"; - private static final String ARG_PARAM2 = "param2"; - - // TODO: Rename and change types of parameters - private String mParam1; - private String mParam2; - - public BlankFragment() { - // Required empty public constructor - } - - /** - * Use this factory method to create a new instance of - * this fragment using the provided parameters. - * - * @param param1 Parameter 1. - * @param param2 Parameter 2. - * @return A new instance of fragment BlankFragment. - */ - // TODO: Rename and change types and number of parameters - public static BlankFragment newInstance(String param1, String param2) { - BlankFragment fragment = new BlankFragment(); - Bundle args = new Bundle(); - args.putString(ARG_PARAM1, param1); - args.putString(ARG_PARAM2, param2); - fragment.setArguments(args); - return fragment; - } - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - if (getArguments() != null) { - mParam1 = getArguments().getString(ARG_PARAM1); - mParam2 = getArguments().getString(ARG_PARAM2); - } - } - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - // Inflate the layout for this fragment - return inflater.inflate(R.layout.fragment_blank, container, false); - } -} \ No newline at end of file diff --git a/src/Front-end/chapter1/src/main/java/com/example/chapter1/fragment/ScrollingFragment.java b/src/Front-end/chapter1/src/main/java/com/example/chapter1/fragment/ScrollingFragment.java deleted file mode 100644 index bccfbb0..0000000 --- a/src/Front-end/chapter1/src/main/java/com/example/chapter1/fragment/ScrollingFragment.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.example.chapter1.fragment; - -import android.os.Bundle; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -import androidx.fragment.app.Fragment; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - -import com.example.chapter1.R; - -class ScrollingFragment extends Fragment { - - @Nullable - @Override - public View onCreateView(@NonNull LayoutInflater inflater, - @Nullable ViewGroup container, - @Nullable Bundle savedInstanceState) { - return inflater.inflate(R.layout.fragment_scrolling, container, false); - } -} \ No newline at end of file diff --git a/src/Front-end/chapter1/src/main/res/drawable-v24/ic_launcher_foreground.xml b/src/Front-end/chapter1/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/src/Front-end/chapter1/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/Front-end/chapter1/src/main/res/drawable/ic_launcher_background.xml b/src/Front-end/chapter1/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/src/Front-end/chapter1/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Front-end/chapter1/src/main/res/layout/activity_main.xml b/src/Front-end/chapter1/src/main/res/layout/activity_main.xml deleted file mode 100644 index dc18c4f..0000000 --- a/src/Front-end/chapter1/src/main/res/layout/activity_main.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Front-end/chapter1/src/main/res/layout/fragment_blank.xml b/src/Front-end/chapter1/src/main/res/layout/fragment_blank.xml deleted file mode 100644 index 39900b5..0000000 --- a/src/Front-end/chapter1/src/main/res/layout/fragment_blank.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/src/Front-end/chapter1/src/main/res/layout/fragment_scrolling.xml b/src/Front-end/chapter1/src/main/res/layout/fragment_scrolling.xml deleted file mode 100644 index 8e6498d..0000000 --- a/src/Front-end/chapter1/src/main/res/layout/fragment_scrolling.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/Front-end/chapter1/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/src/Front-end/chapter1/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index eca70cf..0000000 --- a/src/Front-end/chapter1/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/Front-end/chapter1/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/src/Front-end/chapter1/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index eca70cf..0000000 --- a/src/Front-end/chapter1/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/src/Front-end/chapter1/src/main/res/mipmap-anydpi-v33/ic_launcher.xml b/src/Front-end/chapter1/src/main/res/mipmap-anydpi-v33/ic_launcher.xml deleted file mode 100644 index 6f3b755..0000000 --- a/src/Front-end/chapter1/src/main/res/mipmap-anydpi-v33/ic_launcher.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/Front-end/chapter1/src/main/res/mipmap-hdpi/ic_launcher.webp b/src/Front-end/chapter1/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index c209e78..0000000 Binary files a/src/Front-end/chapter1/src/main/res/mipmap-hdpi/ic_launcher.webp and /dev/null differ diff --git a/src/Front-end/chapter1/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/src/Front-end/chapter1/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index b2dfe3d..0000000 Binary files a/src/Front-end/chapter1/src/main/res/mipmap-hdpi/ic_launcher_round.webp and /dev/null differ diff --git a/src/Front-end/chapter1/src/main/res/mipmap-mdpi/ic_launcher.webp b/src/Front-end/chapter1/src/main/res/mipmap-mdpi/ic_launcher.webp deleted file mode 100644 index 4f0f1d6..0000000 Binary files a/src/Front-end/chapter1/src/main/res/mipmap-mdpi/ic_launcher.webp and /dev/null differ diff --git a/src/Front-end/chapter1/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/src/Front-end/chapter1/src/main/res/mipmap-mdpi/ic_launcher_round.webp deleted file mode 100644 index 62b611d..0000000 Binary files a/src/Front-end/chapter1/src/main/res/mipmap-mdpi/ic_launcher_round.webp and /dev/null differ diff --git a/src/Front-end/chapter1/src/main/res/mipmap-xhdpi/ic_launcher.webp b/src/Front-end/chapter1/src/main/res/mipmap-xhdpi/ic_launcher.webp deleted file mode 100644 index 948a307..0000000 Binary files a/src/Front-end/chapter1/src/main/res/mipmap-xhdpi/ic_launcher.webp and /dev/null differ diff --git a/src/Front-end/chapter1/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/src/Front-end/chapter1/src/main/res/mipmap-xhdpi/ic_launcher_round.webp deleted file mode 100644 index 1b9a695..0000000 Binary files a/src/Front-end/chapter1/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/src/Front-end/chapter1/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/src/Front-end/chapter1/src/main/res/mipmap-xxhdpi/ic_launcher.webp deleted file mode 100644 index 28d4b77..0000000 Binary files a/src/Front-end/chapter1/src/main/res/mipmap-xxhdpi/ic_launcher.webp and /dev/null differ diff --git a/src/Front-end/chapter1/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/src/Front-end/chapter1/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp deleted file mode 100644 index 9287f50..0000000 Binary files a/src/Front-end/chapter1/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/src/Front-end/chapter1/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/src/Front-end/chapter1/src/main/res/mipmap-xxxhdpi/ic_launcher.webp deleted file mode 100644 index aa7d642..0000000 Binary files a/src/Front-end/chapter1/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and /dev/null differ diff --git a/src/Front-end/chapter1/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/src/Front-end/chapter1/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp deleted file mode 100644 index 9126ae3..0000000 Binary files a/src/Front-end/chapter1/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/src/Front-end/chapter1/src/main/res/values-night/themes.xml b/src/Front-end/chapter1/src/main/res/values-night/themes.xml deleted file mode 100644 index 54202f5..0000000 --- a/src/Front-end/chapter1/src/main/res/values-night/themes.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/Front-end/chapter1/src/main/res/values/colors.xml b/src/Front-end/chapter1/src/main/res/values/colors.xml deleted file mode 100644 index f8c6127..0000000 --- a/src/Front-end/chapter1/src/main/res/values/colors.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - #FFBB86FC - #FF6200EE - #FF3700B3 - #FF03DAC5 - #FF018786 - #FF000000 - #FFFFFFFF - \ No newline at end of file diff --git a/src/Front-end/chapter1/src/main/res/values/dimens.xml b/src/Front-end/chapter1/src/main/res/values/dimens.xml deleted file mode 100644 index bd9fded..0000000 --- a/src/Front-end/chapter1/src/main/res/values/dimens.xml +++ /dev/null @@ -1,3 +0,0 @@ - - 16dp - \ No newline at end of file diff --git a/src/Front-end/chapter1/src/main/res/values/strings.xml b/src/Front-end/chapter1/src/main/res/values/strings.xml deleted file mode 100644 index 0a38a69..0000000 --- a/src/Front-end/chapter1/src/main/res/values/strings.xml +++ /dev/null @@ -1,94 +0,0 @@ - - chapter1 - - "Material is the metaphor.\n\n" - - "A material metaphor is the unifying theory of a rationalized space and a system of motion." - "The material is grounded in tactile reality, inspired by the study of paper and ink, yet " - "technologically advanced and open to imagination and magic.\n" - "Surfaces and edges of the material provide visual cues that are grounded in reality. The " - "use of familiar tactile attributes helps users quickly understand affordances. Yet the " - "flexibility of the material creates new affordances that supercede those in the physical " - "world, without breaking the rules of physics.\n" - "The fundamentals of light, surface, and movement are key to conveying how objects move, " - "interact, and exist in space and in relation to each other. Realistic lighting shows " - "seams, divides space, and indicates moving parts.\n\n" - - "Bold, graphic, intentional.\n\n" - - "The foundational elements of print based design typography, grids, space, scale, color, " - "and use of imagery guide visual treatments. These elements do far more than please the " - "eye. They create hierarchy, meaning, and focus. Deliberate color choices, edge to edge " - "imagery, large scale typography, and intentional white space create a bold and graphic " - "interface that immerse the user in the experience.\n" - "An emphasis on user actions makes core functionality immediately apparent and provides " - "waypoints for the user.\n\n" - - "Motion provides meaning.\n\n" - - "Motion respects and reinforces the user as the prime mover. Primary user actions are " - "inflection points that initiate motion, transforming the whole design.\n" - "All action takes place in a single environment. Objects are presented to the user without " - "breaking the continuity of experience even as they transform and reorganize.\n" - "Motion is meaningful and appropriate, serving to focus attention and maintain continuity. " - "Feedback is subtle yet clear. Transitions are efficient yet coherent.\n\n" - - "3D world.\n\n" - - "The material environment is a 3D space, which means all objects have x, y, and z " - "dimensions. The z-axis is perpendicularly aligned to the plane of the display, with the " - "positive z-axis extending towards the viewer. Every sheet of material occupies a single " - "position along the z-axis and has a standard 1dp thickness.\n" - "On the web, the z-axis is used for layering and not for perspective. The 3D world is " - "emulated by manipulating the y-axis.\n\n" - - "Light and shadow.\n\n" - - "Within the material environment, virtual lights illuminate the scene. Key lights create " - "directional shadows, while ambient light creates soft shadows from all angles.\n" - "Shadows in the material environment are cast by these two light sources. In Android " - "development, shadows occur when light sources are blocked by sheets of material at " - "various positions along the z-axis. On the web, shadows are depicted by manipulating the " - "y-axis only. The following example shows the card with a height of 6dp.\n\n" - - "Resting elevation.\n\n" - - "All material objects, regardless of size, have a resting elevation, or default elevation " - "that does not change. If an object changes elevation, it should return to its resting " - "elevation as soon as possible.\n\n" - - "Component elevations.\n\n" - - "The resting elevation for a component type is consistent across apps (e.g., FAB elevation " - "does not vary from 6dp in one app to 16dp in another app).\n" - "Components may have different resting elevations across platforms, depending on the depth " - "of the environment (e.g., TV has a greater depth than mobile or desktop).\n\n" - - "Responsive elevation and dynamic elevation offsets.\n\n" - - "Some component types have responsive elevation, meaning they change elevation in response " - "to user input (e.g., normal, focused, and pressed) or system events. These elevation " - "changes are consistently implemented using dynamic elevation offsets.\n" - "Dynamic elevation offsets are the goal elevation that a component moves towards, relative " - "to the component’s resting state. They ensure that elevation changes are consistent " - "across actions and component types. For example, all components that lift on press have " - "the same elevation change relative to their resting elevation.\n" - "Once the input event is completed or cancelled, the component will return to its resting " - "elevation.\n\n" - - "Avoiding elevation interference.\n\n" - - "Components with responsive elevations may encounter other components as they move between " - "their resting elevations and dynamic elevation offsets. Because material cannot pass " - "through other material, components avoid interfering with one another any number of ways, " - "whether on a per component basis or using the entire app layout.\n" - "On a component level, components can move or be removed before they cause interference. " - "For example, a floating action button (FAB) can disappear or move off screen before a " - "user picks up a card, or it can move if a snackbar appears.\n" - "On the layout level, design your app layout to minimize opportunities for interference. " - "For example, position the FAB to one side of stream of a cards so the FAB won’t interfere " - "when a user tries to pick up one of cards.\n\n" - - - Hello blank fragment - \ No newline at end of file diff --git a/src/Front-end/chapter1/src/main/res/values/themes.xml b/src/Front-end/chapter1/src/main/res/values/themes.xml deleted file mode 100644 index 503477b..0000000 --- a/src/Front-end/chapter1/src/main/res/values/themes.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/Front-end/chapter1/src/test/java/com/example/chapter1/ExampleUnitTest.java b/src/Front-end/chapter1/src/test/java/com/example/chapter1/ExampleUnitTest.java deleted file mode 100644 index 2feff06..0000000 --- a/src/Front-end/chapter1/src/test/java/com/example/chapter1/ExampleUnitTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.example.chapter1; - -import org.junit.Test; - -import static org.junit.Assert.*; - -/** - * Example local unit test, which will execute on the development machine (host). - * - * @see Testing documentation - */ -public class ExampleUnitTest { - @Test - public void addition_isCorrect() { - assertEquals(4, 2 + 2); - } -} \ No newline at end of file diff --git a/src/Front-end/gradle.properties b/src/Front-end/gradle.properties deleted file mode 100644 index 3e927b1..0000000 --- a/src/Front-end/gradle.properties +++ /dev/null @@ -1,21 +0,0 @@ -# Project-wide Gradle settings. -# IDE (e.g. Android Studio) users: -# Gradle settings configured through the IDE *will override* -# any settings specified in this file. -# For more details on how to configure your build environment visit -# http://www.gradle.org/docs/current/userguide/build_environment.html -# Specifies the JVM arguments used for the daemon process. -# The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 -# When configured, Gradle will run in incubating parallel mode. -# This option should only be used with decoupled projects. More details, visit -# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true -# AndroidX package structure to make it clearer which packages are bundled with the -# Android operating system, and which are packaged with your app's APK -# https://developer.android.com/topic/libraries/support-library/androidx-rn -android.useAndroidX=true -# Enables namespacing of each library's R class so that its R class includes only the -# resources declared in the library itself and none from the library's dependencies, -# thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true \ No newline at end of file diff --git a/src/Front-end/gradle/wrapper/gradle-wrapper.jar b/src/Front-end/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index e708b1c..0000000 Binary files a/src/Front-end/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/src/Front-end/gradle/wrapper/gradle-wrapper.properties b/src/Front-end/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index c26a858..0000000 --- a/src/Front-end/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,6 +0,0 @@ -#Sat Sep 02 22:41:29 CST 2023 -distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip -distributionPath=wrapper/dists -zipStorePath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME diff --git a/src/Front-end/gradlew b/src/Front-end/gradlew deleted file mode 100644 index 4f906e0..0000000 --- a/src/Front-end/gradlew +++ /dev/null @@ -1,185 +0,0 @@ -#!/usr/bin/env sh - -# -# Copyright 2015 the original author or authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn () { - echo "$*" -} - -die () { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=`expr $i + 1` - done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -exec "$JAVACMD" "$@" diff --git a/src/Front-end/gradlew.bat b/src/Front-end/gradlew.bat deleted file mode 100644 index 107acd3..0000000 --- a/src/Front-end/gradlew.bat +++ /dev/null @@ -1,89 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/src/Front-end/settings.gradle b/src/Front-end/settings.gradle deleted file mode 100644 index bfe2e1f..0000000 --- a/src/Front-end/settings.gradle +++ /dev/null @@ -1,17 +0,0 @@ -pluginManagement { - repositories { - google() - mavenCentral() - gradlePluginPortal() - } -} -dependencyResolutionManagement { - repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) - repositories { - google() - mavenCentral() - } -} -rootProject.name = "My Application" -include ':app' -include ':chapter1' diff --git a/src/Front-end/app/.gitignore b/src/app/.gitignore similarity index 100% rename from src/Front-end/app/.gitignore rename to src/app/.gitignore diff --git a/src/app/.gradle/6.5/fileChanges/last-build.bin b/src/app/.gradle/6.5/fileChanges/last-build.bin new file mode 100644 index 0000000..f76dd23 Binary files /dev/null and b/src/app/.gradle/6.5/fileChanges/last-build.bin differ diff --git a/src/app/.gradle/6.5/fileHashes/fileHashes.lock b/src/app/.gradle/6.5/fileHashes/fileHashes.lock new file mode 100644 index 0000000..cb5e55e Binary files /dev/null and b/src/app/.gradle/6.5/fileHashes/fileHashes.lock differ diff --git a/src/app/.gradle/6.5/gc.properties b/src/app/.gradle/6.5/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/src/app/.gradle/checksums/checksums.lock b/src/app/.gradle/checksums/checksums.lock new file mode 100644 index 0000000..1322538 Binary files /dev/null and b/src/app/.gradle/checksums/checksums.lock differ diff --git a/src/app/.gradle/vcs-1/gc.properties b/src/app/.gradle/vcs-1/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/src/app/.idea/.gitignore b/src/app/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/src/app/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/src/app/.idea/gradle.xml b/src/app/.idea/gradle.xml new file mode 100644 index 0000000..3a3b909 --- /dev/null +++ b/src/app/.idea/gradle.xml @@ -0,0 +1,13 @@ + + + + + + \ No newline at end of file diff --git a/src/app/.idea/misc.xml b/src/app/.idea/misc.xml new file mode 100644 index 0000000..f45a3da --- /dev/null +++ b/src/app/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/src/app/.idea/modules.xml b/src/app/.idea/modules.xml new file mode 100644 index 0000000..e1f9e1c --- /dev/null +++ b/src/app/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/src/app/.idea/modules/app.iml b/src/app/.idea/modules/app.iml new file mode 100644 index 0000000..5b2d407 --- /dev/null +++ b/src/app/.idea/modules/app.iml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/app/.idea/runConfigurations.xml b/src/app/.idea/runConfigurations.xml new file mode 100644 index 0000000..797acea --- /dev/null +++ b/src/app/.idea/runConfigurations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/src/app/.idea/vcs.xml b/src/app/.idea/vcs.xml new file mode 100644 index 0000000..b2bdec2 --- /dev/null +++ b/src/app/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/Front-end/app/build.gradle b/src/app/build.gradle similarity index 100% rename from src/Front-end/app/build.gradle rename to src/app/build.gradle diff --git a/src/app/local.properties b/src/app/local.properties new file mode 100644 index 0000000..a5667c3 --- /dev/null +++ b/src/app/local.properties @@ -0,0 +1,8 @@ +## This file must *NOT* be checked into Version Control Systems, +# as it contains information specific to your local configuration. +# +# Location of the SDK. This is only used by Gradle. +# For customization when using a Version Control System, please read the +# header note. +#Mon Sep 25 09:53:48 CST 2023 +sdk.dir=E\:\\Android_SDK diff --git a/src/Front-end/app/proguard-rules.pro b/src/app/proguard-rules.pro similarity index 100% rename from src/Front-end/app/proguard-rules.pro rename to src/app/proguard-rules.pro diff --git a/src/Front-end/app/src/androidTest/java/com/example/myapplication/ExampleInstrumentedTest.java b/src/app/src/androidTest/java/com/example/myapplication/ExampleInstrumentedTest.java similarity index 100% rename from src/Front-end/app/src/androidTest/java/com/example/myapplication/ExampleInstrumentedTest.java rename to src/app/src/androidTest/java/com/example/myapplication/ExampleInstrumentedTest.java diff --git a/src/Front-end/app/src/main/AndroidManifest.xml b/src/app/src/main/AndroidManifest.xml similarity index 100% rename from src/Front-end/app/src/main/AndroidManifest.xml rename to src/app/src/main/AndroidManifest.xml diff --git a/src/Front-end/app/src/main/java/com/example/myapplication/BottomNavigiationActivity.java b/src/app/src/main/java/com/example/myapplication/BottomNavigiationActivity.java similarity index 59% rename from src/Front-end/app/src/main/java/com/example/myapplication/BottomNavigiationActivity.java rename to src/app/src/main/java/com/example/myapplication/BottomNavigiationActivity.java index 4bbe575..d1afe50 100644 --- a/src/Front-end/app/src/main/java/com/example/myapplication/BottomNavigiationActivity.java +++ b/src/app/src/main/java/com/example/myapplication/BottomNavigiationActivity.java @@ -1,7 +1,12 @@ package com.example.myapplication; +import android.media.Image; import android.os.Bundle; +import android.util.Log; import android.view.View; +import android.view.Window; +import android.view.WindowManager; +import android.widget.ImageButton; import com.example.myapplication.ui.Buttonfragments.RecycleGarbageFragment; import com.google.android.material.bottomnavigation.BottomNavigationView; @@ -15,24 +20,19 @@ import androidx.navigation.ui.NavigationUI; import com.example.myapplication.databinding.BottomNavigiationBinding; -public class BottomNavigiationActivity extends AppCompatActivity implements View.OnClickListener { +import java.util.List; - private BottomNavigiationBinding binding; - private Fragment recycleGarbageFragment; - - private Fragment kitchenGarbageFragment; +public class BottomNavigiationActivity extends AppCompatActivity{ - private Fragment otherGarbageFragment; - - private Fragment hazardGarbageFragment; + private BottomNavigiationBinding binding; @Override protected void onCreate(Bundle savedInstanceState) { +// Log.d("wc","create"); super.onCreate(savedInstanceState); binding = BottomNavigiationBinding.inflate(getLayoutInflater()); setContentView(binding.getRoot()); BottomNavigationView navView = findViewById(R.id.nav_view); - recycleGarbageFragment=new RecycleGarbageFragment(); // Passing each menu ID as a set of Ids because each // menu should be considered as top level destinations. AppBarConfiguration appBarConfiguration = new AppBarConfiguration.Builder( @@ -42,25 +42,4 @@ public class BottomNavigiationActivity extends AppCompatActivity implements View NavigationUI.setupActionBarWithNavController(this, navController, appBarConfiguration); NavigationUI.setupWithNavController(binding.navView, navController); } - - @Override - public void onClick(View view) { - Fragment curFragment = getSupportFragmentManager().findFragmentById(R.id.content_container); - Fragment targetFargment = null; - switch (view.getId()) { - case R.id.recycle: - targetFargment=recycleGarbageFragment; - break; - case R.id.kitchen_garbage: - targetFargment=kitchenGarbageFragment; - break; - case R.id.other_garbage: - targetFargment=otherGarbageFragment; - break; - case R.id.hazardous_waste: - targetFargment=hazardGarbageFragment; - break; - } - getSupportFragmentManager().beginTransaction().replace(R.id.content_container,targetFargment).commit(); - } } \ No newline at end of file diff --git a/src/app/src/main/java/com/example/myapplication/ui/Buttonfragments/HazardGarbageFragment.java b/src/app/src/main/java/com/example/myapplication/ui/Buttonfragments/HazardGarbageFragment.java new file mode 100644 index 0000000..713a64f --- /dev/null +++ b/src/app/src/main/java/com/example/myapplication/ui/Buttonfragments/HazardGarbageFragment.java @@ -0,0 +1,23 @@ +package com.example.myapplication.ui.Buttonfragments; + +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.fragment.app.Fragment; + +import com.example.myapplication.R; + +public class HazardGarbageFragment extends Fragment { + + public HazardGarbageFragment() { + // Required empty public constructor + } + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + // Inflate the layout for this fragment + return inflater.inflate(R.layout.hazard_garbage, container, false); + } +} \ No newline at end of file diff --git a/src/app/src/main/java/com/example/myapplication/ui/Buttonfragments/KitchenGarbageFragment.java b/src/app/src/main/java/com/example/myapplication/ui/Buttonfragments/KitchenGarbageFragment.java new file mode 100644 index 0000000..97dc149 --- /dev/null +++ b/src/app/src/main/java/com/example/myapplication/ui/Buttonfragments/KitchenGarbageFragment.java @@ -0,0 +1,23 @@ +package com.example.myapplication.ui.Buttonfragments; + +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.fragment.app.Fragment; + +import com.example.myapplication.R; + +public class KitchenGarbageFragment extends Fragment { + + public KitchenGarbageFragment() { + // Required empty public constructor + } + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + // Inflate the layout for this fragment + return inflater.inflate(R.layout.kitchen_garbage, container, false); + } +} \ No newline at end of file diff --git a/src/app/src/main/java/com/example/myapplication/ui/Buttonfragments/OtherGarbageFragment.java b/src/app/src/main/java/com/example/myapplication/ui/Buttonfragments/OtherGarbageFragment.java new file mode 100644 index 0000000..be60494 --- /dev/null +++ b/src/app/src/main/java/com/example/myapplication/ui/Buttonfragments/OtherGarbageFragment.java @@ -0,0 +1,23 @@ +package com.example.myapplication.ui.Buttonfragments; + +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.fragment.app.Fragment; + +import com.example.myapplication.R; + +public class OtherGarbageFragment extends Fragment { + + public OtherGarbageFragment() { + // Required empty public constructor + } + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + // Inflate the layout for this fragment + return inflater.inflate(R.layout.other_garbage, container, false); + } +} \ No newline at end of file diff --git a/src/Front-end/app/src/main/java/com/example/myapplication/ui/Buttonfragments/RecycleGarbageFragment.java b/src/app/src/main/java/com/example/myapplication/ui/Buttonfragments/RecycleGarbageFragment.java similarity index 100% rename from src/Front-end/app/src/main/java/com/example/myapplication/ui/Buttonfragments/RecycleGarbageFragment.java rename to src/app/src/main/java/com/example/myapplication/ui/Buttonfragments/RecycleGarbageFragment.java diff --git a/src/Front-end/app/src/main/java/com/example/myapplication/ui/dashboard/DashboardFragment.java b/src/app/src/main/java/com/example/myapplication/ui/dashboard/DashboardFragment.java similarity index 100% rename from src/Front-end/app/src/main/java/com/example/myapplication/ui/dashboard/DashboardFragment.java rename to src/app/src/main/java/com/example/myapplication/ui/dashboard/DashboardFragment.java diff --git a/src/Front-end/app/src/main/java/com/example/myapplication/ui/dashboard/DashboardViewModel.java b/src/app/src/main/java/com/example/myapplication/ui/dashboard/DashboardViewModel.java similarity index 100% rename from src/Front-end/app/src/main/java/com/example/myapplication/ui/dashboard/DashboardViewModel.java rename to src/app/src/main/java/com/example/myapplication/ui/dashboard/DashboardViewModel.java diff --git a/src/app/src/main/java/com/example/myapplication/ui/home/HomeFragment.java b/src/app/src/main/java/com/example/myapplication/ui/home/HomeFragment.java new file mode 100644 index 0000000..ac87641 --- /dev/null +++ b/src/app/src/main/java/com/example/myapplication/ui/home/HomeFragment.java @@ -0,0 +1,76 @@ +package com.example.myapplication.ui.home; + +import android.media.Image; +import android.os.Bundle; +import android.util.Log; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageButton; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import com.example.myapplication.R; +import com.example.myapplication.databinding.FragmentHomeBinding; +import com.example.myapplication.ui.Buttonfragments.HazardGarbageFragment; +import com.example.myapplication.ui.Buttonfragments.KitchenGarbageFragment; +import com.example.myapplication.ui.Buttonfragments.OtherGarbageFragment; +import com.example.myapplication.ui.Buttonfragments.RecycleGarbageFragment; + +public class HomeFragment extends Fragment { + private Fragment recycleGarbageFragment; + private ImageButton recycleButton; + + private ImageButton kitchenButton; + + private ImageButton otherButton; + + private ImageButton hazardButton; + private FragmentHomeBinding binding; + + public View onCreateView(@NonNull LayoutInflater inflater, + ViewGroup container, Bundle savedInstanceState) { + binding = FragmentHomeBinding.inflate(inflater, container, false); + View root = binding.getRoot(); + recycleButton = root.findViewById(R.id.recycle); + kitchenButton = root.findViewById(R.id.kitchen_garbage); + otherButton = root.findViewById(R.id.other_garbage); + hazardButton = root.findViewById(R.id.hazardous_waste); + recycleButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + FragmentManager fragmentManager = getParentFragmentManager(); + fragmentManager.beginTransaction().replace(R.id.content_container, new RecycleGarbageFragment()).commit(); + } + }); + recycleButton.performClick(); + kitchenButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + FragmentManager fragmentManager = getParentFragmentManager(); + fragmentManager.beginTransaction().replace(R.id.content_container, new KitchenGarbageFragment()).commit(); + } + }); + otherButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + FragmentManager fragmentManager = getParentFragmentManager(); + fragmentManager.beginTransaction().replace(R.id.content_container, new OtherGarbageFragment()).commit(); + } + }); + hazardButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + FragmentManager fragmentManager = getParentFragmentManager(); + fragmentManager.beginTransaction().replace(R.id.content_container, new HazardGarbageFragment()).commit(); + } + }); + return root; + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + binding = null; + } +} diff --git a/src/Front-end/app/src/main/java/com/example/myapplication/ui/home/HomeViewModel.java b/src/app/src/main/java/com/example/myapplication/ui/home/HomeViewModel.java similarity index 100% rename from src/Front-end/app/src/main/java/com/example/myapplication/ui/home/HomeViewModel.java rename to src/app/src/main/java/com/example/myapplication/ui/home/HomeViewModel.java diff --git a/src/Front-end/app/src/main/java/com/example/myapplication/ui/notifications/NotificationsFragment.java b/src/app/src/main/java/com/example/myapplication/ui/notifications/NotificationsFragment.java similarity index 100% rename from src/Front-end/app/src/main/java/com/example/myapplication/ui/notifications/NotificationsFragment.java rename to src/app/src/main/java/com/example/myapplication/ui/notifications/NotificationsFragment.java diff --git a/src/Front-end/app/src/main/java/com/example/myapplication/ui/notifications/NotificationsViewModel.java b/src/app/src/main/java/com/example/myapplication/ui/notifications/NotificationsViewModel.java similarity index 100% rename from src/Front-end/app/src/main/java/com/example/myapplication/ui/notifications/NotificationsViewModel.java rename to src/app/src/main/java/com/example/myapplication/ui/notifications/NotificationsViewModel.java diff --git a/src/Front-end/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/src/app/src/main/res/drawable-v24/ic_launcher_foreground.xml similarity index 100% rename from src/Front-end/app/src/main/res/drawable-v24/ic_launcher_foreground.xml rename to src/app/src/main/res/drawable-v24/ic_launcher_foreground.xml diff --git a/src/app/src/main/res/drawable/button.xml b/src/app/src/main/res/drawable/button.xml new file mode 100644 index 0000000..582cc5b --- /dev/null +++ b/src/app/src/main/res/drawable/button.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/src/app/src/main/res/drawable/capture_photo.png b/src/app/src/main/res/drawable/capture_photo.png new file mode 100644 index 0000000..5dbbc76 Binary files /dev/null and b/src/app/src/main/res/drawable/capture_photo.png differ diff --git a/src/Front-end/app/src/main/res/drawable/garbage_bin.png b/src/app/src/main/res/drawable/garbage_bin.png similarity index 100% rename from src/Front-end/app/src/main/res/drawable/garbage_bin.png rename to src/app/src/main/res/drawable/garbage_bin.png diff --git a/src/Front-end/app/src/main/res/drawable/garbage_recogniton.png b/src/app/src/main/res/drawable/garbage_recogniton.png similarity index 100% rename from src/Front-end/app/src/main/res/drawable/garbage_recogniton.png rename to src/app/src/main/res/drawable/garbage_recogniton.png diff --git a/src/Front-end/app/src/main/res/drawable/gocation.png b/src/app/src/main/res/drawable/gocation.png similarity index 100% rename from src/Front-end/app/src/main/res/drawable/gocation.png rename to src/app/src/main/res/drawable/gocation.png diff --git a/src/app/src/main/res/drawable/hazard.png b/src/app/src/main/res/drawable/hazard.png new file mode 100644 index 0000000..3379dd1 Binary files /dev/null and b/src/app/src/main/res/drawable/hazard.png differ diff --git a/src/Front-end/app/src/main/res/drawable/hazardous_waste.png b/src/app/src/main/res/drawable/hazardous_waste.png similarity index 100% rename from src/Front-end/app/src/main/res/drawable/hazardous_waste.png rename to src/app/src/main/res/drawable/hazardous_waste.png diff --git a/src/Front-end/app/src/main/res/drawable/ic_dashboard_black_24dp.xml b/src/app/src/main/res/drawable/ic_dashboard_black_24dp.xml similarity index 100% rename from src/Front-end/app/src/main/res/drawable/ic_dashboard_black_24dp.xml rename to src/app/src/main/res/drawable/ic_dashboard_black_24dp.xml diff --git a/src/Front-end/app/src/main/res/drawable/ic_home_black_24dp.xml b/src/app/src/main/res/drawable/ic_home_black_24dp.xml similarity index 100% rename from src/Front-end/app/src/main/res/drawable/ic_home_black_24dp.xml rename to src/app/src/main/res/drawable/ic_home_black_24dp.xml diff --git a/src/Front-end/app/src/main/res/drawable/ic_launcher_background.xml b/src/app/src/main/res/drawable/ic_launcher_background.xml similarity index 100% rename from src/Front-end/app/src/main/res/drawable/ic_launcher_background.xml rename to src/app/src/main/res/drawable/ic_launcher_background.xml diff --git a/src/Front-end/app/src/main/res/drawable/ic_notifications_black_24dp.xml b/src/app/src/main/res/drawable/ic_notifications_black_24dp.xml similarity index 100% rename from src/Front-end/app/src/main/res/drawable/ic_notifications_black_24dp.xml rename to src/app/src/main/res/drawable/ic_notifications_black_24dp.xml diff --git a/src/Front-end/app/src/main/res/drawable/image_upload.png b/src/app/src/main/res/drawable/image_upload.png similarity index 100% rename from src/Front-end/app/src/main/res/drawable/image_upload.png rename to src/app/src/main/res/drawable/image_upload.png diff --git a/src/app/src/main/res/drawable/kitchen.png b/src/app/src/main/res/drawable/kitchen.png new file mode 100644 index 0000000..28ab6fa Binary files /dev/null and b/src/app/src/main/res/drawable/kitchen.png differ diff --git a/src/Front-end/app/src/main/res/drawable/kitchen_garbage.png b/src/app/src/main/res/drawable/kitchen_garbage.png similarity index 100% rename from src/Front-end/app/src/main/res/drawable/kitchen_garbage.png rename to src/app/src/main/res/drawable/kitchen_garbage.png diff --git a/src/Front-end/app/src/main/res/drawable/map.png b/src/app/src/main/res/drawable/map.png similarity index 100% rename from src/Front-end/app/src/main/res/drawable/map.png rename to src/app/src/main/res/drawable/map.png diff --git a/src/app/src/main/res/drawable/other.png b/src/app/src/main/res/drawable/other.png new file mode 100644 index 0000000..a0a0d8d Binary files /dev/null and b/src/app/src/main/res/drawable/other.png differ diff --git a/src/Front-end/app/src/main/res/drawable/other_garbage.png b/src/app/src/main/res/drawable/other_garbage.png similarity index 100% rename from src/Front-end/app/src/main/res/drawable/other_garbage.png rename to src/app/src/main/res/drawable/other_garbage.png diff --git a/src/Front-end/app/src/main/res/drawable/photo.png b/src/app/src/main/res/drawable/photo.png similarity index 100% rename from src/Front-end/app/src/main/res/drawable/photo.png rename to src/app/src/main/res/drawable/photo.png diff --git a/src/Front-end/app/src/main/res/drawable/recycle.png b/src/app/src/main/res/drawable/recycle.png similarity index 100% rename from src/Front-end/app/src/main/res/drawable/recycle.png rename to src/app/src/main/res/drawable/recycle.png diff --git a/src/Front-end/app/src/main/res/drawable/recycle_garbage.jpg b/src/app/src/main/res/drawable/recycle_garbage.jpg similarity index 100% rename from src/Front-end/app/src/main/res/drawable/recycle_garbage.jpg rename to src/app/src/main/res/drawable/recycle_garbage.jpg diff --git a/src/Front-end/app/src/main/res/drawable/sqrt.png b/src/app/src/main/res/drawable/sqrt.png similarity index 100% rename from src/Front-end/app/src/main/res/drawable/sqrt.png rename to src/app/src/main/res/drawable/sqrt.png diff --git a/src/Front-end/app/src/main/res/drawable/user_feed_back.png b/src/app/src/main/res/drawable/user_feed_back.png similarity index 100% rename from src/Front-end/app/src/main/res/drawable/user_feed_back.png rename to src/app/src/main/res/drawable/user_feed_back.png diff --git a/src/Front-end/app/src/main/res/drawable/your_image.xml b/src/app/src/main/res/drawable/your_image.xml similarity index 100% rename from src/Front-end/app/src/main/res/drawable/your_image.xml rename to src/app/src/main/res/drawable/your_image.xml diff --git a/src/Front-end/app/src/main/res/layout-v26/bottom_navigiation.xml b/src/app/src/main/res/layout-v26/bottom_navigiation.xml similarity index 100% rename from src/Front-end/app/src/main/res/layout-v26/bottom_navigiation.xml rename to src/app/src/main/res/layout-v26/bottom_navigiation.xml diff --git a/src/Front-end/app/src/main/res/layout/bottom_navigiation.xml b/src/app/src/main/res/layout/bottom_navigiation.xml similarity index 100% rename from src/Front-end/app/src/main/res/layout/bottom_navigiation.xml rename to src/app/src/main/res/layout/bottom_navigiation.xml diff --git a/src/Front-end/app/src/main/res/layout/fragment_dashboard.xml b/src/app/src/main/res/layout/fragment_dashboard.xml similarity index 100% rename from src/Front-end/app/src/main/res/layout/fragment_dashboard.xml rename to src/app/src/main/res/layout/fragment_dashboard.xml diff --git a/src/app/src/main/res/layout/fragment_home.xml b/src/app/src/main/res/layout/fragment_home.xml new file mode 100644 index 0000000..1ed5ced --- /dev/null +++ b/src/app/src/main/res/layout/fragment_home.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Front-end/app/src/main/res/layout/fragment_notifications.xml b/src/app/src/main/res/layout/fragment_notifications.xml similarity index 100% rename from src/Front-end/app/src/main/res/layout/fragment_notifications.xml rename to src/app/src/main/res/layout/fragment_notifications.xml diff --git a/src/app/src/main/res/layout/hazard_garbage.xml b/src/app/src/main/res/layout/hazard_garbage.xml new file mode 100644 index 0000000..04fb689 --- /dev/null +++ b/src/app/src/main/res/layout/hazard_garbage.xml @@ -0,0 +1,37 @@ + + + + + + + + + + diff --git a/src/app/src/main/res/layout/kitchen_garbage.xml b/src/app/src/main/res/layout/kitchen_garbage.xml new file mode 100644 index 0000000..c2e7f80 --- /dev/null +++ b/src/app/src/main/res/layout/kitchen_garbage.xml @@ -0,0 +1,36 @@ + + + + + + + + + + diff --git a/src/app/src/main/res/layout/other_garbage.xml b/src/app/src/main/res/layout/other_garbage.xml new file mode 100644 index 0000000..a4e608c --- /dev/null +++ b/src/app/src/main/res/layout/other_garbage.xml @@ -0,0 +1,34 @@ + + + + + + + + + + diff --git a/src/app/src/main/res/layout/recycle_garbage.xml b/src/app/src/main/res/layout/recycle_garbage.xml new file mode 100644 index 0000000..3d7e6ac --- /dev/null +++ b/src/app/src/main/res/layout/recycle_garbage.xml @@ -0,0 +1,37 @@ + + + + + + + + + + diff --git a/src/Front-end/app/src/main/res/menu/bottom_nav_menu.xml b/src/app/src/main/res/menu/bottom_nav_menu.xml similarity index 100% rename from src/Front-end/app/src/main/res/menu/bottom_nav_menu.xml rename to src/app/src/main/res/menu/bottom_nav_menu.xml diff --git a/src/Front-end/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/src/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from src/Front-end/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to src/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/src/Front-end/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/src/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from src/Front-end/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to src/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/src/Front-end/app/src/main/res/mipmap-anydpi-v33/ic_launcher.xml b/src/app/src/main/res/mipmap-anydpi-v33/ic_launcher.xml similarity index 100% rename from src/Front-end/app/src/main/res/mipmap-anydpi-v33/ic_launcher.xml rename to src/app/src/main/res/mipmap-anydpi-v33/ic_launcher.xml diff --git a/src/Front-end/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/src/app/src/main/res/mipmap-hdpi/ic_launcher.webp similarity index 100% rename from src/Front-end/app/src/main/res/mipmap-hdpi/ic_launcher.webp rename to src/app/src/main/res/mipmap-hdpi/ic_launcher.webp diff --git a/src/Front-end/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/src/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp similarity index 100% rename from src/Front-end/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp rename to src/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp diff --git a/src/Front-end/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/src/app/src/main/res/mipmap-mdpi/ic_launcher.webp similarity index 100% rename from src/Front-end/app/src/main/res/mipmap-mdpi/ic_launcher.webp rename to src/app/src/main/res/mipmap-mdpi/ic_launcher.webp diff --git a/src/Front-end/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/src/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp similarity index 100% rename from src/Front-end/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp rename to src/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp diff --git a/src/Front-end/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/src/app/src/main/res/mipmap-xhdpi/ic_launcher.webp similarity index 100% rename from src/Front-end/app/src/main/res/mipmap-xhdpi/ic_launcher.webp rename to src/app/src/main/res/mipmap-xhdpi/ic_launcher.webp diff --git a/src/Front-end/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/src/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp similarity index 100% rename from src/Front-end/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp rename to src/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp diff --git a/src/Front-end/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/src/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp similarity index 100% rename from src/Front-end/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp rename to src/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp diff --git a/src/Front-end/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/src/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp similarity index 100% rename from src/Front-end/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp rename to src/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp diff --git a/src/Front-end/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/src/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp similarity index 100% rename from src/Front-end/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp rename to src/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp diff --git a/src/Front-end/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/src/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp similarity index 100% rename from src/Front-end/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp rename to src/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp diff --git a/src/Front-end/app/src/main/res/navigation/mobile_navigation.xml b/src/app/src/main/res/navigation/mobile_navigation.xml similarity index 100% rename from src/Front-end/app/src/main/res/navigation/mobile_navigation.xml rename to src/app/src/main/res/navigation/mobile_navigation.xml diff --git a/src/Front-end/app/src/main/res/values-night/themes.xml b/src/app/src/main/res/values-night/themes.xml similarity index 100% rename from src/Front-end/app/src/main/res/values-night/themes.xml rename to src/app/src/main/res/values-night/themes.xml diff --git a/src/Front-end/app/src/main/res/values/colors.xml b/src/app/src/main/res/values/colors.xml similarity index 100% rename from src/Front-end/app/src/main/res/values/colors.xml rename to src/app/src/main/res/values/colors.xml diff --git a/src/Front-end/app/src/main/res/values/dimen.xml b/src/app/src/main/res/values/dimen.xml similarity index 100% rename from src/Front-end/app/src/main/res/values/dimen.xml rename to src/app/src/main/res/values/dimen.xml diff --git a/src/Front-end/app/src/main/res/values/dimens.xml b/src/app/src/main/res/values/dimens.xml similarity index 100% rename from src/Front-end/app/src/main/res/values/dimens.xml rename to src/app/src/main/res/values/dimens.xml diff --git a/src/Front-end/app/src/main/res/values/ids.xml b/src/app/src/main/res/values/ids.xml similarity index 100% rename from src/Front-end/app/src/main/res/values/ids.xml rename to src/app/src/main/res/values/ids.xml diff --git a/src/Front-end/app/src/main/res/values/strings.xml b/src/app/src/main/res/values/strings.xml similarity index 100% rename from src/Front-end/app/src/main/res/values/strings.xml rename to src/app/src/main/res/values/strings.xml diff --git a/src/Front-end/app/src/main/res/values/themes.xml b/src/app/src/main/res/values/themes.xml similarity index 100% rename from src/Front-end/app/src/main/res/values/themes.xml rename to src/app/src/main/res/values/themes.xml diff --git a/src/Front-end/app/src/main/res/xml/backup_rules.xml b/src/app/src/main/res/xml/backup_rules.xml similarity index 100% rename from src/Front-end/app/src/main/res/xml/backup_rules.xml rename to src/app/src/main/res/xml/backup_rules.xml diff --git a/src/Front-end/app/src/main/res/xml/data_extraction_rules.xml b/src/app/src/main/res/xml/data_extraction_rules.xml similarity index 100% rename from src/Front-end/app/src/main/res/xml/data_extraction_rules.xml rename to src/app/src/main/res/xml/data_extraction_rules.xml diff --git a/src/Front-end/app/src/test/java/com/example/myapplication/ExampleUnitTest.java b/src/app/src/test/java/com/example/myapplication/ExampleUnitTest.java similarity index 100% rename from src/Front-end/app/src/test/java/com/example/myapplication/ExampleUnitTest.java rename to src/app/src/test/java/com/example/myapplication/ExampleUnitTest.java