From 1613de0cfc0cabb4a815e97ead99c529888c9742 Mon Sep 17 00:00:00 2001 From: kimsubeen Date: Thu, 18 Nov 2021 12:26:26 +0900 Subject: [PATCH 1/7] =?UTF-8?q?[STYLE]=20=EC=B0=A8=EB=9F=89=20=EC=98=88?= =?UTF-8?q?=EC=95=BD=20.xml=20=ED=8B=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit +) 홈에 임시 버튼 생성하여 intent 확인 --- app/src/main/AndroidManifest.xml | 1 + .../kr/ac/smu/cs/soptsocar/MainActivity.kt | 6 ++ .../kr/ac/smu/cs/soptsocar/ReservationCar.kt | 11 +++ app/src/main/res/drawable-hdpi/ic_back.png | Bin 0 -> 247 bytes .../drawable-hdpi/ic_default_heart_ios.png | Bin 0 -> 869 bytes app/src/main/res/drawable-mdpi/ic_back.png | Bin 0 -> 218 bytes .../drawable-mdpi/ic_default_heart_ios.png | Bin 0 -> 577 bytes app/src/main/res/drawable-xhdpi/ic_back.png | Bin 0 -> 320 bytes .../drawable-xhdpi/ic_default_heart_ios.png | Bin 0 -> 1108 bytes app/src/main/res/drawable-xxhdpi/ic_back.png | Bin 0 -> 357 bytes .../drawable-xxhdpi/ic_default_heart_ios.png | Bin 0 -> 1577 bytes app/src/main/res/drawable-xxxhdpi/ic_back.png | Bin 0 -> 364 bytes .../drawable-xxxhdpi/ic_default_heart_ios.png | Bin 0 -> 1938 bytes app/src/main/res/layout/activity_main.xml | 9 ++ .../res/layout/activity_reservation_car.xml | 85 ++++++++++++++++++ 15 files changed, 112 insertions(+) create mode 100644 app/src/main/java/kr/ac/smu/cs/soptsocar/ReservationCar.kt create mode 100644 app/src/main/res/drawable-hdpi/ic_back.png create mode 100644 app/src/main/res/drawable-hdpi/ic_default_heart_ios.png create mode 100644 app/src/main/res/drawable-mdpi/ic_back.png create mode 100644 app/src/main/res/drawable-mdpi/ic_default_heart_ios.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_back.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_default_heart_ios.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_back.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_default_heart_ios.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_back.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_default_heart_ios.png create mode 100644 app/src/main/res/layout/activity_reservation_car.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8378303..bdfdeea 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -9,6 +9,7 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/Theme.SoptSocar"> + diff --git a/app/src/main/java/kr/ac/smu/cs/soptsocar/MainActivity.kt b/app/src/main/java/kr/ac/smu/cs/soptsocar/MainActivity.kt index 7896258..c0012bf 100644 --- a/app/src/main/java/kr/ac/smu/cs/soptsocar/MainActivity.kt +++ b/app/src/main/java/kr/ac/smu/cs/soptsocar/MainActivity.kt @@ -1,5 +1,6 @@ package kr.ac.smu.cs.soptsocar +import android.content.Intent import androidx.appcompat.app.AppCompatActivity import android.os.Bundle import androidx.viewpager2.widget.ViewPager2 @@ -13,6 +14,11 @@ class MainActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) binding= ActivityMainBinding.inflate(layoutInflater) +//임시 서브 액티비티 넘어가는 버튼 + binding.next.setOnClickListener{ + val intent = Intent(this, ReservationCar::class.java) + startActivity(intent) + } initViewPagerAdapter() initBottomNavigation() diff --git a/app/src/main/java/kr/ac/smu/cs/soptsocar/ReservationCar.kt b/app/src/main/java/kr/ac/smu/cs/soptsocar/ReservationCar.kt new file mode 100644 index 0000000..6d69509 --- /dev/null +++ b/app/src/main/java/kr/ac/smu/cs/soptsocar/ReservationCar.kt @@ -0,0 +1,11 @@ +package kr.ac.smu.cs.soptsocar + +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle + +class ReservationCar : AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_reservation_car) + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable-hdpi/ic_back.png b/app/src/main/res/drawable-hdpi/ic_back.png new file mode 100644 index 0000000000000000000000000000000000000000..902f034c3d6e07ed59b411393639ef7983a4e740 GIT binary patch literal 247 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|l3?zm1T2})pmUKs7M+SzC{oH>NS%G}U;vjb? zhIQv;UIICC0X`wF?gc&?Mm8FT)*xhHp=DqNB|pkR`xi(`n!`Q!u%7Y9z~mcnIByC$f$3A{d&`J!u1`mDvB8>0Qn9E6i* zTZ+ccS803bW30YNyK7FS1_!HBfa2+y1qPDa1;lzIdX7KhSP-0UAn;8mdKI;Vst0Ev%DhX4Qo literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/ic_default_heart_ios.png b/app/src/main/res/drawable-hdpi/ic_default_heart_ios.png new file mode 100644 index 0000000000000000000000000000000000000000..9113a99d9c2670374d6b89fde351df8326f0b7c0 GIT binary patch literal 869 zcmV-r1DgDaP)5f$Agf*k-#1e$n@1T7-(B4w?WO?}&S z<8RvDo>FSt16t)x;{3UvTUI-`Y z15shr=ttz$x?5sT_w-tz@O)HXh)_J{6J!1KV=_AYvaxpjgj_t} zAC5y(qQg;39mh@dkxHYR4yaF-V=A9aChtuB9&k7ikF>#Euandvz@gX8AN)x8i+(Se zO0D0*Gx+K>%ZRW$^q3Ae4Ua}~Rlhmr`0o$AKWFc=A}jwRCs;@fSe`^I*t9A|v< z8B~N%o?7=4EJz40BinHjut3D#4J(6>prR$E1&`{79+44i>44^U zWiGa?PZjA_dL02(s#d?P!W!A z*e5|RXU#HFHOzh-Y=C*|bFu&vAai}G14VPv4Z2`?oIXz4?8>>xhZAXv0g}~Aiq817 z{4hN?8D}ORX8`|D=};$U-b`%Hi={~P48pADs_FN#(+1R3a=~TodMBckl#ITuJi5u~ zdw~8X$u%yn`zJH4cqgnl8@}U7<(IgCsr(7srOs-+( vfg~1DKPx=~{uU$;s*R@WEO-dL;{V1kw}EN%Ja{D?00000NkvXXu0mjf0a$_@ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_back.png b/app/src/main/res/drawable-mdpi/ic_back.png new file mode 100644 index 0000000000000000000000000000000000000000..900baaa90c5b3d1b9fe4be73eb922ead47c68e6a GIT binary patch literal 218 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wmUKs7M+SzC{oH>NS%G}U;vjb? zhIQv;UIICa0X`wF?gc&?hSq8ZmOxU=z)Hi=M#IQP)5u1{08AR$G+%$24phul666=m za9^sxV0*)RhY10Uu53V2M^6{W5Q)pl2@BW)L>wNuC>Guj(^9Yq^A^aN7Ru&vYr10Q z^e9#~ZbQpg+7qV~Do7tl*viy-cxMb_dvSoQ7bgS5bZ5cfcMQC9fQB)6y85}Sb4q9e E0D_Y_bN~PV literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_default_heart_ios.png b/app/src/main/res/drawable-mdpi/ic_default_heart_ios.png new file mode 100644 index 0000000000000000000000000000000000000000..b8ef237a829a0a4820328abc3d72995452bf72f3 GIT binary patch literal 577 zcmV-H0>1r;P)* z!axwlcP|dUVh7Mcz|kQC&X5Y!3e*bJ3X}@K4zL34AdDixKM+bt2|fxVx9%QEjF^b} zq&suTUB0_tzT4Xa`0Ih`!JR)kL{tYF$Y!Akh!fEIqV8;VMZfhQn-;E}B|1RJh~A7| zTCU@SAAp1VpiM+4(J&-#EH>jYB3>`+{7%3#nz{m2v9oA$sAyWQ*Q(`4t?DYmG7((z z_fo8Dn!B;iZ9@~aL@(gFmpJSX#{qY2fjN=&boBjkmuK!;G_7Rn!?7p3k)NrEYRliV zCQCG&>Y+tg$o-DRZ zWGq`~oxu;|X7IF!Kuzw3JI+?m0Hw~@Wsh5PFdUtH7v}jv$x^Bf3wteNHWoSQNBnvw zz_x!M9IS)|L9w9din}F&#l@chP15JDuJpOKx?edJXN4JgoOfI5lws$wrqUDZ_3a5m zD=DX+a_ZeZ*adutNlB%3%yQtf11*bqJDl+ADa}shT1hJAL>+V87TY{uUYiMAhC=Et zlhiCwt5MtRWUb2u#&J6wbrj%nG?YB=o7CjQN}xpF91zM~KFYg(|0mu6!@2bjgaqLv P00000NkvXXu0mjfZGr)3 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_back.png b/app/src/main/res/drawable-xhdpi/ic_back.png new file mode 100644 index 0000000000000000000000000000000000000000..e620888dea277dbe38b65e936ff38bbe4e937baf GIT binary patch literal 320 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDB3?!H8JlO)ISkfJR9T^xl_H+M9WCijWi-X*q z7}lMWc?smG2l#}zx)=Cp7+M37rlF07frWyBgO-7nhLH_O(8xy9$VL^+EjV&cAEEak-aXL9cg7uWsjiWcu$sE&rSn*6DtT1e* zar*|Zg1MH#4WUWrW(G$boq2AK;8CrK#m^Qnn-z-9G(Nr|i^HbajdAsnS;ogVb`{UF z+|01L<(#BQ1BZ!Z2&c<}n+v>Tj-*ZzjA{CNW+vO4#CyfhRG2g6SlBvE%XCj#FbS4# zFupR!vN5*l@tK*NOH|nsJ{_F6?nVyZBacO0Zi{b<@Gx}jh}8Z$^X*TdQyDy6{an^L HB{Ts5I;C*8 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_default_heart_ios.png b/app/src/main/res/drawable-xhdpi/ic_default_heart_ios.png new file mode 100644 index 0000000000000000000000000000000000000000..abebb321fe47acfc40f1b5eaea8239c5197227ce GIT binary patch literal 1108 zcmV-a1grarP)O|e+AH}?t+e5(R+x5W*#N9Na34(lTGktYHpH?9w1mO0 z1eb(o1pbLpBf-Uy;5fK0Inpa^n2QYc5xy=upElqY9C_z;8EiCU*t?n$AF6aHG91gH zGHgyXZzIR3R!hARiSAvzb;04E7vPaE>X%o7ph zFrg6lb;Z2MAHWlUGMF11pvoqE)x8+5FC_;{Ka!(lesX%ADd1+sF#pFxi?5emF@nJ< z4r=-sg4la3hvBl!EKbbzrK!YsPlamis-?7A$5epA1A+_MM9oN7YgRonP5Jsl)!W?y4t!an@Vt$SJyzZ$A=<$a`tPL$r-JLPc>&POY?9ILNm4j!dV%*%4ffWQK4nO5Qsp$U?F_-Cxe8)c zA+DTka!dqG80;B=cvv$|Qy1ZkL}FuHJ##@jP0ctp z!4OBM=M8GwH;rK*2G?tq%3S3696N=uT8X|o=zr@lB_w3T(tLSKX{l(00$6q@v`e-( zDXf^Ma@$GdYFWrJGM`|GVYspE7MLw3{iQ)f%utj#;c0Paf{c;#Fv+p8k$aT4d9jwY zM+tE+f+5D(C2-SE{}SA**vM>yX<)nLCO`Zg+1owIF&^XuL$F<*?^FNg@S1XRgc666=m@N!Cn zf?EKwdOlyAm9?-sBo&Izh!s8GUHUM9gHEFnU)N!vN8u1 z8ozC`c;}>Z_JiQm<#kc(%gb^mE?MHgWmbY(@K%9Uq1;D$rZkwzX)zj`tjgnFFjwEi zd3or*3sMHm@h|$gWJUZ}=Kel)r=D-d9f92RGk^Ey?o!X${rBp&eK9|?qJ8e_`N|Z% zcP^EARdw?S_sx48av3Z|ift!vI!Vfer8X}3n2*2;kHUvMhW5%U5}6K5 tXVia^3F6PrR=6WR@u^8|g=hQ=&Wp!qcRmb0;R^H{gQu&X%Q~loCID0=f@lB$ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_default_heart_ios.png b/app/src/main/res/drawable-xxhdpi/ic_default_heart_ios.png new file mode 100644 index 0000000000000000000000000000000000000000..ef076586b82a01d629123847eae91f7363d5a8b3 GIT binary patch literal 1577 zcmV+^2G;qBP)` z+eQ$_XI8`}q#x)B>Ykvev<-&R;1eXAAmIeS31UtFoB(nH$O-H`1PtjzOioZ8fp5W% zz0(=l0^3@xBwLP69{)aItkui@wKKD`vj&(kW5$db(+fgMD)su}++AzQQFAW|U;_vi z0jThBN4!A-Piy@Fsa;)L`|Ac$BF}K{^eYF|3+~|(5f!+ji_*r=yhTJ$o1J5sQ`^&C=#|1Ch)Alx){V>74bU-PJ!VGJn5H^t}fyYQnUIKTQ_=LoSB z)$Rumpekwjpb`AhQXIfgL4g2&LkVaWI@jArwQ~-hlGa~(pTU7~2@zgE++eg@?qJX~ z3ck3i?{j3_iRuKm9sV@04&1I;ny9gbw8c~rUPDUw8C9ZoY!H$lhv@9Hh^T?_nt60f zJ^c&`?way{#>?3h6`Nu)#WWzobwbyWm&t$k{$5!=fE1k7uFGt~Z%u7%AqT4~?r!j1 z4W5ugFkUEP7jjriBUUIDU9b5SUH;cPAN%IpZk5uC71oQ(Wz92y`M$Ix!8iEcCs;<8 zPkCdw&XbX~nXrvg$-QOKCAm-3ISTdGFiA>)FB<63)Rw!`_wLyz_zCG(#=G&`OFOcI zh-gJ-(L4&ftIz*9g%N3eRb>DO4+`Ra9O*Y{rCyqD)SOo%cSaEN?uvfs6s7msDCDIQ z!FxkfAu#I!AEwYW!BMSR8q$_A*LSpeD(`QLvrBwIqRbV6>gZ0x8~=3ZGD2dN)ZlFoUBXE3XcQ@XqsBRV5S)` zX&xs`>0DfG$m0R^OZ@8mO>*NXzGH6Rj|KyCEAT>E=)@FImeNxsw%5JwJkeiS4*-r5>+6B z35XW4mg2p)kXKu_>l1ILeXM;xw$zxtCi_fj#JX1;wtBhrLHstZ_Lge9bdsXaFY8AU znUw$RBw~eBf-4oC2A=vw^`(fr-D=(5%yP=|r=BK1Gh*8(sAngwpv3xcFAw!)GFLG< zdMk7)7d(eU2Kc)mGS6ltR!IE|fPfhDmfgED@80dfkaYKrPAnU4iOsl|p#^t36}_j^ zxjCISsJWZgue-UityVph*iN5DBu+G>3}!Krc&H7%{>wAKmUnlba?1($uI+aozP~Cu zvF=IpD(=}l?zkgt3}hl$I6vp|iZgctmTl1}zZQSxV0UD@HmhBV%mfQb_JU>Wra_IZ zz{KPH)sMtvw~jPqDp-)YdhV$%bMTfZGs~;sK{jE{=6)ADKZxvkRX^@k)`Rg zJZ`!fZsZAL6D%b0Ya?UWRSX!bV4>^RB6=zAT=7@=B|sLN<57%VaKPE+^+B9p51UM+ zAyqCt3hOJ&JMz;8b1R)Lka6rhf$LOynzPn(-|Ir%zHP5eySNS%G}U;vjb? zhIQv;UIIDN0X`wF?gc&?1{RuzHtL4f8b&riq-JQN0YpYNMXs;qfXX;Zg8YIR6y9H- z+z_;90sEI3K(X7NE{-7)hu==q6>bU;aY+pLEd7U7t>adQ+oFpZCbLg0*km8QPPFE* zr0I)0XRDvpzP-KE^HI^xe=#qY@^hS6${V#{QWaCmq$s8<%nA?UXU)%fnZsaF5+zkI zi+|18dS>fYJU7mN*FST=k+qNQ&9mR(&+?hOCYGcdPU6#X+jU7IH?e2e1H)e>J#kr! zR({ejD7;-NBXQkHl0Ay6XZEUv(TCdm;kjomb4U zJ@0G-?o0X2YjpY?#P(d(?$AR;L(kbwy$kiGzi$7^aP7iRW)AUIpf4F1JYD@<);T3K F0RZ$kiuM2i literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_default_heart_ios.png b/app/src/main/res/drawable-xxxhdpi/ic_default_heart_ios.png new file mode 100644 index 0000000000000000000000000000000000000000..d188e374c544220929cfa6430c688275d79540b3 GIT binary patch literal 1938 zcmV;D2W|L?P)@~0drDELIAGL9O(c600d`2O+f$vv5yPLVjOE9}@Fek{|VErgQ z(w(Y-F(b_M3(O1R{63-6!0?~y>guX$fP#X8f`WpAf`YpULPC7({kw@utfCN)>Ca6C zYK1<0CG=Gu{q50IfPBLx zQGOwn+P*24H6Hz-qk+75*K9OAn1Q_SVI~1Py?(8Va6neJ35kL2OLeht`y+heu)LS& zJ^1ecM|z+8d-SwhkP-;^c2I@=X1#tMb-mN?uT%!|fJXia=|HYVy?eI4_SR;wwSa7O z6`>Bvk*q@cc$aF>oU{br$6@Jk#;NKESz{G;;~r#y01JHaP<1jAkD-TE?US{?4F1t2 z%NJPcWFsDKj zVFKXMP{|J^IXn|$=zpn{r4=b~WfWq-9|~|YElUdSK}q>lp*$0zr`v$I2MJj=33sg2a6hekpoL{OYGFac zhaZ3e3L|!Zw_LHJ`1|B^hb)GF#H<$SNi}@sB3zhGr@vCZFIxiewP`FZY>y@vws-+g zzI+4Cli{gCPkd|E8xPYXKPzYPvt;=~4z?OI2H|1G5AqFYzixUeN3O!Y^%;H)4zHR? zh{rSN3jZ%sK!xHZXg^8qC%un#6wzbx z>V_E26&6ua5Um>{P}~UMr>5{YZ26}73~yuo$sF;R9p@Kd7)%=S3?E z@fd#=Q2sLRI)b0`^byk+<5yquO^GfXCVZ#PE<>qTNiSL^$dF=<1w%>Na>Vu6fL6GK z842;cvDShdP^frI7=0~dWLDXjJBb3T5XnhEg;}MN@`tRi7Ju!>OpFjv=REUCY2^aq z&o;xRS7A`Grb|!dG29Wt3&kX)(bwR0lz_3TkHX9{(z(LBG0-Pcyx?_294O+$1&YEa zH`B|AX*Z^nyw+$+zyNrg7y$?!b~#LDe6p~7njU6_r{D?WPN)FugY>zZ)TJ+PKr(RM9(<1rpI#JTBg|fw{|=#CBpwbK@laf$-P z9+Q}WjEjh-BVDezoZm~bzdKO@8QbpuF_A~QT;au{QYv#&pk^`Lk7bkU_Da0D$e$9! zt2)?qa?QQC1d9b&ipN26lC5&7bZ7AmIy8*epj75_aaL154EsCl#e$DSq|o7-_!JH^ zZW!mOWo2Quevx-K)d3vZo)uOK-aq^acj_r5I8qfb;N!{ZTbq+WW3+zJ(cg`ZWTe=n znMs4?^YyhI%UF@|{bE#^fa))=ZT+3UuN{RcEl80}EHHo@lLVG{g|69*566p6@m&VT zAp$ZLka0g3hiyQ$YJ1q5OR*2DxK+<6p_{pYjLQj0CsOuzQRE_EfXmKBhkpo%Qc<&H zQ|2XC0U1Atc3D-Y$;{tHk^3=+P|)qXJK*^4K^5zb9P81!TVNQMDLwB=`J`AV0U6WD z@gy@TNw9DNGO?jff=B$5Vj+)ug-)+u`$ga1C3wXD&cOR<$}zT}prD|jprD|jpkRUc Y4g>AG9pLdqr2qf`07*qoM6N<$f-RD%Pyhe` literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 2e9e24b..93ee5a4 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -14,6 +14,15 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent"/> +