Skip to content

Commit

Permalink
Merge pull request #3 from DSCHUFS/develop
Browse files Browse the repository at this point in the history
RecyclerView
  • Loading branch information
SeoYoung99 authored Jan 20, 2022
2 parents 35708b2 + b6d1019 commit 3011ed4
Show file tree
Hide file tree
Showing 31 changed files with 434 additions and 4 deletions.
18 changes: 18 additions & 0 deletions .idea/misc.xml

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

1 change: 1 addition & 0 deletions .idea/vcs.xml

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

Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/secondary_second_blue" />
<corners android:radius="10dp" />

</shape>
10 changes: 10 additions & 0 deletions app/src/main/res/drawable/background_layout_round_gray.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"
android:shape="rectangle">

<stroke
android:width="1dp"
android:color="@color/hint_gray" />
<corners android:radius="10dp" />

</shape>
10 changes: 10 additions & 0 deletions app/src/main/res/drawable/background_search_filter_round_white.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"
android:shape="rectangle">

<corners android:radius="10dp" />
<solid android:color="@color/background_white" />
<stroke
android:width="1dp"
android:color="@color/primary_second_blue" />
</shape>
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<stroke
android:width="1dp"
android:color="@color/primary_second_blue" />
<corners android:radius="20dp" />

</shape>
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"
android:shape="rectangle">

<stroke
android:width="1dp"
android:color="@color/hint_gray" />
<corners android:radius="20dp" />

</shape>
11 changes: 11 additions & 0 deletions app/src/main/res/drawable/button_login_round_lightblue.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">

<corners android:radius="20dp" />
<stroke
android:width="1dp"
android:color="@color/primary_second_blue" />
<solid android:color="@color/secondary_second_blue" />

</shape>
7 changes: 7 additions & 0 deletions app/src/main/res/drawable/button_primary_round_blue.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">

<solid android:color="@color/primary_second_blue" />
<corners android:radius="20dp" />
</shape>
11 changes: 11 additions & 0 deletions app/src/main/res/drawable/button_secondary_round_lightblue.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">

<solid android:color="@color/secondary_second_blue" />
<stroke
android:width="1dp"
android:color="@color/primary_second_blue" />
<corners android:radius="20dp" />

</shape>
7 changes: 7 additions & 0 deletions app/src/main/res/drawable/checkbox_selected_round_blue.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">

<solid android:color="@color/primary_second_blue" />
<corners android:radius="10dp" />
</shape>
11 changes: 11 additions & 0 deletions app/src/main/res/drawable/checkbox_unselected_round_lightblue.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">

<solid android:color="@color/secondary_second_blue" />
<corners android:radius="10dp" />
<stroke
android:width="1dp"
android:color="@color/primary_second_blue" />

