diff --git a/.idea/dbnavigator.xml b/.idea/dbnavigator.xml
index 7b1bc5f..31ed1e9 100644
--- a/.idea/dbnavigator.xml
+++ b/.idea/dbnavigator.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="DBNavigator.Project.DataEditorManager">
     <record-view-column-sorting-type value="BY_INDEX" />
-    <value-preview-text-wrapping value="true" />
+    <value-preview-text-wrapping value="false" />
     <value-preview-pinned value="false" />
   </component>
   <component name="DBNavigator.Project.DataExportManager">
@@ -27,6 +27,9 @@
     <show-object-properties value="true" />
     <loaded-nodes />
   </component>
+  <component name="DBNavigator.Project.DatabaseEditorStateManager">
+    <last-used-providers />
+  </component>
   <component name="DBNavigator.Project.DatabaseFileManager">
     <open-files />
   </component>
@@ -99,6 +102,7 @@
         <object-type name="FUNCTION" sorting-type="NAME" />
         <object-type name="PROCEDURE" sorting-type="NAME" />
         <object-type name="ARGUMENT" sorting-type="POSITION" />
+        <object-type name="TYPE ATTRIBUTE" sorting-type="POSITION" />
       </sorting>
       <default-editors>
         <object-type name="VIEW" editor-type="SELECTION" />
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
deleted file mode 100644
index 7847bfd..0000000
--- a/.idea/deploymentTargetDropDown.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetDropDown">
-    <targetSelectedWithDropDown>
-      <Target>
-        <type value="QUICK_BOOT_TARGET" />
-        <deviceKey>
-          <Key>
-            <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="G:\Android\Avd\Pixel_4_API_31.avd" />
-          </Key>
-        </deviceKey>
-      </Target>
-    </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2022-09-14T07:53:33.671044700Z" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a2d7c21..a0de2a1 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,6 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="Embedded JDK" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index d0386bd..fca4164 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -119,7 +119,7 @@
       </map>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index cfb282b..71ce965 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -67,6 +67,16 @@
             <intent-filter>
                 <action android:name="oxygentoolbox.ip" />
 
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".tools.converter.MainActivity"
+            android:exported="false"
+            android:theme="@style/Theme.OxygenToolbox.Default">
+            <intent-filter>
+                <action android:name="oxygentoolbox.converter" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
diff --git a/app/src/main/assets/json/BasicTools.json b/app/src/main/assets/json/BasicTools.json
index c592358..f356330 100644
--- a/app/src/main/assets/json/BasicTools.json
+++ b/app/src/main/assets/json/BasicTools.json
@@ -36,6 +36,13 @@
             "en": "IP Query"
           },
           "activity": "com.fatapp.oxygentoolbox.tools.ip.MainActivity"
+        },
+        {
+          "text": {
+            "cn": "\u8fdb\u5236\u8f6c\u6362",
+            "en": "Base Converter"
+          },
+          "activity": "com.fatapp.oxygentoolbox.tools.converter.MainActivity"
         }
       ]
     }
