diff --git a/app/src/main/java/com/example/jingbin/webviewstudy/MainActivity.java b/app/src/main/java/com/example/jingbin/webviewstudy/MainActivity.java
index 3a3afa8..3d85abb 100644
--- a/app/src/main/java/com/example/jingbin/webviewstudy/MainActivity.java
+++ b/app/src/main/java/com/example/jingbin/webviewstudy/MainActivity.java
@@ -1,12 +1,16 @@
package com.example.jingbin.webviewstudy;
+import android.content.DialogInterface;
import android.os.Bundle;
import android.support.v4.content.ContextCompat;
+import android.support.v7.app.AlertDialog;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.AppCompatButton;
import android.support.v7.widget.AppCompatEditText;
import android.text.TextUtils;
import android.view.KeyEvent;
+import android.view.Menu;
+import android.view.MenuItem;
import android.view.View;
import android.view.inputmethod.EditorInfo;
import android.widget.LinearLayout;
@@ -42,6 +46,8 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
AppCompatButton btOpenUrl;
@BindView(R.id.bt_java_js)
TextView btJavaJs;
+ @BindView(R.id.tv_version)
+ TextView tvVersion;
@Override
@@ -51,6 +57,7 @@ protected void onCreate(Bundle savedInstanceState) {
ButterKnife.bind(this);
StatusBarUtil.setColor(this, ContextCompat.getColor(this, R.color.colorPrimary), 0);
+ tvVersion.setText(String.format("版本：v%s", BuildConfig.VERSION_NAME));
btBaidu.setOnClickListener(this);
btCall.setOnClickListener(this);
btUploadPhoto.setOnClickListener(this);
@@ -58,6 +65,7 @@ protected void onCreate(Bundle savedInstanceState) {
btJavaJs.setOnClickListener(this);
btDeepLink.setOnClickListener(this);
btOpenUrl.setOnClickListener(this);
+ tvVersion.setOnClickListener(this);
/** 处理键盘搜索键 */
etSearch.setOnEditorActionListener(new TextView.OnEditorActionListener() {
@Override
@@ -100,6 +108,25 @@ public void onClick(View v) {
String deepLinkUrl = "file:///android_asset/deeplink.html";
WebViewActivity.loadUrl(this, deepLinkUrl, "DeepLink测试");
break;
+ case R.id.tv_version:
+ AlertDialog.Builder builder = new AlertDialog.Builder(v.getContext());
+ builder.setTitle("感谢");
+ builder.setMessage("开源不易，给作者一个star好吗？😊");
+ builder.setCancelable(false);
+ builder.setNegativeButton("已给", new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ Toast.makeText(MainActivity.this, "感谢老铁~", Toast.LENGTH_LONG).show();
+ }
+ });
+ builder.setPositiveButton("去star", new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ WebViewActivity.loadUrl(MainActivity.this, "https://github.com/youlookwhat/WebViewStudy", "WebViewStudy");
+ }
+ });
+ builder.show();
+ break;
default:
break;
}
@@ -124,4 +151,22 @@ private void openUrl() {
}
WebViewActivity.loadUrl(this, url);
}
+
+ @Override
+ public boolean onCreateOptionsMenu(Menu menu) {
+ getMenuInflater().inflate(R.menu.menu_main, menu);
+ return true;
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ switch (item.getItemId()) {
+ case R.id.actionbar_update:
+ WebViewActivity.loadUrl(this, "https://fir.im/webviewstudy", "网页浏览器 - fir.im");
+ break;
+ default:
+ break;
+ }
+ return super.onOptionsItemSelected(item);
+ }
}
diff --git a/app/src/main/java/com/example/jingbin/webviewstudy/WebViewActivity.java b/app/src/main/java/com/example/jingbin/webviewstudy/WebViewActivity.java
index 9b5ab72..0f1e336 100644
--- a/app/src/main/java/com/example/jingbin/webviewstudy/WebViewActivity.java
+++ b/app/src/main/java/com/example/jingbin/webviewstudy/WebViewActivity.java
@@ -102,7 +102,7 @@ public void run() {
@Override
public boolean onCreateOptionsMenu(Menu menu) {
- getMenuInflater().inflate(R.menu.webview_menu, menu);
+ getMenuInflater().inflate(R.menu.menu_webview, menu);
return true;
}
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index c96e74f..df016f2 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,94 +1,114 @@
-
-
-
+
+
-
-
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:paddingBottom="@dimen/activity_vertical_margin"
+ android:paddingLeft="@dimen/activity_horizontal_margin"
+ android:paddingRight="@dimen/activity_horizontal_margin"
+ android:paddingTop="@dimen/activity_vertical_margin"
+ tools:context="com.example.jingbin.webviewstudy.MainActivity">
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
new file mode 100644
index 0000000..5960751
--- /dev/null
+++ b/app/src/main/res/menu/menu_main.xml
@@ -0,0 +1,11 @@
+
+
\ No newline at end of file
diff --git a/app/src/main/res/menu/webview_menu.xml b/app/src/main/res/menu/menu_webview.xml
similarity index 100%
rename from app/src/main/res/menu/webview_menu.xml
rename to app/src/main/res/menu/menu_webview.xml
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9a97165..080e9fc 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,6 +1,7 @@
- 浏览器
+ 网页浏览器
+ 更新
分享
搜索
更多信息