Skip to content

Commit 6efca2e

Browse files
committed
Pre-release commit (small changes for relese build)
1 parent 911c053 commit 6efca2e

4 files changed

Lines changed: 21 additions & 24 deletions

File tree

app/build.gradle

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,43 +15,47 @@ android {
1515
multiDexEnabled true
1616
}
1717

18-
buildTypes {
19-
debug {
20-
pseudoLocalesEnabled true
21-
}
22-
}
23-
2418
compileOptions {
2519
coreLibraryDesugaringEnabled true
2620
sourceCompatibility JavaVersion.VERSION_17
2721
targetCompatibility JavaVersion.VERSION_17
2822
}
23+
24+
applicationVariants.all { variant ->
25+
variant.outputs.all { output ->
26+
def projectName = "Web-AIDE"
27+
def version = variant.versionName
28+
def buildNumber = variant.versionCode
29+
def variantName = variant.name
30+
outputFileName = "${projectName}-v${version}-build.${buildNumber}.apk"
31+
}
32+
}
2933
}
3034

3135
dependencies {
3236
implementation "androidx.appcompat:appcompat:$app_compat"
3337
implementation "androidx.multidex:multidex:$multidex"
3438
implementation "androidx.preference:preference:$preference"
39+
implementation "androidx.swiperefreshlayout:swiperefreshlayout:$swiperefreshlayout"
40+
3541
implementation "com.google.android.material:material:$material"
3642
implementation "com.google.code.gson:gson:$gson"
37-
implementation("com.google.javascript:closure-compiler:$closure_compiler")
43+
implementation "com.google.javascript:closure-compiler:$closure_compiler"
44+
45+
implementation "com.vladsch.flexmark:flexmark:$flexmark"
46+
implementation "com.vladsch.flexmark:flexmark-ext-tables:$flexmark"
47+
implementation "com.vladsch.flexmark:flexmark-ext-gfm-strikethrough:$flexmark"
3848

3949
implementation "io.github.Rosemoe.sora-editor:editor"
4050
implementation "io.github.Rosemoe.sora-editor:language-textmate"
4151
implementation "io.noties.markwon:core:${markwonVersion}"
4252

4353
implementation "org.eclipse.jgit:org.eclipse.jgit:$jgit"
4454
implementation "org.jsoup:jsoup:$jsoup"
45-
55+
4656
implementation project(":filetree")
4757
implementation project(":colorpicker")
4858
implementation platform("io.github.Rosemoe.sora-editor:bom:$sora_editor")
4959
implementation fileTree(dir: 'libs', include: ['*.jar'])
5060
coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:$desugar_jdk_libs"
51-
52-
implementation "com.vladsch.flexmark:flexmark:$flexmark"
53-
implementation "com.vladsch.flexmark:flexmark-ext-tables:$flexmark"
54-
implementation "com.vladsch.flexmark:flexmark-ext-gfm-strikethrough:$flexmark"
55-
56-
implementation "androidx.swiperefreshlayout:swiperefreshlayout:$swiperefreshlayout"
5761
}

app/src/main/assets/whats_new/EN.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ START:
77
- Material3
88
- AndroidX
99
- AlertDialogX (By Xedox)
10-
- Implemented Markdown preview with engine selection
10+
- Added markdown display type setting
1111
- Markwon
1212
- FlexMark
1313
- Added console gestures
@@ -31,6 +31,7 @@ START:
3131
- Fixed file tree display in dark theme
3232
- Fixed accidental editor closing with gestures
3333
- Various minor fixes
34+
- Fixed open color picker
3435
END
3536

3637

app/src/main/res/layout/editor_drawer_content.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
1111
android:layout_height="match_parent"
1212
android:layout_width="match_parent"
13-
android:layout_below="@+id/file_tree_title"
1413
android:id="@+id/swipe_refresh">
1514

1615
<org.xedox.filetree.widget.TwoDScrollView

colorpicker/build.gradle

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,7 @@ android {
1212
versionCode 1
1313
versionName "0.0.2"
1414
}
15-
16-
buildTypes {
17-
release {
18-
minifyEnabled true
19-
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
20-
}
21-
}
22-
15+
2316
compileOptions {
2417
sourceCompatibility JavaVersion.VERSION_17
2518
targetCompatibility JavaVersion.VERSION_17

0 commit comments

Comments
 (0)