fankes/termux-app
2
0
Fork 0
mirror of https://github.com/fankes/termux-app.git synced 2025-09-06 02:35:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changed!: Move Termux specific classes to com.termux.shared.termux package

Browse Source 
This will allow segregation of Termux utils/classes from general ones and also allow easier management of GPLv3 License for Termux classes
This commit is contained in:
agnostic-apollo
2021-10-19 17:26:39 +05:00
parent 304aed3063
commit 5252fbbe11
59 changed files with 129 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
termux-shared/src/main/java/com/termux/shared/termux/AndroidUtils.java → termux-shared/src/main/java/com/termux/shared/android/AndroidUtils.java
View File

@@ -1,4 +1,4 @@
package com.termux.shared.termux;
package com.termux.shared.android;
import android.annotation.SuppressLint;
import android.content.Context;

2
termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java
View File

@@ -8,7 +8,7 @@ import com.termux.shared.file.FileUtils;
import com.termux.shared.logger.Logger;
import com.termux.shared.markdown.MarkdownUtils;
import com.termux.shared.models.errors.Error;
import com.termux.shared.termux.AndroidUtils;
import com.termux.shared.android.AndroidUtils;
import java.nio.charset.Charset;

2
termux-shared/src/main/java/com/termux/shared/shell/ResultSender.java
View File

