Skip to content

Commit

Permalink
Merge branch 'feature/15-Home-Logic' into feature/11-post-form-activity
Browse files Browse the repository at this point in the history
  • Loading branch information
@visionWWW
visionWWW committed Feb 4, 2022
2 parents bb7d930 + d539a35 commit 8bdb749
Show file tree
Hide file tree
Showing 15 changed files with 1,132 additions and 15 deletions.
37 changes: 37 additions & 0 deletions EarthGardener/.idea/misc.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions EarthGardener/app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,15 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name=".presentation.post.PostFormActivity"
android:theme="@style/Theme.EarthGardener"
android:exported="false" />
<activity
android:name=".presentation.MainActivity"
android:theme="@style/Theme.EarthGardener"
android:exported="false">
</activity>

</application>

Expand Down
7 changes: 7 additions & 0 deletions EarthGardener/app/src/main/java/team/gdsc/earthgardener/presentation/MainActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ class MainActivity : AppCompatActivity() {
setContentView(binding.root)

initViews()
setFloatingActionButton()
initBottomNavigationView()

binding.fabWrite.setOnClickListener {
Expand All @@ -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
}
Expand Down
29 changes: 29 additions & 0 deletions EarthGardener/app/src/main/res/drawable/bg_home.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="398dp"
android:height="125dp"
android:viewportWidth="398"
android:viewportHeight="125">
<path
android:pathData="M0,0H398V125H0V0Z">
<aapt:attr name="android:fillColor">
<gradient
android:startY="-22.5291"
android:startX="-27.064"
android:endY="224.046"
android:endX="223.677"
android:type="linear">
<item android:offset="0" android:color="#FF47AC94"/>
<item android:offset="1" android:color="#47AC94"/>
</gradient>
</aapt:attr>
</path>
<path
android:pathData="M397.5,125C380.362,125 363.393,121.767 347.56,115.485C331.727,109.203 317.341,99.996 305.223,88.388C293.105,76.781 283.492,63.001 276.934,47.835C270.375,32.67 267,16.415 267,0L397.5,0V125Z"
android:fillColor="#ffffff"
android:fillAlpha="0.15"/>
<path
android:pathData="M315,124.5C315,103.15 323.481,82.675 338.578,67.578C353.675,52.481 374.15,44 395.5,44V124.5H315Z"
android:fillColor="#ffffff"
android:fillAlpha="0.15"/>
</vector>
28 changes: 28 additions & 0 deletions EarthGardener/app/src/main/res/drawable/ic_edit.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M13.7474,20.4429H21"
android:strokeLineJoin="round"
android:strokeWidth="1.5"
android:fillColor="#00000000"
android:strokeColor="#ffffff"
android:strokeLineCap="round"/>
<path
android:pathData="M12.78,3.7948C13.5557,2.8678 14.95,2.7319 15.8962,3.4917C15.9485,3.533 17.6295,4.8388 17.6295,4.8388C18.669,5.4672 18.992,6.8031 18.3494,7.8226C18.3153,7.8772 8.8119,19.7645 8.8119,19.7645C8.4958,20.1589 8.0158,20.3918 7.5029,20.3973L3.8635,20.443L3.0435,16.9723C2.9287,16.4843 3.0435,15.9718 3.3597,15.5773L12.78,3.7948Z"
android:strokeLineJoin="round"
android:strokeWidth="1.5"
android:fillColor="#00000000"
android:fillType="evenOdd"
android:strokeColor="#ffffff"
android:strokeLineCap="round"/>
<path
android:pathData="M11.0209,6.0009L16.4731,10.188"
android:strokeLineJoin="round"
android:strokeWidth="1.5"
android:fillColor="#00000000"
android:strokeColor="#ffffff"
android:strokeLineCap="round"/>
</vector>
61 changes: 61 additions & 0 deletions EarthGardener/app/src/main/res/drawable/img_tree_level_1.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="200dp"
android:height="200dp"
android:viewportWidth="200"
android:viewportHeight="200">
<path
android:pathData="M131.7,107.87a46,46 0,0 1,9 13.1,31.84 31.84,0 0,1 2.29,9 68.53,68.53 0,0 1,0.46 7.58,48.45 48.45,0 0,1 -1.36,11.18 38.08,38.08 0,0 1,-3.17 8.74,33.86 33.86,0 0,1 -4.34,6.51 33.36,33.36 0,0 1,-4.72 4.56,32.92 32.92,0 0,1 -4.32,2.9 28.73,28.73 0,0 1,-3.16 1.53c-0.12,0 -1.1,0.53 -1.22,0.44s10.8,8.5 -20.23,8.5 -21.72,-8.39 -21.72,-8.39c-32.4,-13.33 -20.45,-50.1 -20.45,-50.1s3.33,-10 8.16,-15.52H131.7"
android:fillColor="#9f6f49"/>
<path
android:pathData="M79.3,173.61s20.91,6.66 41.83,-0.23"
android:strokeWidth="0.23"
android:fillColor="#00000000"
android:strokeColor="#000"/>
<path
android:pathData="M70.11,117.53s29.4,4.13 57.23,0"
android:strokeWidth="0.23"
android:fillColor="#00000000"
android:strokeColor="#000"/>
<path
android:pathData="M75.16,126.49s22.8,4.6 57.37,0"
android:strokeWidth="0.17"
android:fillColor="#00000000"
android:strokeColor="#000"/>
<path
android:pathData="M73.8,109.94l2.35,0.23c4.69,0.48 9.39,0.45 14.1,0.5 5.44,0.06 10.89,0.07 16.33,-0.06 4,-0.1 8,0.15 12,0a62.33,62.33 0,0 0,7.59 -0.76c1.25,-0.2 2.5,-0.44 3.74,-0.72 0.68,-0.15 2.39,-0.89 1.38,-1.76 -1.27,-1.1 -4.1,-1.06 -5.66,-1.19 -11,-0.9 -22,-1.1 -33.07,-1 -2.79,0 -5.59,0.1 -8.39,0.21 -5.14,0.19 -10.74,0.06 -15.74,1.39l-0.46,0.12c-1.36,0.4 -1.47,1.27 -0.21,1.8A21.54,21.54 0,0 0,73.8 109.94Z"
android:fillColor="#5d3b21"/>
<path
android:pathData="M81.7,80.22s17.57,11.25 18.67,30.07"
android:strokeWidth="1.15"
android:fillColor="#00000000"
android:strokeColor="#60503c"/>
<path
android:pathData="M100.4,110.63s-4.87,-25.51 6.18,-40.79"
android:strokeWidth="1.15"
android:fillColor="#00000000"
android:strokeColor="#60503c"/>
<path
android:pathData="M102.82,71.29a6.38,6.38 0,0 0,-2.36 4.85c-0.14,3.3 4,8.26 8.88,7.6a2.17,2.17 0,0 1,2.2 0.83,4.14 4.14,0 0,0 4.35,1 2.65,2.65 0,0 1,2.44 0.23,6.16 6.16,0 0,0 3,0.49c1.87,-0.11 2.09,0.33 2.09,0.33s2.1,-7.37 0,-12.66 -5.27,-7.27 -5.27,-7.27 -4.29,-2.81 -8.75,-1.27A12.78,12.78 0,0 0,102.82 71.29Z"
android:fillColor="#d7e3ce"/>
<path
android:pathData="M109.05,70.44a3.06,3.06 0,0 1,2.13 -0.27A12.17,12.17 0,0 1,118 73.89a14.26,14.26 0,0 1,3.51 7,0.3 0.3,0 0,1 0,0.21 0.23,0.23 0,0 1,-0.33 0,0.68 0.68,0 0,1 -0.21,-0.3 20.1,20.1 0,0 0,-3.32 -5.2,12.75 12.75,0 0,0 -5.07,-3.48 21.87,21.87 0,0 0,-3 -0.73,1.25 1.25,0 0,1 -0.81,-0.39S108.59,70.74 109.05,70.44Z"
android:fillColor="#465a40"/>
<path
android:pathData="M106.84,73.3a32.13,32.13 0,0 1,5.46 0.94,8.89 8.89,0 0,1 4.6,2.53 8.42,8.42 0,0 1,1.81 2.29c0.77,1.53 1.21,3.65 1.57,4.42 -0.85,-1.19 -1.93,-3.29 -2.63,-4.23 -1.73,-2.31 -4.74,-3.55 -7.83,-3.81a0.44,0.44 0,0 0,-0.39 0.08c-0.17,0.15 0,0.4 0.14,0.53a10.65,10.65 0,0 0,3.22 1.41,14.68 14.68,0 0,1 6.38,6.12c-3.24,-3.13 -6.56,-4.33 -8.52,-5.45a1,1 0,0 0,-1 -0.14,64.63 64.63,0 0,1 8.72,6.23c-0.51,0.16 -4.49,-2.36 -6,-3.25 -0.42,-0.25 -0.89,-0.72 -1.29,-1a29.82,29.82 0,0 0,-2.71 -1.67,6.31 6.31,0 0,0 0.82,1.17c0.79,0.88 7,4.2 8.07,4.85 -0.47,0.33 -6.2,-2.17 -6.64,-2.48a10.94,10.94 0,0 1,-3 -2.66c-0.44,-0.65 -0.76,-1.37 -1.23,-2a5.87,5.87 0,0 0,-3.62 -2.2c-0.24,0 -0.54,-0.13 -0.55,-0.37a0.52,0.52 0,0 1,0.1 -0.26,2.61 2.61,0 0,1 2,-0.77A10.53,10.53 0,0 1,106.84 73.3Z"
android:fillColor="#465a40"/>
<path
android:pathData="M110,67.24c-0.26,0.16 -0.59,0.2 -0.68,0.48a0.68,0.68 0,0 0,0.3 0.77,1.26 1.26,0 0,0 0.67,0.13c0.78,0 1.57,-0.09 2.35,0a8.43,8.43 0,0 1,3.46 1.14,13.16 13.16,0 0,1 6.6,10.86 11.73,11.73 0,0 0,-9.5 -13.46S110.76,66.77 110,67.24Z"
android:fillColor="#465a40"/>
<path
android:pathData="M79.19,75.48S87.64,71.33 92,80.85A11.14,11.14 0,0 1,88.61 94c-4,3.34 -8.69,5.56 -12.91,4.29a41,41 0,0 0,-10.17 -2.13s-0.27,-6.1 0.7,-8.49C68.7,81.59 73.13,78.26 79.19,75.48Z"
android:fillColor="#d5e2d0"/>
<path
android:pathData="M84.33,83.33a3.58,3.58 0,0 0,0.19 -4.1A3.88,3.88 0,0 0,81 78.07a16.67,16.67 0,0 0,-4.4 1.21,8 8,0 0,0 -2.76,1.55 16.81,16.81 0,0 1,6.21 -1.38c1.93,0.12 3.55,1.36 3.41,3.44a3.73,3.73 0,0 0,0 0.94S83.6,84.37 84.33,83.33Z"
android:fillColor="#465a40"/>
<path
android:pathData="M82.34,82.54a2,2 0,0 0,-1.42 -1,11.19 11.19,0 0,0 -4.63,0.53 10.71,10.71 0,0 0,-4.88 2.45,16.39 16.39,0 0,1 7.28,-1.81 3.72,3.72 0,0 1,2.5 0.72c-3.21,-0.5 -8,1.27 -12.37,6.39 0.05,0.47 1.83,-1.22 2.25,-1.64 2.63,-2.63 7.15,-3.76 9.44,-3.77a3.87,3.87 0,0 1,-1.88 1.24c-1.56,0.62 -5.57,2.07 -7.79,4.69 -0.9,1 -1,1.67 -0.61,1.3a42.18,42.18 0,0 1,4.54 -3.46c2,-1.33 5.8,-2.08 6.58,-2.55S83.39,84.44 82.34,82.54Z"
android:fillColor="#465a40"/>
<path
android:pathData="M88.76,85.41a1.33,1.33 0,0 0,-0.68 -0.37,5.34 5.34,0 0,0 -3.78,1.19c-1.21,0.82 -2.37,1.5 -3.6,2.27A9.56,9.56 0,0 1,78 89.76c-0.84,0.2 -1.71,0.57 -2.55,0.73a6.3,6.3 0,0 0,-2.48 1c1.67,-0.32 3.32,-0.46 5,-0.77a15.08,15.08 0,0 0,5 -1.75,5.22 5.22,0 0,1 1.59,-0.75c0.09,0.2 -0.07,0.49 -0.24,0.72a7.2,7.2 0,0 1,-3 2,26 26,0 0,1 -4.52,1.6c-0.78,0.17 -1.56,0.27 -2.34,0.5a0.52,0.52 0,0 0,-0.2 0.09,0.27 0.27,0 0,0 -0.06,0.33 0.56,0.56 0,0 0,0.29 0.14,8.6 8.6,0 0,0 4.13,-0.32 22.64,22.64 0,0 0,4.23 -1.83,8.45 8.45,0 0,0 3.72,-3.16 2.72,2.72 0,0 1,0.33 -0.57c0.16,-0.18 0.41,-0.3 0.57,-0.23s0.13,0.4 0,0.64a12.08,12.08 0,0 1,-2 3.07,8.18 8.18,0 0,1 -1.65,1.57 8.06,8.06 0,0 1,-2.07 0.91,40.73 40.73,0 0,1 -6,1.45c-0.16,0.22 0.07,0.4 0.29,0.44a7.33,7.33 0,0 0,2.62 -0.12,20 20,0 0,0 4,-1.1 11.85,11.85 0,0 0,3.75 -2.39,12.85 12.85,0 0,0 2.64,-4.79A2.2,2.2 0,0 0,88.76 85.41Z"
android:fillColor="#1a2f15"/>
</vector>
Loading

0 comments on commit 8bdb749

Please sign in to comment.