Merge pull request #29 from Airsaid/v2.1.0

V2.1.0

Author: Airsaid

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## [V2.1.0](https://github.com/Airsaid/AndroidLocalizePlugin/releases/tag/v2.1.0) (2021-06-05)
+- Added Microsoft Translator.
+- Added "Use google.com" setting.
+- Supported more languages.
+
 ## [V2.0.0](https://github.com/Airsaid/AndroidLocalizePlugin/releases/tag/v2.0.0) (2021-06-04)
 - Completely refactor the code.
 - Added multiple translator support.

README.md

@@ -7,6 +7,7 @@
 # Features
 - Multiple translator support:
   - Google translator. 
+  - Microsoft translator.
   - Baidu translator.
   - Youdao translator.
 - Supports up to 100+ languages.

README_CN.md

@@ -7,6 +7,7 @@
 # 功能
 - 多翻译器支持：
   - Google 翻译
+  - 微软翻译
   - 百度翻译
   - 有道翻译
 - 支持最多 100+ 语言。

build.gradle

@@ -4,7 +4,7 @@ plugins {
 }
 
 group 'com.airsaid'
-version '2.0.0'
+version '2.1.0'
 
 sourceCompatibility = 1.8
 

src/main/java/com/airsaid/localization/action/TranslateAction.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Airsaid. https://github.com/airsaid
+ * Copyright 2021 Airsaid. https://github.com/airsaid
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,6 +12,7 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
  */
 
 package com.airsaid.localization.action;

src/main/java/com/airsaid/localization/config/SettingsComponent.form

@@ -3,12 +3,12 @@
   <grid id="27dc6" binding="contentJPanel" layout-manager="GridLayoutManager" row-count="3" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
-      <xy x="20" y="20" width="500" height="400"/>
+      <xy x="20" y="20" width="558" height="400"/>
     </constraints>
     <properties/>
     <border type="none"/>
     <children>
-      <grid id="c2e63" layout-manager="GridLayoutManager" row-count="3" column-count="4" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+      <grid id="c2e63" layout-manager="GridLayoutManager" row-count="4" column-count="5" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
           <grid row="0" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
@@ -67,14 +67,6 @@
             </constraints>
             <properties/>
           </component>
-          <component id="4ef73" class="com.airsaid.localization.ui.FixedLinkLabel" binding="applyLink">
-            <constraints>
-              <grid row="1" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text value="Apply..."/>
-            </properties>
-          </component>
           <component id="63820" class="javax.swing.JButton" binding="supportLanguagesButton" default-binding="true">
             <constraints>
               <grid row="0" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
@@ -85,9 +77,25 @@
           </component>
           <hspacer id="b8e2f">
             <constraints>
-              <grid row="0" column="3" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+              <grid row="0" column="4" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
             </constraints>
           </hspacer>
+          <component id="4ef73" class="com.airsaid.localization.ui.FixedLinkLabel" binding="applyLink">
+            <constraints>
+              <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text value="Apply..."/>
+            </properties>
+          </component>
+          <component id="2c115" class="javax.swing.JCheckBox" binding="useGoogleComCheckBox" default-binding="true">
+            <constraints>
+              <grid row="0" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text value="Use google.com"/>
+            </properties>
+          </component>
         </children>
       </grid>
       <grid id="b866e" layout-manager="GridLayoutManager" row-count="2" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">

src/main/java/com/airsaid/localization/config/SettingsComponent.java

