Optimized language, themes, colors.

Added splashscreen, SplashActivity.
This commit is contained in:
2022-03-28 23:38:43 +08:00
parent ef0760ef16
commit ef235a86aa
41 changed files with 351 additions and 124 deletions

View File

@@ -0,0 +1,11 @@
package com.fatapp.oxygentoolbox.util;
public interface Locales {
String getCn();
void setCn(String cn);
String getEn();
void setEn(String en);
}

View File

@@ -108,67 +108,55 @@ public class ToolsJson {
this.buttons = buttons;
}
public static class Title {
public static class Title implements Locales {
@SerializedName("cn")
private String cn;
@SerializedName("tc")
private String tc;
@SerializedName("en")
private String en;
@Override
public String getCn() {
return cn;
}
@Override
public void setCn(String cn) {
this.cn = cn;
}
public String getTc() {
return tc;
}
public void setTc(String tc) {
this.tc = tc;
}
@Override
public String getEn() {
return en;
}
@Override
public void setEn(String en) {
this.en = en;
}
}
public static class Desc {
public static class Desc implements Locales {
@SerializedName("cn")
private String cn;
@SerializedName("tc")
private String tc;
@SerializedName("en")
private String en;
@Override
public String getCn() {
return cn;
}
@Override
public void setCn(String cn) {
this.cn = cn;
}
public String getTc() {
return tc;
}
public void setTc(String tc) {
this.tc = tc;
}
@Override
public String getEn() {
return en;
}
@Override
public void setEn(String en) {
this.en = en;
}
@@ -196,34 +184,28 @@ public class ToolsJson {
this.activity = activity;
}
public static class Text {
public static class Text implements Locales {
@SerializedName("cn")
private String cn;
@SerializedName("tc")
private String tc;
@SerializedName("en")
private String en;
@Override
public String getCn() {
return cn;
}
@Override
public void setCn(String cn) {
this.cn = cn;
}
public String getTc() {
return tc;
}
public void setTc(String tc) {
this.tc = tc;
}
@Override
public String getEn() {
return en;
}
@Override
public void setEn(String en) {
this.en = en;
}

View File

@@ -1,5 +1,10 @@
package com.fatapp.oxygentoolbox.util;
import android.os.Build;
import android.widget.Toast;
import com.fatapp.oxygentoolbox.MainActivity;
import com.fatapp.oxygentoolbox.ui.home.HomeFragment;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
@@ -7,6 +12,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
public class ToolsList {
private static List<Tool> toolList = new ArrayList<>();
@@ -19,16 +25,17 @@ public class ToolsList {
jsonStringBuilder.append((char) i);
}
file.close();
List<ToolsJson> toolsJsonList = new Gson().fromJson(jsonStringBuilder.toString(), new TypeToken<List<ToolsJson>>(){}.getType());
List<ToolsJson> toolsJsonList = new Gson().fromJson(jsonStringBuilder.toString(), new TypeToken<List<ToolsJson>>() {
}.getType());
for (ToolsJson toolsJson : toolsJsonList) {
Tool tool = new Tool();
tool.setFont(toolsJson.getContent().getFont());
tool.setIcon(toolsJson.getContent().getIcon());
tool.setFoldLayoutTitle(toolsJson.getContent().getTitle().getCn());
tool.setFoldLayoutTitle(getLocale(toolsJson.getContent().getTitle()));
for (ToolsJson.Content.Buttons cButton : toolsJson.getContent().getButtons()) {
Button button = new Button();
button.setText(cButton.getText().getCn());
button.setText(getLocale(cButton.getText()));
button.setActivity(cButton.getActivity());
tool.buttonList.add(button);
}
@@ -36,6 +43,19 @@ public class ToolsList {
}
}
private static String getLocale(Locales strings) {
String language;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
language = MainActivity.mainActivity.getResources().getConfiguration().getLocales().get(0).getLanguage();
} else {
language = MainActivity.mainActivity.getResources().getConfiguration().locale.getLanguage();
}
if (language.equals("zh")) {
return strings.getCn();
}
return strings.getEn();
}
public static List<Tool> getToolList() {
return toolList;
}