Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #84

Merged
merged 188 commits into from
Oct 5, 2024
Merged

Dev #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
188 commits
Select commit Hold shift + click to select a range
e88216a
Add auto build and java version
KuznetsovNikita Jul 15, 2024
55a84ea
Kotlin cast to string
KuznetsovNikita Jul 15, 2024
0f4e9f9
Update signingConfigs
KuznetsovNikita Jul 15, 2024
cf59861
Run tests
KuznetsovNikita Jul 15, 2024
6965321
Update name
KuznetsovNikita Jul 15, 2024
1312bc6
Pass APK path to action
KuznetsovNikita Jul 15, 2024
ff89e41
upd fastlane config
polstianka Jul 15, 2024
b0b42f4
Add flag to continue
KuznetsovNikita Jul 15, 2024
495e825
add baseline for main app
polstianka Jul 16, 2024
1e35a8a
fix fastlane
polstianka Jul 16, 2024
a603776
remove logs
polstianka Jul 16, 2024
ee13ee9
fix
polstianka Jul 16, 2024
81c6229
fix
polstianka Jul 16, 2024
f32276f
disable baseline
polstianka Jul 16, 2024
417f0a5
fix
polstianka Jul 16, 2024
e57055f
debug
polstianka Jul 16, 2024
9bc22eb
Upload to google play
KuznetsovNikita Jul 16, 2024
488b029
Upload aab to artifacts
KuznetsovNikita Jul 16, 2024
d04aa7e
Update task
KuznetsovNikita Jul 16, 2024
b8ee316
fix
polstianka Jul 16, 2024
370a13f
Merge branch 'feature/cd' of https://github.com/tonkeeper/android int…
polstianka Jul 16, 2024
e764b95
upd task
polstianka Jul 16, 2024
53c3a08
Upload to google play
KuznetsovNikita Jul 16, 2024
e1e5305
upd task
polstianka Jul 16, 2024
d0cdd80
Merge branch 'feature/cd' of https://github.com/tonkeeper/android int…
polstianka Jul 16, 2024
f6b4153
fix task name
polstianka Jul 16, 2024
bf446e1
fix task name
polstianka Jul 16, 2024
d6a01ad
Merge branch 'feature/cd' of https://github.com/tonkeeper/android int…
polstianka Jul 16, 2024
754ca1c
fix task name
polstianka Jul 16, 2024
0aed590
Merge branch 'feature/cd' of https://github.com/tonkeeper/android int…
polstianka Jul 16, 2024
3c6ad93
fix task name
polstianka Jul 16, 2024
4463793
Merge branch 'feature/cd' of https://github.com/tonkeeper/android int…
polstianka Jul 16, 2024
fe0097a
Upload artifacts
KuznetsovNikita Jul 16, 2024
b720abb
Merge branch 'feature/cd' of https://github.com/tonkeeper/android int…
polstianka Jul 16, 2024
f1bc419
Remove action by push
KuznetsovNikita Jul 16, 2024
54a9730
add baseline
polstianka Jul 16, 2024
be42b1a
Merge branch 'feature/cd' of https://github.com/tonkeeper/android int…
polstianka Jul 16, 2024
65b3e9a
Update actions
KuznetsovNikita Jul 16, 2024
db91d2f
baseline
polstianka Jul 16, 2024
64fe9df
Merge branch 'feature/cd' of https://github.com/tonkeeper/android int…
polstianka Jul 16, 2024
d04d096
fix path
polstianka Jul 16, 2024
1e9fad0
add stacktrace
polstianka Jul 16, 2024
733eb9b
fix baseline
polstianka Jul 16, 2024
a5d00a3
upd git ignore
polstianka Jul 16, 2024
acfc495
fix
polstianka Jul 16, 2024
33321ca
fix
polstianka Jul 16, 2024
6e7fa87
fix
polstianka Jul 16, 2024
cfe7ea7
fix
polstianka Jul 16, 2024
3350ed3
change OS
polstianka Jul 16, 2024
f5f87ac
fix emulator
polstianka Jul 17, 2024
a3f8cc0
change device source
polstianka Jul 17, 2024
7f418be
accept licenses
polstianka Jul 17, 2024
f83ed51
upd emulator
polstianka Jul 17, 2024
d62798b
disable baseline
polstianka Jul 17, 2024
f7c56d1
Bulgarian translation
PVasileff Jul 26, 2024
c1abe63
fix
polstianka Jul 29, 2024
c538455
working fastlane config
polstianka Jul 30, 2024
5d28307
decrypt comment
sorokin0andrey Jul 30, 2024
e83fe83
encryptComment implementation
sorokin0andrey Aug 1, 2024
056cc94
nft bug fixeds
polstianka Aug 2, 2024
ce666d0
Merge branch 'dev' of https://github.com/tonkeeper/android into featu…
polstianka Aug 2, 2024
b86ed04
fix build
polstianka Aug 2, 2024
cd2cf33
proguard rules
polstianka Aug 2, 2024
7d60e69
Merge branch 'dev' of https://github.com/tonkeeper/android into encry…
polstianka Aug 5, 2024
9c60d6d
refactoring
polstianka Aug 6, 2024
72facf7
sending encrypted comments
polstianka Aug 6, 2024
86c5baf
Merge pull request #60 from tonkeeper/encrypted-comment
polstianka Aug 6, 2024
80b9cfa
Merge branch 'dev' of https://github.com/tonkeeper/android into featu…
polstianka Aug 6, 2024
f719032
w5 send fix and required memo
polstianka Aug 7, 2024
ac931b7
Merge branch 'dev' of https://github.com/tonkeeper/android into featu…
polstianka Aug 7, 2024
ff5e855
ledger: nft, tonconnect, blind signing
sorokin0andrey Aug 7, 2024
fde8956
Merge pull request #62 from tonkeeper/ledger-update
polstianka Aug 8, 2024
6717701
fix passcode
polstianka Aug 8, 2024
b664319
Merge branch 'dev' of https://github.com/tonkeeper/android into featu…
polstianka Aug 8, 2024
4471632
localization fix
polstianka Aug 8, 2024
e57bdc8
Merge branch 'dev' of https://github.com/tonkeeper/android into featu…
polstianka Aug 8, 2024
edfe252
Merge pull request #57 from PVasileff/patch-1
polstianka Aug 8, 2024
70d6b59
bug fixeds
polstianka Aug 8, 2024
c7880dd
fix comment decryption
sorokin0andrey Aug 9, 2024
b30c49d
fix comment encryption
sorokin0andrey Aug 9, 2024
140afe4
Merge pull request #63 from tonkeeper/fix-comment-decryption
polstianka Aug 9, 2024
80047fe
send input fix
polstianka Aug 9, 2024
8f42420
bug fixeds
polstianka Aug 9, 2024
4f9e8de
bug fixeds
polstianka Aug 9, 2024
3bfa775
Merge branch 'dev' of https://github.com/tonkeeper/android into featu…
polstianka Aug 9, 2024
9192fd2
migration fix
polstianka Aug 10, 2024
13bf5c5
bug fixeds
polstianka Aug 11, 2024
31afdfe
bug fixeds
polstianka Aug 11, 2024
5349887
Merge branch 'dev' of https://github.com/tonkeeper/android into featu…
polstianka Aug 11, 2024
d704669
bug fixeds
polstianka Aug 15, 2024
23c639a
bug fixeds
polstianka Aug 19, 2024
ed5e460
bug fixeds
polstianka Aug 20, 2024
f447213
bug fixeds
polstianka Aug 21, 2024
5d88e22
bug fixeds
polstianka Aug 22, 2024
b964ae2
fix
polstianka Aug 22, 2024
8d6ca04
push fixeds
polstianka Aug 23, 2024
0321de7
bug fixeds
polstianka Aug 24, 2024
75d67f8
bug fixed
polstianka Aug 24, 2024
6b90bef
change min android version
polstianka Aug 26, 2024
bbad74f
up version
polstianka Aug 26, 2024
4e839f5
signer helper
polstianka Aug 27, 2024
0844f53
try fix for google play
polstianka Aug 29, 2024
cbbab08
billing
polstianka Aug 29, 2024
8091ea5
bug fixeds
polstianka Aug 30, 2024
ed07566
localization
polstianka Aug 30, 2024
8282498
feat: battery (#65)
sorokin0andrey Sep 2, 2024
a2471c8
fixeds
polstianka Sep 2, 2024
0b70e1c
Merge branch 'dev' of https://github.com/tonkeeper/android into staki…
polstianka Sep 2, 2024
c562434
pull from dev
polstianka Sep 2, 2024
91697fe
remove build
polstianka Sep 2, 2024
34a000d
using op codes
polstianka Sep 2, 2024
65db73d
Merge pull request #68 from tonkeeper/staking_fix
polstianka Sep 2, 2024
c6ab240
proguard rules for battery api
polstianka Sep 3, 2024
1784d91
fixed hidden balance
polstianka Sep 3, 2024
3b321ea
fix wallet picker
polstianka Sep 3, 2024
ff0bdc1
firebase perfomance
polstianka Sep 3, 2024
6107522
slide navigation
polstianka Sep 4, 2024
3060287
fix staking
polstianka Sep 4, 2024
5ff98b6
support gasless
sorokin0andrey Sep 5, 2024
38da808
token picker for battery
polstianka Sep 5, 2024
fe4eaeb
bug fixeds
polstianka Sep 5, 2024
dab49df
bug fixeds
polstianka Sep 6, 2024
b315fce
gasless fixes
sorokin0andrey Sep 6, 2024
ae649df
Merge branch 'dev' of https://github.com/tonkeeper/android into gasle…
polstianka Sep 6, 2024
9cf33bb
from dev
polstianka Sep 6, 2024
f409317
impovements
polstianka Sep 6, 2024
ef3121d
Merge pull request #69 from tonkeeper/gasless-support
polstianka Sep 6, 2024
d7116e0
add screen context
polstianka Sep 7, 2024
6689455
add wallet context to staking
polstianka Sep 7, 2024
b38e040
wallet picker fix
polstianka Sep 8, 2024
537b5c2
fix add wallet
polstianka Sep 8, 2024
2cb2b6e
fragment factory fix
polstianka Sep 8, 2024
d19176d
koin update
polstianka Sep 8, 2024
b4875ac
add baseline
polstianka Sep 9, 2024
ebcee39
disable auto generation baseline
polstianka Sep 9, 2024
8b75dbb
change cd
polstianka Sep 9, 2024
b18b6a3
change trigger for ci
polstianka Sep 9, 2024
c720462
remove afer optimize
polstianka Sep 9, 2024
d391a4b
bug fixeds
polstianka Sep 12, 2024
4896152
compress jetton
polstianka Sep 13, 2024
67c133f
fixed realtime
polstianka Sep 16, 2024
9f40413
bug fixeds
polstianka Sep 16, 2024
86e4b78
fix for compressed jetton
polstianka Sep 17, 2024
61bfaba
battery & swap fixes
sorokin0andrey Sep 17, 2024
14b52f4
Merge pull request #71 from tonkeeper/battery-and-swap-fixes
polstianka Sep 17, 2024
cc9d030
signUseCase and Keystone
polstianka Sep 18, 2024
59f34c4
useCase for sign tx
polstianka Sep 19, 2024
a6262de
Merge pull request #73 from tonkeeper/keystone
polstianka Sep 19, 2024
4117274
new tonconnect
polstianka Sep 23, 2024
8f30618
bug fixeds
polstianka Sep 23, 2024
6842eaf
bug fixeds
polstianka Sep 23, 2024
d973a71
fix gass proxy
polstianka Sep 23, 2024
f56481a
Merge pull request #74 from tonkeeper/tonconnect
polstianka Sep 23, 2024
a9388c9
staking
polstianka Sep 25, 2024
9725670
bug fixeds
polstianka Sep 26, 2024
798f2d2
battery fixes (#75)
sorokin0andrey Sep 27, 2024
920c4ac
update version
sorokin0andrey Sep 27, 2024
3018da5
Merge pull request #76 from tonkeeper/update-version
polstianka Sep 27, 2024
21800ae
bug fixeds
polstianka Sep 27, 2024
40fd373
bug fixeds
polstianka Sep 27, 2024
dcab863
baseline
polstianka Sep 27, 2024
3c395a9
bug fixeds
polstianka Sep 28, 2024
cfaa815
fix send
polstianka Sep 29, 2024
7f36de4
staking bug fixeds
polstianka Sep 29, 2024
4914bf6
fix battery keyboard
polstianka Sep 29, 2024
e2b23ac
Bug fixeds
polstianka Sep 29, 2024
16fca72
bug fixeds
polstianka Sep 30, 2024
b298837
custom tabs for all merchants
polstianka Sep 30, 2024
b428d45
mini fix
polstianka Sep 30, 2024
c9dde09
bridge for tonapi
polstianka Sep 30, 2024
8192fe7
bug fixeds
polstianka Sep 30, 2024
435912d
beta
polstianka Oct 1, 2024
01e9334
enable staking
polstianka Oct 1, 2024
2b03915
add battery iap
sorokin0andrey Oct 1, 2024
fa6b4cd
Merge pull request #78 from tonkeeper/iap
polstianka Oct 1, 2024
d6efd32
iap: add success toast & update balance (#79)
sorokin0andrey Oct 1, 2024
49a5693
battery fixes (#80)
sorokin0andrey Oct 1, 2024
e29804b
bug fixeds
polstianka Oct 2, 2024
b401994
Merge branch 'dev' of https://github.com/tonkeeper/android into dev
polstianka Oct 2, 2024
9bc62bb
js tonapi bridge
polstianka Oct 2, 2024
4ccd647
bug fixeds
polstianka Oct 2, 2024
a7c2d28
fix battery decimals & forcing (#82)
sorokin0andrey Oct 3, 2024
7b45ad5
fix gasless decimals & max (#83)
sorokin0andrey Oct 3, 2024
012c2e0
bug fixeds
polstianka Oct 4, 2024
cf8f8c7
Merge branch 'dev' of https://github.com/tonkeeper/android into dev
polstianka Oct 4, 2024
b93e962
push fixeds
polstianka Oct 5, 2024
aec5035
staking fix
polstianka Oct 5, 2024
2c1f974
burn
polstianka Oct 5, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
57 changes: 57 additions & 0 deletions .github/workflows/baselineprofile.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
name: Android generate baseline profile

on:
workflow_dispatch:

jobs:
baseline:
name: generate-baselineprofile
runs-on: macOS-latest

env:
EMULATOR_API_LEVEL: '30'
EMULATOR_AVD_TARGET: 'aosp_atd'
EMULATOR_AVD_ARCH: 'x86'

steps:
- name: Checkout to git repository
uses: actions/checkout@v4
with:
lfs: 'true'

- name: Check LFS files
uses: actionsdesk/[email protected]

- name: Install JDK
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: '22'

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4

- name: Build benchmark
id: gradle
run: ./gradlew :apps:wallet:instance:main:generateReleaseBaselineProfile

- name: AVD cache
uses: actions/cache@v4
id: avd-cache
with:
path: |
~/.android/avd/*
~/.android/adb*
key: avd-${{ env.EMULATOR_API_LEVEL }}

- name: create AVD and generate snapshot for caching
if: steps.avd-cache.outputs.cache-hit != 'true'
uses: reactivecircus/android-emulator-runner@v2
with:
api-level: ${{ env.EMULATOR_API_LEVEL }}
target: ${{ env.EMULATOR_AVD_TARGET }}
arch: ${{ env.EMULATOR_AVD_ARCH }}
force-avd-creation: false
emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
disable-animations: false
script: echo "Generated AVD snapshot for caching."
45 changes: 25 additions & 20 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
@@ -1,51 +1,56 @@
name: Android APK build CD

on:
# Allows you to run this workflow manually from the Actions a tab
workflow_dispatch:
push:
branches:
- dev

jobs:
android-build:
name: android-build
runs-on: ubuntu-latest
runs-on: macos-latest

steps:
- name: Checkout to git repository
uses: actions/checkout@v4

- name: Set up ruby env
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.2
bundler-cache: true

- name: Setup Java
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: ${{ matrix.java-version }}
java-version: 20.0.2+9

- name: Decode signing certificate into a file
working-directory: './apps/wallet/instance/main'
env:
CERTIFICATE_BASE64: ${{ secrets.ANDROID_DIST_SIGNING_KEY }}
run: |
echo $CERTIFICATE_BASE64 | base64 --decode > google-release.keystore

- name: Decode service account into a file
working-directory: './apps/wallet/instance/main'
env:
CREDENTIALS: ${{ secrets.ANDROID_PUBLISHER_CREDENTIALS }}
run: |
echo $CREDENTIALS > service-account.json

- name: Build android apk
working-directory: './apps/wallet/instance/main'
run: bundle exec fastlane android apk
- name: Build android beta
run: bundle exec fastlane android beta
env:
KEYSTORE_FILE: ${{ github.workspace }}/apps/wallet/instance/main/google-release.keystore
KEYSTORE_FILE: ${{ github.workspace }}/google-release.keystore
KEYSTORE_PASSWORD: ${{ secrets.TONKEEPER_UPLOAD_STORE_PASSWORD }}
KEY_ALIAS: ${{ secrets.TONKEEPER_UPLOAD_KEY_ALIAS}}
KEY_PASSWORD: ${{ secrets.TONKEEPER_UPLOAD_KEY_PASSWORD }}
ANDROID_JSON_KEY_FILE: service-account.json
ANDROID_PUBLISHER_CREDENTIALS: ${{ secrets.ANDROID_PUBLISHER_CREDENTIALS }}

- name: Upload android aab to artifacts
uses: actions/upload-artifact@v4
with:
name: Tonkeeper X aab ${{ env.VERSION_CODE }}
path: |
${{ env.AAB_OUTPUT_PATH }}

- name: Upload android apk to artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Tonkeeper apk ${{ env.VERSION_CODE }}
name: Tonkeeper X apk ${{ env.VERSION_CODE }}
path: |
${{ github.workspace }}/apps/wallet/instance/main/build/outputs
${{ env.APK_OUTPUT_PATH }}
14 changes: 12 additions & 2 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
source 'https://rubygems.org'
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
ruby ">= 2.6.10"
gem "fastlane"
gem "fastlane-plugin-increment_version_code"
Loading