修复一下bug

app/src/main/java/me/yoqi/calculator/ui/AboutActivity.java

@@ -1,6 +1,14 @@
 package me.yoqi.calculator.ui;
 
+import android.content.DialogInterface;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
 import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import android.widget.Toast;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
@@ -9,8 +17,30 @@ import me.yoqi.calculator.R;
 
 public class AboutActivity extends AppCompatActivity {
     @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState) {
+        Button checkNewButton = (Button) findViewById(R.id.check_view_button);
+
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_about);
+        TextView versionName = (TextView) findViewById(R.id.versionNameTextView);
+        TextView appName = (TextView) findViewById(R.id.appNameTextView);
+        LinearLayout linearLayout = (LinearLayout) findViewById(R.id.about_developer_title_bacground);
+        linearLayout.setBackgroundColor(getResources().getColor(R.color.blue_bright));
+        try {
+            versionName.setText("V " + getVersionName());
+        } catch (Exception e) {
+        }
+        appName.setText(getResources().getString(R.string.app_name));
+
+    }
+
+    private String getVersionName() throws Exception {
+        PackageManager packageManager = getPackageManager();
+        PackageInfo packInfo = packageManager.getPackageInfo(getPackageName(), 0);
+        String version = packInfo.versionName;
+        return version;
+    }
+
+    public void onClickCheckNewButton(View view) {
     }
 }

app/src/main/res/layout/activity_about.xml

@@ -92,15 +92,6 @@
                     android:textColor="@color/black"
                     android:textSize="14dp" />
 
-                <TextView
-                    android:layout_width="fill_parent"
-                    android:layout_height="50dp"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:gravity="center_vertical"
-                    android:text="@string/sina_weibo"
-                    android:textColor="@color/black"
-                    android:textSize="14dp" />
-
                 <TextView
                     android:layout_width="fill_parent"
                     android:layout_height="50dp"

app/src/main/res/values-zh/strings.xml

@@ -5,10 +5,10 @@
     <string name="hello_world">Hello world!</string>
     <string name="action_settings">Settings</string>
     <string name="init_text">0</string>
-    <string name="hex_view_button">十六</string>
-    <string name="dec_view_button">十</string>
-    <string name="oct_view_button">八</string>
-    <string name="bin_view_button">二</string>
+    <string name="hex_view_button">HEX</string>
+    <string name="dec_view_button">DEC</string>
+    <string name="oct_view_button">OCT</string>
+    <string name="bin_view_button">BIN</string>
     <string name="blank">  </string>
     <string name="bit_length_BYTE">8位</string>
     <string name="bit_length_WORD">16位</string>
@@ -73,11 +73,10 @@
     <string name="error_of_mod">对零取模结果未定义</string>
     <string name="title_activity_about_app">AboutAppActivity</string>
     <string name="about_developer_title">关于开发者：</string>
-    <string name="about_developer">开发者：幽灵王子SpectrePrince</string>
-    <string name="Email">Email：youlingwangzi@outlook.com</string>
-    <string name="sina_weibo">新浪微博：@幽灵王子SpectrePrince</string>
+    <string name="about_developer">开发者：liuyuqi</string>
+    <string name="Email">Email：liuyuqi.gov@msn.cn</string>
     <string name="tips_title">你知道吗？</string>
-    <string name="tell_me">如果您在使用过程中遇到任何问题，欢迎通过邮箱微博联系我。感谢您的帮助。</string>
+    <string name="tell_me">如果您在使用过程中遇到任何问题，欢迎通过邮箱联系我。感谢您的帮助。</string>
     <string name="check_new_button">检查更新</string>
     <string name="checking_new">正在检查更新</string>
     <string name="checked_updated">您的应用已是最新版</string>

app/src/main/res/values/strings.xml

@@ -2,7 +2,7 @@
     <string name="app_name">Calculator</string>
     <string name="and_button">and</string>
     <string name="add_button">+</string>
-    <string name="bin_view_button">2</string>
+    <string name="bin_view_button">BIN</string>
     <string name="bit_flag_8">0</string>
     <string name="bit_flag_60">0</string>
     <string name="bit_flag_56">0</string>
@@ -21,17 +21,16 @@
     <string name="bit_flag_0">0</string>
     <string name="action_settings">Settings</string>
     <string name="about_developer_title">about developer:</string>
-    <string name="about_developer">developer:liuyuqi.gov@msn.cn</string>
+    <string name="about_developer">developer:liuyuqi</string>
     <string name="num_f_button">F</string>
     <string name="sub_button">-</string>