</shape>
5 changes: 5 additions & 0 deletions app/src/main/res/drawable/ic_add_24.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="#FFFFFF"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
</vector>
36 changes: 36 additions & 0 deletions app/src/main/res/drawable/ic_anxiety_64.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<vector android:height="64dp" android:viewportHeight="300"
android:viewportWidth="300" android:width="64dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#80A3BF"
android:pathData="M61.045,109.5C63.819,109.5 65.911,110.254 67.616,111.503C69.374,112.79 70.909,114.746 72.273,117.412C75.06,122.858 76.718,130.375 78.483,138.799C78.553,139.132 78.623,139.466 78.693,139.801C80.347,147.708 82.134,156.248 85.215,163.39C88.455,170.899 93.389,177.488 101.712,180.135C130.22,189.205 158.78,189.205 187.288,180.135C195.611,177.488 200.545,170.899 203.785,163.39C206.867,156.248 208.653,147.708 210.307,139.8C210.377,139.465 210.447,139.132 210.517,138.799C212.282,130.375 213.94,122.858 216.727,117.412C218.091,114.746 219.626,112.79 221.384,111.503C223.089,110.254 225.181,109.5 227.955,109.5C233.846,109.5 238.065,111.783 241.1,115.531C244.237,119.407 246.259,125.057 247.082,131.864C248.73,145.496 245.411,162.487 238.763,175.176C232.719,186.714 226.736,192.981 221.77,198.183C221.232,198.747 220.706,199.298 220.192,199.843C217.569,202.624 215.099,205.413 213.336,208.778C211.526,212.233 210.546,216.118 210.546,221.05V221.123V221.196V221.269V221.343V221.417V221.491V221.566V221.641V221.716V221.792V221.867V221.943V222.02V222.096V222.173V222.25V222.328V222.406V222.484V222.562V222.641V222.719V222.799V222.878V222.958V223.038V223.118V223.198V223.279V223.36V223.441V223.523V223.605V223.687V223.769V223.852V223.935V224.018V224.101V224.185V224.269V224.353V224.437V224.522V224.607V224.692V224.777V224.863V224.949V225.035V225.121V225.208V225.295V225.382V225.469V225.557V225.644V225.733V225.821V225.909V225.998V226.087V226.176V226.266V226.355V226.445V226.535V226.626V226.716V226.807V226.898V226.989V227.081V227.173V227.265V227.357V227.449V227.542V227.634V227.727V227.82V227.914V228.007V228.101V228.195V228.289V228.384V228.479V228.573V228.668V228.764V228.859V228.955V229.051V229.147V229.243V229.339V229.436V229.533V229.63V229.727V229.824V229.922V230.02V230.117V230.216V230.314V230.412V230.511V230.61V230.709V230.808V230.907V231.007V231.107V231.207V231.307V231.407V231.507V231.608V231.709V231.81V231.911V232.012V232.113V232.215V232.317V232.419V232.521V232.623V232.725V232.828V232.93V233.033V233.136V233.239V233.343V233.446V233.55V233.653V233.757V233.861V233.965V234.07V234.174V234.279V234.383V234.488V234.593V234.698V234.804V234.909V235.015V235.12V235.226V235.332V235.438V235.544V235.651V235.757V235.864V235.97V236.077V236.184V236.291V236.398V236.505V236.613V236.72V236.828V236.936V237.044V237.152V237.26V237.368V237.476V237.585V237.693V237.802V237.91V238.019V238.128V238.237V238.346V238.455V238.565V238.674V238.784V238.893V239.003V239.113V239.223V239.333V239.443V239.553V239.663V239.773V239.884V239.994V240.105V240.215V240.326V240.437V240.548V240.659V240.77V240.881V240.992V241.103V241.215V241.326V241.437V241.549V241.66V241.772V241.884V241.996V242.107V242.219V242.331V242.443V242.555V242.668V242.78V242.892V243.004V243.117V243.229V243.341V243.454V243.567V243.679V243.792V243.904V244.017V244.13V244.243V244.356V244.468V244.581V244.694V244.807V244.92V245.033V245.147V245.26V245.373V245.486V245.599V245.713V245.826V245.939V246.052V246.166V246.279V246.393V246.506V246.619V246.733V246.846V246.96V247.073V247.187V247.3V247.414V247.527V247.641V247.754V247.868V247.982V248.095V248.209V248.322V248.436V248.549V248.663V248.777V248.89V249.004V249.117V249.231V249.344V249.458V249.571V249.685V249.798V249.912V250.025V250.139V250.252V250.366V250.479V250.592V250.706V250.819V250.933V251.046V251.159V251.272V251.386V251.499V251.612V251.725V251.838V251.951V252.064V252.177V252.29V252.403V252.516V252.629V252.742V252.854V252.967V253.08V253.192V253.305V253.418V253.53V253.643V253.755V253.867V253.98V254.092V254.204V254.316V254.428V254.54V254.652V254.764V254.876V254.988V255.099V255.211V255.323V255.434V255.546V255.657V255.768V255.879V255.991V256.102V256.213V256.324V256.434V256.545V256.656V256.767V256.877V256.988V257.098V257.208V257.319V257.429V257.539V257.649V257.758V257.868V257.978V258.088V258.197V258.306V258.416V258.525V258.634V258.743V258.852V258.961V259.069V259.178V259.287V259.395V259.503V259.611V259.719V259.827V259.935V260.043V260.151V260.258V260.366V260.473V260.58V260.687V260.794V260.901V261.007V261.114V261.22V261.327V261.433V261.539V261.645V261.751V261.856V261.962V262.067V262.172V262.277V262.382V262.487V262.592V262.697V262.801V262.905V263.009V263.113V263.217V263.321V263.425V263.528V263.631V263.734V263.837V263.94V264.043V264.145V264.248V264.35V264.452V264.554V264.655V264.757V264.858V264.96V265.061V265.162V265.262V265.363V265.463V265.564V265.664V265.763V265.863V265.963V266.062V266.161V266.26V266.359V266.458V266.556V266.654V266.753V266.85V266.948V267.046V267.143V267.24V267.337V267.434V267.531V267.627V267.723V267.819V267.915V268.011V268.106V268.201V268.296V268.391V268.486V268.58V268.674V268.768V268.862V268.956V269.049V269.142V269.235V269.328V269.42V269.513V269.605V269.697V269.788V269.88V269.971V270.062V270.153V270.243V270.334V270.424V270.514V270.603V270.693V270.782V270.871V270.96V271.048V271.136V271.224V271.312V271.4V271.487V271.574V271.661V271.748V271.834V271.92V272.006V272.091V272.177V272.262V272.347V272.431V272.516V272.6V272.684V272.767V272.851V272.934V273.017C210.546,276.599 207.643,279.5 204.046,279.5H84.954C81.357,279.5 78.454,276.599 78.454,273.017L78.454,221.05C78.454,216.118 77.474,212.233 75.664,208.778C73.901,205.413 71.431,202.624 68.808,199.843C68.294,199.298 67.768,198.747 67.23,198.183C62.264,192.981 56.281,186.714 50.237,175.176C43.589,162.487 40.27,145.496 41.918,131.864C42.741,125.057 44.763,119.407 47.901,115.531C50.936,111.783 55.155,109.5 61.045,109.5Z"
android:strokeColor="#000000" android:strokeWidth="7"/>
<path android:fillColor="#FCF3F3"
android:pathData="M215.691,113.999C215.691,153.189 183.701,184.999 144.191,184.999C104.68,184.999 72.691,153.189 72.691,113.999C72.691,74.809 104.68,42.999 144.191,42.999C183.701,42.999 215.691,74.809 215.691,113.999Z"
android:strokeColor="#000000" android:strokeWidth="7"/>
<path android:fillColor="#00000000"
android:pathData="M202.832,22.82L189.091,46.511"
android:strokeColor="#000000" android:strokeLineCap="round" android:strokeWidth="7"/>
<path android:fillColor="#00000000"
android:pathData="M212.511,59.786L235.45,45.223"
android:strokeColor="#000000" android:strokeLineCap="round" android:strokeWidth="7"/>
<path android:fillColor="#00000000"
android:pathData="M40.896,57.719L64.432,75.712"
android:strokeColor="#000000" android:strokeLineCap="round" android:strokeWidth="7"/>
<path android:fillColor="#00000000"
android:pathData="M62.505,34.654L75.939,58.527"
android:strokeColor="#000000" android:strokeLineCap="round" android:strokeWidth="7"/>
<path android:fillColor="#00000000"
android:pathData="M274.364,115.463L281.592,128.517C284.28,133.371 282.492,139.507 277.611,142.179L274.691,143.778C270.899,145.854 268.854,150.126 269.619,154.374L271.871,166.886C272.614,171.018 270.7,175.186 267.08,177.323L260.206,181.379C256.585,183.515 254.671,187.684 255.415,191.815L257.749,204.785C258.727,210.22 255.118,215.441 249.687,216.445L235.793,219.015"
android:strokeColor="#000000" android:strokeLineCap="round" android:strokeWidth="7"/>
<path android:fillColor="#00000000"
android:pathData="M13.249,123.399L8.109,138.778C6.52,143.531 8.699,148.733 13.204,150.941L14.722,151.686C18.35,153.464 20.555,157.249 20.314,161.28L19.454,175.606C19.221,179.498 21.271,183.174 24.705,185.025L29.56,187.64C32.995,189.49 35.045,193.167 34.811,197.059L33.954,211.343C33.624,216.856 37.824,221.601 43.337,221.941L52.769,222.522"
android:strokeColor="#000000" android:strokeLineCap="round" android:strokeWidth="7"/>
<path android:fillColor="#00000000"
android:pathData="M103,92.485L124.666,99.973C125.44,100.24 125.577,101.278 124.899,101.743L106.426,114.432"
android:strokeColor="#000000" android:strokeLineCap="round" android:strokeWidth="7"/>
<path android:fillColor="#00000000"
android:pathData="M184.126,114.431L165.798,100.528C165.143,100.031 165.329,99.002 166.115,98.771L187.55,92.484"
android:strokeColor="#000000" android:strokeLineCap="round" android:strokeWidth="7"/>
<path android:fillColor="#00000000"
android:pathData="M167,149C156.545,135.667 131.455,135.667 121,149"
android:strokeColor="#000000" android:strokeLineCap="round" android:strokeWidth="7"/>
</vector>
5 changes: 5 additions & 0 deletions app/src/main/res/drawable/ic_call_24.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="#FFFFFF"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M20.01,15.38c-1.23,0 -2.42,-0.2 -3.53,-0.56 -0.35,-0.12 -0.74,-0.03 -1.01,0.24l-1.57,1.97c-2.83,-1.35 -5.48,-3.9 -6.89,-6.83l1.95,-1.66c0.27,-0.28 0.35,-0.67 0.24,-1.02 -0.37,-1.11 -0.56,-2.3 -0.56,-3.53 0,-0.54 -0.45,-0.99 -0.99,-0.99H4.19C3.65,3 3,3.24 3,3.99 3,13.28 10.73,21 20.01,21c0.71,0 0.99,-0.63 0.99,-1.18v-3.45c0,-0.54 -0.45,-0.99 -0.99,-0.99z"/>
</vector>
Loading

0 comments on commit 3011ed4

Please sign in to comment.