Compare commits

...

3 Commits

Author SHA1 Message Date
NickVs2015 4941fcad23 feat: add edge-to-edge android 15 view 2026-03-24 13:12:45 +03:00
vkamn 4116c83624 chore: bump version (#63) 2026-03-13 10:56:03 +08:00
albexk 762e82c71f Feat/build action (#62)
* feat: add build script

* fix: fix build script

* fix: remove `jarsigner -verify`
2026-03-02 20:23:16 +03:00
6 changed files with 43 additions and 6 deletions
+4 -3
View File
@@ -1,4 +1,5 @@
name: Build signed AAB (Release)
name: Android build (signed AAB / debug APK)
run-name: "Android • ${{ inputs.target }} • ${{ inputs.ref || github.ref_name }}"
on:
workflow_dispatch:
@@ -18,6 +19,7 @@ on:
jobs:
build:
name: "Build (${{ inputs.target }})"
runs-on: ubuntu-latest
steps:
@@ -25,6 +27,7 @@ jobs:
uses: actions/checkout@v4
with:
ref: ${{ inputs.ref }}
submodules: recursive
fetch-depth: 0
- name: Set up JDK
@@ -128,8 +131,6 @@ jobs:
"${AAB}" \
"${KEY_ALIAS}"
jarsigner -verify -verbose -certs "${SIGNED_AAB}"
echo "final_file=${SIGNED_AAB}" >> "$GITHUB_OUTPUT"
- name: Upload artifact
+1 -1
View File
@@ -1,4 +1,4 @@
amneziawgVersionCode=9
amneziawgVersionCode=10
amneziawgVersionName=2.0.0
amneziawgPackageName=org.amnezia.awg
+1
View File
@@ -78,6 +78,7 @@
<activity
android:name=".activity.SettingsActivity"
android:label="@string/settings"
android:theme="@style/AppTheme.NoActionBar"
android:parentActivityName=".activity.MainActivity" />
<activity
@@ -29,9 +29,12 @@ import kotlinx.coroutines.withContext
class SettingsActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
if (supportFragmentManager.findFragmentById(android.R.id.content) == null) {
setContentView(R.layout.activity_settings)
setSupportActionBar(findViewById(R.id.toolbar))
supportActionBar?.setDisplayHomeAsUpEnabled(true)
if (supportFragmentManager.findFragmentById(R.id.settings_container) == null) {
supportFragmentManager.commit {
add(android.R.id.content, SettingsFragment())
add(R.id.settings_container, SettingsFragment())
}
}
}
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/app_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fitsSystemWindows="true">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize" />
</com.google.android.material.appbar.AppBarLayout>
<FrameLayout
android:id="@+id/settings_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>
+5
View File
@@ -15,6 +15,11 @@
<!-- Various additional API-specific features in values-v*/styles.xml -->
<style name="AppTheme" parent="AppThemeBase" />
<style name="AppTheme.NoActionBar">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>
<style name="AmneziaWgTheme.MaterialCardView" parent="Widget.Material3.CardView.Elevated">
<item name="cornerRadius">4dp</item>
<item name="contentPadding">8dp</item>