-    <string name="sina_weibo">sina:</string>
     <string name="set_1_button">set 1</string>
     <string name="set_0_button">set 0</string>
     <string name="rsh_button">Rsh</string>
     <string name="or_button">or</string>
     <string name="opp_button">±</string>
-    <string name="oct_view_button">8</string>
-    <string name="num_keyboard_button">number pad</string>
+    <string name="oct_view_button">OCT</string>
+    <string name="num_keyboard_button">number keyboard</string>
     <string name="num_e_button">E</string>
     <string name="num_d_button">D</string>
     <string name="num_c_button">C</string>
@@ -47,44 +46,44 @@
     <string name="num_2_button">2</string>
     <string name="num_1_button">1</string>
     <string name="num_0_button">0</string>
-    <string name="not_button">exo</string>
+    <string name="not_button">not</string>
     <string name="mul_button">×</string>
     <string name="mod_button">mod</string>
     <string name="lsh_button">Lsh</string>
     <string name="init_text">0</string>
-    <string name="hex_view_button">16</string>
+    <string name="hex_view_button">HEX</string>
     <string name="help_button">about</string>
     <string name="hello_world">Hello world!</string>
-    <string name="error_of_mod">对零取模结果未定义</string>
-    <string name="error_of_divide">除数不能为零</string>
+    <string name="error_of_mod">"The result of zero modulus is not defined  "</string>
+    <string name="error_of_divide">"The divisor cannot be zero  "</string>
     <string name="equal_button">=</string>
-    <string name="Email">Email：youlingwangzi@outlook.com</string>
+    <string name="Email">Email:liuyuqi.gov@msn.cn</string>
     <string name="blank">  </string>
-    <string name="bit_length_BYTE">8位</string>
-    <string name="bit_length_WORD">16位</string>
-    <string name="bit_length_DWORD">32位</string>
-    <string name="bit_length_QWORD">64位</string>
-    <string name="bit_keyboard_button">位键盘</string>
-    <string name="tips_title">你知道吗？</string>
-    <string name="tell_me">如果您在使用过程中遇到任何问题，欢迎通过邮箱微博联系我。感谢您的帮助。</string>
-    <string name="check_new_button">检查更新</string>
-    <string name="checking_new">正在检查更新</string>
-    <string name="checked_updated">您的应用已是最新版</string>
-    <string name="checked_no_network">没有网络，请检查您的网络设置</string>
-    <string name="checked_no_server">与服务器通讯失败，请稍后再试</string>
-    <string name="checked_error">检查更新出现问题，请稍后再试</string>
-    <string name="checked_new_alert_message">程序员计算器有新版本，是否更新？</string>
-    <string name="cancel">取消</string>
+    <string name="bit_length_BYTE">8 bit</string>
+    <string name="bit_length_WORD">16 bit</string>
+    <string name="bit_length_DWORD">32 bit</string>
+    <string name="bit_length_QWORD">64 bit</string>
+    <string name="bit_keyboard_button">bit keyboard</string>
+    <string name="tips_title">Do you know?</string>
+    <string name="tell_me">"If you encounter any problems in the process of use, please contact me via email. Thank you for your help  "</string>
+    <string name="check_new_button">check update</string>
+    <string name="checking_new">"Checking for updates  "</string>
+    <string name="checked_updated">"Your application is the latest version  "</string>
+    <string name="checked_no_network">"There is no network. Please check your network Settings  "</string>
+    <string name="checked_no_server">"Failed to communicate with server. Please try again later  "</string>
+    <string name="checked_error">"Check for update problems, please try again later  "</string>
+    <string name="checked_new_alert_message">calculator has a new version, whether updated</string>
+    <string name="cancel">cacel</string>
     <string name="title_activity_start">StartActivity</string>
     <string name="title_activity_ad">AdActivity</string>
     <string name="title_activity_about_app">AboutAppActivity</string>
-    <string name="xor_button">异或</string>
+    <string name="xor_button">xor</string>
     <string name="clear_button">C</string>
     <string name="clear_one_button">←</string>
-    <string name="dec_view_button">10</string>
+    <string name="dec_view_button">DEC</string>
     <string name="divide_button">÷</string>
     <string name="ce_button">CE</string>
     <string name="bracket_left_button">(</string>
     <string name="bracket_right_button">)</string>
-    <string name="alert_update_yes_button">更新</string>
+    <string name="alert_update_yes_button">update</string>
 </resources>