diff --git a/app/src/main/java/com/fatapp/oxygentoolbox/tools/converter/MainActivity.java b/app/src/main/java/com/fatapp/oxygentoolbox/tools/converter/MainActivity.java
new file mode 100644
index 0000000..83dafda
--- /dev/null
+++ b/app/src/main/java/com/fatapp/oxygentoolbox/tools/converter/MainActivity.java
@@ -0,0 +1,161 @@
+package com.fatapp.oxygentoolbox.tools.converter;
+
+import android.graphics.drawable.AnimatedVectorDrawable;
+import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+
+import com.fatapp.oxygentoolbox.R;
+import com.fatapp.oxygentoolbox.util.HexConversionUtils;
+import com.fatapp.oxygentoolbox.util.ResourceUtil;
+import com.fatapp.oxygentoolbox.util.tool.BaseActivityNormal;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.google.android.material.snackbar.Snackbar;
+
+import java.util.regex.Pattern;
+
+public class MainActivity extends BaseActivityNormal {
+
+    private final String[] BASE_ITEMS = new String[35];
+
+    {
+        for (int i = 0; i < 35; i++) {
+            switch (i + 2) {
+                case 2:
+                    BASE_ITEMS[i] = ResourceUtil.getString(R.string.tool_converter_base_2);
+                    break;
+                case 8:
+                    BASE_ITEMS[i] = ResourceUtil.getString(R.string.tool_converter_base_8);
+                    break;
+                case 10:
+                    BASE_ITEMS[i] = ResourceUtil.getString(R.string.tool_converter_base_10);
+                    break;
+                case 16:
+                    BASE_ITEMS[i] = ResourceUtil.getString(R.string.tool_converter_base_16);
+                    break;
+                default:
+                    BASE_ITEMS[i] = String.valueOf(i + 2);
+            }
+        }
+    }
+
+    private int baseFrom = 10;
+    private int baseTo = 2;
+
+    private TextView textViewBaseFrom;
+    private ImageView imageViewSwap;
+    private TextView textViewBaseTo;
+    private EditText editTextFrom;
+    private TextView textViewTo;
+    private ImageView imageViewConvert;
+
+    private void initView() {
+        textViewBaseFrom = findViewById(R.id.text_view_base_from);
+        imageViewSwap = findViewById(R.id.image_view_swap);
+        textViewBaseTo = findViewById(R.id.text_view_base_to);
+        editTextFrom = findViewById(R.id.edit_text_from);
+        textViewTo = findViewById(R.id.text_view_to);
+        imageViewConvert = findViewById(R.id.image_view_convert);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        super.loadView(this, R.layout.activity_tool_converter);
+
+        initView();
+        initBaseChoose();
+        initConverter();
+    }
+
+    private void initBaseChoose() {
+        textViewBaseFrom.setOnClickListener(view -> new MaterialAlertDialogBuilder(this)
+                .setTitle(ResourceUtil.getString(R.string.tool_converter_choose_base))
+                .setItems(BASE_ITEMS, (dialogInterface, i) -> {
+                    textViewBaseFrom.setText(BASE_ITEMS[i]);
+                    baseFrom = i + 2;
+                    editTextFrom.setText(null);
+                    textViewTo.setText(null);
+                })
+                .show());
+
+        textViewBaseTo.setOnClickListener(view -> new MaterialAlertDialogBuilder(this)
+                .setTitle(ResourceUtil.getString(R.string.tool_converter_choose_base))
+                .setItems(BASE_ITEMS, (dialogInterface, i) -> {
+                    textViewBaseTo.setText(BASE_ITEMS[i]);
+                    baseTo = i + 2;
+                    if (textViewTo.getText().length() > 0) {
+                        convert();
+                    }
+                })
+                .show());
+
+        imageViewSwap.setOnClickListener(view -> {
+            AnimatedVectorDrawable animatedVectorDrawable = (AnimatedVectorDrawable) imageViewSwap.getDrawable();
+            animatedVectorDrawable.start();
+            {
+                int temp = baseFrom;
+                baseFrom = baseTo;
+                baseTo = temp;
+            }
+            {
+                String temp = textViewBaseFrom.getText().toString();
+                textViewBaseFrom.setText(textViewBaseTo.getText());
+                textViewBaseTo.setText(temp);
+            }
+            editTextFrom.setText(null);
+            textViewTo.setText(null);
+        });
+    }
+
+    private void initConverter() {
+        StringBuffer beforeText = new StringBuffer();
+        editTextFrom.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+                beforeText.delete(0, beforeText.length());
+                beforeText.append(charSequence);
+            }
+
+            @Override
+            public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+                imageViewConvert.setEnabled(charSequence.length() != 0);
+                if (!Pattern.compile(HexConversionUtils.getRegExp(baseFrom)).matcher(charSequence).matches()) {
+                    editTextFrom.setText(beforeText.toString());
+                    editTextFrom.setSelection(beforeText.toString().length() - 1);
+                } else {
+                    textViewTo.setText(null);
+                }
+            }
+
+            @Override
+            public void afterTextChanged(Editable editable) {
+            }
+        });
+
+        textViewTo.setOnFocusChangeListener((view, b) -> ((InputMethodManager) getSystemService(INPUT_METHOD_SERVICE)).hideSoftInputFromWindow(editTextFrom.getWindowToken(), 0));
+
+        imageViewConvert.setEnabled(false);
+        imageViewConvert.setOnClickListener(view -> convert());
+    }
+
+    private void convert() {
+        ((InputMethodManager) getSystemService(INPUT_METHOD_SERVICE)).hideSoftInputFromWindow(editTextFrom.getWindowToken(), 0);
+        if (baseFrom == baseTo) {
+            textViewTo.setText(editTextFrom.getText());
+        }
+        try {
+            String result = HexConversionUtils.decimalToBase(HexConversionUtils.baseToDecimal(editTextFrom.getText().toString(), baseFrom), baseTo);
+            textViewTo.setText(result);
+        } catch (Exception e) {
+            textViewTo.setText(ResourceUtil.getString(R.string.base_nan));
+            Snackbar.make(getConstraintLayoutRoot(), ResourceUtil.getString(R.string.tool_converter_illegal_number), Snackbar.LENGTH_LONG).show();
+        }
+    }
+}
diff --git a/app/src/main/java/com/fatapp/oxygentoolbox/util/HexConversionUtils.java b/app/src/main/java/com/fatapp/oxygentoolbox/util/HexConversionUtils.java
new file mode 100644
index 0000000..e5cb822
--- /dev/null
+++ b/app/src/main/java/com/fatapp/oxygentoolbox/util/HexConversionUtils.java
@@ -0,0 +1,151 @@
+package com.fatapp.oxygentoolbox.util;
+
+import java.math.BigDecimal;
+import java.util.regex.Pattern;
+
+public class HexConversionUtils {
+    private static int handleLetter(String letter) {
+        return Integer.parseInt(letter, 36);
+    }
+
+    private static String handleNumber(int number) {
+        return Integer.toString(number, 36);
+    }
+
+    public static String getRegExp(int base) {
+        String regExp;
+        if (base <= 10) {
+            regExp = "^[+\\-]?[0-" + (base - 1) + "]*(?:[0-" + (base - 1) + "][.][0-" + (base - 1) + "]*)?";
+        } else {
+            String letter = Integer.toString(base - 1, 36);
+            regExp = "^[+\\-]?[0-9a-" + letter + "]*(?:[0-9a-" + letter + "][.][0-9a-" + letter + "]*)?";
+        }
+        return regExp;
+    }
+
+    public static String getStrictRegExp(int base) {
+        String regExp;
+        if (base <= 10) {
+            regExp = "^[+\\-]?[0-" + (base - 1) + "]+(?:[.][0-" + (base - 1) + "]+)?$";
+        } else {
+            String letter = Integer.toString(base - 1, 36);
+            regExp = "^[+\\-]?[0-9a-" + letter + "]+(?:[.][0-9a-" + letter + "]+)?$";
+        }
+        return regExp;
+    }
+
+    public static boolean checkNumber(String number, int base) {
+        return Pattern.matches(getStrictRegExp(base), number);
+    }
+
+    private static String baseToDecimal_(String number, int base) {
+        if (base == 10) {
+            return number;
+        }
+        BigDecimal result = new BigDecimal(0);
+        String[] data = new StringBuilder(number).reverse().toString().split("");
+        for (int i = 0; i < data.length; i++) {
+            result = result.add(BigDecimal.valueOf(handleLetter(data[i]) * Math.pow(base, i)));
+        }
+        return result.toString().split("\\.")[0];
+    }
+
+    private static String decimalToBase_(String decimal, int base) {
+        if (base == 10) {
+            return decimal;
+        }
+        StringBuilder result = new StringBuilder();
+        BigDecimal quotient = new BigDecimal(decimal);
+        while (quotient.compareTo(new BigDecimal(base)) > -1) {
+            BigDecimal[] divideAndRemainder = quotient.divideAndRemainder(new BigDecimal(base));
+            quotient = divideAndRemainder[0];
+            BigDecimal remainder = divideAndRemainder[1];
+            result.insert(0, handleNumber(remainder.intValue()));
+        }
+        result.insert(0, handleNumber(quotient.intValue()));
+        return result.toString();
+    }
+
+    private static String _baseToDecimal(String number, int base) {
+        if (base == 10) {
+            return number;
+        }
+        BigDecimal result = new BigDecimal(0);
+        String[] data = number.split("");
+        for (int i = 0; i < data.length; i++) {
+            result = result.add(BigDecimal.valueOf(handleLetter(data[i]) * Math.pow(base, -1 * (i + 1))));
+        }
+        return result.toString().split("\\.")[1];
+    }
+
+    private static String _decimalToBase(String decimal, int base) {
+        if (base == 10) {
+            return decimal;
+        }
+        BigDecimal bigDecimal = new BigDecimal("0." + decimal);
+        StringBuilder result = new StringBuilder();
+
+        while (bigDecimal.compareTo(new BigDecimal(0)) > 0 && result.length() < 50) {
+            bigDecimal = bigDecimal.multiply(new BigDecimal(base));
+            if (bigDecimal.toString().contains("E")) {
+                break;
+            }
+            if (bigDecimal.toString().contains(".99999")) {
+                result.append(handleNumber(Integer.parseInt(bigDecimal.toString().split("\\.")[0]) + 1));
+                break;
+            }
+            result.append(handleNumber(Integer.parseInt(bigDecimal.toString().split("\\.")[0])));
+            bigDecimal = new BigDecimal("0." + bigDecimal.toString().split("\\.")[1]);
+        }
+        return result.toString();
+    }
+
+    public static String baseToDecimal(String number, int base) throws Exception{
+        if (!checkNumber(number, base)) {
+            throw new Exception("Illegal number");
+        }
+        StringBuilder result = new StringBuilder();
+
+        String sign = "";
+        if (number.charAt(0) == '-' || number.charAt(0) == '+') {
+            sign = number.substring(0, 1);
+            number = number.substring(1);
+        }
+
+        if (!number.contains(".")) {
+            result.append(baseToDecimal_(number, base));
+        } else {
+            String[] data = number.split("\\.");
+            result.append(baseToDecimal_(data[0], base));
+            result.append(".");
+            result.append(_baseToDecimal(data[1], base));
+        }
+
+        result.insert(0, sign);
+
+        return result.toString();
+    }
+
+    public static String decimalToBase(String number, int base) {
+        StringBuilder result = new StringBuilder();
+
+        String sign = "";
+        if (number.charAt(0) == '-' || number.charAt(0) == '+') {
+            sign = number.substring(0, 1);
+            number = number.substring(1);
+        }
+
+        if (!number.contains(".")) {
+            result.append(decimalToBase_(number, base));
+        } else {
+            String[] data = number.split("\\.");
+            result.append(decimalToBase_(data[0], base));
+            result.append(".");
+            result.append(_decimalToBase(data[1], base));
+        }
+
+        result.insert(0, sign);
+
+        return result.toString();
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_tool_converter_convert.xml b/app/src/main/res/drawable/ic_tool_converter_convert.xml
new file mode 100644
index 0000000..2b3bab6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_tool_converter_convert.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="56dp"
+    android:height="56dp"
+    android:autoMirrored="true"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="?attr/app_theme"
+        android:pathData="M 0 12 C 0 5.374 5.374 0 12 0 C 18.627 0 24 5.374 24 12 C 24 18.627 18.627 24 12 24 C 5.374 24 0 18.627 0 12 Z" />
+
+    <path
+        android:fillColor="?attr/app_on_theme"
+        android:pathData="M18.67,12l-1.17,-1.17L12.83,15.48V5.33h-1.67v10.14l-4.65,-4.66L5.33,12l6.67,6.67 6.67,-6.67z" />
+</vector>
diff --git a/app/src/main/res/layout/activity_tool_converter.xml b/app/src/main/res/layout/activity_tool_converter.xml
new file mode 100644
index 0000000..9163b07
--- /dev/null
+++ b/app/src/main/res/layout/activity_tool_converter.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".tools.converter.MainActivity">
+
+    <LinearLayout
+        android:id="@+id/linear_layout_base"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/tool_converter_layout_margin"
+        android:background="@drawable/background_radius"
+        android:gravity="center"
+        android:orientation="horizontal"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <TextView
+            android:id="@+id/text_view_base_from"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:text="@string/tool_converter_base_10"
+            android:textColor="?attr/app_theme"
+            android:textSize="@dimen/tool_converter_text_size" />
+
+        <ImageView
+            android:id="@+id/image_view_swap"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:contentDescription="Swap"
+            android:padding="@dimen/tool_converter_clickable_padding"
+            android:src="@drawable/animation_swap_horizon" />
+
+        <TextView
+            android:id="@+id/text_view_base_to"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:text="@string/tool_converter_base_2"
+            android:textColor="?attr/app_theme"
+            android:textSize="@dimen/tool_converter_text_size" />
+
+    </LinearLayout>
+
+    <EditText
+        android:id="@+id/edit_text_from"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/tool_converter_edit_text_view_height"
+        android:layout_margin="@dimen/tool_converter_layout_margin"
+        android:autofillHints="text"
+        android:background="@drawable/background_radius"
+        android:gravity="start|top"
+        android:hint="@string/tool_converter_please_enter_text"
+        android:inputType="text"
+        android:maxLength="850"
+        android:paddingHorizontal="@dimen/tool_converter_edit_text_view_padding"
+        android:paddingTop="@dimen/tool_converter_edit_text_view_padding"
+        android:paddingBottom="@dimen/tool_converter_edit_text_view_padding_plus"
+        android:textColor="?attr/app_text_theme"
+        android:textSize="@dimen/tool_converter_text_size"
+        app:layout_constraintTop_toBottomOf="@id/linear_layout_base" />
+
+
+    <TextView
+        android:id="@+id/text_view_to"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/tool_converter_edit_text_view_height"
+        android:layout_margin="@dimen/tool_converter_layout_margin"
+        android:autofillHints="text"
+        android:background="@drawable/background_radius"
+        android:gravity="start|top"
+        android:paddingHorizontal="@dimen/tool_converter_edit_text_view_padding"
+        android:paddingTop="@dimen/tool_converter_edit_text_view_padding_plus"
+        android:paddingBottom="@dimen/tool_converter_edit_text_view_padding"
+        android:textColor="?attr/app_text_theme"
+        android:textIsSelectable="true"
+        android:textSize="@dimen/tool_converter_text_size"
+        app:layout_constraintTop_toBottomOf="@id/edit_text_from" />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@drawable/background_round"
+        android:padding="@dimen/tool_converter_clickable_padding"
+        app:layout_constraintBottom_toTopOf="@id/text_view_to"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/edit_text_from">
+
+        <ImageView
+            android:id="@+id/image_view_convert"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:clickable="true"
+            android:contentDescription="Convert"
+            android:focusable="true"
+            android:foreground="@drawable/foreground_ripple"
+            android:src="@drawable/ic_tool_converter_convert"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/raw/dependencies.json b/app/src/main/res/raw/dependencies.json
index 162bb7a..1fd3939 100644
--- a/app/src/main/res/raw/dependencies.json
+++ b/app/src/main/res/raw/dependencies.json
@@ -1 +1 @@
-{"metadata":{"generated":"2022-09-18T05:51:31.577Z"},"libraries":[{"uniqueId":"com.google.code.gson:gson","funding":[],"developers":[{"name":"Google"}],"artifactVersion":"2.9.0","description":"A Java serialization/deserialization library to convert Java Objects into JSON and back.","scm":{"connection":"scm:git:https://github.com/google/gson.git","url":"https://github.com/google/gson/","developerConnection":"scm:git:git@github.com:google/gson.git"},"name":"Gson","website":"https://github.com/google/gson","licenses":["Apache-2.0"]},{"uniqueId":"com.github.KilleTom:BangScreenToolsMaster","funding":[],"developers":[{"name":"\u6613\u5e9e\u5b99"}],"artifactVersion":"v1.0.0","description":"Android \u5218\u6d77\u5c4f\u9002\u914d\u5de5\u5177\u5e93\u3001\u5218\u6d77\u5c4f\u5e55\u591a\u6837\u5f0f\u9002\u914d\u3001\u5218\u6d77\u5c4f\u9002\u914d\u3001Android \u5218\u6d77\u5c4f\u9002\u914d\u5de5\u5177\u7c7b","scm":{"connection":"scm:git://github.com/KilleTom/BangScreenToolsMaster.git","url":"git://github.com/KilleTom/BangScreenToolsMaster.git","developerConnection":"scm:git://github.com/KilleTom/BangScreenToolsMaster.git"},"name":"KilleTom/BangScreenToolsMaster","website":"https://github.com/KilleTom/BangScreenToolsMaster","licenses":[]},{"uniqueId":"com.squareup.okhttp3:okhttp","funding":[],"developers":[{"name":"Square, Inc."}],"artifactVersion":"4.10.0","description":"Square\u2019s meticulous HTTP client for Java and Kotlin.","scm":{"connection":"scm:git:https://github.com/square/okhttp.git","url":"https://github.com/square/okhttp","developerConnection":"scm:git:ssh://git@github.com/square/okhttp.git"},"name":"okhttp","website":"https://square.github.io/okhttp/","licenses":["Apache-2.0"]}],"licenses":{"Apache-2.0":{"hash":"Apache-2.0","internalHash":"Apache-2.0","url":"http://www.apache.org/licenses/LICENSE-2.0.txt","spdxId":"Apache-2.0","name":"The Apache Software License, Version 2.0"}}}
\ No newline at end of file
+{"metadata":{"generated":"2023-01-07T08:04:40.821Z"},"libraries":[{"uniqueId":"com.google.code.gson:gson","funding":[],"developers":[{"name":"Google"}],"artifactVersion":"2.9.0","description":"A Java serialization/deserialization library to convert Java Objects into JSON and back.","scm":{"connection":"scm:git:https://github.com/google/gson.git","url":"https://github.com/google/gson/","developerConnection":"scm:git:git@github.com:google/gson.git"},"name":"Gson","website":"https://github.com/google/gson","licenses":["Apache-2.0"]},{"uniqueId":"com.github.KilleTom:BangScreenToolsMaster","funding":[],"developers":[{"name":"\u6613\u5e9e\u5b99"}],"artifactVersion":"v1.0.0","description":"Android \u5218\u6d77\u5c4f\u9002\u914d\u5de5\u5177\u5e93\u3001\u5218\u6d77\u5c4f\u5e55\u591a\u6837\u5f0f\u9002\u914d\u3001\u5218\u6d77\u5c4f\u9002\u914d\u3001Android \u5218\u6d77\u5c4f\u9002\u914d\u5de5\u5177\u7c7b","scm":{"connection":"scm:git://github.com/KilleTom/BangScreenToolsMaster.git","url":"git://github.com/KilleTom/BangScreenToolsMaster.git","developerConnection":"scm:git://github.com/KilleTom/BangScreenToolsMaster.git"},"name":"KilleTom/BangScreenToolsMaster","website":"https://github.com/KilleTom/BangScreenToolsMaster","licenses":[]},{"uniqueId":"com.squareup.okhttp3:okhttp","funding":[],"developers":[{"name":"Square, Inc."}],"artifactVersion":"4.10.0","description":"Square\u2019s meticulous HTTP client for Java and Kotlin.","scm":{"connection":"scm:git:https://github.com/square/okhttp.git","url":"https://github.com/square/okhttp","developerConnection":"scm:git:ssh://git@github.com/square/okhttp.git"},"name":"okhttp","website":"https://square.github.io/okhttp/","licenses":["Apache-2.0"]}],"licenses":{"Apache-2.0":{"content":"Apache License\nVersion 2.0, January 2004\nhttp://www.apache.org/licenses/\n\nTERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n1. Definitions.\n\n\"License\" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.\n\n\"Licensor\" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.\n\n\"Legal Entity\" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, \"control\" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.\n\n\"You\" (or \"Your\") shall mean an individual or Legal Entity exercising permissions granted by this License.\n\n\"Source\" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.\n\n\"Object\" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.\n\n\"Work\" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).\n\n\"Derivative Works\" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.\n\n\"Contribution\" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, \"submitted\" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as \"Not a Contribution.\"\n\n\"Contributor\" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.\n\n2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.\n\n3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.\n\n4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:\n\n     (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and\n\n     (b) You must cause any modified files to carry prominent notices stating that You changed the files; and\n\n     (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and\n\n     (d) If the Work includes a \"NOTICE\" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.\n\n     You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.\n\n5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.\n\n6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.\n\n7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.\n\n8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.\n\n9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.\n\nEND OF TERMS AND CONDITIONS\n\nAPPENDIX: How to apply the Apache License to your work.\n\nTo apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets \"[]\" replaced with your own identifying information. (Don't include the brackets!)  The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same \"printed page\" as the copyright notice for easier identification within third-party archives.\n\nCopyright [yyyy] [name of copyright owner]\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\nhttp://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.","hash":"Apache-2.0","internalHash":"Apache-2.0","url":"https://spdx.org/licenses/Apache-2.0.html","spdxId":"Apache-2.0","name":"Apache License 2.0"}}}
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 7611d98..c0e817c 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -87,4 +87,10 @@
     <string name="tool_ip_province">省份</string>
     <string name="tool_ip_isp">网络提供商</string>
     <string name="tool_ip_query_failed">查询失败，请检查网络连接。</string>
+
+    <string name="tool_converter_choose_base">选择进制</string>
+    <string name="tool_converter_from_base">源进制</string>
+    <string name="tool_converter_to_base">目标进制</string>
+    <string name="tool_converter_please_enter_text">请输入内容……</string>
+    <string name="tool_converter_illegal_number">非法数字</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 7611d98..c0e817c 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -87,4 +87,10 @@
     <string name="tool_ip_province">省份</string>
     <string name="tool_ip_isp">网络提供商</string>
     <string name="tool_ip_query_failed">查询失败，请检查网络连接。</string>
+
+    <string name="tool_converter_choose_base">选择进制</string>
+    <string name="tool_converter_from_base">源进制</string>
+    <string name="tool_converter_to_base">目标进制</string>
+    <string name="tool_converter_please_enter_text">请输入内容……</string>
+    <string name="tool_converter_illegal_number">非法数字</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 7611d98..c0e817c 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -87,4 +87,10 @@
     <string name="tool_ip_province">省份</string>
     <string name="tool_ip_isp">网络提供商</string>
     <string name="tool_ip_query_failed">查询失败，请检查网络连接。</string>
+
+    <string name="tool_converter_choose_base">选择进制</string>
+    <string name="tool_converter_from_base">源进制</string>
+    <string name="tool_converter_to_base">目标进制</string>
+    <string name="tool_converter_please_enter_text">请输入内容……</string>
+    <string name="tool_converter_illegal_number">非法数字</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index e44b4bd..c7a9afa 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -48,4 +48,11 @@
     <dimen name="tool_ip_layout_padding">10dp</dimen>
     <dimen name="tool_ip_layout_margin">@dimen/common_layout_margin</dimen>
     <dimen name="tool_ip_query_bar_size">48dp</dimen>
+
+    <dimen name="tool_converter_text_size">16sp</dimen>
+    <dimen name="tool_converter_clickable_padding">5dp</dimen>
+    <dimen name="tool_converter_layout_margin">@dimen/common_layout_margin</dimen>
+    <dimen name="tool_converter_edit_text_view_height">200dp</dimen>
+    <dimen name="tool_converter_edit_text_view_padding">15dp</dimen>
+    <dimen name="tool_converter_edit_text_view_padding_plus">30dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4667f87..eba6c4a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,6 +3,8 @@
     <string name="app_name">Oxygen</string>
     <string name="app_full_name">Oxygen Toolbox</string>
     <string name="app_desc">All in One</string>
+    
+    <string name="base_nan" translatable="false">NaN</string>
 
     <string name="navigation_drawer_open">Open navigation drawer</string>
     <string name="navigation_drawer_close">Close navigation drawer</string>
@@ -123,4 +125,14 @@
     <string name="tool_ip_province">Province</string>
     <string name="tool_ip_isp">ISP</string>
     <string name="tool_ip_query_failed">Query failed, please check network connection.</string>
+    
+    <string name="tool_converter_base_2" translatable="false">2 (binary)</string>
+    <string name="tool_converter_base_8" translatable="false">8 (octal)</string>
+    <string name="tool_converter_base_10" translatable="false">10 (decimal)</string>
+    <string name="tool_converter_base_16" translatable="false">16 (hex)</string>
+    <string name="tool_converter_choose_base">Choose base</string>
+    <string name="tool_converter_from_base">From Base</string>
+    <string name="tool_converter_to_base">To Base</string>
+    <string name="tool_converter_please_enter_text">Please enter text…</string>
+    <string name="tool_converter_illegal_number">Illegal Number</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/test/java/com/fatapp/oxygentoolbox/MethodTest.java b/app/src/test/java/com/fatapp/oxygentoolbox/MethodTest.java
new file mode 100644
index 0000000..9ac674a
--- /dev/null
+++ b/app/src/test/java/com/fatapp/oxygentoolbox/MethodTest.java
@@ -0,0 +1,14 @@
+package com.fatapp.oxygentoolbox;
+
+import static org.junit.Assert.assertEquals;
+
+import com.fatapp.oxygentoolbox.util.HexConversionUtils;
+
+import org.junit.Test;
+
+public class MethodTest {
+    @Test
+    public void decimalToBaseTest() {
+        assertEquals(HexConversionUtils.decimalToBase("2.2", 2), "10.00110011001100110011001100110011001100110011001100");
+    }
+}
diff --git a/app/src/test/java/com/fatapp/oxygentoolbox/Tester.java b/app/src/test/java/com/fatapp/oxygentoolbox/TempTest.java
similarity index 67%
rename from app/src/test/java/com/fatapp/oxygentoolbox/Tester.java
rename to app/src/test/java/com/fatapp/oxygentoolbox/TempTest.java
index 1ee36ad..0af3547 100644
--- a/app/src/test/java/com/fatapp/oxygentoolbox/Tester.java
+++ b/app/src/test/java/com/fatapp/oxygentoolbox/TempTest.java
@@ -1,14 +1,21 @@
 package com.fatapp.oxygentoolbox;
 
+import static org.junit.Assert.assertEquals;
+
 import org.junit.Test;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 
-public class Tester {
+public class TempTest {
     @Test
     public void urlEncodeTest() throws UnsupportedEncodingException {
         System.out.println(URLEncoder.encode(" ", StandardCharsets.UTF_8.toString()));
     }
+
+    @Test
+    public void hexTest() {
+        assertEquals(Integer.parseInt("a", 36), 10);
+    }
 }
diff --git a/build.gradle b/build.gradle
index 7223fcd..011cc96 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '7.3.0' apply false
-    id 'com.android.library' version '7.3.0' apply false
+    id 'com.android.application' version '7.3.1' apply false
+    id 'com.android.library' version '7.3.1' apply false
     id 'com.mikepenz.aboutlibraries.plugin' version '10.3.1' apply false
 }