diff --git a/.idea/misc.xml b/.idea/misc.xml index 360c39a..7e13972 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -15,6 +15,11 @@ + + + + + diff --git a/app/src/main/java/com/qtagger/Activity/NaviFragment/SearchFragment.java b/app/src/main/java/com/qtagger/Activity/NaviFragment/SearchFragment.java index d103082..fb6d13f 100644 --- a/app/src/main/java/com/qtagger/Activity/NaviFragment/SearchFragment.java +++ b/app/src/main/java/com/qtagger/Activity/NaviFragment/SearchFragment.java @@ -7,8 +7,11 @@ import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.TextView; +import com.qtagger.Activity.NavigationActivity; import com.qtagger.R; +import com.qtagger.util.DataManager; /** * A simple {@link Fragment} subclass. @@ -25,6 +28,7 @@ public class SearchFragment extends Fragment { // TODO: Rename and change types of parameters private String mParam1; private String mParam2; + private DataManager dataManager = DataManager.getInstance(); public SearchFragment() { // Required empty public constructor @@ -60,7 +64,32 @@ public class SearchFragment extends Fragment { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + + View view = inflater.inflate(R.layout.fragment_search,container,false); + + TextView txt = view.findViewById(R.id.textViewAccountAccTitle); + txt.setText(dataManager.testEnum.label()+"조회"); + + view.findViewById(R.id.imageFilterButton_Back).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + ((NavigationActivity) getActivity()).changeFragmentSelect(); + } + }); + view.findViewById(R.id.button_바코드).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + + } + }); + view.findViewById(R.id.button_방폐물목록).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + + } + }); + // Inflate the layout for this fragment - return inflater.inflate(R.layout.fragment_search, container, false); + return view; } } \ No newline at end of file diff --git a/app/src/main/java/com/qtagger/Activity/NaviFragment/SelectFragment.java b/app/src/main/java/com/qtagger/Activity/NaviFragment/SelectFragment.java index bd9c3bc..6979d7f 100644 --- a/app/src/main/java/com/qtagger/Activity/NaviFragment/SelectFragment.java +++ b/app/src/main/java/com/qtagger/Activity/NaviFragment/SelectFragment.java @@ -2,20 +2,27 @@ package com.qtagger.Activity.NaviFragment; import android.os.Bundle; +import androidx.constraintlayout.utils.widget.ImageFilterButton; import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentTransaction; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.FrameLayout; +import android.widget.Toast; +import com.qtagger.Activity.NavigationActivity; +import com.qtagger.Data.TestEnum; import com.qtagger.R; +import com.qtagger.util.DataManager; /** * A simple {@link Fragment} subclass. * Use the {@link SelectFragment#newInstance} factory method to * create an instance of this fragment. */ -public class SelectFragment extends Fragment { +public class SelectFragment extends Fragment { // TODO: Rename parameter arguments, choose names that match // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER @@ -25,6 +32,7 @@ public class SelectFragment extends Fragment { // TODO: Rename and change types of parameters private String mParam1; private String mParam2; + private DataManager dataManager = DataManager.getInstance(); public SelectFragment() { // Required empty public constructor @@ -60,7 +68,43 @@ public class SelectFragment extends Fragment { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + View view = inflater.inflate(R.layout.fragment_select,container,false); + + view.findViewById(R.id.button_발생지특성검사).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + dataManager.testEnum = TestEnum.발생지특성검사; + ((NavigationActivity) getActivity()).changeFragmentNaviSelect(); + + } + }); + + view.findViewById(R.id.button_예비검사).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + dataManager.testEnum = TestEnum.예비검사; + ((NavigationActivity) getActivity()).changeFragmentNaviSelect(); + } + }); + + view.findViewById(R.id.button_인수검사).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + dataManager.testEnum = TestEnum.인수검사; + ((NavigationActivity) getActivity()).changeFragmentNaviSelect(); + } + }); + + view.findViewById(R.id.button_처분검사).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + dataManager.testEnum = TestEnum.처분검사; + ((NavigationActivity) getActivity()).changeFragmentNaviSelect(); + } + }); + // Inflate the layout for this fragment - return inflater.inflate(R.layout.fragment_select, container, false); + return view; } + } \ No newline at end of file diff --git a/app/src/main/java/com/qtagger/Activity/NaviFragment/TestFragment.java b/app/src/main/java/com/qtagger/Activity/NaviFragment/TestFragment.java index b321956..a2c17a5 100644 --- a/app/src/main/java/com/qtagger/Activity/NaviFragment/TestFragment.java +++ b/app/src/main/java/com/qtagger/Activity/NaviFragment/TestFragment.java @@ -7,8 +7,11 @@ import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.TextView; +import com.qtagger.Activity.NavigationActivity; import com.qtagger.R; +import com.qtagger.util.DataManager; /** * A simple {@link Fragment} subclass. @@ -25,6 +28,7 @@ public class TestFragment extends Fragment { // TODO: Rename and change types of parameters private String mParam1; private String mParam2; + private DataManager dataManager = DataManager.getInstance(); public TestFragment() { // Required empty public constructor @@ -60,7 +64,51 @@ public class TestFragment extends Fragment { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + View view = inflater.inflate(R.layout.fragment_test,container,false); + + TextView txt = view.findViewById(R.id.textViewAccountAccTitle); + txt.setText(dataManager.testEnum.label()+"검사"); + + //selectFragment로 이동 + view.findViewById(R.id.imageFilterButton_Back).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + ((NavigationActivity) getActivity()).changeFragmentSelect(); + } + }); + view.findViewById(R.id.button_표면).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + + } + }); + view.findViewById(R.id.button_1m).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + + } + }); + view.findViewById(R.id.button_무게).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + + } + }); + view.findViewById(R.id.button_채움률).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + + } + }); + view.findViewById(R.id.button_사진).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + + } + }); + + // Inflate the layout for this fragment - return inflater.inflate(R.layout.fragment_test, container, false); + return view; } } \ No newline at end of file diff --git a/app/src/main/java/com/qtagger/Activity/NavigationActivity.java b/app/src/main/java/com/qtagger/Activity/NavigationActivity.java index c10060e..d64330e 100644 --- a/app/src/main/java/com/qtagger/Activity/NavigationActivity.java +++ b/app/src/main/java/com/qtagger/Activity/NavigationActivity.java @@ -13,8 +13,10 @@ import android.widget.Toast; import com.google.android.material.bottomnavigation.BottomNavigationView; import com.google.android.material.internal.NavigationMenu; import com.qtagger.Activity.NaviFragment.SearchFragment; +import com.qtagger.Activity.NaviFragment.SelectFragment; import com.qtagger.Activity.NaviFragment.SettingFragment; import com.qtagger.Activity.NaviFragment.TestFragment; +import com.qtagger.Data.TestEnum; import com.qtagger.R; import com.qtagger.databinding.ActivityMainBinding; import com.qtagger.util.DataManager; @@ -22,49 +24,109 @@ import com.qtagger.util.DataManager; public class NavigationActivity extends AppCompatActivity { private final long finishtimeed = 1000; private long presstime = 0; - private FragmentManager fragmentManager = getSupportFragmentManager(); private TestFragment testFragment = new TestFragment(); private SearchFragment searchFragment = new SearchFragment(); private SettingFragment settingFragment = new SettingFragment(); + private SelectFragment selectFragment = new SelectFragment(); private DataManager dataManager = DataManager.getInstance(); + public BottomNavigationView bottomNavigationView; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_navigation); + dataManager.fragmentManager = getSupportFragmentManager(); - FragmentTransaction transaction = fragmentManager.beginTransaction(); - transaction.replace(R.id.frame, testFragment).commitAllowingStateLoss(); + FragmentTransaction transaction = dataManager.fragmentManager.beginTransaction(); + transaction.replace(R.id.frame, selectFragment).commitAllowingStateLoss(); - BottomNavigationView bottomNavigationView = findViewById(R.id.nav_view); + bottomNavigationView = findViewById(R.id.nav_view); bottomNavigationView.setOnNavigationItemSelectedListener(new ItemSelectedListener()); + + } class ItemSelectedListener implements BottomNavigationView.OnNavigationItemSelectedListener { @Override public boolean onNavigationItemSelected(@NonNull MenuItem menuItem) { - FragmentTransaction transaction = fragmentManager.beginTransaction(); - - switch (menuItem.getItemId()) { - case R.id.navigation_test: - transaction.replace(R.id.frame, testFragment).commitAllowingStateLoss(); - break; - case R.id.navigation_search: - transaction.replace(R.id.frame, searchFragment).commitAllowingStateLoss(); - break; - case R.id.navigation_setting: - transaction.replace(R.id.frame, settingFragment).commitAllowingStateLoss(); - break; - - } + FragmentTransaction transaction = dataManager.fragmentManager.beginTransaction(); + changeFragment(menuItem.getItemId()); return true; } } + public void changeFragment(int itemId) + { + FragmentTransaction transaction = dataManager.fragmentManager.beginTransaction(); + switch (itemId) { + case R.id.navigation_test: + if(dataManager.testEnum == TestEnum.선택안함) { + transaction.replace(R.id.frame, selectFragment).commitAllowingStateLoss(); + Toast.makeText(getApplicationContext(), "검사 단계를 선택해주세요", Toast.LENGTH_SHORT).show(); + } + else { + transaction.replace(R.id.frame, testFragment).commitAllowingStateLoss(); + } + break; + case R.id.navigation_search: + if(dataManager.testEnum == TestEnum.선택안함) { + transaction.replace(R.id.frame, selectFragment).commitAllowingStateLoss(); + Toast.makeText(getApplicationContext(), "검사 단계를 선택해주세요", Toast.LENGTH_SHORT).show(); + } + else { + transaction.replace(R.id.frame, searchFragment).commitAllowingStateLoss(); + } + break; + case R.id.navigation_setting: + transaction.replace(R.id.frame, settingFragment).commitAllowingStateLoss(); + break; + + } + + } + + public void changeFragmentNaviSelect() + { + switch (bottomNavigationView.getSelectedItemId()) { + case R.id.navigation_test: + changeFragmentTest(); + break; + case R.id.navigation_search: + changeFragmentSearch(); + break; + + } + + } + + + public void changeFragmentTest() + { + FragmentTransaction transaction = dataManager.fragmentManager.beginTransaction(); + transaction.replace(R.id.frame, testFragment).commitAllowingStateLoss(); + } + public void changeFragmentSelect() + { + FragmentTransaction transaction = dataManager.fragmentManager.beginTransaction(); + transaction.replace(R.id.frame, selectFragment).commitAllowingStateLoss(); + } + public void changeFragmentSetting() + { + FragmentTransaction transaction = dataManager.fragmentManager.beginTransaction(); + transaction.replace(R.id.frame, settingFragment).commitAllowingStateLoss(); + } + public void changeFragmentSearch() + { + FragmentTransaction transaction = dataManager.fragmentManager.beginTransaction(); + transaction.replace(R.id.frame, searchFragment).commitAllowingStateLoss(); + } + + + @Override public void onBackPressed() { diff --git a/app/src/main/java/com/qtagger/Data/TestEnum.java b/app/src/main/java/com/qtagger/Data/TestEnum.java new file mode 100644 index 0000000..dfca31b --- /dev/null +++ b/app/src/main/java/com/qtagger/Data/TestEnum.java @@ -0,0 +1,14 @@ +package com.qtagger.Data; + +public enum TestEnum { + 선택안함("선택안함"),발생지특성검사("발생지특성"),예비검사("예비"),인수검사("인수"),처분검사("처분"); + private final String label; + + TestEnum(String label) { + this.label = label; + } + + public String label() { + return label; + } +} diff --git a/app/src/main/java/com/qtagger/util/DataManager.java b/app/src/main/java/com/qtagger/util/DataManager.java index cc9bef6..e949218 100644 --- a/app/src/main/java/com/qtagger/util/DataManager.java +++ b/app/src/main/java/com/qtagger/util/DataManager.java @@ -1,11 +1,16 @@ package com.qtagger.util; +import androidx.fragment.app.FragmentManager; + +import com.qtagger.Data.TestEnum; import com.qtagger.Database.Account; public class DataManager { private DataManager(){} public Account loginAccount; + public FragmentManager fragmentManager; + public TestEnum testEnum = TestEnum.선택안함; private static class DataManagerHolder{ public static final DataManager INSTANCE = new DataManager(); diff --git a/app/src/main/res/drawable/button_normal_background.xml b/app/src/main/res/drawable/button_normal_background.xml new file mode 100644 index 0000000..dae8fb3 --- /dev/null +++ b/app/src/main/res/drawable/button_normal_background.xml @@ -0,0 +1,20 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/font/notosanskr.otf b/app/src/main/res/font/notosanskr.otf new file mode 100644 index 0000000..5599581 Binary files /dev/null and b/app/src/main/res/font/notosanskr.otf differ diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml index 49cd1e5..7a93873 100644 --- a/app/src/main/res/layout/fragment_search.xml +++ b/app/src/main/res/layout/fragment_search.xml @@ -3,12 +3,80 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" + xmlns:app="http://schemas.android.com/apk/res-auto" tools:context=".Activity.NaviFragment.SearchFragment"> - + android:layout_height="match_parent"> + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_select.xml b/app/src/main/res/layout/fragment_select.xml index d8866ba..8d2aa7a 100644 --- a/app/src/main/res/layout/fragment_select.xml +++ b/app/src/main/res/layout/fragment_select.xml @@ -1,14 +1,100 @@ - + android:layout_height="match_parent"> + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_test.xml b/app/src/main/res/layout/fragment_test.xml index 287b230..1682c26 100644 --- a/app/src/main/res/layout/fragment_test.xml +++ b/app/src/main/res/layout/fragment_test.xml @@ -3,12 +3,127 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" + xmlns:app="http://schemas.android.com/apk/res-auto" tools:context=".Activity.NaviFragment.TestFragment"> - + android:layout_height="match_parent"> + + + + + + + + + + + + + + + + + \ No newline at end of file