Skip to content

Commit 94c9d2c

Browse files
PangBaiWorkPangBaiWork
committed
add github action
1 parent f75e3b8 commit 94c9d2c

21 files changed

+200
-198
lines changed

‎.github/workflows/main.yml

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: Android CI
2+
3+
on:
4+
push:
5+
branches: [ master ]
6+
pull_request:
7+
branches: [ master ]
8+
9+
jobs:
10+
build:
11+
12+
runs-on: ubuntu-latest
13+
14+
steps:
15+
- uses: actions/checkout@v2
16+
- name: set up JDK 17
17+
uses: actions/setup-java@v2
18+
with:
19+
java-version: '17'
20+
distribution: 'adopt'
21+
cache: gradle
22+
23+
- name: Grant execute permission for gradlew
24+
run: chmod +x gradlew
25+
- name: Build with Gradle
26+
run: ./gradlew build
27+
28+
- name: find apk
29+
run: find ./ -regex ".*\.apk\|.*\.aar"
30+
31+
32+
- name: Upload APK
33+
uses: actions/upload-artifact@v2
34+
with:
35+
name: dowork-debug
36+
path: app/build/outputs/apk/debug/*.apk

‎app/src/main/java/com/pangbai/terminal/TerminalEmulator.java

+119-133
Large diffs are not rendered by default.

‎app/src/main/java/com/pangbai/terminal/TerminalRow.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ boolean isBlank() {
243243
return true;
244244
}
245245

246-
public final long getStyle(int column) {
246+
public long getStyle(int column) {
247247
return mStyle[column];
248248
}
249249

‎app/src/main/java/com/pangbai/terminal/TerminalSession.java

+3-7
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,8 @@ public TerminalSession(String shellPath, String cwd, String[] args, String[] env
9696
*/
9797
public void writeDe(String com){
9898
byte[] buffer = null;
99-
try
100-
{
101-
buffer = com.getBytes("UTF8");
102-
}
103-
catch (UnsupportedEncodingException e) {}
104-
if(buffer==null)
99+
buffer = com.getBytes(StandardCharsets.UTF_8);
100+
if(buffer==null)
105101
return;
106102
FileOutputStream termOut = new FileOutputStream(wrapFileDescriptor(mTerminalFileDescriptor, mClient));
107103
try {
@@ -261,7 +257,7 @@ public TerminalEmulator getEmulator() {
261257
}
262258

263259
/** Notify the {@link #mClient} that the screen has changed. */
264-
protected void notifyScreenUpdate() {
260+
private void notifyScreenUpdate() {
265261
mClient.onTextChanged(this);
266262
}
267263

‎app/src/main/java/com/pangbai/terminal/view/ExtraKeysView.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public void readkeys() {
8484
}
8585
}
8686
} catch (JSONException e) {
87-
Toast.makeText(getContext(), "Could not load the extra-keys property from the Config: " + e.toString(), Toast.LENGTH_LONG).show();
87+
Toast.makeText(getContext(), "Could not load the extra-keys property from the Config: " + e, Toast.LENGTH_LONG).show();
8888
// Log.e("termux", "Error loading props", e);
8989
mExtraKeys = new String[0][];
9090
}
@@ -170,7 +170,7 @@ private static class SpecialButtonState {
170170
ToggleButton button = null;
171171
}
172172

173-
private Map<SpecialButton, SpecialButtonState> specialButtons = new HashMap<SpecialButton, SpecialButtonState>() {{
173+
private final Map<SpecialButton, SpecialButtonState> specialButtons = new HashMap<SpecialButton, SpecialButtonState>() {{
174174
put(SpecialButton.CTRL, new SpecialButtonState());
175175
put(SpecialButton.ALT, new SpecialButtonState());
176176
put(SpecialButton.FN, new SpecialButtonState());

‎app/src/main/java/com/pangbai/terminal/view/SuperTerminalView.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public final class SuperTerminalView extends TerminalView {
3838

3939
public SuperTerminalView terminal ;
4040
public TerminalSessionClient mTerminalSessionClient;
41-
private TerminalViewClient mTerminalViewClient;
41+
private final TerminalViewClient mTerminalViewClient;
4242
// private boolean set_done = false;
4343
// private boolean run_done = false;
4444
// static int currentsize=30;

‎app/src/main/java/com/pangbai/terminal/view/TerminalRenderer.java

+5-11
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ public TerminalRenderer(int textSize, Typeface typeface,int mDefColor) {
6666
}
6767

6868
/** Render the terminal to a canvas with at a specified row scroll, and an optional rectangular selection. */
69-
public final void render(TerminalEmulator mEmulator, Canvas canvas, int topRow,
70-
int selectionY1, int selectionY2, int selectionX1, int selectionX2) {
69+
public void render(TerminalEmulator mEmulator, Canvas canvas, int topRow,
70+
int selectionY1, int selectionY2, int selectionX1, int selectionX2) {
7171
final boolean reverseVideo = mEmulator.isReverseVideo();
7272
final int endRow = topRow + mEmulator.mRows;
7373
final int columns = mEmulator.mColumns;
@@ -136,11 +136,8 @@ public final void render(TerminalEmulator mEmulator, Canvas canvas, int topRow,
136136
//else
137137
//cursorColor=Color.TRANSPARENT;
138138

139-
boolean invertCursorTextColor = false;
140-
if (lastRunInsideCursor && cursorShape == TerminalEmulator.TERMINAL_CURSOR_STYLE_BLOCK) {
141-
invertCursorTextColor = true;
142-
}
143-
139+
boolean invertCursorTextColor = lastRunInsideCursor && cursorShape == TerminalEmulator.TERMINAL_CURSOR_STYLE_BLOCK;
140+
144141
drawTextRun(canvas, line, palette, heightOffset, lastRunStartColumn, columnWidthSinceLastRun,
145142
lastRunStartIndex, charsSinceLastRun, measuredWidthForRun,
146143
cursorColor, cursorShape, lastRunStyle, reverseVideo || invertCursorTextColor || lastRunInsideSelection);
@@ -167,10 +164,7 @@ public final void render(TerminalEmulator mEmulator, Canvas canvas, int topRow,
167164
final int charsSinceLastRun = currentCharIndex - lastRunStartIndex;
168165
int cursorColor = lastRunInsideCursor ? mEmulator.mColors.mCurrentColors[TextStyle.COLOR_INDEX_CURSOR] : 0;
169166

170-
boolean invertCursorTextColor = false;
171-
if (lastRunInsideCursor && cursorShape == TerminalEmulator.TERMINAL_CURSOR_STYLE_BLOCK) {
172-
invertCursorTextColor = true;
173-
}
167+
boolean invertCursorTextColor = lastRunInsideCursor && cursorShape == TerminalEmulator.TERMINAL_CURSOR_STYLE_BLOCK;
174168
drawTextRun(canvas, line, palette, heightOffset, lastRunStartColumn, columnWidthSinceLastRun, lastRunStartIndex, charsSinceLastRun,
175169
measuredWidthForRun, cursorColor, cursorShape, lastRunStyle, reverseVideo || invertCursorTextColor || lastRunInsideSelection);
176170
}

‎app/src/main/java/com/pangbai/weblog/execute/cmdExer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public static int execute(String command, boolean su, boolean wait) {
5252
if (cwd != null)
5353
processBuilder.directory(new File(cwd));
5454
for (String env : Init.envp) {
55-
String tmp[] = getByEnv(env);
55+
String[] tmp = getByEnv(env);
5656
processBuilder.environment().put(tmp[0], tmp[1]);
5757
}
5858

‎app/src/main/java/com/pangbai/weblog/project/PostCreate.java

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ public void setParams(String title, String path, String category, String descrip
3232
file.createNewFile();
3333
writer = new PrintWriter(new FileWriter(file), true);
3434
} catch (Exception e) {
35-
return ;
3635
}
3736
}
3837

‎app/src/main/java/com/pangbai/weblog/tool/Init.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public Init(Activity ct) {
6767
"ANDROID_DATA=/data",
6868
"ANDROID_ROOT=/system"
6969
};
70-
this.envp = envp;
70+
Init.envp = envp;
7171

7272

7373
if (!new File(binDir).exists()) {
@@ -129,7 +129,7 @@ boolean checkLink(String link) {
129129

130130

131131
private static final int REQUEST_EXTERNAL_STORAGE = 1;
132-
private static String[] PERMISSIONS_STORAGE = {
132+
private static final String[] PERMISSIONS_STORAGE = {
133133
Manifest.permission.READ_EXTERNAL_STORAGE,
134134
Manifest.permission.WRITE_EXTERNAL_STORAGE
135135
};

‎app/src/main/java/com/pangbai/weblog/view/ArticleCreateFragment.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131

3232
import java.io.File;
3333
import java.nio.charset.Charset;
34+
import java.nio.charset.StandardCharsets;
3435
import java.security.MessageDigest;
3536
import java.util.Collections;
3637
import java.util.Set;
@@ -171,7 +172,7 @@ String generatePath(String projectPath, String name) {
171172
String tmp = "";
172173
if (name.isBlank()) {
173174
//nothing
174-
} else if (Charset.forName("US-ASCII").newEncoder().canEncode(name)) {
175+
} else if (StandardCharsets.US_ASCII.newEncoder().canEncode(name)) {
175176
String[] arr = name.split(" ");
176177
for (int i = 0; i < arr.length; i++) {
177178
if (arr[i].isBlank())

‎app/src/main/java/com/pangbai/weblog/view/MainViewPagerAdapter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* author: 敬往事一杯酒
1616
*/
1717
public class MainViewPagerAdapter extends PagerAdapter {
18-
private List<View> mList;
18+
private final List<View> mList;
1919
public MainViewPagerAdapter(List<View> list){
2020
this.mList = list;
2121
}

‎markdownView/src/main/java/br/tiagohm/markdownview/MarkdownView.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ public void render(Image node, NodeRendererContext context, HtmlWriter html) {
319319
final int index = url.indexOf('@');
320320

321321
if (index >= 0) {
322-
String[] dimensions = url.substring(index + 1, url.length()).split("\\|");
322+
String[] dimensions = url.substring(index + 1).split("\\|");
323323
url = url.substring(0, index);
324324

325325
if (dimensions.length == 2) {

‎markdownView/src/main/java/br/tiagohm/markdownview/css/ExternalStyleSheet.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import java.net.URL;
55

66
public class ExternalStyleSheet implements StyleSheet {
7-
private String mUrl;
7+
private final String mUrl;
88
private String mMediaQuery;
99

1010
public ExternalStyleSheet(String url) {

‎markdownView/src/main/java/br/tiagohm/markdownview/css/InternalStyleSheet.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
public class InternalStyleSheet implements StyleSheet {
1111
private static final String NO_MEDIA_QUERY = "NO_MEDIA_QUERY";
12-
private Map<String, Map<String, Map<String, String>>> mRules = new LinkedHashMap<>();
13-
private Map<String, String> mFontFaces = new LinkedHashMap<>();
12+
private final Map<String, Map<String, Map<String, String>>> mRules = new LinkedHashMap<>();
13+
private final Map<String, String> mFontFaces = new LinkedHashMap<>();
1414
private String currentMediaQuery;
1515

1616
public InternalStyleSheet() {
@@ -97,7 +97,7 @@ public String toString() {
9797

9898
@Override
9999
public String toHTML() {
100-
return "<style>\n" + toString() + "\n</style>\n";
100+
return "<style>\n" + this + "\n</style>\n";
101101
}
102102

103103
private Map<String, Map<String, String>> getCurrentMediaQuery() {

‎markdownView/src/main/java/br/tiagohm/markdownview/ext/bean/BeanExtension.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,8 @@ public void extend(Parser.Builder parserBuilder) {
3737

3838
@Override
3939
public void extend(HtmlRenderer.Builder rendererBuilder, String rendererType) {
40-
switch (rendererType) {
41-
case "HTML":
42-
rendererBuilder.nodeRendererFactory(new BeanNodeRenderer.Factory());
43-
break;
40+
if (rendererType.equals("HTML")) {
41+
rendererBuilder.nodeRendererFactory(new BeanNodeRenderer.Factory());
4442
}
4543
}
4644
}

‎markdownView/src/main/java/br/tiagohm/markdownview/ext/kbd/KeystrokeExtension.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,8 @@ public void extend(Parser.Builder parserBuilder) {
3333

3434
@Override
3535
public void extend(HtmlRenderer.Builder rendererBuilder, String rendererType) {
36-
switch (rendererType) {
37-
case "HTML":
38-
rendererBuilder.nodeRendererFactory(new KeystrokeNodeRenderer.Factory());
39-
break;
36+
if (rendererType.equals("HTML")) {
37+
rendererBuilder.nodeRendererFactory(new KeystrokeNodeRenderer.Factory());
4038
}
4139
}
4240
}

‎markdownView/src/main/java/br/tiagohm/markdownview/ext/label/LabelExtension.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,8 @@ public void extend(Parser.Builder parserBuilder) {
3333

3434
@Override
3535
public void extend(HtmlRenderer.Builder rendererBuilder, String rendererType) {
36-
switch (rendererType) {
37-
case "HTML":
38-
rendererBuilder.nodeRendererFactory(new LabelNodeRenderer.Factory());
39-
break;
36+
if (rendererType.equals("HTML")) {
37+
rendererBuilder.nodeRendererFactory(new LabelNodeRenderer.Factory());
4038
}
4139
}
4240
}

‎markdownView/src/main/java/br/tiagohm/markdownview/ext/mark/MarkExtension.java

+7-9
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,13 @@ public void extend(Parser.Builder parserBuilder) {
3636

3737
@Override
3838
public void extend(HtmlRenderer.Builder rendererBuilder, String rendererType) {
39-
switch (rendererType) {
40-
case "HTML":
41-
rendererBuilder.nodeRendererFactory(new NodeRendererFactory() {
42-
@Override
43-
public NodeRenderer create(DataHolder options) {
44-
return new MarkNodeRenderer(options);
45-
}
46-
});
47-
break;
39+
if (rendererType.equals("HTML")) {
40+
rendererBuilder.nodeRendererFactory(new NodeRendererFactory() {
41+
@Override
42+
public NodeRenderer create(DataHolder options) {
43+
return new MarkNodeRenderer(options);
44+
}
45+
});
4846
}
4947
}
5048
}

‎markdownView/src/main/java/br/tiagohm/markdownview/ext/mathjax/MathJaxExtension.java

+7-9
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,13 @@ public void extend(Parser.Builder parserBuilder) {
3636

3737
@Override
3838
public void extend(HtmlRenderer.Builder rendererBuilder, String rendererType) {
39-
switch (rendererType) {
40-
case "HTML":
41-
rendererBuilder.nodeRendererFactory(new NodeRendererFactory() {
42-
@Override
43-
public NodeRenderer create(DataHolder options) {
44-
return new MathJaxNodeRenderer(options);
45-
}
46-
});
47-
break;
39+
if (rendererType.equals("HTML")) {
40+
rendererBuilder.nodeRendererFactory(new NodeRendererFactory() {
41+
@Override
42+
public NodeRenderer create(DataHolder options) {
43+
return new MathJaxNodeRenderer(options);
44+
}
45+
});
4846
}
4947
}
5048
}

‎markdownView/src/main/java/br/tiagohm/markdownview/ext/twitter/internal/TwitterNodeRenderer.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import br.tiagohm.markdownview.ext.twitter.Twitter;
2828

2929
public class TwitterNodeRenderer implements NodeRenderer {
30-
private ConditionVariable mCondition = new ConditionVariable(false);
30+
private final ConditionVariable mCondition = new ConditionVariable(false);
3131
private String mHtml = null;
3232

3333
public TwitterNodeRenderer(DataHolder options) {
@@ -96,7 +96,7 @@ public NodeRenderer create(final DataHolder options) {
9696
}
9797

9898
private class LoadTweetRunnable implements Runnable {
99-
private String mUrl;
99+
private final String mUrl;
100100

101101
public LoadTweetRunnable(String url) {
102102
mUrl = url;

0 commit comments

Comments
 (0)