Compare commits
14 Commits
aes-v15.20
...
winboll
| Author | SHA1 | Date | |
|---|---|---|---|
| bbb0e22198 | |||
| ee75f95c79 | |||
| c40e301c90 | |||
| 5f2170a7a1 | |||
| 6308df8f36 | |||
| 5f24c2d351 | |||
| 882016454f | |||
| 998cb3d193 | |||
| 9ba3374b16 | |||
| 4ded8537e8 | |||
| 59e51da991 | |||
| 070e2fb4f0 | |||
| 83da84371c | |||
| 8f869e19cc |
@@ -1,5 +1,5 @@
|
||||
#Created by .winboll/winboll_app_build.gradle
|
||||
#Tue May 12 13:11:09 HKT 2026
|
||||
#Tue May 12 13:11:28 HKT 2026
|
||||
stageCount=4
|
||||
libraryProject=libaes
|
||||
baseVersion=15.20
|
||||
|
||||
@@ -12,6 +12,10 @@ android {
|
||||
minSdkVersion 26
|
||||
targetSdkVersion 30
|
||||
}
|
||||
compileOptions {
|
||||
sourceCompatibility JavaVersion.VERSION_1_7
|
||||
targetCompatibility JavaVersion.VERSION_1_7
|
||||
}
|
||||
buildTypes {
|
||||
release {
|
||||
minifyEnabled false
|
||||
@@ -31,8 +35,8 @@ dependencies {
|
||||
api 'com.jcraft:jsch:0.1.54'
|
||||
|
||||
// WinBoLL库 nexus.winboll.cc 地址
|
||||
api 'cc.winboll.studio:libaes:15.15.2'
|
||||
api 'cc.winboll.studio:libappbase:15.15.11'
|
||||
|
||||
api 'cc.winboll.studio:libaes:15.20.3'
|
||||
api 'cc.winboll.studio:libappbase:15.20.9'
|
||||
|
||||
api fileTree(dir: 'libs', include: ['*.jar'])
|
||||
}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#Created by .winboll/winboll_app_build.gradle
|
||||
#Sat May 09 19:01:46 GMT 2026
|
||||
stageCount=27
|
||||
#Wed May 13 11:15:04 CST 2026
|
||||
stageCount=2
|
||||
libraryProject=libwinboll
|
||||
baseVersion=15.11
|
||||
publishVersion=15.11.26
|
||||
buildCount=29
|
||||
baseBetaVersion=15.11.27
|
||||
baseVersion=15.20
|
||||
publishVersion=15.20.1
|
||||
buildCount=1
|
||||
baseBetaVersion=15.20.2
|
||||
|
||||
@@ -31,7 +31,7 @@ android {
|
||||
// versionName 更新后需要手动设置
|
||||
// .winboll/winbollBuildProps.properties 文件的 stageCount=0
|
||||
// Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
|
||||
versionName "15.11"
|
||||
versionName "15.20"
|
||||
if(true) {
|
||||
versionName = genVersionName("${versionName}")
|
||||
}
|
||||
@@ -51,7 +51,6 @@ android {
|
||||
|
||||
dependencies {
|
||||
api project(':libwinboll')
|
||||
|
||||
api 'com.google.code.gson:gson:2.10.1'
|
||||
|
||||
// 下拉控件
|
||||
@@ -68,8 +67,6 @@ dependencies {
|
||||
api 'io.github.medyo:android-about-page:2.0.0'
|
||||
// 网络连接类库
|
||||
api 'com.squareup.okhttp3:okhttp:4.4.1'
|
||||
// OkHttp网络请求
|
||||
implementation 'com.squareup.okhttp3:okhttp:3.14.9'
|
||||
// FastJSON解析
|
||||
implementation 'com.alibaba:fastjson:1.2.76'
|
||||
|
||||
@@ -87,7 +84,6 @@ dependencies {
|
||||
//注意:以下5个库必须要引入
|
||||
//implementation 'androidx.appcompat:appcompat:1.4.1'
|
||||
api 'androidx.recyclerview:recyclerview:1.0.0'
|
||||
api 'com.google.code.gson:gson:2.8.5'
|
||||
api 'com.github.bumptech.glide:glide:4.9.0'
|
||||
//annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
|
||||
|
||||
@@ -108,13 +104,5 @@ dependencies {
|
||||
implementation 'com.termux:terminal-view:0.118.0'
|
||||
implementation 'com.termux:termux-shared:0.118.0'
|
||||
|
||||
// WinBoLL库 nexus.winboll.cc 地址
|
||||
api 'cc.winboll.studio:libaes:15.15.2'
|
||||
api 'cc.winboll.studio:libappbase:15.15.11'
|
||||
|
||||
// WinBoLL备用库 jitpack.io 地址
|
||||
//api 'com.github.ZhanGSKen:AES:aes-v15.15.7'
|
||||
//api 'com.github.ZhanGSKen:APPBase:appbase-v15.15.4'
|
||||
|
||||
api fileTree(dir: 'libs', include: ['*.jar'])
|
||||
}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#Created by .winboll/winboll_app_build.gradle
|
||||
#Sat May 09 19:01:46 GMT 2026
|
||||
stageCount=27
|
||||
#Wed May 13 11:15:04 CST 2026
|
||||
stageCount=2
|
||||
libraryProject=libwinboll
|
||||
baseVersion=15.11
|
||||
publishVersion=15.11.26
|
||||
buildCount=29
|
||||
baseBetaVersion=15.11.27
|
||||
baseVersion=15.20
|
||||
publishVersion=15.20.1
|
||||
buildCount=1
|
||||
baseBetaVersion=15.20.2
|
||||
|
||||
@@ -15,14 +15,13 @@
|
||||
<uses-permission android:name="android.permission.REORDER_TASKS"/>
|
||||
|
||||
<!-- 计算应用存储空间 -->
|
||||
<uses-permission android:name="android.permission.GET_PACKAGE_SIZE"/>
|
||||
<uses-permission
|
||||
android:name="android.permission.GET_PACKAGE_SIZE"/>
|
||||
|
||||
<uses-permission
|
||||
android:name="android.permission.QUERY_ALL_PACKAGES"
|
||||
tools:ignore="QueryAllPackagesPermission"/>
|
||||
|
||||
<uses-permission android:name="android.permission.GET_PACKAGE_SIZE"/>
|
||||
|
||||
<application
|
||||
android:allowBackup="true"
|
||||
android:icon="@drawable/ic_launcher"
|
||||
|
||||
@@ -11,6 +11,7 @@ import android.view.View;
|
||||
import android.widget.AdapterView;
|
||||
import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity;
|
||||
import cc.winboll.studio.libaes.models.DrawerMenuBean;
|
||||
import cc.winboll.studio.libaes.utils.AESThemeUtil;
|
||||
import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
|
||||
import cc.winboll.studio.libappbase.LogUtils;
|
||||
import cc.winboll.studio.winboll.R;
|
||||
@@ -36,19 +37,17 @@ public class MainActivity extends DrawerFragmentActivity {
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
setTheme(cc.winboll.studio.winboll.theme.WinBoLLThemeUtil.getThemeTypeID(this));
|
||||
super.onCreate(savedInstanceState);
|
||||
// ------------------- 新增:初始化MainActivity的Handler(关键) -------------------
|
||||
initMainHandler();
|
||||
|
||||
if (mBrowserFragment == null) {
|
||||
LogUtils.d(TAG, "The code in this line is not fix yet.");
|
||||
// String externalUrl = extractExternalUrl(getIntent());
|
||||
// if (externalUrl != null) {
|
||||
// mBrowserFragment = BrowserFragment.newInstance(externalUrl);
|
||||
// } else {
|
||||
// mBrowserFragment = new BrowserFragment();
|
||||
// }
|
||||
// addFragment(mBrowserFragment);
|
||||
String externalUrl = extractExternalUrl(getIntent());
|
||||
if (externalUrl != null) {
|
||||
mBrowserFragment = BrowserFragment.newInstance(externalUrl);
|
||||
} else {
|
||||
mBrowserFragment = BrowserFragment.newInstance();
|
||||
}
|
||||
addFragment(mBrowserFragment);
|
||||
}
|
||||
showFragment(mBrowserFragment);
|
||||
}
|
||||
@@ -171,36 +170,35 @@ public class MainActivity extends DrawerFragmentActivity {
|
||||
|
||||
@Override
|
||||
public boolean onOptionsItemSelected(MenuItem item) {
|
||||
int nItemId = item.getItemId();
|
||||
if (nItemId == R.id.item_home) {
|
||||
// 发送MSG_HOMEPAGE消息给BrowserFragment
|
||||
if (mBrowserFragment != null && mBrowserFragment.getBrowserHandler() != null) {
|
||||
Message msg = Message.obtain();
|
||||
msg.what = BrowserFragment.MSG_HOMEPAGE;
|
||||
mBrowserFragment.getBrowserHandler().sendMessage(msg);
|
||||
}
|
||||
} else if (nItemId == R.id.item_settings) {
|
||||
WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), SettingsActivity.class);
|
||||
} else if (nItemId == R.id.item_about) {
|
||||
Intent intent = new Intent(getApplicationContext(), AboutActivity.class);
|
||||
|
||||
WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), intent, AboutActivity.class);
|
||||
} else if (nItemId == R.id.item_mytermux) {
|
||||
Intent intent = new Intent(getApplicationContext(), MyTermuxActivity.class);
|
||||
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
||||
startActivity(intent);
|
||||
} else if (nItemId == R.id.item_termux_env_test) {
|
||||
Intent intent = new Intent(getApplicationContext(), TermuxEnvTestActivity.class);
|
||||
|
||||
WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), intent, AboutActivity.class);
|
||||
} else if (nItemId == R.id.item_library_activity) {
|
||||
Intent intent = new Intent(getApplicationContext(), cc.winboll.studio.libwinboll.WinBoLLLibraryActivity.class);
|
||||
|
||||
WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), intent, AboutActivity.class);
|
||||
if (AESThemeUtil.onWinBoLLThemeItemSelected(this, item)) {
|
||||
recreate();
|
||||
} else {
|
||||
return super.onOptionsItemSelected(item);
|
||||
}
|
||||
|
||||
int nItemId = item.getItemId();
|
||||
if (nItemId == R.id.item_home) {
|
||||
if (mBrowserFragment != null && mBrowserFragment.getBrowserHandler() != null) {
|
||||
Message msg = Message.obtain();
|
||||
msg.what = BrowserFragment.MSG_HOMEPAGE;
|
||||
mBrowserFragment.getBrowserHandler().sendMessage(msg);
|
||||
}
|
||||
} else if (nItemId == R.id.item_settings) {
|
||||
WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), SettingsActivity.class);
|
||||
} else if (nItemId == R.id.item_about) {
|
||||
Intent intent = new Intent(getApplicationContext(), AboutActivity.class);
|
||||
WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), intent, AboutActivity.class);
|
||||
} else if (nItemId == R.id.item_mytermux) {
|
||||
Intent intent = new Intent(getApplicationContext(), MyTermuxActivity.class);
|
||||
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
||||
startActivity(intent);
|
||||
} else if (nItemId == R.id.item_termux_env_test) {
|
||||
Intent intent = new Intent(getApplicationContext(), TermuxEnvTestActivity.class);
|
||||
WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), intent, AboutActivity.class);
|
||||
} else if (nItemId == R.id.item_library_activity) {
|
||||
Intent intent = new Intent(getApplicationContext(), cc.winboll.studio.libwinboll.WinBoLLLibraryActivity.class);
|
||||
WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), intent, AboutActivity.class);
|
||||
} else {
|
||||
return super.onOptionsItemSelected(item);
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -5,8 +5,8 @@ import android.os.Bundle;
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
|
||||
import cc.winboll.studio.libaes.models.AESThemeBean;
|
||||
import cc.winboll.studio.libaes.utils.AESThemeUtil;
|
||||
import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
|
||||
import cc.winboll.studio.winboll.theme.WinBoLLThemeUtil;
|
||||
|
||||
/**
|
||||
* @Author 豆包&ZhanGSKen<zhangsken@qq.com>
|
||||
@@ -29,16 +29,11 @@ public abstract class BaseWinBoLLActivity extends AppCompatActivity implements I
|
||||
}
|
||||
|
||||
AESThemeBean.ThemeType getThemeType() {
|
||||
/*SharedPreferences sharedPreferences = getSharedPreferences(
|
||||
SHAREDPREFERENCES_NAME, MODE_PRIVATE);
|
||||
return AESThemeBean.ThemeType.values()[((sharedPreferences.getInt(DRAWER_THEME_TYPE, AESThemeBean.ThemeType.DEFAULT.ordinal())))];
|
||||
*/
|
||||
return AESThemeBean.getThemeStyleType(AESThemeUtil.getThemeTypeID(getApplicationContext()));
|
||||
return WinBoLLThemeUtil.getThemeStyleType(WinBoLLThemeUtil.getThemeTypeID(getApplicationContext()));
|
||||
}
|
||||
|
||||
void setThemeStyle() {
|
||||
//setTheme(AESThemeBean.getThemeStyle(getThemeType()));
|
||||
setTheme(AESThemeUtil.getThemeTypeID(getApplicationContext()));
|
||||
setTheme(WinBoLLThemeUtil.getThemeTypeID(getApplicationContext()));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,31 +1,46 @@
|
||||
package cc.winboll.studio.winboll.applications;
|
||||
|
||||
import android.app.AlertDialog;
|
||||
import android.content.DialogInterface;
|
||||
import android.os.Bundle;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.AdapterView;
|
||||
import android.widget.BaseAdapter;
|
||||
import android.widget.Button;
|
||||
import android.widget.EditText;
|
||||
import android.widget.LinearLayout;
|
||||
import android.widget.ListView;
|
||||
import android.widget.TextView;
|
||||
import android.widget.Toast;
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
import androidx.appcompat.widget.Toolbar;
|
||||
import cc.winboll.studio.libappbase.LogUtils;
|
||||
import cc.winboll.studio.winboll.R;
|
||||
import cc.winboll.studio.winboll.models.TermuxButtonManager;
|
||||
import cc.winboll.studio.winboll.models.TermuxButtonModel;
|
||||
import cc.winboll.studio.winboll.termux.TermuxCommandExecutor;
|
||||
import java.util.ArrayList;
|
||||
|
||||
public class MyTermuxActivity extends AppCompatActivity {
|
||||
|
||||
public static final String TAG = "MyTermuxActivity";
|
||||
|
||||
private Toolbar mToolbar;
|
||||
private Button mTermuxButton;
|
||||
private Button mTermuxWorkSpacesButton;
|
||||
private ListView mListView;
|
||||
private Button mBtnAdd;
|
||||
private ButtonAdapter mAdapter;
|
||||
private ArrayList<TermuxButtonModel> mButtonList;
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.activity_my_termux);
|
||||
|
||||
// 初始化工具栏
|
||||
initToolbar();
|
||||
// 初始化按钮
|
||||
initView();
|
||||
initListView();
|
||||
initAddButton();
|
||||
refreshList();
|
||||
}
|
||||
|
||||
private void initToolbar() {
|
||||
@@ -34,44 +49,189 @@ public class MyTermuxActivity extends AppCompatActivity {
|
||||
setSupportActionBar(mToolbar);
|
||||
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
|
||||
mToolbar.setNavigationOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
LogUtils.d(TAG, "点击返回按钮");
|
||||
finish();
|
||||
}
|
||||
});
|
||||
LogUtils.d(TAG, "工具栏初始化完成");
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
finish();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
private void initView() {
|
||||
mTermuxButton = findViewById(R.id.btn_termux);
|
||||
if (mTermuxButton != null) {
|
||||
mTermuxButton.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
LogUtils.d(TAG, "点击 Termux 按钮");
|
||||
TermuxCommandExecutor.openTermuxBash(MyTermuxActivity.this, "cd ~");
|
||||
//TermuxCommandExecutor.openTermuxBash(MyTermuxActivity.this, "cd ~/TermuxWorkSpaces", "./TermuxWorkSpaces");
|
||||
}
|
||||
});
|
||||
LogUtils.d(TAG, "Termux 按钮初始化完成");
|
||||
}
|
||||
private void initListView() {
|
||||
mListView = findViewById(R.id.list_termux_buttons);
|
||||
mButtonList = new ArrayList<TermuxButtonModel>();
|
||||
mAdapter = new ButtonAdapter();
|
||||
mListView.setAdapter(mAdapter);
|
||||
|
||||
mTermuxWorkSpacesButton = findViewById(R.id.btn_termuxworkspaces);
|
||||
if (mTermuxWorkSpacesButton != null) {
|
||||
mTermuxWorkSpacesButton.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
LogUtils.d(TAG, "点击 TermuxWorkSpaces 按钮");
|
||||
TermuxCommandExecutor.openTermuxBash(MyTermuxActivity.this, "cd ~/TermuxWorkSpaces", "./TermuxWorkSpaces");
|
||||
}
|
||||
});
|
||||
LogUtils.d(TAG, "TermuxWorkSpaces 按钮初始化完成");
|
||||
}
|
||||
mListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
|
||||
@Override
|
||||
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
|
||||
TermuxButtonModel model = mButtonList.get(position);
|
||||
TermuxCommandExecutor.openTermuxBash(MyTermuxActivity.this,
|
||||
model.getExeCommand(), model.getWorkDir());
|
||||
}
|
||||
});
|
||||
|
||||
mListView.setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() {
|
||||
@Override
|
||||
public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
|
||||
showContextMenu(position);
|
||||
return true;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private boolean isTermuxAvailable() {
|
||||
return TermuxCommandExecutor.isTermuxInstalled(this);
|
||||
private void initAddButton() {
|
||||
mBtnAdd = findViewById(R.id.btn_add_termux_button);
|
||||
mBtnAdd.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
showButtonDialog(-1, null);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private void refreshList() {
|
||||
mButtonList.clear();
|
||||
ArrayList<TermuxButtonModel> loaded = TermuxButtonManager.loadButtons(this);
|
||||
if (loaded != null) {
|
||||
mButtonList.addAll(loaded);
|
||||
}
|
||||
mAdapter.notifyDataSetChanged();
|
||||
}
|
||||
|
||||
private void showContextMenu(final int position) {
|
||||
final TermuxButtonModel model = mButtonList.get(position);
|
||||
String[] items = new String[]{
|
||||
getString(R.string.menu_execute),
|
||||
getString(R.string.menu_edit),
|
||||
getString(R.string.menu_delete),
|
||||
getString(R.string.menu_cancel)
|
||||
};
|
||||
new AlertDialog.Builder(this)
|
||||
.setTitle(model.getButtonName())
|
||||
.setItems(items, new DialogInterface.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(DialogInterface dialog, int which) {
|
||||
if (which == 0) {
|
||||
TermuxCommandExecutor.openTermuxBash(MyTermuxActivity.this,
|
||||
model.getExeCommand(), model.getWorkDir());
|
||||
} else if (which == 1) {
|
||||
showButtonDialog(position, model);
|
||||
} else if (which == 2) {
|
||||
showDeleteConfirmDialog(position);
|
||||
}
|
||||
}
|
||||
})
|
||||
.show();
|
||||
}
|
||||
|
||||
private void showDeleteConfirmDialog(final int position) {
|
||||
new AlertDialog.Builder(this)
|
||||
.setTitle(getString(R.string.dialog_delete_title))
|
||||
.setMessage(getString(R.string.dialog_delete_message) + mButtonList.get(position).getButtonName())
|
||||
.setPositiveButton(getString(R.string.dialog_confirm), new DialogInterface.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(DialogInterface dialog, int which) {
|
||||
TermuxButtonManager.deleteButton(MyTermuxActivity.this, mButtonList, position);
|
||||
refreshList();
|
||||
Toast.makeText(MyTermuxActivity.this, R.string.toast_deleted, Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
})
|
||||
.setNegativeButton(getString(R.string.dialog_cancel), null)
|
||||
.show();
|
||||
}
|
||||
|
||||
private void showButtonDialog(final int index, final TermuxButtonModel model) {
|
||||
final boolean isEdit = (model != null);
|
||||
|
||||
LinearLayout layout = new LinearLayout(this);
|
||||
layout.setOrientation(LinearLayout.VERTICAL);
|
||||
layout.setPadding(40, 20, 40, 20);
|
||||
|
||||
final EditText etName = new EditText(this);
|
||||
etName.setHint(R.string.hint_button_name);
|
||||
if (model != null) {
|
||||
etName.setText(model.getButtonName());
|
||||
}
|
||||
layout.addView(etName);
|
||||
|
||||
final EditText etCommand = new EditText(this);
|
||||
etCommand.setHint(R.string.hint_exe_command);
|
||||
if (model != null) {
|
||||
etCommand.setText(model.getExeCommand());
|
||||
}
|
||||
layout.addView(etCommand);
|
||||
|
||||
final EditText etWorkDir = new EditText(this);
|
||||
etWorkDir.setHint(R.string.hint_work_dir);
|
||||
if (model != null) {
|
||||
etWorkDir.setText(model.getWorkDir());
|
||||
}
|
||||
layout.addView(etWorkDir);
|
||||
|
||||
int titleResId = isEdit ? R.string.dialog_edit_title : R.string.dialog_add_title;
|
||||
new AlertDialog.Builder(this)
|
||||
.setTitle(titleResId)
|
||||
.setView(layout)
|
||||
.setPositiveButton(getString(R.string.dialog_save), new DialogInterface.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(DialogInterface dialog, int which) {
|
||||
String name = etName.getText().toString().trim();
|
||||
String command = etCommand.getText().toString().trim();
|
||||
String workDir = etWorkDir.getText().toString().trim();
|
||||
if (name.isEmpty() || command.isEmpty()) {
|
||||
Toast.makeText(MyTermuxActivity.this, R.string.toast_fields_required, Toast.LENGTH_SHORT).show();
|
||||
return;
|
||||
}
|
||||
TermuxButtonModel newModel = new TermuxButtonModel();
|
||||
newModel.setButtonName(name);
|
||||
newModel.setExeCommand(command);
|
||||
newModel.setWorkDir(workDir);
|
||||
if (isEdit) {
|
||||
TermuxButtonManager.updateButton(MyTermuxActivity.this, mButtonList, index, newModel);
|
||||
} else {
|
||||
TermuxButtonManager.addButton(MyTermuxActivity.this, mButtonList, newModel);
|
||||
}
|
||||
refreshList();
|
||||
}
|
||||
})
|
||||
.setNegativeButton(getString(R.string.dialog_cancel), null)
|
||||
.show();
|
||||
}
|
||||
|
||||
private class ButtonAdapter extends BaseAdapter {
|
||||
@Override
|
||||
public int getCount() {
|
||||
return mButtonList.size();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getItem(int position) {
|
||||
return mButtonList.get(position);
|
||||
}
|
||||
|
||||
@Override
|
||||
public long getItemId(int position) {
|
||||
return position;
|
||||
}
|
||||
|
||||
@Override
|
||||
public View getView(int position, View convertView, ViewGroup parent) {
|
||||
TextView tv;
|
||||
if (convertView == null) {
|
||||
tv = new TextView(MyTermuxActivity.this);
|
||||
tv.setPadding(30, 20, 30, 20);
|
||||
tv.setTextSize(16);
|
||||
tv.setMinHeight(80);
|
||||
} else {
|
||||
tv = (TextView) convertView;
|
||||
}
|
||||
|
||||
TermuxButtonModel model = mButtonList.get(position);
|
||||
tv.setText(model.getButtonName() + "\n" + model.getExeCommand());
|
||||
tv.setTextColor(getResources().getColor(android.R.color.white));
|
||||
return tv;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
package cc.winboll.studio.winboll.models;
|
||||
|
||||
import android.content.Context;
|
||||
import cc.winboll.studio.libappbase.BaseBean;
|
||||
import java.util.ArrayList;
|
||||
|
||||
public class TermuxButtonManager {
|
||||
|
||||
public static ArrayList<TermuxButtonModel> loadButtons(Context context) {
|
||||
ArrayList<TermuxButtonModel> list = new ArrayList<TermuxButtonModel>();
|
||||
BaseBean.loadBeanList(context, list, TermuxButtonModel.class);
|
||||
return list;
|
||||
}
|
||||
|
||||
public static boolean saveButtons(Context context, ArrayList<TermuxButtonModel> list) {
|
||||
return BaseBean.saveBeanList(context, list, TermuxButtonModel.class);
|
||||
}
|
||||
|
||||
public static void addButton(Context context, ArrayList<TermuxButtonModel> list, TermuxButtonModel button) {
|
||||
list.add(button);
|
||||
saveButtons(context, list);
|
||||
}
|
||||
|
||||
public static void updateButton(Context context, ArrayList<TermuxButtonModel> list, int index, TermuxButtonModel button) {
|
||||
if (index >= 0 && index < list.size()) {
|
||||
list.set(index, button);
|
||||
saveButtons(context, list);
|
||||
}
|
||||
}
|
||||
|
||||
public static void deleteButton(Context context, ArrayList<TermuxButtonModel> list, int index) {
|
||||
if (index >= 0 && index < list.size()) {
|
||||
list.remove(index);
|
||||
saveButtons(context, list);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,49 @@
|
||||
package cc.winboll.studio.winboll.theme;
|
||||
|
||||
import cc.winboll.studio.libaes.models.AESThemeBean;
|
||||
import cc.winboll.studio.winboll.R;
|
||||
|
||||
public class WinBoLLThemeBean {
|
||||
|
||||
public static final String TAG = "WinBoLLThemeBean";
|
||||
|
||||
public static int getDefaultThemeStyleID() {
|
||||
return R.style.MyAppTheme;
|
||||
}
|
||||
|
||||
public static int getThemeStyleID(AESThemeBean.ThemeType themeType) {
|
||||
int themeStyleID = getDefaultThemeStyleID();
|
||||
if (AESThemeBean.ThemeType.DEPTH == themeType) {
|
||||
themeStyleID = R.style.MyDepthAppTheme;
|
||||
} else if (AESThemeBean.ThemeType.SKY == themeType) {
|
||||
themeStyleID = R.style.MySkyAppTheme;
|
||||
} else if (AESThemeBean.ThemeType.GOLDEN == themeType) {
|
||||
themeStyleID = R.style.MyGoldenAppTheme;
|
||||
} else if (AESThemeBean.ThemeType.BEARING == themeType) {
|
||||
themeStyleID = R.style.MyBearingAppTheme;
|
||||
} else if (AESThemeBean.ThemeType.MEMOR == themeType) {
|
||||
themeStyleID = R.style.MyMemorAppTheme;
|
||||
} else if (AESThemeBean.ThemeType.TAO == themeType) {
|
||||
themeStyleID = R.style.MyTaoAppTheme;
|
||||
}
|
||||
return themeStyleID;
|
||||
}
|
||||
|
||||
public static AESThemeBean.ThemeType getThemeStyleType(int nThemeStyleID) {
|
||||
AESThemeBean.ThemeType themeStyle = AESThemeBean.ThemeType.AES;
|
||||
if (R.style.MyDepthAppTheme == nThemeStyleID) {
|
||||
themeStyle = AESThemeBean.ThemeType.DEPTH;
|
||||
} else if (R.style.MySkyAppTheme == nThemeStyleID) {
|
||||
themeStyle = AESThemeBean.ThemeType.SKY;
|
||||
} else if (R.style.MyGoldenAppTheme == nThemeStyleID) {
|
||||
themeStyle = AESThemeBean.ThemeType.GOLDEN;
|
||||
} else if (R.style.MyBearingAppTheme == nThemeStyleID) {
|
||||
themeStyle = AESThemeBean.ThemeType.BEARING;
|
||||
} else if (R.style.MyMemorAppTheme == nThemeStyleID) {
|
||||
themeStyle = AESThemeBean.ThemeType.MEMOR;
|
||||
} else if (R.style.MyTaoAppTheme == nThemeStyleID) {
|
||||
themeStyle = AESThemeBean.ThemeType.TAO;
|
||||
}
|
||||
return themeStyle;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,36 @@
|
||||
package cc.winboll.studio.winboll.theme;
|
||||
|
||||
import android.content.Context;
|
||||
import cc.winboll.studio.libaes.models.AESThemeBean;
|
||||
import cc.winboll.studio.libaes.utils.AESThemeUtil;
|
||||
|
||||
public class WinBoLLThemeUtil {
|
||||
|
||||
public static final String TAG = "WinBoLLThemeUtil";
|
||||
|
||||
public static int getThemeTypeID(Context context) {
|
||||
AESThemeBean bean = AESThemeBean.loadBean(context, AESThemeBean.class);
|
||||
int themeTypeID;
|
||||
if (bean == null) {
|
||||
themeTypeID = WinBoLLThemeBean.getDefaultThemeStyleID();
|
||||
} else {
|
||||
int aesStyleID = bean.getCurrentThemeTypeID();
|
||||
AESThemeBean.ThemeType themeType = WinBoLLThemeBean.getThemeStyleType(aesStyleID);
|
||||
themeTypeID = WinBoLLThemeBean.getThemeStyleID(themeType);
|
||||
}
|
||||
return themeTypeID;
|
||||
}
|
||||
|
||||
public static void saveThemeStyleID(Context context, int nThemeTypeID) {
|
||||
AESThemeBean bean = new AESThemeBean(nThemeTypeID);
|
||||
AESThemeBean.saveBean(context, bean);
|
||||
}
|
||||
|
||||
public static AESThemeBean.ThemeType getThemeStyleType(int nThemeStyleID) {
|
||||
return WinBoLLThemeBean.getThemeStyleType(nThemeStyleID);
|
||||
}
|
||||
|
||||
public static int getThemeStyleID(AESThemeBean.ThemeType themeType) {
|
||||
return WinBoLLThemeBean.getThemeStyleID(themeType);
|
||||
}
|
||||
}
|
||||
@@ -4,8 +4,7 @@
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="top">
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<androidx.appcompat.widget.Toolbar
|
||||
android:id="@+id/toolbar"
|
||||
@@ -17,74 +16,20 @@
|
||||
app:titleTextColor="@android:color/white"
|
||||
app:subtitleTextColor="@android:color/white"/>
|
||||
|
||||
<ScrollView
|
||||
<ListView
|
||||
android:id="@+id/list_termux_buttons"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight="1.0">
|
||||
android:layout_weight="1.0"
|
||||
android:divider="@android:color/darker_gray"
|
||||
android:dividerHeight="1dp"/>
|
||||
|
||||
<LinearLayout
|
||||
android:orientation="vertical"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<LinearLayout
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<HorizontalScrollView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1.0">
|
||||
|
||||
<LinearLayout
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<cc.winboll.studio.winboll.views.TermuxButton
|
||||
android:id="@+id/btn_termux"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Termux"
|
||||
android:textSize="18sp"
|
||||
android:padding="16dp"
|
||||
android:backgroundTint="@android:color/holo_blue_dark"
|
||||
app:exeCommand="cd ~"
|
||||
app:workDir="~"
|
||||
app:isCommitted="true"
|
||||
app:commitTitle="打开 Termux"
|
||||
app:commitInfo="打开 Termux 应用"/>
|
||||
|
||||
<cc.winboll.studio.winboll.views.TermuxButton
|
||||
android:id="@+id/btn_termuxworkspaces"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="TermuxWorkSpaces"
|
||||
android:textSize="18sp"
|
||||
android:padding="16dp"
|
||||
android:backgroundTint="@android:color/holo_blue_dark"
|
||||
app:exeCommand="cd ~/TermuxWorkSpaces"
|
||||
app:workDir="~"
|
||||
app:isCommitted="false"
|
||||
app:commitTitle="打开 TermuxWorkSpaces"
|
||||
app:commitInfo="打开 Termux 应用,进入 TermuxWorkSpaces 目录。"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</HorizontalScrollView>
|
||||
|
||||
<Button
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="+"
|
||||
android:id="@+id/btn_addtermuxbutton"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</ScrollView>
|
||||
<Button
|
||||
android:id="@+id/btn_add_termux_button"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/add_termux_button"
|
||||
android:textSize="16sp"
|
||||
android:padding="12dp"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
@@ -4,4 +4,10 @@
|
||||
<color name="colorPrimaryDark">#00796B</color>
|
||||
<color name="colorAccent">#FF9800</color>
|
||||
<color name="pattern_lock_black">#000000</color>
|
||||
|
||||
<color name="mainWindowBackgroundColor">#FFF5F5F5</color>
|
||||
<color name="mainWindowTextColor">#FF000000</color>
|
||||
<color name="toolbarTextColor">#FF000000</color>
|
||||
<color name="toolbarBackgroundColor">#FF00B322</color>
|
||||
<color name="debugTextColor">#FF808080</color>
|
||||
</resources>
|
||||
@@ -13,4 +13,21 @@
|
||||
<string name="toolbar_icon_description">WinBoLL APP</string>
|
||||
<string name="my_termux_activity">MyTermuxActivity</string>
|
||||
<string name="pattern_lock_title">图案密码设置</string>
|
||||
<string name="add_termux_button">+ 添加Termux按钮</string>
|
||||
<string name="menu_execute">执行</string>
|
||||
<string name="menu_edit">编辑</string>
|
||||
<string name="menu_delete">删除</string>
|
||||
<string name="menu_cancel">取消</string>
|
||||
<string name="dialog_delete_title">确认删除</string>
|
||||
<string name="dialog_delete_message">确定要删除</string>
|
||||
<string name="dialog_add_title">添加Termux按钮</string>
|
||||
<string name="dialog_edit_title">编辑Termux按钮</string>
|
||||
<string name="dialog_save">保存</string>
|
||||
<string name="dialog_confirm">确定</string>
|
||||
<string name="dialog_cancel">取消</string>
|
||||
<string name="hint_button_name">按钮名称</string>
|
||||
<string name="hint_exe_command">执行命令</string>
|
||||
<string name="hint_work_dir">工作目录(默认 ~)</string>
|
||||
<string name="toast_deleted">已删除</string>
|
||||
<string name="toast_fields_required">按钮名称和执行命令不能为空</string>
|
||||
</resources>
|
||||
|
||||
@@ -1,5 +1,57 @@
|
||||
<resources>
|
||||
<style name="MyAppTheme" parent="AESTheme">
|
||||
<style name="MyAppTheme" parent="AESTheme">
|
||||
<item name="themeDebug">@style/MyDebugActivityTheme</item>
|
||||
<item name="aToolbar">@style/MyAESAToolbar</item>
|
||||
<item name="aSupportToolbar">@style/MyAESASupportToolbar</item>
|
||||
</style>
|
||||
|
||||
<style name="MyDepthAppTheme" parent="DepthAESTheme">
|
||||
<item name="themeDebug">@style/MyDebugActivityTheme</item>
|
||||
<item name="aToolbar">@style/MyAESAToolbar</item>
|
||||
<item name="aSupportToolbar">@style/MyAESASupportToolbar</item>
|
||||
</style>
|
||||
|
||||
<style name="MySkyAppTheme" parent="SkyAESTheme">
|
||||
<item name="themeDebug">@style/MyDebugActivityTheme</item>
|
||||
<item name="aToolbar">@style/MyAESAToolbar</item>
|
||||
<item name="aSupportToolbar">@style/MyAESASupportToolbar</item>
|
||||
</style>
|
||||
|
||||
<style name="MyGoldenAppTheme" parent="GoldenAESTheme">
|
||||
<item name="themeDebug">@style/MyDebugActivityTheme</item>
|
||||
<item name="aToolbar">@style/MyAESAToolbar</item>
|
||||
<item name="aSupportToolbar">@style/MyAESASupportToolbar</item>
|
||||
</style>
|
||||
|
||||
<style name="MyBearingAppTheme" parent="BearingAESTheme">
|
||||
<item name="themeDebug">@style/MyDebugActivityTheme</item>
|
||||
<item name="aToolbar">@style/MyAESAToolbar</item>
|
||||
<item name="aSupportToolbar">@style/MyAESASupportToolbar</item>
|
||||
</style>
|
||||
|
||||
<style name="MyMemorAppTheme" parent="MemorAESTheme">
|
||||
<item name="themeDebug">@style/MyDebugActivityTheme</item>
|
||||
<item name="aToolbar">@style/MyAESAToolbar</item>
|
||||
<item name="aSupportToolbar">@style/MyAESASupportToolbar</item>
|
||||
</style>
|
||||
|
||||
<style name="MyTaoAppTheme" parent="TaoAESTheme">
|
||||
<item name="themeDebug">@style/MyDebugActivityTheme</item>
|
||||
<item name="aToolbar">@style/MyAESAToolbar</item>
|
||||
<item name="aSupportToolbar">@style/MyAESASupportToolbar</item>
|
||||
</style>
|
||||
|
||||
<style name="MyAESAToolbar" parent="AESAToolbar" />
|
||||
|
||||
<style name="MyAESASupportToolbar" parent="AESASupportToolbar" />
|
||||
|
||||
<style name="MyDebugActivityTheme" parent="Theme.AppCompat.Light.NoActionBar">
|
||||
<item name="android:statusBarColor">@color/toolbarBackgroundColor</item>
|
||||
<item name="colorTittle">@color/mainWindowTextColor</item>
|
||||
<item name="colorTittleBackgound">@color/toolbarBackgroundColor</item>
|
||||
<item name="colorText">@color/debugTextColor</item>
|
||||
<item name="colorTextBackgound">@color/mainWindowBackgroundColor</item>
|
||||
<item name="debugTextColor">@color/debugTextColor</item>
|
||||
<item name="toolbarTextColor">@color/toolbarTextColor</item>
|
||||
</style>
|
||||
|
||||
</resources>
|
||||
|
||||
Reference in New Issue
Block a user