@@ -16,7 +16,7 @@ import com.termux.shared.models.ResultConfig;
import com.termux.shared.models.ResultData;
import com.termux.shared.models.errors.FunctionErrno;
import com.termux.shared.models.errors.ResultSenderErrno;
import com.termux.shared.termux.AndroidUtils;
import com.termux.shared.android.AndroidUtils;
import com.termux.shared.termux.TermuxConstants.RESULT_SENDER;
public class ResultSender {

5
termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java
View File

@@ -11,15 +11,16 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.termux.shared.R;
import com.termux.shared.android.AndroidUtils;
import com.termux.shared.data.DataUtils;
import com.termux.shared.file.FileUtils;
import com.termux.shared.file.TermuxFileUtils;
import com.termux.shared.termux.file.TermuxFileUtils;
import com.termux.shared.logger.Logger;
import com.termux.shared.markdown.MarkdownUtils;
import com.termux.shared.models.ExecutionCommand;
import com.termux.shared.models.errors.Error;
import com.termux.shared.packages.PackageUtils;
import com.termux.shared.shell.TermuxShellEnvironmentClient;
import com.termux.shared.termux.shell.TermuxShellEnvironmentClient;
import com.termux.shared.shell.TermuxTask;
import org.apache.commons.io.IOUtils;

3
termux-shared/src/main/java/com/termux/shared/crash/TermuxCrashUtils.java → termux-shared/src/main/java/com/termux/shared/termux/crash/TermuxCrashUtils.java
View File

@@ -1,9 +1,10 @@
package com.termux.shared.crash;
package com.termux.shared.termux.crash;
import android.content.Context;
import androidx.annotation.NonNull;
import com.termux.shared.crash.CrashHandler;
import com.termux.shared.termux.TermuxConstants;
import com.termux.shared.termux.TermuxUtils;

2
termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/ExtraKeyButton.java → termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeyButton.java
View File

@@ -1,4 +1,4 @@
package com.termux.shared.terminal.io.extrakeys;
package com.termux.shared.termux.extrakeys;
import android.text.TextUtils;

2
termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/ExtraKeysConstants.java → termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysConstants.java
View File

@@ -1,4 +1,4 @@
package com.termux.shared.terminal.io.extrakeys;
package com.termux.shared.termux.extrakeys;
import android.view.KeyEvent;

7
termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/ExtraKeysInfo.java → termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysInfo.java
View File

@@ -1,11 +1,12 @@
package com.termux.shared.terminal.io.extrakeys;
package com.termux.shared.termux.extrakeys;
import android.view.View;
import android.widget.Button;
import androidx.annotation.NonNull;
import com.termux.shared.terminal.io.extrakeys.ExtraKeysConstants.EXTRA_KEY_DISPLAY_MAPS;
import com.termux.shared.termux.extrakeys.ExtraKeysConstants.EXTRA_KEY_DISPLAY_MAPS;
import com.termux.shared.termux.terminal.io.TerminalExtraKeys;
import org.json.JSONArray;
import org.json.JSONException;
@@ -68,7 +69,7 @@ import org.json.JSONObject;
* Its up to the {@link ExtraKeysView.IExtraKeysView} client on how to handle individual key values
* of an {@link ExtraKeyButton}. They are sent as is via
* {@link ExtraKeysView.IExtraKeysView#onExtraKeyButtonClick(View, ExtraKeyButton, Button)}. The
* {@link com.termux.shared.terminal.io.TerminalExtraKeys} which is an implementation of the interface,
* {@link TerminalExtraKeys} which is an implementation of the interface,
* checks if the key is one of {@link ExtraKeysConstants#PRIMARY_KEY_CODES_FOR_STRINGS} and generates
* a {@link android.view.KeyEvent} for it, and if its not, then converts the key to code points by
* calling {@link CharSequence#codePoints()} and passes them to the terminal as literal strings.

8
termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/ExtraKeysView.java → termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysView.java
View File

@@ -1,4 +1,4 @@
package com.termux.shared.terminal.io.extrakeys;
package com.termux.shared.termux.extrakeys;
import android.annotation.SuppressLint;
import android.content.Context;
@@ -32,6 +32,8 @@ import android.widget.PopupWindow;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.termux.shared.termux.terminal.io.TerminalExtraKeys;
/**
* A {@link View} showing extra keys (such as Escape, Ctrl, Alt) not normally available on an Android soft
* keyboards.
@@ -40,7 +42,7 @@ import androidx.annotation.Nullable;
* it with a {@link androidx.viewpager.widget.ViewPager}.:
* {@code
* <?xml version="1.0" encoding="utf-8"?>
* <com.termux.shared.terminal.io.extrakeys.ExtraKeysView xmlns:android="http://schemas.android.com/apk/res/android"
* <com.termux.shared.termux.extrakeys.ExtraKeysView xmlns:android="http://schemas.android.com/apk/res/android"
* android:id="@+id/extra_keys"
* style="?android:attr/buttonBarStyle"
* android:layout_width="match_parent"
@@ -66,7 +68,7 @@ import androidx.annotation.Nullable;
* The {@link ExtraKeysInfo} is created by TermuxAppSharedProperties.setExtraKeys().
* Then its got and the view height is adjusted in TermuxActivity.setTerminalToolbarHeight().
* The client used is TermuxTerminalExtraKeys, which extends
* {@link com.termux.shared.terminal.io.TerminalExtraKeys} to handle Termux app specific logic and
* {@link TerminalExtraKeys } to handle Termux app specific logic and
* leave the rest to the super class.
*/
public final class ExtraKeysView extends GridLayout {

2
termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/SpecialButton.java → termux-shared/src/main/java/com/termux/shared/termux/extrakeys/SpecialButton.java
View File

@@ -1,4 +1,4 @@
package com.termux.shared.terminal.io.extrakeys;
package com.termux.shared.termux.extrakeys;
import androidx.annotation.NonNull;

2
termux-shared/src/main/java/com/termux/shared/terminal/io/extrakeys/SpecialButtonState.java → termux-shared/src/main/java/com/termux/shared/termux/extrakeys/SpecialButtonState.java
View File

@@ -1,4 +1,4 @@
package com.termux.shared.terminal.io.extrakeys;
package com.termux.shared.termux.extrakeys;
import android.widget.Button;

7
termux-shared/src/main/java/com/termux/shared/file/TermuxFileUtils.java → termux-shared/src/main/java/com/termux/shared/termux/file/TermuxFileUtils.java
View File

@@ -1,18 +1,19 @@
package com.termux.shared.file;
package com.termux.shared.termux.file;
import android.content.Context;
import android.os.Environment;
import androidx.annotation.NonNull;
import com.termux.shared.file.FileUtils;
import com.termux.shared.logger.Logger;
import com.termux.shared.markdown.MarkdownUtils;
import com.termux.shared.models.ExecutionCommand;
import com.termux.shared.models.errors.Error;
import com.termux.shared.models.errors.FileUtilsErrno;
import com.termux.shared.shell.TermuxShellEnvironmentClient;
import com.termux.shared.termux.shell.TermuxShellEnvironmentClient;
import com.termux.shared.shell.TermuxTask;
import com.termux.shared.termux.AndroidUtils;
import com.termux.shared.android.AndroidUtils;
import com.termux.shared.termux.TermuxConstants;
import com.termux.shared.termux.TermuxUtils;

8
termux-shared/src/main/java/com/termux/shared/interact/TextInputDialogUtils.java → termux-shared/src/main/java/com/termux/shared/termux/interact/TextInputDialogUtils.java
View File

@@ -1,20 +1,14 @@
package com.termux.shared.interact;
package com.termux.shared.termux.interact;
import android.app.Activity;
import android.app.AlertDialog;
import android.content.Context;
import android.content.DialogInterface;
import android.text.Selection;
import android.util.TypedValue;
import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup.LayoutParams;
import android.widget.EditText;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.termux.shared.R;
public final class TextInputDialogUtils {

6
termux-shared/src/main/java/com/termux/shared/notification/TermuxNotificationUtils.java → termux-shared/src/main/java/com/termux/shared/termux/notification/TermuxNotificationUtils.java
View File

@@ -1,9 +1,9 @@
package com.termux.shared.notification;
package com.termux.shared.termux.notification;
import android.content.Context;
import com.termux.shared.settings.preferences.TermuxAppSharedPreferences;
import com.termux.shared.settings.preferences.TermuxPreferenceConstants;
import com.termux.shared.termux.settings.preferences.TermuxAppSharedPreferences;
import com.termux.shared.termux.settings.preferences.TermuxPreferenceConstants;
import com.termux.shared.termux.TermuxConstants;
public class TermuxNotificationUtils {

5
termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAPIAppSharedPreferences.java → termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAPIAppSharedPreferences.java
View File

@@ -1,4 +1,4 @@
package com.termux.shared.settings.preferences;
package com.termux.shared.termux.settings.preferences;
import android.app.Activity;
import android.content.Context;
@@ -9,7 +9,8 @@ import androidx.annotation.Nullable;
import com.termux.shared.logger.Logger;
import com.termux.shared.packages.PackageUtils;
import com.termux.shared.settings.preferences.TermuxPreferenceConstants.TERMUX_API_APP;
import com.termux.shared.settings.preferences.SharedPreferenceUtils;
import com.termux.shared.termux.settings.preferences.TermuxPreferenceConstants.TERMUX_API_APP;
import com.termux.shared.termux.TermuxConstants;
public class TermuxAPIAppSharedPreferences {

5
termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxAppSharedPreferences.java → termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAppSharedPreferences.java
View File

@@ -1,4 +1,4 @@
package com.termux.shared.settings.preferences;
package com.termux.shared.termux.settings.preferences;
import android.app.Activity;
import android.content.Context;
@@ -9,10 +9,11 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.termux.shared.packages.PackageUtils;
import com.termux.shared.settings.preferences.SharedPreferenceUtils;
import com.termux.shared.termux.TermuxConstants;
import com.termux.shared.logger.Logger;
import com.termux.shared.data.DataUtils;
import com.termux.shared.settings.preferences.TermuxPreferenceConstants.TERMUX_APP;
import com.termux.shared.termux.settings.preferences.TermuxPreferenceConstants.TERMUX_APP;
public class TermuxAppSharedPreferences {

5
termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxBootAppSharedPreferences.java → termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxBootAppSharedPreferences.java
View File

@@ -1,4 +1,4 @@
package com.termux.shared.settings.preferences;
package com.termux.shared.termux.settings.preferences;
import android.app.Activity;
import android.content.Context;
@@ -9,7 +9,8 @@ import androidx.annotation.Nullable;
import com.termux.shared.logger.Logger;
import com.termux.shared.packages.PackageUtils;
import com.termux.shared.settings.preferences.TermuxPreferenceConstants.TERMUX_BOOT_APP;
import com.termux.shared.settings.preferences.SharedPreferenceUtils;
import com.termux.shared.termux.settings.preferences.TermuxPreferenceConstants.TERMUX_BOOT_APP;
import com.termux.shared.termux.TermuxConstants;
public class TermuxBootAppSharedPreferences {

5
termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxFloatAppSharedPreferences.java → termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxFloatAppSharedPreferences.java
View File

@@ -1,4 +1,4 @@
package com.termux.shared.settings.preferences;
package com.termux.shared.termux.settings.preferences;
import android.app.Activity;
import android.content.Context;
@@ -10,7 +10,8 @@ import androidx.annotation.Nullable;
import com.termux.shared.data.DataUtils;
import com.termux.shared.logger.Logger;
import com.termux.shared.packages.PackageUtils;
import com.termux.shared.settings.preferences.TermuxPreferenceConstants.TERMUX_FLOAT_APP;
import com.termux.shared.settings.preferences.SharedPreferenceUtils;
import com.termux.shared.termux.settings.preferences.TermuxPreferenceConstants.TERMUX_FLOAT_APP;
import com.termux.shared.termux.TermuxConstants;
public class TermuxFloatAppSharedPreferences {

2
termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxPreferenceConstants.java → termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxPreferenceConstants.java
View File

@@ -1,4 +1,4 @@
package com.termux.shared.settings.preferences;
package com.termux.shared.termux.settings.preferences;
/*
* Version: v0.15.0

5
termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxStylingAppSharedPreferences.java → termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxStylingAppSharedPreferences.java
View File

@@ -1,4 +1,4 @@
package com.termux.shared.settings.preferences;
package com.termux.shared.termux.settings.preferences;
import android.app.Activity;
import android.content.Context;
@@ -9,7 +9,8 @@ import androidx.annotation.Nullable;
import com.termux.shared.logger.Logger;
import com.termux.shared.packages.PackageUtils;
import com.termux.shared.settings.preferences.TermuxPreferenceConstants.TERMUX_STYLING_APP;
import com.termux.shared.settings.preferences.SharedPreferenceUtils;
import com.termux.shared.termux.settings.preferences.TermuxPreferenceConstants.TERMUX_STYLING_APP;
import com.termux.shared.termux.TermuxConstants;
public class TermuxStylingAppSharedPreferences {

5
termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxTaskerAppSharedPreferences.java → termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxTaskerAppSharedPreferences.java
View File

@@ -1,4 +1,4 @@
package com.termux.shared.settings.preferences;
package com.termux.shared.termux.settings.preferences;
import android.app.Activity;
import android.content.Context;
@@ -8,8 +8,9 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.termux.shared.packages.PackageUtils;
import com.termux.shared.settings.preferences.SharedPreferenceUtils;
import com.termux.shared.termux.TermuxConstants;
import com.termux.shared.settings.preferences.TermuxPreferenceConstants.TERMUX_TASKER_APP;
import com.termux.shared.termux.settings.preferences.TermuxPreferenceConstants.TERMUX_TASKER_APP;
import com.termux.shared.logger.Logger;
public class TermuxTaskerAppSharedPreferences {

5
termux-shared/src/main/java/com/termux/shared/settings/preferences/TermuxWidgetAppSharedPreferences.java → termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxWidgetAppSharedPreferences.java
View File

@@ -1,4 +1,4 @@
package com.termux.shared.settings.preferences;
package com.termux.shared.termux.settings.preferences;
import android.app.Activity;
import android.content.Context;
@@ -9,7 +9,8 @@ import androidx.annotation.Nullable;
import com.termux.shared.logger.Logger;
import com.termux.shared.packages.PackageUtils;
import com.termux.shared.settings.preferences.TermuxPreferenceConstants.TERMUX_WIDGET_APP;
import com.termux.shared.settings.preferences.SharedPreferenceUtils;
import com.termux.shared.termux.settings.preferences.TermuxPreferenceConstants.TERMUX_WIDGET_APP;
import com.termux.shared.termux.TermuxConstants;
import java.util.UUID;

3
termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java → termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxPropertyConstants.java
View File

@@ -1,8 +1,9 @@
package com.termux.shared.settings.properties;
package com.termux.shared.termux.settings.properties;
import com.google.common.collect.ImmutableBiMap;
import com.termux.shared.file.FileUtils;
import com.termux.shared.file.filesystem.FileType;
import com.termux.shared.settings.properties.SharedProperties;
import com.termux.shared.termux.TermuxConstants;
import com.termux.shared.logger.Logger;
import com.termux.terminal.TerminalEmulator;

5
termux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java → termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxSharedProperties.java
View File

@@ -1,12 +1,13 @@
package com.termux.shared.settings.properties;
package com.termux.shared.termux.settings.properties;
import android.content.Context;
import android.content.res.Configuration;
import androidx.annotation.NonNull;
import com.termux.shared.logger.Logger;
import com.termux.shared.data.DataUtils;
import com.termux.shared.settings.properties.SharedProperties;
import com.termux.shared.settings.properties.SharedPropertiesParser;
import java.io.File;
import java.util.HashMap;

4
termux-shared/src/main/java/com/termux/shared/shell/TermuxSession.java → termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxSession.java
View File

@@ -1,4 +1,4 @@
package com.termux.shared.shell;
package com.termux.shared.termux.shell;
import android.content.Context;
import android.system.OsConstants;
@@ -10,6 +10,8 @@ import com.termux.shared.models.ExecutionCommand;
import com.termux.shared.models.ResultData;
import com.termux.shared.models.errors.Errno;
import com.termux.shared.logger.Logger;
import com.termux.shared.shell.ShellEnvironmentClient;
import com.termux.shared.shell.ShellUtils;
import com.termux.terminal.TerminalSession;
import com.termux.terminal.TerminalSessionClient;

4
termux-shared/src/main/java/com/termux/shared/shell/TermuxShellEnvironmentClient.java → termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellEnvironmentClient.java
View File

@@ -1,9 +1,11 @@
package com.termux.shared.shell;
package com.termux.shared.termux.shell;
import android.content.Context;
import androidx.annotation.NonNull;
import com.termux.shared.shell.ShellEnvironmentClient;
public class TermuxShellEnvironmentClient implements ShellEnvironmentClient {
@NonNull

2
termux-shared/src/main/java/com/termux/shared/shell/TermuxShellUtils.java → termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellUtils.java
View File

@@ -1,4 +1,4 @@
package com.termux.shared.shell;
package com.termux.shared.termux.shell;
import android.content.Context;

2
termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalSessionClientBase.java → termux-shared/src/main/java/com/termux/shared/termux/terminal/TermuxTerminalSessionClientBase.java
View File

@@ -1,4 +1,4 @@
package com.termux.shared.terminal;
package com.termux.shared.termux.terminal;
import com.termux.shared.logger.Logger;
import com.termux.terminal.TerminalSession;

2
termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalViewClientBase.java → termux-shared/src/main/java/com/termux/shared/termux/terminal/TermuxTerminalViewClientBase.java
View File

@@ -1,4 +1,4 @@
package com.termux.shared.terminal;
package com.termux.shared.termux.terminal;
import android.view.KeyEvent;
import android.view.MotionEvent;

2
termux-shared/src/main/java/com/termux/shared/terminal/io/BellHandler.java → termux-shared/src/main/java/com/termux/shared/termux/terminal/io/BellHandler.java
View File

@@ -1,4 +1,4 @@
package com.termux.shared.terminal.io;
package com.termux.shared.termux.terminal.io;
import android.content.Context;
import android.os.Build;

10
termux-shared/src/main/java/com/termux/shared/terminal/io/TerminalExtraKeys.java → termux-shared/src/main/java/com/termux/shared/termux/terminal/io/TerminalExtraKeys.java
View File

@@ -1,4 +1,4 @@
package com.termux.shared.terminal.io;
package com.termux.shared.termux.terminal.io;
import android.view.KeyEvent;
import android.view.View;
@@ -6,12 +6,12 @@ import android.widget.Button;
import androidx.annotation.NonNull;
import com.termux.shared.terminal.io.extrakeys.ExtraKeyButton;
import com.termux.shared.terminal.io.extrakeys.ExtraKeysView;
import com.termux.shared.terminal.io.extrakeys.SpecialButton;
import com.termux.shared.termux.extrakeys.ExtraKeyButton;
import com.termux.shared.termux.extrakeys.ExtraKeysView;
import com.termux.shared.termux.extrakeys.SpecialButton;
import com.termux.view.TerminalView;
import static com.termux.shared.terminal.io.extrakeys.ExtraKeysConstants.PRIMARY_KEY_CODES_FOR_STRINGS;
import static com.termux.shared.termux.extrakeys.ExtraKeysConstants.PRIMARY_KEY_CODES_FOR_STRINGS;
public class TerminalExtraKeys implements ExtraKeysView.IExtraKeysView {