From 3fb0b38b2b9d8c779648b530f719c7e29b8d66d8 Mon Sep 17 00:00:00 2001 From: andycheng Date: Sat, 11 Nov 2017 20:02:40 +0800 Subject: [PATCH] Upgrade to AS 3.0, remove MoPub --- .idea/misc.xml | 15 +-- app/app.iml | 123 ++++++++++-------- app/build.gradle | 38 ++---- app/release/output.json | 1 + .../buddhavoice2/view/MainActivity.java | 16 +-- .../com/oddsoft/buddhavoice2/view/Prefs.java | 4 +- .../buddhavoice2/view/VoiceListener.java | 12 +- app/src/main/libs/FacebookAdapter.jar | Bin 5724 -> 0 bytes app/src/main/libs/libAdapterSDKMoPub.jar | Bin 7584 -> 0 bytes build.gradle | 7 +- gradle/wrapper/gradle-wrapper.properties | 4 +- 11 files changed, 109 insertions(+), 111 deletions(-) create mode 100644 app/release/output.json delete mode 100644 app/src/main/libs/FacebookAdapter.jar delete mode 100644 app/src/main/libs/libAdapterSDKMoPub.jar diff --git a/.idea/misc.xml b/.idea/misc.xml index 58743c1..77dd45e 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,8 +1,5 @@ - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/app/app.iml b/app/app.iml index 9935caa..df75154 100644 --- a/app/app.iml +++ b/app/app.iml @@ -22,26 +22,27 @@ - + + - + - + @@ -49,6 +50,13 @@ + + + + + + + @@ -79,68 +87,79 @@ + - + - + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 92d7d38..e85451d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,14 +1,14 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 25 - buildToolsVersion '25.0.0' + compileSdkVersion 27 + buildToolsVersion '26.0.2' defaultConfig { applicationId "com.oddsoft.buddhavoice2" minSdkVersion 16 targetSdkVersion 21 - versionCode 41 - versionName '2.5.6.090317BV' + versionCode 42 + versionName '2.5.7.111117BV' } buildTypes { release { @@ -26,29 +26,19 @@ android { dependencies { compile fileTree(include: ['*.jar'], dir: 'libs') - compile 'com.android.support:appcompat-v7:25.3.1' - compile 'com.android.support:design:25.3.1' - compile 'com.google.android.gms:play-services-analytics:11.0.4' - compile 'com.google.firebase:firebase-core:11.0.4' - compile 'com.google.firebase:firebase-ads:11.0.4' - releaseCompile 'com.google.firebase:firebase-crash:11.0.4' + compile 'com.android.support:appcompat-v7:27.0.0' + compile 'com.android.support:design:27.0.0' + compile 'com.google.android.gms:play-services-analytics:11.6.0' + compile 'com.google.firebase:firebase-core:11.6.0' + compile 'com.google.firebase:firebase-ads:11.6.0' + releaseCompile 'com.google.firebase:firebase-crash:11.6.0' compile('com.mikepenz:aboutlibraries:5.9.4@aar') { transitive = true } - // For banners - compile('com.mopub:mopub-sdk-banner:4.16.1@aar') { - transitive = true - } - // For native static (images). - compile('com.mopub:mopub-sdk-native-static:4.16.1@aar') { - transitive = true - } - compile 'com.google.ads.mediation:mopub:4.15.0.0' - compile 'com.facebook.android:audience-network-sdk:4.25.0' - compile 'com.google.ads.mediation:facebook:4.25.0.0' - //compile files('src/main/libs/libAdapterSDKMoPub.jar') - //compile files('src/main/libs/FacebookAdapter.jar') - compile 'com.jakewharton:butterknife:7.0.1' + compile 'com.facebook.android:audience-network-sdk:4.26.1' + compile 'com.google.ads.mediation:facebook:4.26.1.0' + compile 'com.jakewharton:butterknife:8.8.1' + annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1' compile 'me.majiajie:swipe-back:1.0.0-alpha2' } diff --git a/app/release/output.json b/app/release/output.json new file mode 100644 index 0000000..42dfb17 --- /dev/null +++ b/app/release/output.json @@ -0,0 +1 @@ +[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":42},"path":"app-release.apk","properties":{"packageId":"com.oddsoft.buddhavoice2","split":"","minSdkVersion":"16"}}] \ No newline at end of file diff --git a/app/src/main/java/com/oddsoft/buddhavoice2/view/MainActivity.java b/app/src/main/java/com/oddsoft/buddhavoice2/view/MainActivity.java index 7d5c7be..400b2a8 100644 --- a/app/src/main/java/com/oddsoft/buddhavoice2/view/MainActivity.java +++ b/app/src/main/java/com/oddsoft/buddhavoice2/view/MainActivity.java @@ -27,29 +27,29 @@ import com.oddsoft.buddhavoice2.utils.Constant; import com.oddsoft.buddhavoice2.view.base.BaseActivity; -import butterknife.Bind; +import butterknife.BindView; import butterknife.ButterKnife; public class MainActivity extends BaseActivity { private static final String TAG = "BuddhaVoice"; - @Bind(R.id.navigation) - NavigationView navigation; - - @Bind(R.id.drawerlayout) + @BindView(R.id.drawerlayout) DrawerLayout drawerLayout; - @Bind(R.id.tabs) + @BindView(R.id.navigation) + NavigationView navigation; + + @BindView(R.id.tabs) TabLayout tabs; - @Bind(R.id.pager) + @BindView(R.id.pager) ViewPager pager; private AdView adView; private Analytics ga; private ActionBarDrawerToggle actionBarDrawerToggle; - @Bind(R.id.toolbar) + @BindView(R.id.toolbar) Toolbar toolbar; @Override diff --git a/app/src/main/java/com/oddsoft/buddhavoice2/view/Prefs.java b/app/src/main/java/com/oddsoft/buddhavoice2/view/Prefs.java index 05887bf..f296acd 100755 --- a/app/src/main/java/com/oddsoft/buddhavoice2/view/Prefs.java +++ b/app/src/main/java/com/oddsoft/buddhavoice2/view/Prefs.java @@ -10,12 +10,12 @@ import com.oddsoft.buddhavoice2.R; -import butterknife.Bind; +import butterknife.BindView; import butterknife.ButterKnife; public class Prefs extends AppCompatActivity { - @Bind(R.id.toolbar) + @BindView(R.id.toolbar) Toolbar toolbar; protected void onCreate(Bundle savedInstanceState) { diff --git a/app/src/main/java/com/oddsoft/buddhavoice2/view/VoiceListener.java b/app/src/main/java/com/oddsoft/buddhavoice2/view/VoiceListener.java index c423624..e07831d 100755 --- a/app/src/main/java/com/oddsoft/buddhavoice2/view/VoiceListener.java +++ b/app/src/main/java/com/oddsoft/buddhavoice2/view/VoiceListener.java @@ -28,20 +28,20 @@ import com.oddsoft.buddhavoice2.utils.Constant; import com.oddsoft.buddhavoice2.view.base.BaseActivity; -import butterknife.Bind; +import butterknife.BindView; import butterknife.ButterKnife; public class VoiceListener extends BaseActivity { private static final String TAG = "VoiceListener"; private MediaPlayer mp; - @Bind(R.id.songcontent) + @BindView(R.id.songcontent) TextView songcontentTextView; - @Bind(R.id.songinfo) + @BindView(R.id.songinfo) TextView songinfoTextView; - @Bind(R.id.main) + @BindView(R.id.main) NestedScrollView mainScollView; private String[] songInfo, songInfo1; @@ -53,10 +53,10 @@ public class VoiceListener extends BaseActivity { private AdView adView; private Analytics ga; - @Bind(R.id.toolbar) + @BindView(R.id.toolbar) Toolbar toolbar; - @Bind(R.id.progress_wheel) + @BindView(R.id.progress_wheel) ProgressBar progressWheel; @Override diff --git a/app/src/main/libs/FacebookAdapter.jar b/app/src/main/libs/FacebookAdapter.jar deleted file mode 100644 index 6f8595462b07a1d9068a0a8bcbcb02961b3cde35..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5724 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 T%HNGH{kqagNk}Szzu*1~gZpH) diff --git a/app/src/main/libs/libAdapterSDKMoPub.jar b/app/src/main/libs/libAdapterSDKMoPub.jar deleted file mode 100644 index 9f897d6b6b4592fe747ae59002ee2b849c72f2f0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7584 zcmb_h1yEeuvKO?iM5jCxa%R z)csZWzFYsjy07Z@KDO)B*PmObB%H0}p27+U<7@3r{xh>vVg@T+C*qVSEtY(@TIVLK! zre+4L_!06zgD+3XHm$GM&(J^Is)Cf++9bCR7i@FRzqhrwjfq^JuZbZ5j@@s?si=Mw zkCgMkVp6pDi=(0{9Z++;ET&5w4(v3?$o%MP+LMTe(uHcDjqF^sS^y(Nm1!=i#JdmP z9Sps1qIOFQfSJB(SkxIT#a!98D)t2riLdffZiJ z%?X$1WEVQbYD7dEM3(rJ7bI{dJwf_*%8$M}Y=|e~(J+=_)xy35$R?}`l+i@H_ifAF zji~l8n{%hiG!)argY7DXM(9{~3|mc41Xc1~K#>LY#~&%s!GKtT&HZLPS>(Fz6a~Xh z>ZrPI(!`xj!kG&uPG*oP`K+_@*9wjWq;|)`>@DNbWIp2Ry6KeC9bSjeb#?_9N^Hu% zCT7itNQiss6EIJ3J80hPDDwc@5($0;#o*G$FuwVe?|PzEF~gtX1-|)#Nl=~BO$65e z%IK_cS?e6NPe0*qw;_-dYw1<%MfXJ7LQ^QD=;}G+Vro+Ugi?|r9>$(^ij7Dn0f|Ul z6a*c;&>(ZcjA*>y(OHBlHQ!v5&7~mxFo~mAEN3zP)<6>)8$3NRNLcwJ%%aq&sUHt3 z>=O;~ut^9Nbb9_ffvo_UK{YWl8a%ABicdgx!EIj2i8lw3S$iG!x&Q-iNBqb_$~yT% zu}kKVT-UDDJFkL_e0*) zEoea^@4ZqcJ0YLO8%ef~=Y7^*e2xc}a6ay85(Z?DqkK(U{-on@3h{GEi^w55HV}br zy>_`s1po^ku~fI=yByv&ld7q-MUl($3Dn@qKxdA9VtQ_1+Vg*;b6&SZs)-&=vv{(LX1tT z$#1JPB*<+26tC?QxK8NQjEg-MAzYq)X^{s~_3!d+9Wx&aqQSH98=MOCoKEq)FqSKL z(`Nd*zuQbGfqS;%VmE~4CGj%9VB)Oew*w_XZ|7!A_1##z@5_F~L!S%S(6e(VoYJIN z;&}FMRmz_@i7eP*>sgRI_pgiRK$npWpCMV7nOrEXA3d&)3dmkE*ph~xit^43=mY2G zP<)*d66;G71s&zY0^RrCi(=|!Ho_XS65*yPmy})iUPQ$$5&M-E&S|()x58g>yIMui zZOHtrRY#Stt8w~W%)fo5Ju#URfU$Yp!1bWg_~d)}Y-7-$m-BGd=etf9(;Mtwv&DDG zA8_kFJhygGc7oIw8{m2B;mOpF`@9{UFg@&4-=ib%kf7@DmpcLX!gH{$uw&Mdw62mj zeO{Z3%aOJh1WUPwZu{O@@3dED8VdY6h5S5JkqMi}G$!XhaCUNXVwSZMEWM>IxpB$A z$ys>+gVQF~CFFo(76}lLA$@ovJN=BdH6-w*x2b;?v9Rj&OA2~@O(~_tp+c_uWJb2u zibACi+*9++sTH_^0jN&HcSi5=Z`4oN2#Yim_^7(!3G51S4ECFxqw(Ugk&SX^Ajz(N zMyXC)kGOt#h*~eo0Od3iLOJDSL1+H4cBHFcKu004K~|AabP|2673 zL9MOq%{}a0oRyt_W0HrxhrPMuzk*PO-irGJ2>n_q_E_>*Dt_jNMUQ4DOBd#+9mupW zUbkP&XwUH^82YJpiFqNRP`-9u26&z^Y_8M>-M95wA`u1V0gzw~ZzN9;HOmRt>`No0A=i`(qo{pi&!mzDO7K)cXv8pK0T ziGQ?pUzMzRMbAyb=-sTYPGPjl3x3v8S#E&cC^DOuy=)spV-Jj zV~E0pn_KUElJEU5j>z|wPJNkBGr_4&m+eUf?h+Pqare1Xq##Y|gHy(AqN)`0-K`m| z9#L^96A0W3pbsyvw0-=;i}RD1m$t8a`c#dj^?YMT;rr*{z(*7dT87ghDLWfBOb1#? zY8FZ*VK02%Us7lFldv>b$#>X={1jaR#Ss zi2Husxftq9ICeTusUso^#6t9Ky9xupraz*`bAu-4<3VJ4X|abC(YBS6zTt(Rz)cJC z6?UrFQL&wCNZn{{ zY}7kj@N%nqu#q_M-cX{%_UuQVUC#c73VAr6+K2;}SZne#5py-xcrY8g1;7L7z+49; ziN8{(GFCG4+`bD6D~Kc4Qx5o$6G3twGX2`k=Lx5La-2hI3wFPJ>zD88PGSPUXw;{V zN^@Z95n*trEOjk^H(plbG76VB!)rwJ2`0w}*ecVd&y~(n^VB0Be;xE{>Gx7(&}4IH zqNG=7l23Hfv;xf)$rak}<|g}PGI_YIT9m^Qc!6tISRGzy_Q`#Gd3(X* z5%(CG-Kocl^leG4PKY(XpwR&><~GZVU*to|Mi5cAPONg2@&?^nT@o3|z!~{zv7J*W7+@YI;`b`PB+!nI@KhGRk%YQ3K@?6l;w zc8%ej_G>zAPh`DNmHLL-TK@RW6ThM(-`r_c=|^S$avxsqcH>BfDN8*s-ynRKNAwkM zC}Vk$S3q2LRtu>ULV$Bm)ulVsz95fgQoV=kClt+~*e-urmzNQ?{Bv;OTUs9hUzaX% zbHo8%LQK3444XxXz;OeJ$y6ik?Y5XOS|n;rv7v=&8KuG$hod}G&#Tr&Wc&r*f@Yk) zt<}brwUuBH7h~2R50iUER@6eFZ6M2!7;g>VtBw4+68HX8d-{fe&>o90vx6;NAc{`5 zCfuE0Z9|-UlV~LMlxDT$`jKB)tlj4zbzbPXr(d*-omUce3~hOkzM(%_vafFJYiz_s zpP^eIzV=?02+Hnbno_21eXhH?6VVY4`(r1cM=sPRGD1^JJ|&^AMAw)=`uFI+vFCX- zm+T!X05I_%u?PI$V$UBPPMd+D52ZfI&yQR$sch4QA(?u$P!xC-Cl6$@kPV)x=QTYW zZvEEBo*HX(K7G(~2wZAo)t|=?Y}PQcd$fYgB^LaNIqpkQC{aBCb?~S3##XqH*+#P4 z=&(`>(?Z>HEsy)Lgy^lrZad;2`B&Qo=(XupSuj@MET1Jizcu4j!3FgUQ7I8vwz?&e zj;WZDOTaobzc2p6Zr)J&1Y;V?It5|P+dI`*+Y1)8QGQQ~QJvpt-b3sV=BfID4_eJH zi!WbOqb5H$qobx9-H|OsdN8|yty06!v=MYkv^cF`KQ$xBYk#wH5E>XZFCp zqTVxd<-0|@wfN4__|+3>goafi2MD-N{g^z0>ihB0H>Mp4?CZS-t#lfe__Ai4m0I8m zg%**09U3Kypuqqh=4R#?YjsK3M8rb)P_DeXf<9iZin!seXkkXE8iKxrdOcNcF?8 z5N`%!9pxjaZ?z{AaEdWa;NHkYzuY52xH&@P$H(#TFPI!f@4lliGF_n>4H6PHrr#au zYfm|pj_>XrNU-bJ-OfI7-8$&8M`#^L*w55{^5i*LlOBUC6)J+clKXzp$j27paFJ>y z3~2ZaPZkTn>iz5ZNEY$?Z|V{q2%Cb9H|8~2GLsj*yc_M6o=UIZSZCCdMq{{52w|I$ zeF+h_(O@~ydmq_POuBFMsEd;vrolnSIIgMJD<(kiyn(PX9a^UF60sG>7Xbz4?Fho@jEaxY zj11MEjKfY|)5#R^a?t405F9gHQEk`mZU9^m7>@{?@dgo13( zM=cRBJe$G5r63F zF->0f)=Nv1@3U`pLy(FCCMqKRqY~wCX-MLXiWQO?n`0%eP+XkQ$7pPyWwW|=`a(Is zb+P$D`bth2W%8_rrLY{ak~(%M#JK=oH-_Z4C**nqtE(6s-lA<*T=svpuG*R^$*9Bnj~$QyWNu%-p|H$ z7T0l931#1aMVc8c7!*BDQzEbNYi)h9#VP1U*S78$?rtXhG5@Buz$2ZN4#A~k8$$^W z5k4^`-@T$rdR`@s%Z;TY-*f`wWf{-@*eO-;E?}kVjxELM9RDDy zCt&Er-SoBsKJ$?aboFRh#V6cvK-BJ7CYCVuRQ66uS_3Ya!a7Q{v&eO_XpD3?1ZzRg zHA`sHuX``e?Cv^BmZ}2Ud`xzQNcISBXF<7 z*7|my^yFD!7{ZH9pw^N``oD5HYqZv!5g0$4MYw*n7z!}m89o0-3CIdw!!W4<5>pEq z*6XAGXiwWpJZdd^6?dZ8ER=$9q(5O}uHf;Zo$R)_zQyv=%G1k7){Q%iUo8Sedx+(q zQa56K3$tv4mNAsB|MJ{x31_9F*bjTE>xy@|>y%QqZ|p?uy+v^|i1)~^5R1Q^bdGTD zQt+76Sh=jMaI)pnBrrnOmz~|6eKoCQ(-f7xo}_e-<3rHmB<_Zk*Luh4x;VvK-Bu2sHxVxY#rxeBr>p*Q}YOL6crJB^rqLBe0YE%8`NeEjZzbczqopg5bY8NgRQb07n8(4AUN~t}0 zZFtzxwwF7!C9`b%*0%#rPi7O`)jEa;PQdX)(= ziPwJ~DUx4%Tr##p^r?5X|5j5L(dX$CM|48qd&66_g9I63@FKd4X=q~1tnDr=qh~r9 zy29%1Gmpu=@#HVi3W{^Bk<*7zsJD$qw@R1h#s+_kDc>Zc&mOsKR95gMqiBj-c{;ZK zO=jaF{3y=uxV@9{-cP1Ab_#(Rf#7HJOUQo_v52rg_-uQA^JyY_u3{|OEI)vFjUAc% zlga$*STahQ%Wf;JXWQE5)m0YQV0UY~%~k#O{$`tk~$ zZba(5+|lsRu}z1p*yhDTT|?yErsxl}3}Yi6^Ng{rvgY6l^1DU?nvjab()8_yEtbkV zX9!t|lXiCN$Hm!`DJFrqW2pw)c2~_)P=LMnbCQ4%{gWkQzbop%!Q-;Ib^N45sfl@o z$ydyyjM1-TdVeAPE{aM9Tu^H<003?B|J0C!{&7(x@8jWS?*2zjl%)exCzb(9$UgJ9 z1(fOlX-R-8#s<=ag<+cc6NOKdF@s~Lyg0F!Rz|$YcAnYi6ERK1GXG@V%K9Ez?^hKt zpSIBAJt~4Y%(}kcy~PKpe0j^;6UUJuP-kQ09Nw2ujBWOzEZI9{kYm{`*i^q^n7ZNO z?2YC53ygr!35I|!-7HGoOQ(IMq%49U957LdL%Oc%d!l@1b_#F)DUF7Z^VQl|N(`Jl zBbb2JNt}t|)C`yN4tbY+g@bE<9cs55V(#+k+xorvbj=a67a`k17z~Y-ndYM zd{;sv5gO~=N4^vQ7x?ZBKfow%=VQ)f%B zG$sAWZ{M|t+ItQnkDMNqe1Uv{GZ0fOqKcRz0P-lU-{~8!- zfmmkpzNWf+SFm#axTL|3fl}F|AZ-A=CO7ypN}AI>Cj1R}`6_5&xL@$yQ?QajF!unS zMmeqrb^}`h-B}F!d%+@9P!8V$64r~(ellrfr#RqIy-cw#^0iU|HR8hX5c#xH)d!lqDC_8OIuqo=xEsr7$^h9k))nN#mrQR5|k?oVYzO zS^r);5&y?YqiyZxW$mV6?q=>}{hPh|-}KQOf;{2_O6)J$*BN={iOI;AKHkg6fXJZ8 zyn|FP`WF-Te^J!}rTt9h=nSDw(T$g%T*UxwRHUaVm2|PwzKRg={`h4E ze$_7YKsojRy_k8DXdCWfGx4t&4qp#XHt-pF@?&HG>-HTd%m$S&KIA5eCT&{dOylQN z-6<6Yahn$a5mk`+Yt{~m7dzXRpB%QRfB&KMZ=E^9NB{uc!(Y-+K|%%s{#45Ts(k%c z%Kp{w82)z-{|R0CcmIDyir-E0 zpC{RW&rO_TJWI`}L6{C)ku#>DU3{L?}o!0(@J;Q!844VB-V SHUNP3Ff1M-j+OHF?0*1dw`=PF diff --git a/build.gradle b/build.gradle index 1ab0006..e2003bd 100644 --- a/build.gradle +++ b/build.gradle @@ -3,10 +3,12 @@ buildscript { repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.0.0' classpath 'com.google.gms:google-services:3.0.0' + classpath 'com.jakewharton:butterknife-gradle-plugin:8.8.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -16,7 +18,6 @@ buildscript { allprojects { repositories { jcenter() - // includes the MoPub SDK and AVID library - maven { url "https://s3.amazonaws.com/moat-sdk-builds" } + google() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 075e6ca..3f4ae28 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Mar 26 18:49:11 CST 2017 +#Fri Nov 10 22:04:49 CST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip