translate (b0bde6e6) · Commits · Android-smartphones / Fedilab

app/src/main/AndroidManifest.xml

+2 −22

Original line number	Diff line number	Diff line
		@@ -34,14 +34,12 @@
		tools:replace="android:allowBackup">

		<activity
		android:name="app.fedilab.android.activities.MainActivity"
		android:name=".activities.MainActivity"
		android:launchMode="singleTask"
		android:configChanges="orientation\|screenSize\|keyboardHidden\|screenLayout\|smallestScreenSize"
		android:exported="true">
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		<category android:name="android.intent.category.LAUNCHER" />

		</intent-filter>
		<intent-filter>
		<action android:name="android.intent.action.SEND" />
		@@ -66,14 +64,11 @@

		<activity-alias
		android:name=".activities.MainActivity.Bubbles"
		android:enabled="false"
		android:enabled="true"
		android:exported="true"
		android:icon="@mipmap/ic_launcher_bubbles"
		android:roundIcon="@mipmap/ic_launcher_bubbles_round"
		android:targetActivity=".activities.MainActivity">
		<meta-data
		android:name="icon"
		android:value="bubbles" />
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		<category android:name="android.intent.category.LAUNCHER" />
		@@ -87,9 +82,6 @@
		android:icon="@mipmap/ic_launcher_fediverse"
		android:roundIcon="@mipmap/ic_launcher_fediverse_round"
		android:targetActivity=".activities.MainActivity">
		<meta-data
		android:name="icon"
		android:value="Fediverse" />
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		<category android:name="android.intent.category.LAUNCHER" />
		@@ -103,9 +95,6 @@
		android:icon="@mipmap/ic_launcher_hero"
		android:roundIcon="@mipmap/ic_launcher_hero_round"
		android:targetActivity=".activities.MainActivity">
		<meta-data
		android:name="icon"
		android:value="hero" />
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		<category android:name="android.intent.category.LAUNCHER" />
		@@ -119,9 +108,6 @@
		android:icon="@mipmap/ic_launcher_atom"
		android:roundIcon="@mipmap/ic_launcher_atom_round"
		android:targetActivity=".activities.MainActivity">
		<meta-data
		android:name="icon"
		android:value="atom" />
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		<category android:name="android.intent.category.LAUNCHER" />
		@@ -135,9 +121,6 @@
		android:icon="@mipmap/ic_launcher_crash"
		android:roundIcon="@mipmap/ic_launcher_crash_round"
		android:targetActivity=".activities.MainActivity">
		<meta-data
		android:name="icon"
		android:value="braincrash" />
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		<category android:name="android.intent.category.LAUNCHER" />
		@@ -151,9 +134,6 @@
		android:icon="@mipmap/ic_launcher_mastalab"
		android:roundIcon="@mipmap/ic_launcher_mastalab_round"
		android:targetActivity=".activities.MainActivity">
		<meta-data
		android:name="icon"
		android:value="mastalab" />
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		<category android:name="android.intent.category.LAUNCHER" />

app/src/main/java/app/fedilab/android/BaseMainActivity.java

+1 −38

Original line number	Diff line number	Diff line
		@@ -26,8 +26,6 @@ import android.content.Context;
		import android.content.Intent;
		import android.content.IntentFilter;
		import android.content.SharedPreferences;
		import android.content.pm.ActivityInfo;
		import android.content.pm.PackageManager;
		import android.graphics.PorterDuff;
		import android.graphics.drawable.ColorDrawable;
		import android.graphics.drawable.Drawable;
		@@ -214,44 +212,9 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
		BaseMainActivity.currentToken = sharedpreferences.getString(Helper.PREF_USER_TOKEN, null);
		}

		Intent intentIni = getIntent();
		PackageManager pm = getPackageManager();
		try {
		if (intentIni != null && intentIni.getComponent() != null) {
		ActivityInfo ai = pm.getActivityInfo(intentIni.getComponent(), PackageManager.GET_META_DATA);
		String icon;
		Bundle b = ai.metaData;
		if (b != null) {
		icon = b.getString("icon");
		if (icon != null) {
		switch (icon) {
		case "fediverse":
		mLauncher = iconLauncher.FEDIVERSE;
		break;
		case "hero":
		mLauncher = iconLauncher.HERO;
		break;
		case "atom":
		mLauncher = iconLauncher.ATOM;
		break;
		case "braincrash":
		mLauncher = iconLauncher.BRAINCRASH;
		break;
		default:
		mLauncher = iconLauncher.BUBBLES;
		}
		SharedPreferences.Editor editor = sharedpreferences.edit();
		editor.putString(getString(R.string.SET_LOGO_LAUNCHER), icon);
		editor.apply();
		}
		}
		}
		} catch (PackageManager.NameNotFoundException e) {
		e.printStackTrace();
		}


		mamageNewIntent(intentIni);
		mamageNewIntent(getIntent());
		ThemeHelper.initiliazeColors(BaseMainActivity.this);
		filterFetched = false;
		networkStateReceiver = new NetworkStateReceiver();

