diff --git a/android/.gitignore b/android/.gitignore
index 17076f1..b0f90cf 100644
--- a/android/.gitignore
+++ b/android/.gitignore
@@ -1,16 +1,42 @@
-*.iml
-.gradle
-/local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
-.DS_Store
-/build
-/captures
-.externalNativeBuild
-.cxx
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
 local.properties
+
+# Log/OS Files
+*.log
+
+# Android Studio generated files and folders
+captures/
+.externalNativeBuild/
+.cxx/
+*.apk
+output.json
+
+# IntelliJ
+*.iml
+.idea/
+misc.xml
+deploymentTargetDropDown.xml
+render.experimental.xml
+
+# Keystore files
+*.jks
+*.keystore
+
+# Google Services (e.g. APIs or Firebase)
+google-services.json
+
+# Android Profiling
+*.hprof
+
+# Misc Files
+.DS_Store
+
+# API Keys
 /app/src/main/java/com/pushdeer/os/AppKeys.kt
+
+# Signing Keys
+/key_debug.properties
diff --git a/android/.idea/.gitignore b/android/.idea/.gitignore
deleted file mode 100644
index 26d3352..0000000
--- a/android/.idea/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
diff --git a/android/.idea/compiler.xml b/android/.idea/compiler.xml
deleted file mode 100644
index fb7f4a8..0000000
--- a/android/.idea/compiler.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/android/.idea/gradle.xml b/android/.idea/gradle.xml
deleted file mode 100644
index 2182cf6..0000000
--- a/android/.idea/gradle.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
-            <option value="$PROJECT_DIR$/app_self_hosted" />
-            <option value="$PROJECT_DIR$/common" />
-            <option value="$PROJECT_DIR$/compose" />
-            <option value="$PROJECT_DIR$/pushdeerclient" />
-            <option value="$PROJECT_DIR$/pushdeercommon" />
-          </set>
-        </option>
-        <option name="resolveModulePerSourceSet" value="false" />
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/android/.idea/inspectionProfiles/Project_Default.xml b/android/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 2842237..0000000
--- a/android/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="PreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewMultipleParameterProviders" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-  </profile>
-</component>
\ No newline at end of file
diff --git a/android/.idea/misc.xml b/android/.idea/misc.xml
deleted file mode 100644
index feaa15e..0000000
--- a/android/.idea/misc.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="DesignSurface">
-    <option name="filePathToZoomLevelMap">
-      <map>
-        <entry key="../../../../layout/compose-model-1640490388500.xml" value="0.33" />
-        <entry key="../../../../layout/compose-model-1640490589000.xml" value="0.36944444444444446" />
-        <entry key="../../../../layout/compose-model-1640569321856.xml" value="1.6638655462184875" />
-        <entry key="../../../../layout/compose-model-1641297602161.xml" value="0.29771959459459457" />
-        <entry key="../../../../layout/compose-model-1641300051131.xml" value="1.0" />
-        <entry key="../../../../layout/compose-model-1641348859824.xml" value="0.1" />
-        <entry key="../../../../layout/compose-model-1641366243757.xml" value="2.0" />
-        <entry key="../../../../layout/compose-model-1641659551303.xml" value="2.0" />
-        <entry key="../../../../layout/compose-model-1641659962289.xml" value="2.0" />
-        <entry key="../../../../layout/compose-model-1641694023752.xml" value="0.1" />
-        <entry key="../../../../layout/compose-model-1642733328920.xml" value="2.0" />
-        <entry key="../../../../layout/compose-model-1642826587452.xml" value="2.0" />
-        <entry key="../../../../layout/compose-model-1643039843013.xml" value="2.0" />
-        <entry key="../../../../layout/compose-model-1643123274044.xml" value="0.2916666666666667" />
-        <entry key="../../../../layout/compose-model-1643123509726.xml" value="4.0" />
-        <entry key="../../../../layout/compose-model-1643595536124.xml" value="0.1" />
-        <entry key="app/src/main/res/drawable/fragment_qr_scan.xml" value="0.12314814814814815" />
-        <entry key="app/src/main/res/drawable/ic_apple_logo_svgrepo_com.xml" value="0.23802083333333332" />
-        <entry key="app/src/main/res/drawable/ic_deer_head_with_mail.xml" value="0.23802083333333332" />
-        <entry key="app/src/main/res/drawable/ic_launcher_foreground.xml" value="0.23802083333333332" />
-        <entry key="app/src/main/res/drawable/ic_logo_svg_1.xml" value="0.23802083333333332" />
-        <entry key="app/src/main/res/drawable/ic_markdown.xml" value="0.12962962962962962" />
-        <entry key="app/src/main/res/drawable/ic_weixin_logo_svgrepo_com.xml" value="0.23802083333333332" />
-        <entry key="app/src/main/res/layout/activity_qr_scan.xml" value="0.1" />
-        <entry key="app/src/main/res/layout/activity_webview.xml" value="0.3691123188405797" />
-        <entry key="app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml" value="0.1" />
-        <entry key="app_self_hosted/src/main/res/mipmap-anydpi-v26/ic_launcher.xml" value="0.1925925925925926" />
-        <entry key="common/src/main/res/layout/activity_qr_scan.xml" value="0.1" />
-        <entry key="pushdeerclient/src/main/res/drawable-v24/ic_markdown.xml" value="0.11944444444444445" />
-      </map>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/android/.idea/vcs.xml b/android/.idea/vcs.xml
deleted file mode 100644
index 94a25f7..0000000
--- a/android/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/android/app/build.gradle b/android/app/build.gradle
index c3ac4de..b75f254 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -4,14 +4,19 @@ plugins {
     id 'kotlin-kapt'
 }
 
-android {
+def debugKeyProps = new Properties()
+def debugKeyPropsFile = rootProject.file('key_debug.properties')
+if (debugKeyPropsFile.exists()) {
+    debugKeyProps.load(new FileInputStream(debugKeyPropsFile))
+}
 
+android {
     signingConfigs {
         debug {
-            storeFile file('/Users/wolf/Documents/com.wh.pushdeer')
-            storePassword 'wh.pushdeer'
-            keyAlias 'whpushdeer'
-            keyPassword 'wh.pushdeer'
+            storeFile file(debugKeyProps['storeFile'])
+            storePassword debugKeyProps['storePassword']
+            keyAlias debugKeyProps['keyAlias']
+            keyPassword debugKeyProps['keyPassword']
         }
     }