go on

.idea/misc.xml

@@ -8,7 +8,7 @@
   <component name="Kotlin2JsCompilerArguments">
     <option name="sourceMapEmbedSources" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

app/build.gradle

@@ -12,7 +12,7 @@ android {
     }
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }

app/src/main/AndroidManifest.xml

@@ -2,21 +2,13 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="me.yoqi.calculator">
 
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="com.xiaomi.market.sdk.UPDATE" />
-
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@android:style/Theme.NoTitleBar">
+        android:theme="@style/AppTheme">
         <activity android:name=".ProgrammerCalcActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -25,6 +17,7 @@
             </intent-filter>
         </activity>
         <activity android:name=".MainActivity"/>
+        <activity android:name=".ui.AboutActivity"/>
     </application>
 
 </manifest>

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

@@ -266,16 +266,16 @@
             android:gravity="center_horizontal"
             android:layout_height="0dp"
             android:layout_weight="16">
+
             <Button
+                android:id="@+id/bit_length_button"
                 android:layout_width="0dp"
-                android:layout_weight="20"
                 android:layout_height="match_parent"
+                android:layout_weight="20"
                 android:background="@color/gray_one"
-                android:id="@+id/bit_length_button"
                 android:text="@string/bit_length_QWORD"
-                android:textSize="15sp"
-                android:onClick="onClickBitLengthButton"
                 android:textColor="@color/blue"
+                android:textSize="15sp"
                 android:visibility="gone" />
             <Button
                 android:layout_width="0dp"
@@ -680,27 +680,27 @@
                         android:onClick="onClickAboutButton"
                         android:textColor="@color/gray_word"
                         android:visibility="visible" />
+
                     <Button
+                        android:id="@+id/bracket_left_button"
                         android:layout_width="0dp"
-                        android:layout_weight="20"
                         android:layout_height="match_parent"
-                        android:id="@+id/bracket_left_button"
-                        android:text="@string/bracket_left_button"
-                        android:textSize="13sp"
+                        android:layout_weight="20"
                         android:background="@color/gray_two"
-                        android:onClick="onClickBracketLeftButton"
+                        android:text="@string/bracket_left_button"
                         android:textColor="@color/black"
+                        android:textSize="13sp"
                         android:visibility="gone" />
+
                     <Button
+                        android:id="@+id/bracket_right_button"
                         android:layout_width="0dp"
-                        android:layout_weight="20"
                         android:layout_height="match_parent"
-                        android:id="@+id/bracket_right_button"
-                        android:text="@string/bracket_right_button"
-                        android:textSize="13sp"
+                        android:layout_weight="20"
                         android:background="@color/gray_two"
-                        android:onClick="onClickBracketRightButton"
+                        android:text="@string/bracket_right_button"
                         android:textColor="@color/black"
+                        android:textSize="13sp"
                         android:visibility="invisible" />
                     <Button
                         android:layout_width="0dp"

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

@@ -1,9 +1,8 @@
 <resources>
     <string name="app_name">Calculator</string>
     <string name="and_button">and</string>
-    <string name="alert_update_yes_button">update</string>
     <string name="add_button">+</string>
-    <string name="bin_view_button">two</string>
+    <string name="bin_view_button">2</string>
     <string name="bit_flag_8">0</string>
     <string name="bit_flag_60">0</string>
     <string name="bit_flag_56">0</string>
@@ -31,7 +30,7 @@
     <string name="rsh_button">Rsh</string>
     <string name="or_button">or</string>
     <string name="opp_button">±</string>
-    <string name="oct_view_button">eight</string>
+    <string name="oct_view_button">8</string>
     <string name="num_keyboard_button">number pad</string>
     <string name="num_e_button">E</string>
     <string name="num_d_button">D</string>
@@ -82,7 +81,7 @@
     <string name="xor_button">异或</string>
     <string name="clear_button">C</string>
     <string name="clear_one_button">←</string>
-    <string name="dec_view_button">十</string>
+    <string name="dec_view_button">10</string>
     <string name="divide_button">÷</string>
     <string name="ce_button">CE</string>
     <string name="bracket_left_button">(</string>

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

@@ -6,6 +6,7 @@
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
+        <item name="windowNoTitle">true</item>
     </style>
 
 </resources>