app/src/main/java/app/fedilab/android/activities/MediaActivity.java

+14 −2

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import android.content.ContentResolver;
		import android.content.Context;
		import android.content.Intent;
		import android.content.IntentFilter;
		import android.content.SharedPreferences;
		import android.content.pm.PackageManager;
		import android.graphics.Point;
		import android.graphics.drawable.ColorDrawable;
		@@ -44,6 +45,7 @@ import androidx.core.content.ContextCompat;
		import androidx.fragment.app.Fragment;
		import androidx.fragment.app.FragmentManager;
		import androidx.fragment.app.FragmentStatePagerAdapter;
		import androidx.preference.PreferenceManager;
		import androidx.viewpager.widget.ViewPager;

		import com.github.stom79.mytransl.MyTransL;
		@@ -171,7 +173,12 @@ public class MediaActivity extends BaseActivity implements OnDownloadInterface {
		statusToTranslate = Html.fromHtml(descriptionToTranslate, Html.FROM_HTML_MODE_LEGACY).toString();
		else
		statusToTranslate = Html.fromHtml(descriptionToTranslate).toString();
		myTransL.translate(statusToTranslate, MyTransL.getLocale(), params, new Results() {
		SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(MediaActivity.this);
		String translate = sharedpreferences.getString(getString(R.string.SET_LIVE_TRANSLATE), MyTransL.getLocale());
		if (translate != null && translate.equalsIgnoreCase("default")) {
		translate = MyTransL.getLocale();
		}
		myTransL.translate(statusToTranslate, translate, params, new Results() {
		@Override
		public void onSuccess(Translate translate) {
		if (translate.getTranslatedContent() != null) {
		@@ -231,7 +238,12 @@ public class MediaActivity extends BaseActivity implements OnDownloadInterface {
		statusToTranslate = Html.fromHtml(descriptionToTranslate, Html.FROM_HTML_MODE_LEGACY).toString();
		else
		statusToTranslate = Html.fromHtml(descriptionToTranslate).toString();
		myTransL.translate(statusToTranslate, MyTransL.getLocale(), params, new Results() {
		SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(MediaActivity.this);
		String translate = sharedpreferences.getString(getString(R.string.SET_LIVE_TRANSLATE), MyTransL.getLocale());
		if (translate != null && translate.equalsIgnoreCase("default")) {
		translate = MyTransL.getLocale();
		}
		myTransL.translate(statusToTranslate, translate, params, new Results() {
		@Override
		public void onSuccess(Translate translate) {
		if (translate.getTranslatedContent() != null) {

app/src/main/java/app/fedilab/android/ui/drawer/ReleaseNoteAdapter.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -16,12 +16,14 @@ package app.fedilab.android.ui.drawer;


		import android.content.Context;
		import android.content.SharedPreferences;
		import android.view.LayoutInflater;
		import android.view.View;
		import android.view.ViewGroup;
		import android.widget.Toast;

		import androidx.annotation.NonNull;
		import androidx.preference.PreferenceManager;
		import androidx.recyclerview.widget.RecyclerView;

		import com.github.stom79.mytransl.MyTransL;
		@@ -88,7 +90,12 @@ public class ReleaseNoteAdapter extends RecyclerView.Adapter<ReleaseNoteAdapter.
		params.setFormat(Params.fType.TEXT);
		params.setSource_lang("auto");
		myTransL.setLibretranslateDomain("translate.fedilab.app");
		myTransL.translate(note.note, MyTransL.getLocale(), params, new Results() {
		SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(context);
		String translate = sharedpreferences.getString(context.getString(R.string.SET_LIVE_TRANSLATE), MyTransL.getLocale());
		if (translate != null && translate.equalsIgnoreCase("default")) {
		translate = MyTransL.getLocale();
		}
		myTransL.translate(note.note, translate, params, new Results() {
		@Override
		public void onSuccess(Translate translate) {
		if (translate.getTranslatedContent() != null) {

app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java

+6 −1

Original line number	Diff line number	Diff line
		@@ -1804,11 +1804,16 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
		params.setSource_lang("auto");
		myTransL.setLibretranslateDomain("translate.fedilab.app");
		String statusToTranslate;
		String translate = sharedpreferences.getString(context.getString(R.string.SET_LIVE_TRANSLATE), MyTransL.getLocale());
		if (translate != null && translate.equalsIgnoreCase("default")) {
		translate = MyTransL.getLocale();
		}

		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
		statusToTranslate = Html.fromHtml(statusToDeal.content, Html.FROM_HTML_MODE_LEGACY).toString();
		else
		statusToTranslate = Html.fromHtml(statusToDeal.content).toString();
		myTransL.translate(statusToTranslate, MyTransL.getLocale(), params, new Results() {
		myTransL.translate(statusToTranslate, translate, params, new Results() {
		@Override
		public void onSuccess(Translate translate) {
		if (translate.getTranslatedContent() != null) {