diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml new file mode 100644 index 0000000..4e2e1e3 --- /dev/null +++ b/.idea/deploymentTargetDropDown.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts index ddca48b..848110c 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -45,7 +45,11 @@ dependencies { implementation("androidx.appcompat:appcompat:1.6.1") implementation("com.google.android.material:material:1.11.0") implementation("androidx.constraintlayout:constraintlayout:2.1.4") + implementation ("com.google.android.material:material:1.4.0") testImplementation("junit:junit:4.13.2") androidTestImplementation("androidx.test.ext:junit:1.1.5") androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") + implementation ("androidx.navigation:navigation-fragment-ktx:2.3.0") + implementation ("androidx.navigation:navigation-ui-ktx:2.3.0") + } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 44d453e..1dcf643 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -21,6 +21,8 @@ + + \ No newline at end of file diff --git a/app/src/main/java/com/example/brandol/AvartarFragment.kt b/app/src/main/java/com/example/brandol/AvartarFragment.kt index 699f5ba..ef3ccf4 100644 --- a/app/src/main/java/com/example/brandol/AvartarFragment.kt +++ b/app/src/main/java/com/example/brandol/AvartarFragment.kt @@ -5,7 +5,6 @@ import androidx.fragment.app.Fragment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import com.example.brandol.databinding.FragmentAvartarBinding private const val ARG_PARAM1 = "param1" @@ -15,7 +14,6 @@ private const val ARG_PARAM2 = "param2" class AvartarFragment : Fragment() { private var param1: String? = null private var param2: String? = null - lateinit var binding: FragmentAvartarBinding override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) arguments?.let { @@ -24,15 +22,6 @@ class AvartarFragment : Fragment() { } } - override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? - ): View? { - binding = FragmentAvartarBinding.inflate(inflater,container,false) - binding.abataChattingQuantity.bringToFront() - return binding.root - } - companion object { fun newInstance(param1: String, param2: String) = diff --git a/app/src/main/java/com/example/brandol/CatagoryFragment.kt b/app/src/main/java/com/example/brandol/CatagoryFragment.kt new file mode 100644 index 0000000..c9be269 --- /dev/null +++ b/app/src/main/java/com/example/brandol/CatagoryFragment.kt @@ -0,0 +1,17 @@ +package com.example.brandol + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.fragment.app.Fragment + +class CatagoryFragment : Fragment() { + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + return inflater.inflate(R.layout.fragment_catagory, container, false) + } +} diff --git a/app/src/main/java/com/example/brandol/MainActivity.kt b/app/src/main/java/com/example/brandol/MainActivity.kt index 4a0681f..84f36ed 100644 --- a/app/src/main/java/com/example/brandol/MainActivity.kt +++ b/app/src/main/java/com/example/brandol/MainActivity.kt @@ -14,6 +14,7 @@ class MainActivity : AppCompatActivity() { //바텀 네비게이션 initBottomnavigation() + } private fun initBottomnavigation() { diff --git a/app/src/main/java/com/example/brandol/PointDetailFragment.kt b/app/src/main/java/com/example/brandol/PointDetailFragment.kt new file mode 100644 index 0000000..79667a7 --- /dev/null +++ b/app/src/main/java/com/example/brandol/PointDetailFragment.kt @@ -0,0 +1,40 @@ +//package com.example.brandol +import PointDetailVPAdapter +import android.graphics.Color +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.fragment.app.Fragment +import com.example.brandol.databinding.FragmentPointDetailBinding +import com.google.android.material.tabs.TabLayout +import com.google.android.material.tabs.TabLayoutMediator + +class PointDetailFragment : Fragment() { + + private lateinit var binding: FragmentPointDetailBinding + private val tabTitles = arrayOf("전체", "획득", "사용") + //private val selectedColor = Color.parseColor("#800080") // 보라색 + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + binding = FragmentPointDetailBinding.inflate(inflater, container, false) + return binding.root + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + + // ViewPager2 어댑터 설정 + val adapter = PointDetailVPAdapter(this) + binding.pointUsePageVp.adapter = adapter + + // ViewPager2와 TabLayout 연결 + TabLayoutMediator(binding.pointUsePageTb, binding.pointUsePageVp) { tab, position -> + tab.text = tabTitles[position] + }.attach() + + } +} diff --git a/app/src/main/java/com/example/brandol/PointDetailVPAdapter.kt b/app/src/main/java/com/example/brandol/PointDetailVPAdapter.kt new file mode 100644 index 0000000..5d18dd2 --- /dev/null +++ b/app/src/main/java/com/example/brandol/PointDetailVPAdapter.kt @@ -0,0 +1,20 @@ +import androidx.fragment.app.Fragment +import androidx.viewpager2.adapter.FragmentStateAdapter +import com.example.brandol.PointUseGetFragment +import com.example.brandol.PointUseTotalFragment +import com.example.brandol.PointUseUseFragment + +class PointDetailVPAdapter(fragment: Fragment) : FragmentStateAdapter(fragment) { + + override fun getItemCount(): Int = 3 // 탭의 개수 + + override fun createFragment(position: Int): Fragment { + // 각 탭에 맞는 Fragment를 반환 + return when (position) { + 0 -> PointUseTotalFragment() + 1 -> PointUseGetFragment() + 2 -> PointUseUseFragment() + else -> throw IllegalArgumentException("Invalid position: $position") + } + } +} diff --git a/app/src/main/java/com/example/brandol/PointFragment.kt b/app/src/main/java/com/example/brandol/PointFragment.kt index 973760a..c87b5ac 100644 --- a/app/src/main/java/com/example/brandol/PointFragment.kt +++ b/app/src/main/java/com/example/brandol/PointFragment.kt @@ -1,10 +1,15 @@ package com.example.brandol +import android.content.Intent import android.os.Bundle import androidx.fragment.app.Fragment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.Button +import androidx.navigation.findNavController +import androidx.navigation.fragment.findNavController +import com.example.brandol.databinding.FragmentPointBinding // TODO: Rename parameter arguments, choose names that match // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER @@ -21,12 +26,15 @@ class PointFragment : Fragment() { private var param1: String? = null private var param2: String? = null + private lateinit var binding: FragmentPointBinding + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) arguments?.let { param1 = it.getString(ARG_PARAM1) param2 = it.getString(ARG_PARAM2) } + } override fun onCreateView( @@ -34,7 +42,23 @@ class PointFragment : Fragment() { savedInstanceState: Bundle? ): View? { // Inflate the layout for this fragment - return inflater.inflate(R.layout.fragment_point, container, false) + binding = FragmentPointBinding.inflate(inflater, container, false) + return binding.root + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + + /** + binding.pointUseIv.setOnClickListener { + startActivity(Intent(activity,PointDetailFragment::class.java)) + }**/ + + // "Go to PointDetailFragment" 버튼 클릭 시 + binding.pointUseIv.setOnClickListener { + // 화면 전환 + findNavController().navigate(R.id.action_pointFragment_to_pointDetailFragment3) + } } companion object { diff --git a/app/src/main/java/com/example/brandol/PointUseGetFragment.kt b/app/src/main/java/com/example/brandol/PointUseGetFragment.kt new file mode 100644 index 0000000..3002b36 --- /dev/null +++ b/app/src/main/java/com/example/brandol/PointUseGetFragment.kt @@ -0,0 +1,24 @@ +package com.example.brandol + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.fragment.app.Fragment +import com.example.brandol.databinding.FragmentPointUseGetBinding +import com.example.brandol.databinding.FragmentPointUseTotalBinding + +class PointUseGetFragment : Fragment() { + + lateinit var binding : FragmentPointUseGetBinding + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + binding = FragmentPointUseGetBinding.inflate(inflater,container,false) + + return binding.root + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/brandol/PointUseTotalFragment.kt b/app/src/main/java/com/example/brandol/PointUseTotalFragment.kt new file mode 100644 index 0000000..15d8b7d --- /dev/null +++ b/app/src/main/java/com/example/brandol/PointUseTotalFragment.kt @@ -0,0 +1,23 @@ +package com.example.brandol + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.fragment.app.Fragment +import com.example.brandol.databinding.FragmentPointUseTotalBinding + +class PointUseTotalFragment :Fragment() { + + lateinit var binding : FragmentPointUseTotalBinding + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + binding = FragmentPointUseTotalBinding.inflate(inflater,container,false) + + return binding.root + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/brandol/PointUseUseFragment.kt b/app/src/main/java/com/example/brandol/PointUseUseFragment.kt new file mode 100644 index 0000000..7fb7120 --- /dev/null +++ b/app/src/main/java/com/example/brandol/PointUseUseFragment.kt @@ -0,0 +1,24 @@ +package com.example.brandol + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.fragment.app.Fragment +import com.example.brandol.databinding.FragmentPointUseTotalBinding +import com.example.brandol.databinding.FragmentPointUseUseBinding + +class PointUseUseFragment : Fragment() { + + lateinit var binding : FragmentPointUseUseBinding + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + binding = FragmentPointUseUseBinding.inflate(inflater,container,false) + + return binding.root + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/brandol/SearchAvartarFragment.kt b/app/src/main/java/com/example/brandol/SearchAvartarFragment.kt new file mode 100644 index 0000000..356fa03 --- /dev/null +++ b/app/src/main/java/com/example/brandol/SearchAvartarFragment.kt @@ -0,0 +1,22 @@ +package com.example.brandol + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.fragment.app.Fragment +import com.example.brandol.databinding.FragmentSearchAvartarBinding + +class SearchAvartarFragment : Fragment() { + lateinit var binding : FragmentSearchAvartarBinding + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + binding = FragmentSearchAvartarBinding.inflate(inflater,container,false) + + return binding.root + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/brandol/SearchBarFragment.kt b/app/src/main/java/com/example/brandol/SearchBarFragment.kt new file mode 100644 index 0000000..c476f22 --- /dev/null +++ b/app/src/main/java/com/example/brandol/SearchBarFragment.kt @@ -0,0 +1,70 @@ +package com.example.brandol + +import android.graphics.Color +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.fragment.app.Fragment +import androidx.viewpager2.widget.ViewPager2 +import com.example.brandol.databinding.FragmentSearchBarBinding +import com.google.android.material.tabs.TabLayout +import com.google.android.material.tabs.TabLayoutMediator + +class SearchBarFragment : Fragment() { + + private lateinit var binding: FragmentSearchBarBinding + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + + binding = FragmentSearchBarBinding.inflate(inflater, container, false) + + // TabLayout 초기화 + val tabLayout: TabLayout = binding.searchBarTb + + // 탭의 제목 리스트 + val tabTitles = arrayListOf("브랜드", "유저", "콘텐츠", "아바타 스토어") + + // ViewPager2 초기화 + val viewPager: ViewPager2 = binding.searchBarVp + val adapter = SearchPagerAdapter(childFragmentManager, lifecycle) + viewPager.adapter = adapter + + // TabLayout에 ViewPager2 연결 + TabLayoutMediator(binding.searchBarTb, binding.searchBarVp) { + tab, position -> + tab.text = tabTitles[position] + }.attach() + + // Tab이 선택되었을 때의 색상 변경 + tabLayout.addOnTabSelectedListener(object : TabLayout.OnTabSelectedListener { + override fun onTabSelected(tab: TabLayout.Tab?) { + // 선택된 탭의 색상 변경 + tab?.text?.let { + when (it) { + "브랜드" -> tab.view.setBackgroundColor(Color.BLUE) + "유저" -> tab.view.setBackgroundColor(Color.BLUE) + "콘텐츠" -> tab.view.setBackgroundColor(Color.BLUE) + "아바타 스토어" -> tab.view.setBackgroundColor(Color.BLUE) + } + } + } + + override fun onTabUnselected(tab: TabLayout.Tab?) { + // 선택 해제된 탭의 색상 초기화 + tab?.view?.setBackgroundColor(Color.TRANSPARENT) + } + + override fun onTabReselected(tab: TabLayout.Tab?) { + // 재선택된 탭의 색상 변경 (여기서는 동일하게 처리) + onTabSelected(tab) + } + }) + + return binding.root + } +} + diff --git a/app/src/main/java/com/example/brandol/SearchBrandFragment.kt b/app/src/main/java/com/example/brandol/SearchBrandFragment.kt new file mode 100644 index 0000000..fb66834 --- /dev/null +++ b/app/src/main/java/com/example/brandol/SearchBrandFragment.kt @@ -0,0 +1,23 @@ +package com.example.brandol + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.fragment.app.Fragment +import com.example.brandol.databinding.FragmentSearchBrandBinding + +class SearchBrandFragment : Fragment() { + + lateinit var binding : FragmentSearchBrandBinding + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + binding = FragmentSearchBrandBinding.inflate(inflater,container,false) + + return binding.root + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/brandol/SearchContentFragment.kt b/app/src/main/java/com/example/brandol/SearchContentFragment.kt new file mode 100644 index 0000000..e9d1fb3 --- /dev/null +++ b/app/src/main/java/com/example/brandol/SearchContentFragment.kt @@ -0,0 +1,22 @@ +package com.example.brandol + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.fragment.app.Fragment +import com.example.brandol.databinding.FragmentSearchContentBinding + +class SearchContentFragment : Fragment() { + lateinit var binding : FragmentSearchContentBinding + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + binding = FragmentSearchContentBinding.inflate(inflater,container,false) + + return binding.root + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/brandol/SearchFragment.kt b/app/src/main/java/com/example/brandol/SearchFragment.kt index 892ad1a..60b4b41 100644 --- a/app/src/main/java/com/example/brandol/SearchFragment.kt +++ b/app/src/main/java/com/example/brandol/SearchFragment.kt @@ -5,6 +5,9 @@ import androidx.fragment.app.Fragment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import androidx.fragment.app.FragmentActivity +import androidx.viewpager2.adapter.FragmentStateAdapter +import com.example.brandol.databinding.FragmentSearchBinding // TODO: Rename parameter arguments, choose names that match // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER @@ -28,15 +31,46 @@ class SearchFragment : Fragment() { param2 = it.getString(ARG_PARAM2) } } + private lateinit var binding: FragmentSearchBinding override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View? { + binding = FragmentSearchBinding.inflate(inflater, container, false) // 데이터 바인딩 초기화 + + // ViewPager2 초기화 + binding.catagoryContentVp.adapter = CategoryPagerAdapter(requireActivity()) + + // 검색 버튼 클릭 이벤트 처리 + binding.btnSearchBarIb.setOnClickListener { + // SearchBarFragment로 직접 화면 전환 + val searchBarFragment = SearchBarFragment() + val transaction = parentFragmentManager.beginTransaction() + transaction.replace(R.id.btn_search_bar_Fl, searchBarFragment) + //transaction.addToBackStack(null) + transaction.commit() + } + + return binding.root // Inflate the layout for this fragment - return inflater.inflate(R.layout.fragment_search, container, false) + //return inflater.inflate(R.layout.fragment_search, container, false) + } + private inner class CategoryPagerAdapter(fragmentActivity: FragmentActivity) : + FragmentStateAdapter(fragmentActivity) { + + override fun getItemCount(): Int { + // Return the number of fragments/pages + return 1 + } + + override fun createFragment(position: Int): Fragment { + // Return the fragment associated with the specified position + return CatagoryFragment() // Assuming CategoryFragment is the fragment_catagory.xml fragment + } } + companion object { /** * Use this factory method to create a new instance of @@ -56,4 +90,6 @@ class SearchFragment : Fragment() { } } } + + } \ No newline at end of file diff --git a/app/src/main/java/com/example/brandol/SearchPagerAdapter.kt b/app/src/main/java/com/example/brandol/SearchPagerAdapter.kt new file mode 100644 index 0000000..6654963 --- /dev/null +++ b/app/src/main/java/com/example/brandol/SearchPagerAdapter.kt @@ -0,0 +1,21 @@ +package com.example.brandol + +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.lifecycle.Lifecycle +import androidx.viewpager2.adapter.FragmentStateAdapter + +class SearchPagerAdapter(fragment: FragmentManager, lifecycle: Lifecycle) : FragmentStateAdapter(fragment, lifecycle) { + + override fun getItemCount(): Int = 4 + + override fun createFragment(position: Int): Fragment { + return when (position) { + 0 -> SearchBrandFragment() + 1 -> SearchUserFragment() + 2 -> SearchContentFragment() + 3 -> SearchAvartarFragment() + else -> throw IllegalArgumentException("Invalid position: $position") + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/brandol/SearchUserFragment.kt b/app/src/main/java/com/example/brandol/SearchUserFragment.kt new file mode 100644 index 0000000..f1f68e6 --- /dev/null +++ b/app/src/main/java/com/example/brandol/SearchUserFragment.kt @@ -0,0 +1,22 @@ +package com.example.brandol + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.fragment.app.Fragment +import com.example.brandol.databinding.FragmentSearchUserBinding + +class SearchUserFragment : Fragment() { + lateinit var binding : FragmentSearchUserBinding + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + binding = FragmentSearchUserBinding.inflate(inflater,container,false) + + return binding.root + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/avartar_store_item1.png b/app/src/main/res/drawable/avartar_store_item1.png new file mode 100644 index 0000000..09fc584 Binary files /dev/null and b/app/src/main/res/drawable/avartar_store_item1.png differ diff --git a/app/src/main/res/drawable/border_background.xml b/app/src/main/res/drawable/border_background.xml new file mode 100644 index 0000000..375d044 --- /dev/null +++ b/app/src/main/res/drawable/border_background.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/btn_back.png b/app/src/main/res/drawable/btn_back.png new file mode 100644 index 0000000..5fc5b0f Binary files /dev/null and b/app/src/main/res/drawable/btn_back.png differ diff --git a/app/src/main/res/drawable/btn_chat.png b/app/src/main/res/drawable/btn_chat.png new file mode 100644 index 0000000..1b739a3 Binary files /dev/null and b/app/src/main/res/drawable/btn_chat.png differ diff --git a/app/src/main/res/drawable/btn_like.png b/app/src/main/res/drawable/btn_like.png new file mode 100644 index 0000000..c1e81d7 Binary files /dev/null and b/app/src/main/res/drawable/btn_like.png differ diff --git a/app/src/main/res/drawable/btn_point_use.png b/app/src/main/res/drawable/btn_point_use.png new file mode 100644 index 0000000..b26e55e Binary files /dev/null and b/app/src/main/res/drawable/btn_point_use.png differ diff --git a/app/src/main/res/drawable/btn_search_bar.png b/app/src/main/res/drawable/btn_search_bar.png new file mode 100644 index 0000000..5daf919 Binary files /dev/null and b/app/src/main/res/drawable/btn_search_bar.png differ diff --git a/app/src/main/res/drawable/btn_search_glasses.png b/app/src/main/res/drawable/btn_search_glasses.png new file mode 100644 index 0000000..bae4e68 Binary files /dev/null and b/app/src/main/res/drawable/btn_search_glasses.png differ diff --git a/app/src/main/res/drawable/btn_search_x.png b/app/src/main/res/drawable/btn_search_x.png new file mode 100644 index 0000000..ef017aa Binary files /dev/null and b/app/src/main/res/drawable/btn_search_x.png differ diff --git a/app/src/main/res/drawable/btn_search_x_2.png b/app/src/main/res/drawable/btn_search_x_2.png new file mode 100644 index 0000000..2bba990 Binary files /dev/null and b/app/src/main/res/drawable/btn_search_x_2.png differ diff --git a/app/src/main/res/drawable/img_box.png b/app/src/main/res/drawable/img_box.png new file mode 100644 index 0000000..c450f2f Binary files /dev/null and b/app/src/main/res/drawable/img_box.png differ diff --git a/app/src/main/res/drawable/img_box_big.png b/app/src/main/res/drawable/img_box_big.png new file mode 100644 index 0000000..5bce4c8 Binary files /dev/null and b/app/src/main/res/drawable/img_box_big.png differ diff --git a/app/src/main/res/drawable/img_box_long.png b/app/src/main/res/drawable/img_box_long.png new file mode 100644 index 0000000..0d47add Binary files /dev/null and b/app/src/main/res/drawable/img_box_long.png differ diff --git a/app/src/main/res/drawable/img_brandol.png b/app/src/main/res/drawable/img_brandol.png new file mode 100644 index 0000000..d72c292 Binary files /dev/null and b/app/src/main/res/drawable/img_brandol.png differ diff --git a/app/src/main/res/drawable/img_brandol_logo.png b/app/src/main/res/drawable/img_brandol_logo.png new file mode 100644 index 0000000..f3d6072 Binary files /dev/null and b/app/src/main/res/drawable/img_brandol_logo.png differ diff --git a/app/src/main/res/drawable/img_content_img.png b/app/src/main/res/drawable/img_content_img.png new file mode 100644 index 0000000..ebd73cd Binary files /dev/null and b/app/src/main/res/drawable/img_content_img.png differ diff --git a/app/src/main/res/drawable/img_line.png b/app/src/main/res/drawable/img_line.png new file mode 100644 index 0000000..6c66fcf Binary files /dev/null and b/app/src/main/res/drawable/img_line.png differ diff --git a/app/src/main/res/drawable/img_line_bright.png b/app/src/main/res/drawable/img_line_bright.png new file mode 100644 index 0000000..14a8bd3 Binary files /dev/null and b/app/src/main/res/drawable/img_line_bright.png differ diff --git a/app/src/main/res/drawable/img_line_l.png b/app/src/main/res/drawable/img_line_l.png new file mode 100644 index 0000000..bd9c514 Binary files /dev/null and b/app/src/main/res/drawable/img_line_l.png differ diff --git a/app/src/main/res/drawable/img_long_box.png b/app/src/main/res/drawable/img_long_box.png new file mode 100644 index 0000000..fd23801 Binary files /dev/null and b/app/src/main/res/drawable/img_long_box.png differ diff --git a/app/src/main/res/drawable/img_mini_char.png b/app/src/main/res/drawable/img_mini_char.png new file mode 100644 index 0000000..16dbffd Binary files /dev/null and b/app/src/main/res/drawable/img_mini_char.png differ diff --git a/app/src/main/res/drawable/img_plus.png b/app/src/main/res/drawable/img_plus.png new file mode 100644 index 0000000..d335901 Binary files /dev/null and b/app/src/main/res/drawable/img_plus.png differ diff --git a/app/src/main/res/drawable/img_puple_box.png b/app/src/main/res/drawable/img_puple_box.png new file mode 100644 index 0000000..8a9be59 Binary files /dev/null and b/app/src/main/res/drawable/img_puple_box.png differ diff --git a/app/src/main/res/drawable/img_search_glasses_black.png b/app/src/main/res/drawable/img_search_glasses_black.png new file mode 100644 index 0000000..7888d85 Binary files /dev/null and b/app/src/main/res/drawable/img_search_glasses_black.png differ diff --git a/app/src/main/res/drawable/img_user_char.png b/app/src/main/res/drawable/img_user_char.png new file mode 100644 index 0000000..8298132 Binary files /dev/null and b/app/src/main/res/drawable/img_user_char.png differ diff --git a/app/src/main/res/drawable/object_default_backgroud.xml b/app/src/main/res/drawable/object_default_backgroud.xml new file mode 100644 index 0000000..2d47fe6 --- /dev/null +++ b/app/src/main/res/drawable/object_default_backgroud.xml @@ -0,0 +1,14 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 0935b9b..948953b 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -17,7 +17,7 @@ + android:background="#D9D9D9" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_point.xml b/app/src/main/res/layout/fragment_point.xml index 12a1722..4ee260a 100644 --- a/app/src/main/res/layout/fragment_point.xml +++ b/app/src/main/res/layout/fragment_point.xml @@ -1,15 +1,235 @@ - + - + android:layout_height="wrap_content" + android:orientation="vertical"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_point_detail.xml b/app/src/main/res/layout/fragment_point_detail.xml new file mode 100644 index 0000000..be8b279 --- /dev/null +++ b/app/src/main/res/layout/fragment_point_detail.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_point_use_get.xml b/app/src/main/res/layout/fragment_point_use_get.xml new file mode 100644 index 0000000..0f19d11 --- /dev/null +++ b/app/src/main/res/layout/fragment_point_use_get.xml @@ -0,0 +1,155 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_point_use_total.xml b/app/src/main/res/layout/fragment_point_use_total.xml new file mode 100644 index 0000000..79d3af3 --- /dev/null +++ b/app/src/main/res/layout/fragment_point_use_total.xml @@ -0,0 +1,224 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_point_use_use.xml b/app/src/main/res/layout/fragment_point_use_use.xml new file mode 100644 index 0000000..d8e1880 --- /dev/null +++ b/app/src/main/res/layout/fragment_point_use_use.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml index 2842980..85d73a7 100644 --- a/app/src/main/res/layout/fragment_search.xml +++ b/app/src/main/res/layout/fragment_search.xml @@ -1,15 +1,67 @@ - + android:layout_height="match_parent"> - - + android:layout_height="match_parent"> - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_search_avartar.xml b/app/src/main/res/layout/fragment_search_avartar.xml new file mode 100644 index 0000000..01466c4 --- /dev/null +++ b/app/src/main/res/layout/fragment_search_avartar.xml @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_search_bar.xml b/app/src/main/res/layout/fragment_search_bar.xml new file mode 100644 index 0000000..b1e918a --- /dev/null +++ b/app/src/main/res/layout/fragment_search_bar.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_search_brand.xml b/app/src/main/res/layout/fragment_search_brand.xml new file mode 100644 index 0000000..8af797a --- /dev/null +++ b/app/src/main/res/layout/fragment_search_brand.xml @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_search_content.xml b/app/src/main/res/layout/fragment_search_content.xml new file mode 100644 index 0000000..7f9cd3c --- /dev/null +++ b/app/src/main/res/layout/fragment_search_content.xml @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_search_user.xml b/app/src/main/res/layout/fragment_search_user.xml new file mode 100644 index 0000000..4eef3e2 --- /dev/null +++ b/app/src/main/res/layout/fragment_search_user.xml @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/bottom_navigation_menu.xml b/app/src/main/res/menu/bottom_navigation_menu.xml index 08959c2..285cdd0 100644 --- a/app/src/main/res/menu/bottom_navigation_menu.xml +++ b/app/src/main/res/menu/bottom_navigation_menu.xml @@ -6,7 +6,6 @@ diff --git a/app/src/main/res/navigation/navigation.xml b/app/src/main/res/navigation/navigation.xml new file mode 100644 index 0000000..2a0daf0 --- /dev/null +++ b/app/src/main/res/navigation/navigation.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index c8524cd..0a2cc0b 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -2,4 +2,9 @@ #FF000000 #FFFFFFFF + #A40DBD + #979595 + #FF7575 + #6B68FF + #F9F9F9 \ No newline at end of file