Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

7주차 미션 / 안드로이드 2조 황지영 #10

Open
wants to merge 14 commits into
base: jiyoung
Choose a base branch
from
6 changes: 3 additions & 3 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
xmlns:tools="http://schemas.android.com/tools" >

<application
android:allowBackup="true"
Expand All @@ -11,7 +11,7 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.MyApplication"
tools:targetApi="31">
tools:targetApi="31" >
<activity
android:name=".AlarmActivity"
android:exported="false" />
Expand All @@ -20,7 +20,7 @@
android:exported="false" />
<activity
android:name=".MainActivity"
android:exported="true">
android:exported="true" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.fragment.app.Fragment
import com.example.carrotmarket.databinding.FragmentMyBinding
import com.example.carrotmarket.databinding.FragmentMypageBinding

class MyCarrotFragment : Fragment() {
lateinit var binding : FragmentMyBinding
lateinit var binding : FragmentMypageBinding

override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?
): View? {
binding = FragmentMyBinding.inflate(layoutInflater)
binding = FragmentMypageBinding.inflate(layoutInflater)
return binding.root
}
}
10 changes: 10 additions & 0 deletions app/src/main/res/drawable/box_round_shape.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<stroke
android:width="1dp"
android:color="#000000" />
<corners android:radius="10dp"/>
<solid android:color="@color/white"/>


</shape>
7 changes: 7 additions & 0 deletions app/src/main/res/drawable/btn_entire.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:width="15dp"
android:height="15dp"
android:drawable="@drawable/tab_icon_category_p" />

</layer-list>
10 changes: 10 additions & 0 deletions app/src/main/res/drawable/btn_little_round_shape.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<stroke
android:width="1dp"
android:color="#000000" />
<corners android:radius="5dp"/>
<solid android:color="@color/white"/>


</shape>
7 changes: 7 additions & 0 deletions app/src/main/res/drawable/btn_plus.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:width="15dp"
android:height="15dp"
android:drawable="@drawable/ic_floating_plus" />

</layer-list>
10 changes: 10 additions & 0 deletions app/src/main/res/drawable/btn_round_shape.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<stroke
android:width="1dp"
android:color="#000000" />
<corners android:radius="40dp"/>
<solid android:color="@color/white"/>


</shape>
Binary file added app/src/main/res/drawable/profile.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions app/src/main/res/font/font.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<font-family xmlns:android="http://schemas.android.com/apk/res/android">

</font-family>
Binary file added app/src/main/res/font/inter_black.ttf
Binary file not shown.
Binary file added app/src/main/res/font/inter_bold.ttf
Binary file not shown.
Binary file added app/src/main/res/font/inter_extrabold.ttf
Binary file not shown.
Binary file added app/src/main/res/font/inter_extralight.ttf
Binary file not shown.
Binary file added app/src/main/res/font/inter_light.ttf
Binary file not shown.
Binary file added app/src/main/res/font/inter_medium.ttf
Binary file not shown.
Binary file added app/src/main/res/font/inter_regular.ttf
Binary file not shown.
Binary file added app/src/main/res/font/inter_semibold.ttf
Binary file not shown.
Binary file added app/src/main/res/font/inter_thin.ttf
Binary file not shown.
Loading