From 082dc2e3f5cd7e43af98376626df2dedb3cccede Mon Sep 17 00:00:00 2001 From: seven332 Date: Tue, 7 Oct 2014 01:54:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20file=20select=20=E5=AF=B9?= =?UTF-8?q?=E8=AF=9D=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- res/drawable-hdpi/ic_dir_dark.png | Bin 407 -> 0 bytes res/drawable-hdpi/ic_dir_dark_dialog.png | Bin 0 -> 375 bytes res/drawable-mdpi/ic_dir_dark.png | Bin 289 -> 0 bytes res/drawable-mdpi/ic_dir_dark_dialog.png | Bin 0 -> 228 bytes res/drawable-xhdpi/ic_dir_dark.png | Bin 562 -> 0 bytes res/drawable-xhdpi/ic_dir_dark_dialog.png | Bin 0 -> 499 bytes res/drawable-xxhdpi/ic_dir_dark.png | Bin 898 -> 0 bytes res/drawable-xxhdpi/ic_dir_dark_dialog.png | Bin 0 -> 853 bytes res/layout/file_explorer_item.xml | 6 +- .../ehviewer/ui/GalleryListActivity.java | 2 +- .../hippo/ehviewer/ui/SettingsActivity.java | 115 +++++------------- 11 files changed, 36 insertions(+), 87 deletions(-) delete mode 100644 res/drawable-hdpi/ic_dir_dark.png create mode 100644 res/drawable-hdpi/ic_dir_dark_dialog.png delete mode 100644 res/drawable-mdpi/ic_dir_dark.png create mode 100644 res/drawable-mdpi/ic_dir_dark_dialog.png delete mode 100644 res/drawable-xhdpi/ic_dir_dark.png create mode 100644 res/drawable-xhdpi/ic_dir_dark_dialog.png delete mode 100644 res/drawable-xxhdpi/ic_dir_dark.png create mode 100644 res/drawable-xxhdpi/ic_dir_dark_dialog.png diff --git a/res/drawable-hdpi/ic_dir_dark.png b/res/drawable-hdpi/ic_dir_dark.png deleted file mode 100644 index 3255c0c75c45c0b8fae8f3984d97eb708cfa2156..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 407 zcmV;I0cie-P)Y3U9|4WK|mo5C`7Op>|f!`)b0wfTb0KY75W*Q=%ICa>*)4YN z>$*P7nU9?rH86;G&RxwF{#D2+O^h0-s_G6x&b0}h%EYLFvMe7o>3=5yBX61zKtEt_ z-?r`h)c%x#N6o{=JHdOu>HGev>$;DhZvS-ypPE7O6(pV)YXHIzP1D>i*+2#Z*EC@K z0~MVk0a08DhDjhnsG^f3Ac`x&FbO0GRdkXBL~$h;CV>Q@icXS%D6Ry<|B^s-D`5!2 zgTRgGA6aZKWGFsE#j-=ww-OnMY33}&rZ6h*A1!xH9#hyj}RFk4Rs6D9E$Lv4OGi{kSp&>wu1@im{v2cLmE7gp zcUIYr)+OGA+hS|=O}stGWuPuG!FXgKShSwRYQQt7V8_%zuxLGr)qrPE!Hz}Wz!R6} VGcgn8$L|0D002ovPDHLkV1mvAnce^Z literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/ic_dir_dark.png b/res/drawable-mdpi/ic_dir_dark.png deleted file mode 100644 index 51e63427af280af05b517e286829f27c57e1ccbe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 289 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ7oIMTArbD$DG~_>EDn4#?y*WR zVKHzzaN$Bg*Tjj2j592rHcDi3{Qdv`|KuubJE1bpY;powI7&vjVWRA6UjLC35gc2 kQEs!JE><*npvb^*{B^OSn!%+2pr08$UHx3vIVCg!01i%bPXGV_ diff --git a/res/drawable-mdpi/ic_dir_dark_dialog.png b/res/drawable-mdpi/ic_dir_dark_dialog.png new file mode 100644 index 0000000000000000000000000000000000000000..2c658071917e4070ae765137e57d7193c9e52044 GIT binary patch literal 228 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ)t)YnArbD$DG~_>EDn4#?y*WR zVcF2yU}BKi#t>H4YOkh$R6 z)R^CxbzXSoKhA)=rX^daST%U;et4>kDYAN^>BZZO_Zz2O=U>9?P&U06WV)L(gm7s; zP`}{)Y0g%Ljl4oZtCJ@DYIm@iI)S+(bJD~t%M;K28!J==7MnbFi$1zo(LjocLD^GD VQD}YE4xqCcJYD@<);T3K0RRzGQ;`4w literal 0 HcmV?d00001 diff --git a/res/drawable-xhdpi/ic_dir_dark.png b/res/drawable-xhdpi/ic_dir_dark.png deleted file mode 100644 index d97b97d3cfd7cd009d807647456af1b9d8639f16..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 562 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVEpOn;uum9_jcAszrzLsZL=FT zePxWOXg85|>R@;5@%X^Q!?TBpX9ai1R%Pey9E^*CCi}e+WzNx1?wZwde+7?hRCK5A zqaW|1?mvC^dG25JZP$zcJhz-z-_H=i*e9I8Z4t*1!*Y`;hw(V)238U71N?^z?tlO5 z+;e~Bsx0q|d8sp=S7z?NFMq6X&x+*yLvBl%{v1pw=xKldlEcBlV^Ru7{MrTu)`pq( z4j0_5CjI~1$TjOs+UDD44grh>dedpRGF0u|taKki)R)N+DEe$6xCrbWV_WyB0N@MfH z&2GCH^gJYX%3mX?rRrlt{0U?Nx1KNjT{u$vs&#foH91 tUnJu+pD7y+A{mcehD< diff --git a/res/drawable-xhdpi/ic_dir_dark_dialog.png b/res/drawable-xhdpi/ic_dir_dark_dialog.png new file mode 100644 index 0000000000000000000000000000000000000000..f2e1b5c6ab7ca5d4f4f3632161a2ade9bca1a538 GIT binary patch literal 499 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVBF>D;uum9_cqGfkJ*vOSK!J^ z3zsadtRt#L{4A$DmVdI=lbqoW|_JC95m6Kb=#fW7Ff<+ov*~xo#5iee?Wd z^ljtKGwarW^56gIN3}|WWPl~JPU9)z2Hy#)2ZUD4VVu@r#2B`4JLk=YHO^sE%Kl%S zXHdXX`99-)-m;SorWLY|ZGQLU8;hBK7927@n89(QsXce{^vcJaZRZr@&+SQW{yclPDVE-3u{idRU6sYgVVy$0CcCQ8 z2kFno`(zxY!skrl6j0KuH%d%Yn&NkWTgg5{tN9Y=gk?LTjTwc0^KoV*Echanz_x+q z2J;P;om>TyPmFfVV0_0M^gQ*C+)pQ$hxgVTQab^L5pSgx=do2vJ;|J~+%d0Zhu|Z( z75924#2mV@d78tOzYL!Z{TU5f&n=wV&>^kVwR1Pn@2+}DGqxSNSKbn%6x?vf`MHSF zfBsn<0?F&6le#Krhb(!PK0*3KtX9RxC6%gavjX28Q&IS?E@Eq+=3sJo=VN2$qI#!` lpOe{KjOSR}86!*8Gw+IZajg26rVNZs22WQ%mvv4FO#m@p&W!*7 literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/ic_dir_dark.png b/res/drawable-xxhdpi/ic_dir_dark.png deleted file mode 100644 index 9ba119ed20c55294eac50a8cdaef3386ba286d04..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 898 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>VD|KMaSW-5dpk$BUpP^uwOlJh z_N0_d{eq6VAAgxSOvD(unw1?VC73Hpu%xlFH9z2QaQdRWRFyZfm5K4B+LD(hzNhE1 z97>y<`fhH~y8{IGSJYW>`Q@D~6Df1yeV?;+f!y0~?KbJ(dF{gJTAFJHO-5V7bA5Hq0WjDWmwNU`m zs({@edU795w>dxGclqTcZ6|$Bj)%Xpe_T@M>Td zGE!pn*wuGa=s`nEj|an~b;;XUEEE)#g&LN;o}tUg=W(KgMd77Yn)e`5s>$-^bgC?$ z%t_^)oIB(*dH?s{m=_Z+Y?-`iP3(h@l_pZQeIjkFZw|KlPW-HT_SVzZ{9}(lzV^tB zVEB1z(}|lw>F3|9>rgKXKl0t9Fv7ubPDy6`lbDs8kM4EVXKOxa5EbKjz>;(2y0ty? zv{V0`d9Z&C)BYc-+T0p)ekFz3UNi2k+q1*)w4VMPz3Hd7U+kazS=E~J!@q5(V*P-r m@jV|W$w?EQZWXwHaI((`EqMOT{t_^6F?hQAxvXV3zT8aSW-5dpl=iUvHpDYr2ce z7Ott6m{+(goc@7n-T~x$p4 z*<6&r&$CSV_5I&}?w5a`G0|eSbd4)#j@xqM8fM0a{ESQj0%`(s=h+k#d=zZv@j5un zaHz16ZfG!Q{7_-Wz?jJN@M8`G(;=2ak8d)tv~ac@-^|FtAb<)?p$>}so+ zt@l6J-CzCu?ke@RdmpDQX1Z0ZzS=KbcFqSe-$QR#r3=vrv5Vj>Qm>dpI4cmE{Q2+JiX_4oXzjW zv$n|hz7MaJ$?Rwl%-TJ_GQPf~xLSLcmC^$4>-C4YMlCKdlUsQ$=$Ar+kX= z%4-+6;GA9fE!8zor|++)!h-f|k8*xr{PF3L1XGp7*OdCOA4%t#a~$|}b*mk_|N1E| zXrDICwc*&wX-*BiYp+Q#N~uS4F`8|ON@mHJlcULU<3d)i;DW+UO9c{~SDU&G7KPrc z?kX0pT>kmQf5F?U7+=25s=8O0_AQoo_buZB7l&Vmmd*P|bN bp&@=oVrrtG|Fr+W?84yb>gTe~DWM4fUr2T6 literal 0 HcmV?d00001 diff --git a/res/layout/file_explorer_item.xml b/res/layout/file_explorer_item.xml index f8d96780a..6eca429a0 100644 --- a/res/layout/file_explorer_item.xml +++ b/res/layout/file_explorer_item.xml @@ -26,15 +26,15 @@ android:layout_alignParentLeft="true" android:layout_centerVertical="true" android:layout_marginLeft="8dp" - android:src="@drawable/ic_dir_dark" /> + android:src="@drawable/ic_dir_dark_dialog" /> + android:layout_toRightOf="@id/icon" /> \ No newline at end of file diff --git a/src/com/hippo/ehviewer/ui/GalleryListActivity.java b/src/com/hippo/ehviewer/ui/GalleryListActivity.java index b2c51f85d..0fab0723c 100644 --- a/src/com/hippo/ehviewer/ui/GalleryListActivity.java +++ b/src/com/hippo/ehviewer/ui/GalleryListActivity.java @@ -881,7 +881,7 @@ public class GalleryListActivity extends AbsGalleryActivity lus.setSearchImage(intent.getStringExtra(KEY_IMAGE_KEY), intent.getStringExtra(KEY_IMAGE_URL), EhClient.IMAGE_SEARCH_USE_SIMILARITY_SCAN); - mTitle = getString(R.string.similar_content); // TODO + mTitle = getString(R.string.similar_content); setTitle(mTitle); break; diff --git a/src/com/hippo/ehviewer/ui/SettingsActivity.java b/src/com/hippo/ehviewer/ui/SettingsActivity.java index 6c30f2d51..547e14af0 100644 --- a/src/com/hippo/ehviewer/ui/SettingsActivity.java +++ b/src/com/hippo/ehviewer/ui/SettingsActivity.java @@ -44,6 +44,8 @@ import android.view.ViewGroup; import android.webkit.WebView; import android.widget.AdapterView; import android.widget.CheckBox; +import android.widget.EditText; +import android.widget.LinearLayout; import android.widget.ListView; import android.widget.TableLayout; import android.widget.TextView; @@ -702,7 +704,8 @@ public class SettingsActivity extends AbsPreferenceActivity { warning.setVisibility(View.VISIBLE); mDirSelectDialog = new MaterialAlertDialog.Builder(mActivity).setTitle(downloadPath) - .setView(view, false).setActionButton("New") // TODO + .setView(view, false, new LinearLayout.LayoutParams( + LinearLayout.LayoutParams.MATCH_PARENT, Ui.dp2pix(360))).setActionButton(R.string._new) .setPositiveButton(android.R.string.ok) .setNegativeButton(android.R.string.cancel) .setButtonListener(new MaterialAlertDialog.OnClickListener() { @@ -710,6 +713,34 @@ public class SettingsActivity extends AbsPreferenceActivity { public boolean onClick(MaterialAlertDialog dialog, int which) { switch (which) { case MaterialAlertDialog.ACTION: + final EditText et = new EditText(mActivity); + et.setText("New folder"); // TODO + LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams( + LinearLayout.LayoutParams.MATCH_PARENT, + LinearLayout.LayoutParams.WRAP_CONTENT); + int x = Ui.dp2pix(8); + lp.leftMargin = x; + lp.rightMargin = x; + lp.topMargin = x; + lp.bottomMargin = x; + new MaterialAlertDialog.Builder(mActivity).setTitle(R.string.new_folder) + .setView(et, true, lp) + .setPositiveButton(R.string._new) + .setNegativeButton(android.R.string.cancel) + .setButtonListener(new MaterialAlertDialog.OnClickListener() { + @Override + public boolean onClick( + MaterialAlertDialog dialog, + int which) { + if (which == MaterialAlertDialog.POSITIVE) { + File dir = new File(fileExplorerView.getCurPath(), + et.getText().toString()); + dir.mkdirs(); + fileExplorerView.refresh(); + } + return true; + } + }).show(); return false; case MaterialAlertDialog.POSITIVE: if (!fileExplorerView.canWrite()) { @@ -734,88 +765,6 @@ public class SettingsActivity extends AbsPreferenceActivity { } }).create(); mDirSelectDialog.show(); - /* - DialogBuilder dialogBuilder = new DialogBuilder(mActivity) - .setView(view, new LinearLayout.LayoutParams( - LayoutParams.MATCH_PARENT, Ui.dp2pix(360)), false) - .setTitle(downloadPath) - .setAction(R.drawable.ic_plus, - new View.OnClickListener(){ - @Override - public void onClick(View v) { - final EditText et = new EditText(mActivity); - et.setText("New folder"); - LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams( - LinearLayout.LayoutParams.MATCH_PARENT, - LinearLayout.LayoutParams.WRAP_CONTENT); - int x = Ui.dp2pix(8); - lp.leftMargin = x; - lp.rightMargin = x; - lp.topMargin = x; - lp.bottomMargin = x; - new DialogBuilder(mActivity).setView(et, lp) - .setTitle(R.string.new_folder) - .setPositiveButton(R.string._new, new View.OnClickListener() { - @Override - public void onClick(View v) { - ((AlertButton)v).dialog.dismiss(); - File dir = new File(fileExplorerView.getCurPath(), - et.getText().toString()); - dir.mkdirs(); - fileExplorerView.refresh(); - // TODO check if the directory was created - } - }).setSimpleNegativeButton().create().show(); - } - }).setPositiveButton(android.R.string.ok, - new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!fileExplorerView.canWrite()) - MaterialToast.showToast(R.string.cur_dir_not_writable); - else { - String downloadPath = fileExplorerView.getCurPath(); - - // Update .nomedia file - // TODO Should I delete .nomedia in old download dir ? - if (!Config.getMediaScan()) { - try { - new File(Config.getDownloadPath(), ".nomedia").createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - - Config.setDownloadPath(downloadPath); - mDownloadPath.setSummary(downloadPath); - ((AlertButton)v).dialog.dismiss(); - } - } - }).setSimpleNegativeButton(); - final TextView title = dialogBuilder.getTitleView(); - - if (fileExplorerView.canWrite()) - warning.setVisibility(View.GONE); - else - warning.setVisibility(View.VISIBLE); - - fileExplorerView.setPath(downloadPath); - fileExplorerView.setOnItemClickListener( - new AdapterView.OnItemClickListener() { - @Override - public void onItemClick(AdapterView parent, View view, - int position, long id) { - fileExplorerView.onItemClick(parent, view, position, id); - title.setText(fileExplorerView.getCurPath()); - if (fileExplorerView.canWrite()) - warning.setVisibility(View.GONE); - else - warning.setVisibility(View.VISIBLE); - } - }); - - mDirSelectDialog = dialogBuilder.create(); - mDirSelectDialog.show();*/ } return true;