From 3229945c4c4cc9e2f6cbc8e3db80f5aed24a7d11 Mon Sep 17 00:00:00 2001 From: "HAKO-PC\\Hako" Date: Sat, 30 Dec 2017 00:17:43 -0300 Subject: [PATCH] - Search button added to the action bar --- .../ExampleInstrumentedTest.java | 2 +- .../activities/ArtistListActivity.java | 24 +++++++++++++++--- .../androiditunesapi/models/Artist.java | 4 +-- .../androiditunesapi/models/Result.java | 1 - app/src/main/res/drawable-hdpi/ic_search.png | Bin 0 -> 626 bytes app/src/main/res/drawable-mdpi/ic_search.png | Bin 0 -> 427 bytes app/src/main/res/drawable-xhdpi/ic_search.png | Bin 0 -> 818 bytes .../main/res/drawable-xxhdpi/ic_search.png | Bin 0 -> 1333 bytes app/src/main/res/drawable/branded_launch.xml | 3 +-- app/src/main/res/drawable/ic_search.xml | 9 ------- app/src/main/res/menu/actionbar_search.xml | 10 ++++++++ .../res/mipmap-anydpi-v26/ic_launcher.xml | 4 +-- .../mipmap-anydpi-v26/ic_launcher_round.xml | 4 +-- app/src/main/res/values/strings.xml | 2 ++ .../androiditunesapi/ExampleUnitTest.java | 2 +- 15 files changed, 41 insertions(+), 24 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/ic_search.png create mode 100644 app/src/main/res/drawable-mdpi/ic_search.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_search.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_search.png delete mode 100644 app/src/main/res/drawable/ic_search.xml create mode 100644 app/src/main/res/menu/actionbar_search.xml diff --git a/app/src/androidTest/java/com/hakodev/androiditunesapi/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/hakodev/androiditunesapi/ExampleInstrumentedTest.java index 98f8372..6421d82 100644 --- a/app/src/androidTest/java/com/hakodev/androiditunesapi/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/com/hakodev/androiditunesapi/ExampleInstrumentedTest.java @@ -7,7 +7,7 @@ import android.support.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; /** * Instrumented test, which will execute on an Android device. diff --git a/app/src/main/java/com/hakodev/androiditunesapi/activities/ArtistListActivity.java b/app/src/main/java/com/hakodev/androiditunesapi/activities/ArtistListActivity.java index 9cfd772..4618b0c 100644 --- a/app/src/main/java/com/hakodev/androiditunesapi/activities/ArtistListActivity.java +++ b/app/src/main/java/com/hakodev/androiditunesapi/activities/ArtistListActivity.java @@ -1,10 +1,10 @@ package com.hakodev.androiditunesapi.activities; -import android.support.v7.app.AppCompatActivity; import android.os.Bundle; -import android.view.View; -import android.view.Window; -import android.view.WindowManager; +import android.support.v7.app.AppCompatActivity; +import android.view.Menu; +import android.view.MenuItem; +import android.widget.Toast; import com.hakodev.androiditunesapi.R; @@ -17,6 +17,22 @@ public class ArtistListActivity extends AppCompatActivity { setContentView(R.layout.activity_main); } + @Override + public boolean onCreateOptionsMenu(Menu menu) { + getMenuInflater().inflate(R.menu.actionbar_search, menu); + return true; + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + int id = item.getItemId(); + if (id == R.id.action_search) { + Toast.makeText(this, "Test", Toast.LENGTH_SHORT).show(); + return true; + } + return super.onOptionsItemSelected(item); + } + private void setupTheme() { setTheme(R.style.AppTheme); } diff --git a/app/src/main/java/com/hakodev/androiditunesapi/models/Artist.java b/app/src/main/java/com/hakodev/androiditunesapi/models/Artist.java index 543e4c1..f775b01 100644 --- a/app/src/main/java/com/hakodev/androiditunesapi/models/Artist.java +++ b/app/src/main/java/com/hakodev/androiditunesapi/models/Artist.java @@ -1,10 +1,10 @@ - package com.hakodev.androiditunesapi.models; -import java.util.List; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; +import java.util.List; + public class Artist { @SerializedName("resultCount") diff --git a/app/src/main/java/com/hakodev/androiditunesapi/models/Result.java b/app/src/main/java/com/hakodev/androiditunesapi/models/Result.java index 4ff16be..801cae4 100644 --- a/app/src/main/java/com/hakodev/androiditunesapi/models/Result.java +++ b/app/src/main/java/com/hakodev/androiditunesapi/models/Result.java @@ -1,4 +1,3 @@ - package com.hakodev.androiditunesapi.models; import com.google.gson.annotations.Expose; diff --git a/app/src/main/res/drawable-hdpi/ic_search.png b/app/src/main/res/drawable-hdpi/ic_search.png new file mode 100644 index 0000000000000000000000000000000000000000..407fb1be686e9a9c0a660cb43b7db3b4b88ef691 GIT binary patch literal 626 zcmV-&0*(ENP)OFc$-0q4w=sUQZh@eNs1>C@c2hpG=?-c)n3XDaM ziIeG0M!Mi5!(^tqtNZWns&O1^)~s0zo#pfSTF?&?-~c>=H|Bxw#X&EqskY9KgA~Yu zToLG*Loiwm9glz{_$r~}5_)F?)K{wW?clUXCqJ0qo=Jn&N{sxehdfB@v!DlbFmyc+ zjyz;W@{5=ZAgSoYHJJEqfzp2<3T_qeubb-pq(bw@e~|&pFRhrp5ffYGiD>xBkA_)V zH^SGE)-4v!2Ze^|daMk8QN_;Gr!#<6(co^mBgXP``;6-hASD``4#4M}@Ohv!fM?NI zcK|+ngwH!#Yq|pXbTyO-;s7EaVpn_7b~^uu0G`DTq(egYIwh3Wu!v_(E@HWj?gX%n z9txicodFCh4xW)R{Edr)k^BwlP9&@fIW|b=AEC37%TYEP$xJG zprp*WeqTY%WDt#D%SS<9n5`rqWFO*w%yf+$<=rV;;@60iLLI?_kWoArGy46A>s>l0 z*7(GJVoAL6HKpP!V94Dues5V3eAajnBA_~6l#yb&jVlP1%wkSh%wr~U6`ctmGORv1 z`3%C!sjB4^mRV5Ai2_)3!ep+QAQqgk8PCL0=tf=!;aIa~%~~kz8wsa)QfSw-HUIzs M07*qoM6N<$f)ctP!9aWp z$s!PY84&ja@oXSIjOLI&AZDee&yg*!Mh|KrpB;$9fcOBCx+-c|4l;NvlA!?v)GGk- zE+q9vlsX`gR38D=St99~M5zNNBgMHW3Hs(i^_>J_Zb}@m8*0#E67?k^g@OSk4uB=T z9uoC=BRRmH5(mJt*9;Q%g&{e>f)WQTff{m7oK(jx}MN1=LF zQ<@8;fcON|uzf%*OF%s{5KlvLbQm=XBjiv3RX`?qe2#4SGO85EKtotS1qxbOKMRQC zfY<|wLx8v$h>xJDsQ_X#YF5Mb1ZqMUUJk@HNc<#f){17(U_OP#;&nhA4hnW?1$Kre zj(|FZ4~UI{*a?WOfmj-gnsk~vf=GvsI%3c|0@RQd87N19EY}{$ro9-$C>RAe0036j V^0DEMkhTB-002ovPDHLkV1l;_qw@d& literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_search.png b/app/src/main/res/drawable-xhdpi/ic_search.png new file mode 100644 index 0000000000000000000000000000000000000000..2d270ff61355954a81e1d84da26fb0d9104d17df GIT binary patch literal 818 zcmV-21I_%2P)FbngrEGdi4vuhM!G~MCZQ(3Y(r}rQsyS@2W5@8vLB{JOKI{YQ;RZ7 zm-)8;>3To)sN3oDoO92;=i~Fa&hym!m+kKP^4jO~IiK@9Hwe_!)YR0})YMY2QmM2U z+5=sNMxpo67ibQefnGwxP#3i2e=2-EbRGH(%_q<#bdtc;YvIk%0Q4ha;bBcf2kNc( zR_I-gg@<*Apw>h2`*>f^ThI$=wa>-xhknHrL2wFCA9NZz3Z3V3VzL4VZ=sbw7T*^0 zpQls5BW@Yv_Zy(A(Dw*m6J8yTNM;!{B_vBLq9_d@DsoUVax{rgFY=|`rE%52^`$kLFQoJJq@K#pXk`JJ#FbKDR!?+SovKjtjQd}xR{6 zxB^fxB=gK-yiLNkJLC#Lw;`F|wwf03drkn*;tIevA)!kaVlCokNI2FTmsjBi;T$NY zy$ay(lmPpJ>$gE^Sr*c|qx0UMHN>Ef^BUIxsQvv(fH08K_4l>l|AsFep^k{wRleF+ zWBlDl=#}7i#+&9Sp9K#hAUuV(Ch)fq>WrBtGH?p2)E9g1s^m0&|T;@7fgfF%>*sR&&9fhkRnWlpb!*-LQn__K_OHHA(v$c^u42|APZ)I wke%WU5VBW%8H8h*EnZDcO-)TrO|2UH1L;IKyG5`Po07*qoM6N<$f=CdBwEzGB literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_search.png b/app/src/main/res/drawable-xxhdpi/ic_search.png new file mode 100644 index 0000000000000000000000000000000000000000..d0d4d59ed3b71db105a1f55dbc8a9993ac1af1f3 GIT binary patch literal 1333 zcmV-51z}6x%bXI=Pq-8@cS~O@11wfyT5zxx#y10$6zoR3d96WUS+qF6 zI7H_U1MdK!VG1t~-CDqVuPK_kktA1cmz~P(a$~8nXB6 z18#6R+j*(rcw7tY#I->f_l&3DVR}0)dG9VKvm+`I$U46USHm8!tj|i$6__10x~Ti( zk{L3uNUI>Sil;5N8KLoxfJ+RU>nw_a$L@QFe@q2XrEs~ z9vf_RKE7d}1rK*u_YkMWS}+?w*&2X6iHWYr06WVCi!_`k*4h|=69VTCnXpX=HlzRt z1h!V%7=UKML$w%W>pg+3O*RIgOYl$?2HARCU~9W|TbN*QuV9f=Y>=&Gf&jd=ZdD8h zj|f^uG7YkIlOO=y)>TLat4yrLq#I;wx*%ig!O7aC0DK3oHY@ZLA>L~4kjY_no zl>2N4HDa3nRLhx>yf^l-F88?zI=!xPKm#Yj zThv{hsBoVolD$@ia{+Tll`?!TgLGK+2+<_1s!_%c(V1dAnv_OdPiqeR?j}v>Qz0H- z#cQk}rdpqdE)awY56%To(`Xu2e9L7f-~l2Q>1tga34TM4seTh=Xfrf{J2?{aspUi0 zLG9OgD37}MrUj#-&eb5G&R$o@QoP_K{X9Z4*^ow3CXyyM<%pb6Os6OpGZ53%u~#tf z-ZBAjTaL&PiBvm!+snsh55)`Ihwa}Eu#H|!7v<;>F5*C0pe{4?w=J#vKGpY`k^J#vI^em(2H9ywy!(HMvZ%>CID`T`Kk rvcq677z_r3!C){L3 - + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml deleted file mode 100644 index affc7ba..0000000 --- a/app/src/main/res/drawable/ic_search.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/menu/actionbar_search.xml b/app/src/main/res/menu/actionbar_search.xml new file mode 100644 index 0000000..c7b5775 --- /dev/null +++ b/app/src/main/res/menu/actionbar_search.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 036d09b..c9ad5f9 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 036d09b..c9ad5f9 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index cb8cbcc..efa5e36 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,3 +1,5 @@ + Artist Vault + Buscar diff --git a/app/src/test/java/com/hakodev/androiditunesapi/ExampleUnitTest.java b/app/src/test/java/com/hakodev/androiditunesapi/ExampleUnitTest.java index 1257c5e..b8b382f 100644 --- a/app/src/test/java/com/hakodev/androiditunesapi/ExampleUnitTest.java +++ b/app/src/test/java/com/hakodev/androiditunesapi/ExampleUnitTest.java @@ -2,7 +2,7 @@ package com.hakodev.androiditunesapi; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; /** * Example local unit test, which will execute on the development machine (host).