diff --git a/app.apk b/app.apk index 83413d2..48f60c8 100644 Binary files a/app.apk and b/app.apk differ diff --git a/main/assets/about.htm b/main/assets/about.htm index 1d74fd6..aae1037 100644 --- a/main/assets/about.htm +++ b/main/assets/about.htm @@ -23,7 +23,7 @@ p { text-indent:2em; }

获取网页图标

字符串转Bitmap

更新日志：

-

V4.29 (2023-02-26)

  1. 收藏夹增加分类。
  2. 收藏夹分类的修改和删除。
  3. 修改导出HTML和CSV方法。
+

V4.29 (2023-03-01)

  1. 收藏夹增加分类。
  2. 收藏夹分类的修改和删除。
  3. 修改导出HTML和CSV方法。
  4. 新建收藏和修改收藏编辑框设置最大行数，避免窗口撑大不完整。

V4.28 (2022-11-07)

  1. 资源探查脚本支持返回多个对象。
    分类标题增加数量。
    使用 <details> 代替 <div>，分类可折叠。

V4.27 (2022-10-22)

  1. 修改收藏夹数据库目录。
  2. 收藏夹增加分享数据库功能。

V4.26 (2022-07-23)

  1. 增加页面信息。
  2. 增加资源探查。
diff --git a/main/java/com/hty/browser/FavoriteActivity.java b/main/java/com/hty/browser/FavoriteActivity.java index 8083cf9..fc2d855 100644 --- a/main/java/com/hty/browser/FavoriteActivity.java +++ b/main/java/com/hty/browser/FavoriteActivity.java @@ -279,14 +279,16 @@ public class FavoriteActivity extends Activity { case 3: LinearLayout layout = new LinearLayout(FavoriteActivity.this); layout.setOrientation(LinearLayout.VERTICAL); - final EditText ET_title = new EditText(FavoriteActivity.this); - ET_title.setHint("标题"); - ET_title.setText(title); - layout.addView(ET_title); - final EditText ET_url = new EditText(FavoriteActivity.this); - ET_title.setHint("网址"); - ET_url.setText(url); - layout.addView(ET_url); + final EditText editText_title = new EditText(FavoriteActivity.this); + editText_title.setMaxLines(3); + editText_title.setHint("标题"); + editText_title.setText(title); + layout.addView(editText_title); + final EditText editText_url = new EditText(FavoriteActivity.this); + editText_url.setMaxLines(5); + editText_title.setHint("网址"); + editText_url.setText(url); + layout.addView(editText_url); final Spinner spinner = new Spinner(this); ArrayList list = new ArrayList<>(); list.add(""); @@ -309,8 +311,8 @@ public class FavoriteActivity extends Activity { builder.setPositiveButton("确定", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { - String stitle = ET_title.getText().toString(); - String surl = ET_url.getText().toString(); + String stitle = editText_title.getText().toString(); + String surl = editText_url.getText().toString(); Field field = null; try { //通过反射获取dialog中的私有属性mShowing @@ -326,10 +328,12 @@ public class FavoriteActivity extends Activity { values.put("title", stitle); values.put("category", spinner.getSelectedItem().toString()); db.update(DBHelper.TableName, values, "_id = " + sid, null); - IMM.hideSoftInputFromWindow(ET_title.getWindowToken(), 0); + IMM.hideSoftInputFromWindow(editText_title.getWindowToken(), 0); RadioButton radioButton = (RadioButton) findViewById(radioGroup.getCheckedRadioButtonId()); - //search(0, editText.getText().toString()); - search(1, radioButton.getText().toString()); + if (radioButton == null) + search(0, editText.getText().toString()); + else + search(1, radioButton.getText().toString()); try { //关闭 field.set(dialog, true); @@ -338,10 +342,10 @@ public class FavoriteActivity extends Activity { } } else { if (stitle.equals("")){ - ET_title.setError("标题不能为空！"); + editText_title.setError("标题不能为空！"); } - if (!surl.startsWith("http") || !surl.startsWith("file:///")){ - ET_url.setError("网址错误！"); + if (!surl.startsWith("http://") || !surl.startsWith("https://") || !surl.startsWith("file://")){ + editText_url.setError("网址错误！"); } try { //设置dialog不可关闭 @@ -355,7 +359,7 @@ public class FavoriteActivity extends Activity { builder.setNegativeButton("取消", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { - IMM.hideSoftInputFromWindow(ET_title.getWindowToken(), 0); + IMM.hideSoftInputFromWindow(editText_title.getWindowToken(), 0); Field field = null; try { //通过反射获取dialog中的私有属性mShowing diff --git a/main/java/com/hty/browser/MainActivity.java b/main/java/com/hty/browser/MainActivity.java index 465ec7e..1413fe7 100644 --- a/main/java/com/hty/browser/MainActivity.java +++ b/main/java/com/hty/browser/MainActivity.java @@ -705,14 +705,16 @@ public class MainActivity extends Activity { case 2: LinearLayout layout = new LinearLayout(MainActivity.this); layout.setOrientation(LinearLayout.VERTICAL); - final EditText ET_title = new EditText(MainActivity.this); - ET_title.setHint("标题"); - ET_title.setText(list_webView.get(currentPage).getTitle()); - layout.addView(ET_title); - final EditText ET_url = new EditText(MainActivity.this); - ET_title.setHint("网址"); - ET_url.setText(list_webView.get(currentPage).getUrl()); - layout.addView(ET_url); + final EditText editText_title = new EditText(MainActivity.this); + editText_title.setHint("标题"); + editText_title.setMaxLines(3); + editText_title.setText(list_webView.get(currentPage).getTitle()); + layout.addView(editText_title); + final EditText editText_url = new EditText(MainActivity.this); + editText_url.setMaxLines(5); + editText_url.setHint("网址"); + editText_url.setText(list_webView.get(currentPage).getUrl()); + layout.addView(editText_url); final Spinner spinner = new Spinner(MainActivity.this); ArrayList list = new ArrayList<>(); list.add(""); @@ -741,8 +743,8 @@ public class MainActivity extends Activity { builder.setPositiveButton("确定", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { - String stitle = ET_title.getText().toString(); - String surl = ET_url.getText().toString(); + String stitle = editText_title.getText().toString(); + String surl = editText_url.getText().toString(); Field field = null; try { //通过反射获取dialog中的私有属性mShowing @@ -760,7 +762,7 @@ public class MainActivity extends Activity { values.put("title", stitle); values.put("category", spinner.getSelectedItem().toString()); helper.insert("webfav", values); - IMM.hideSoftInputFromWindow(ET_title.getWindowToken(), 0); + IMM.hideSoftInputFromWindow(editText_title.getWindowToken(), 0); } else { Toast.makeText(getApplicationContext(), "网址已存在", Toast.LENGTH_SHORT).show(); } @@ -772,10 +774,10 @@ public class MainActivity extends Activity { } } else { if (stitle.equals("")){ - ET_title.setError("标题不能为空！"); + editText_title.setError("标题不能为空！"); } - if (!surl.startsWith("http") || !surl.startsWith("file:///")){ - ET_url.setError("网址错误！"); + if (!surl.startsWith("http://") || !surl.startsWith("https://") || !surl.startsWith("file://")){ + editText_url.setError("网址错误！"); } try { //设置dialog不可关闭 @@ -789,7 +791,7 @@ public class MainActivity extends Activity { builder.setNegativeButton("取消", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { - IMM.hideSoftInputFromWindow(ET_title.getWindowToken(), 0); + IMM.hideSoftInputFromWindow(editText_title.getWindowToken(), 0); Field field = null; try { //通过反射获取dialog中的私有属性mShowing