diff --git a/EarthGardener/.idea/misc.xml b/EarthGardener/.idea/misc.xml index b61b36d..d5d3414 100644 --- a/EarthGardener/.idea/misc.xml +++ b/EarthGardener/.idea/misc.xml @@ -39,7 +39,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -49,4 +79,11 @@ + + + \ No newline at end of file diff --git a/EarthGardener/app/src/main/AndroidManifest.xml b/EarthGardener/app/src/main/AndroidManifest.xml index 2950352..80eafdf 100644 --- a/EarthGardener/app/src/main/AndroidManifest.xml +++ b/EarthGardener/app/src/main/AndroidManifest.xml @@ -33,6 +33,15 @@ + + + diff --git a/EarthGardener/app/src/main/java/team/gdsc/earthgardener/presentation/MainActivity.kt b/EarthGardener/app/src/main/java/team/gdsc/earthgardener/presentation/MainActivity.kt index a65b505..ca54622 100644 --- a/EarthGardener/app/src/main/java/team/gdsc/earthgardener/presentation/MainActivity.kt +++ b/EarthGardener/app/src/main/java/team/gdsc/earthgardener/presentation/MainActivity.kt @@ -29,6 +29,7 @@ class MainActivity : AppCompatActivity() { setContentView(binding.root) initViews() + setFloatingActionButton() initBottomNavigationView() binding.fabWrite.setOnClickListener { @@ -38,6 +39,12 @@ class MainActivity : AppCompatActivity() { } + private fun setFloatingActionButton() { + binding.fabPost.setOnClickListener { + startActivity(Intent(this, PostFormActivity::class.java)) + } + } + private fun initViews() { bottomNavigationView = binding.bnvMain } diff --git a/EarthGardener/app/src/main/res/drawable/bg_home.xml b/EarthGardener/app/src/main/res/drawable/bg_home.xml new file mode 100644 index 0000000..b26e3db --- /dev/null +++ b/EarthGardener/app/src/main/res/drawable/bg_home.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + diff --git a/EarthGardener/app/src/main/res/drawable/ic_edit.xml b/EarthGardener/app/src/main/res/drawable/ic_edit.xml new file mode 100644 index 0000000..3145b9f --- /dev/null +++ b/EarthGardener/app/src/main/res/drawable/ic_edit.xml @@ -0,0 +1,28 @@ + + + + + diff --git a/EarthGardener/app/src/main/res/drawable/img_tree_level_1.xml b/EarthGardener/app/src/main/res/drawable/img_tree_level_1.xml new file mode 100644 index 0000000..20d665b --- /dev/null +++ b/EarthGardener/app/src/main/res/drawable/img_tree_level_1.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + diff --git a/EarthGardener/app/src/main/res/drawable/img_tree_level_2.xml b/EarthGardener/app/src/main/res/drawable/img_tree_level_2.xml new file mode 100644 index 0000000..15d17ec --- /dev/null +++ b/EarthGardener/app/src/main/res/drawable/img_tree_level_2.xml @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/EarthGardener/app/src/main/res/drawable/img_tree_level_3.xml b/EarthGardener/app/src/main/res/drawable/img_tree_level_3.xml new file mode 100644 index 0000000..025390d --- /dev/null +++ b/EarthGardener/app/src/main/res/drawable/img_tree_level_3.xml @@ -0,0 +1,107 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/EarthGardener/app/src/main/res/drawable/img_tree_level_4.xml b/EarthGardener/app/src/main/res/drawable/img_tree_level_4.xml new file mode 100644 index 0000000..18620d2 --- /dev/null +++ b/EarthGardener/app/src/main/res/drawable/img_tree_level_4.xml @@ -0,0 +1,164 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/EarthGardener/app/src/main/res/drawable/img_tree_level_5.xml b/EarthGardener/app/src/main/res/drawable/img_tree_level_5.xml new file mode 100644 index 0000000..82ae077 --- /dev/null +++ b/EarthGardener/app/src/main/res/drawable/img_tree_level_5.xml @@ -0,0 +1,207 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/EarthGardener/app/src/main/res/drawable/selector_edit_text_tracker_green.xml b/EarthGardener/app/src/main/res/drawable/selector_edit_text_tracker_green.xml new file mode 100644 index 0000000..622b286 --- /dev/null +++ b/EarthGardener/app/src/main/res/drawable/selector_edit_text_tracker_green.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/EarthGardener/app/src/main/res/layout/activity_main.xml b/EarthGardener/app/src/main/res/layout/activity_main.xml index 646d81f..be60910 100644 --- a/EarthGardener/app/src/main/res/layout/activity_main.xml +++ b/EarthGardener/app/src/main/res/layout/activity_main.xml @@ -15,12 +15,18 @@ app:layout_constraintTop_toTopOf="parent" /> + android:backgroundTint="@color/secondary_green" + android:layout_margin="20dp" + android:src="@drawable/ic_edit" + app:layout_anchor="@id/fcv_main" + app:layout_anchorGravity="bottom|right|end" + app:layout_constraintBottom_toTopOf="@id/bnv_main" + app:layout_constraintEnd_toEndOf="parent" + tools:ignore="ContentDescription" /> + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/EarthGardener/app/src/main/res/layout/fragment_home.xml b/EarthGardener/app/src/main/res/layout/fragment_home.xml index e683e26..b3197a9 100644 --- a/EarthGardener/app/src/main/res/layout/fragment_home.xml +++ b/EarthGardener/app/src/main/res/layout/fragment_home.xml @@ -1,14 +1,268 @@ - - - - + + + + + + + android:layout_height="match_parent"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file + \ No newline at end of file diff --git a/EarthGardener/app/src/main/res/values/strings.xml b/EarthGardener/app/src/main/res/values/strings.xml index 3ef9937..f52e422 100644 --- a/EarthGardener/app/src/main/res/values/strings.xml +++ b/EarthGardener/app/src/main/res/values/strings.xml @@ -34,6 +34,7 @@ 도움말 로그아웃 회원탈퇴 + 1/31 1월 @@ -60,4 +61,14 @@ 사진 인증 저장하기 + + 지구를 지켜보아요 + 지금 자라고있는 나무 + 지구를 지키기위한 발자취 + 이번 달에 심은 나무 + 전체 나무 개수 + 다음으로 키울 식물의\n이름을 정해주세요. + 나무를 완성할때 마다 정할 수 있어요. + 나무 이름을 작성하세요 + \ No newline at end of file