fix: java lint

osfans · Dec 16, 2024 · 4d3eb09 · 4d3eb09
1 parent 89275c8
commit 4d3eb09
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 20 deletions.
diff --git a/.github/workflows/commit.yml b/.github/workflows/commit.yml
@@ -37,11 +37,6 @@ jobs:
         python3 make.py
         popd
 
-    - name: Deploy to SF
-      run: |
-        sshpass -p '${{ secrets.SF_PASSWORD }}' scp -o StrictHostKeyChecking=no cgi/cgi-bin/*.* ${{ secrets.SF_USERNAME }}@web.sourceforge.net:/home/project-web/mcpdict/cgi-bin
-        sshpass -p '${{ secrets.SF_PASSWORD }}' scp -o StrictHostKeyChecking=no tools/warnings.txt ${{ secrets.SF_USERNAME }}@web.sourceforge.net:/home/project-web/mcpdict/htdocs
-
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build with Gradle
@@ -56,4 +51,9 @@ jobs:
         title: "Nightly Build"
         files: |
           app/build/outputs/apk/release/*.APK
-          tools/warnings.txt
+          tools/warnings.txt
+
+    - name: Deploy to SF
+      run: |
+        sshpass -p '${{ secrets.SF_PASSWORD }}' scp -o StrictHostKeyChecking=no cgi/cgi-bin/*.* ${{ secrets.SF_USERNAME }}@web.sourceforge.net:/home/project-web/mcpdict/cgi-bin
+        sshpass -p '${{ secrets.SF_PASSWORD }}' scp -o StrictHostKeyChecking=no tools/warnings.txt app/build/reports/lint-results-debug.html ${{ secrets.SF_USERNAME }}@web.sourceforge.net:/home/project-web/mcpdict/htdocs
diff --git a/app/src/main/res/layout/dictionary_fragment.xml b/app/src/main/res/layout/dictionary_fragment.xml
@@ -62,6 +62,7 @@
                     android:hint="@string/search_lang_hint"
                     android:singleLine="true"
                     android:textSize="16sp"
+                    android:paddingStart="0dp"
                     android:paddingEnd="@dimen/button_icon_size"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
@@ -182,6 +183,7 @@
                     android:hint="@string/custom_languages"
                     android:singleLine="true"
                     android:textSize="16sp"
+                    android:paddingStart="0dp"
                     android:paddingEnd="@dimen/button_icon_size"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toStartOf="@id/checkBox_output_table"

diff --git a/app/src/main/res/layout/help_activity.xml b/app/src/main/res/layout/help_activity.xml
diff --git a/app/src/main/res/values-sw360dp/values.xml b/app/src/main/res/values-sw360dp/values.xml
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -6,7 +6,7 @@
     <string name="help">幫助</string>
     <string name="about">關於</string>
     <string name="info">簡介</string>
-    <string name="about_message"><![CDATA[%s V%s<br/>作者：osfans (waxaca&#64;163.com)<br/><a href="https://github.com/osfans/MCPDict">GitHub</a><br/><br/>漢字古今中外讀音查詢 V3.0<br/>2016.05.03<br/>作者：Maigo<br/>maigoakisame&#64;gmail.com]]></string>
+    <string name="about_message"><![CDATA[%1$s V%2$s<br/>作者：osfans (waxaca&#64;163.com)<br/><a href="https://github.com/osfans/MCPDict">GitHub</a><br/><br/>漢字古今中外讀音查詢 V3.0<br/>2016.05.03<br/>作者：Maigo<br/>maigoakisame&#64;gmail.com]]></string>
 
     <string name="ok">確定</string>
     <string name="cancel">取消</string>
@@ -376,7 +376,7 @@
     </string-array>
     <string name="pref_key_custom_languages">CUSTOM_LANGUAGES</string>
     <string name="custom_languages">自選語言</string>
-    <string name="select_custom_language_summary">已選%d個語言：%s</string>
+    <string name="select_custom_language_summary">已選%1$d個語言：%2$s</string>
     <string name="pref_key_input">INPUT</string>
     <string name="pref_key_language">LANGUAGE</string>
     <string name="custom_title">自定標題</string>

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
@@ -1,5 +1,4 @@
-<PreferenceScreen xmlns:tools="http://schemas.android.com/tools"
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <PreferenceCategory android:title="@string/appearance">
         <EditTextPreference

diff --git a/cgi/cgi-bin/template.html b/cgi/cgi-bin/template.html
@@ -27,7 +27,7 @@
 			<tr id="hzOption" name="hzOption" style="display:none"><td><select name="charset">%s</select>&nbsp;<input type="checkbox" name="variant" checked="checked">%s</input></td></tr>
 		</table>
 	</form>
-	<iframe name="receiver" id="receiver" width=100%% height=70%% frameBorder="0"></iframe>
+	<iframe name="receiver" id="receiver" width=100%% height=75%% frameBorder="0"></iframe>
 	<script>
 		document.getElementById('receiver').srcdoc="<html lang=ko>%s";
 	</script>