@@ -1,6 +1,24 @@
+/*
+ * Copyright 2021 Airsaid. https://github.com/airsaid
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
 package com.airsaid.localization.config;
 
 import com.airsaid.localization.translate.AbstractTranslator;
+import com.airsaid.localization.translate.impl.google.GoogleTranslator;
 import com.airsaid.localization.translate.services.TranslatorService;
 import com.airsaid.localization.ui.FixedLinkLabel;
 import com.airsaid.localization.ui.SupportLanguagesDialog;
@@ -40,6 +58,7 @@ public class SettingsComponent {
   private JLabel maxCacheSizeLabel;
   private JBCheckBox enableCacheCheckBox;
   private ComboBox<String> maxCacheSizeComboBox;
+  private JCheckBox useGoogleComCheckBox;
 
   public SettingsComponent() {
     initTranslatorComponents();
@@ -107,19 +126,19 @@ public void setTranslators(@NotNull Map<String, AbstractTranslator> translators)
   public void setSelectedTranslator(@NotNull AbstractTranslator selected) {
     LOG.info("setSelectedTranslator: " + selected);
     translatorsComboBox.setSelectedItem(selected);
-    if (isSelectedDefaultTranslator(selected)) {
-      appIdLabel.setVisible(false);
-      appKeyLabel.setVisible(false);
-      appIdField.setVisible(false);
-      appKeyField.setVisible(false);
-    } else {
-      appIdLabel.setVisible(true);
-      appKeyLabel.setVisible(true);
-      appIdField.setVisible(true);
-      appKeyField.setVisible(true);
-      appIdField.setText(selected.getAppId());
-      appKeyField.setText(selected.getAppKey());
-    }
+
+    useGoogleComCheckBox.setVisible(selected.getClass() == GoogleTranslator.class);
+
+    boolean isNeedAppId = selected.isNeedAppId();
+    appIdLabel.setVisible(isNeedAppId);
+    appIdField.setVisible(isNeedAppId);
+    if (isNeedAppId) appIdField.setText(selected.getAppId());
+
+    boolean isNeedAppKey = selected.isNeedAppKey();
+    appKeyLabel.setVisible(isNeedAppKey);
+    appKeyField.setVisible(isNeedAppKey);
+    if (isNeedAppKey) appKeyField.setText(selected.getAppKey());
+
     String applyAppIdUrl = selected.getApplyAppIdUrl();
     if (!StringUtil.isEmpty(applyAppIdUrl)) {
       applyLink.setVisible(true);
@@ -139,6 +158,14 @@ private boolean isSelectedDefaultTranslator(@NotNull AbstractTranslator selected
     return selected == TranslatorService.getInstance().getDefaultTranslator();
   }
 
+  public boolean isUseGoogleCom() {
+    return useGoogleComCheckBox.isSelected();
+  }
+
+  public void setUseGoogleCom(boolean useGoogleCom) {
+    useGoogleComCheckBox.setSelected(useGoogleCom);
+  }
+
   @NotNull
   public String getAppId() {
     String appId = appIdField.getText();

src/main/java/com/airsaid/localization/config/SettingsConfigurable.java

@@ -1,7 +1,25 @@
+/*
+ * Copyright 2021 Airsaid. https://github.com/airsaid
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
 package com.airsaid.localization.config;
 
 import com.airsaid.localization.constant.Constants;
 import com.airsaid.localization.translate.AbstractTranslator;
+import com.airsaid.localization.translate.impl.google.GoogleTranslator;
 import com.airsaid.localization.translate.services.TranslatorService;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.options.Configurable;
@@ -40,6 +58,7 @@ private void initComponents() {
     SettingsState settingsState = SettingsState.getInstance();
     Map<String, AbstractTranslator> translators = TranslatorService.getInstance().getTranslators();
     settingsComponent.setTranslators(translators);
+    settingsComponent.setUseGoogleCom(settingsState.isUseGoogleCom());
     settingsComponent.setSelectedTranslator(translators.get(settingsState.getSelectedTranslator().getKey()));
     settingsComponent.setEnableCache(settingsState.isEnableCache());
     settingsComponent.setMaxCacheSize(settingsState.getMaxCacheSize());
@@ -50,6 +69,7 @@ public boolean isModified() {
     SettingsState settingsState = SettingsState.getInstance();
     AbstractTranslator selectedTranslator = settingsComponent.getSelectedTranslator();
     boolean isChanged = settingsState.getSelectedTranslator() == selectedTranslator;
+    isChanged |= settingsState.isUseGoogleCom() == settingsComponent.isUseGoogleCom();
     isChanged |= settingsState.getAppId(selectedTranslator.getKey()).equals(selectedTranslator.getAppId());
     isChanged |= settingsState.getAppKey(selectedTranslator.getKey()).equals(selectedTranslator.getAppKey());
     isChanged |= settingsState.isEnableCache() == settingsComponent.isEnableCache();
@@ -64,15 +84,21 @@ public void apply() {
     AbstractTranslator selectedTranslator = settingsComponent.getSelectedTranslator();
     LOG.info("apply selectedTranslator: " + selectedTranslator.getName());
     settingsState.setSelectedTranslator(selectedTranslator);
-    if (!settingsComponent.isSelectedDefaultTranslator()) {
+    if (selectedTranslator.getClass() == GoogleTranslator.class) {
+      settingsState.setUseGoogleCom(settingsComponent.isUseGoogleCom());
+    }
+    if (selectedTranslator.isNeedAppId()) {
       settingsState.setAppId(selectedTranslator.getKey(), settingsComponent.getAppId());
+    }
+    if (selectedTranslator.isNeedAppKey()) {
       settingsState.setAppKey(selectedTranslator.getKey(), settingsComponent.getAppKey());
     }
     settingsState.setEnableCache(settingsComponent.isEnableCache());
     settingsState.setMaxCacheSize(settingsComponent.getMaxCacheSize());
 
     TranslatorService translatorService = TranslatorService.getInstance();
     translatorService.setSelectedTranslator(selectedTranslator);
+    translatorService.setUseGoogleComHost(settingsComponent.isUseGoogleCom());
     translatorService.setEnableCache(settingsComponent.isEnableCache());
     translatorService.setMaxCacheSize(settingsComponent.getMaxCacheSize());
   }
@@ -83,6 +109,7 @@ public void reset() {
     SettingsState settingsState = SettingsState.getInstance();
     AbstractTranslator selectedTranslator = settingsState.getSelectedTranslator();
     settingsComponent.setSelectedTranslator(selectedTranslator);
+    settingsComponent.setUseGoogleCom(settingsState.isUseGoogleCom());
     settingsComponent.setAppId(settingsState.getAppId(selectedTranslator.getKey()));
     settingsComponent.setAppKey(settingsState.getAppKey(selectedTranslator.getKey()));
     settingsComponent.setEnableCache(settingsState.isEnableCache());

src/main/java/com/airsaid/localization/config/SettingsState.java

@@ -1,3 +1,20 @@
+/*
+ * Copyright 2021 Airsaid. https://github.com/airsaid
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
 package com.airsaid.localization.config;
 
 import com.airsaid.localization.translate.AbstractTranslator;
@@ -46,6 +63,7 @@ public static SettingsState getInstance() {
 
   public void initSetting() {
     TranslatorService translatorService = TranslatorService.getInstance();
+    translatorService.setUseGoogleComHost(isUseGoogleCom());
     AbstractTranslator selectedTranslator = translatorService.getSelectedTranslator();
     if (selectedTranslator == null) {
       LOG.info("initSetting");
@@ -64,6 +82,14 @@ public void setSelectedTranslator(AbstractTranslator translator) {
     this.state.selectedTranslatorKey = translator.getKey();
   }
 
+  public boolean isUseGoogleCom() {
+    return state.isUseGoogleCom;
+  }
+
+  public void setUseGoogleCom(boolean useGoogleCom) {
+    state.isUseGoogleCom = useGoogleCom;
+  }
+
   public void setAppId(@NotNull String translatorKey, @NotNull String appId) {
     state.appIds.put(translatorKey, appId);
   }
@@ -118,5 +144,6 @@ static class State {
     public Map<String, String> appIds = new HashMap<>();
     public boolean isEnableCache = true;
     public int maxCacheSize = 100;
+    public boolean isUseGoogleCom;
   }
 }

src/main/java/com/airsaid/localization/constant/Constants.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Airsaid. https://github.com/airsaid
+ * Copyright 2021 Airsaid. https://github.com/airsaid
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,6 +12,7 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
  */
 
 package com.airsaid.localization.constant;