Skip to content
This repository has been archived by the owner on Jul 5, 2023. It is now read-only.

Commit

Permalink
Merge branch 'release/0.0.4' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
mike-audi committed Apr 9, 2021
2 parents d31df29 + d73a878 commit dde79d3
Show file tree
Hide file tree
Showing 50 changed files with 34 additions and 9 deletions.
11 changes: 10 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,4 +108,13 @@ jobs:
with:
artifacts: "build/app/outputs/bundle/release/*.aab,build/ios/release/app.ipa"
replacesArtifacts: false
token: ${{ secrets.GH_TOKEN }}
token: ${{ secrets.GH_TOKEN }}

- name: Create Sentry release
uses: getsentry/action-release@v1
env:
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
SENTRY_ORG: 'my-tiki'
SENTRY_PROJECT: 'app'
with:
environment: public
1 change: 1 addition & 0 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<application
android:label="TIKI"
android:icon="@mipmap/ic_launcher"
android:roundIcon="@mipmap/ic_launcher_round"
android:allowBackup="false"
android:fullBackupContent="false">
<activity
Expand Down
Binary file modified android/app/src/main/ic_launcher-playstore.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion android/app/src/main/res/values/ic_launcher_background.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="ic_launcher_background">#FFD225</color>
<color name="ic_launcher_background">#FEF64B</color>
</resources>
2 changes: 1 addition & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:4.2.0-beta06'
classpath 'com.android.tools.build:gradle:4.2.0-rc01'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand Down
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/100.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/1024.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/114.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/120.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/144.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/152.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/167.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/172.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/180.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/196.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/20.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/216.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/256.png
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/29.png
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/32.png
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/40.png
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/48.png
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/50.png
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/512.png
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/55.png
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/57.png
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/58.png
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/60.png
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/64.png
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/72.png
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/76.png
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/80.png
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/87.png
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/88.png
6 changes: 4 additions & 2 deletions lib/src/screens/screen_login.dart
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,14 @@ class ScreenLogin extends PlatformScaffold {
static final double _hPadding =
ConfigSizes.hPadding * PlatformRelativeSize.safeBlockHorizontal;
static final double _vMarginStart =
25 * PlatformRelativeSize.safeBlockVertical;
15 * PlatformRelativeSize.safeBlockVertical;
static final double _vMarginBlob =
46 * PlatformRelativeSize.blockSizeVertical;
static final double _vMarginPineapple =
4 * PlatformRelativeSize.safeBlockVertical;
static final double _vMargin = 2.5 * PlatformRelativeSize.safeBlockVertical;
static final double _vMarginTitleRight =
15 * PlatformRelativeSize.safeBlockHorizontal;
static final double _fsizeTitle =
10 * PlatformRelativeSize.safeBlockHorizontal;
static final double _fsizeEmailCta =
Expand Down Expand Up @@ -83,7 +85,7 @@ class ScreenLogin extends PlatformScaffold {

Widget _title() {
return Container(
margin: EdgeInsets.only(top: _vMarginStart),
margin: EdgeInsets.only(top: _vMarginStart, right: _vMarginTitleRight),
child: Align(
alignment: Alignment.centerLeft,
child: Text(ConfigStrings.loginTitle,
Expand Down
11 changes: 9 additions & 2 deletions lib/src/ui/ui_magiclink_send/ui_magic_link_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class _UIMagicLinkView extends State<UIMagicLinkView> {
static final double _fSizeButton =
6 * PlatformRelativeSize.safeBlockHorizontal;
static final double _vMarginButton =
6 * PlatformRelativeSize.safeBlockVertical;
4 * PlatformRelativeSize.safeBlockVertical;
static final double _widthButton =
50 * PlatformRelativeSize.safeBlockHorizontal;
static final double _heightButton =
Expand Down Expand Up @@ -104,8 +104,15 @@ class _UIMagicLinkView extends State<UIMagicLinkView> {
color: ConfigColors.gray,
fontWeight: FontWeight.bold,
fontSize: _fSizeInput),
filled: true,
fillColor: Colors.white,
border: UnderlineInputBorder(
enabledBorder: UnderlineInputBorder(
borderSide: BorderSide(
color:
isError ? ConfigColors.grenadier : ConfigColors.mardiGras,
width: 2,
style: BorderStyle.solid)),
focusedBorder: UnderlineInputBorder(
borderSide: BorderSide(
color:
isError ? ConfigColors.grenadier : ConfigColors.mardiGras,
Expand Down
8 changes: 7 additions & 1 deletion lib/src/ui/ui_security_restore/ui_security_restore_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,14 @@ class _UISecurityRestoreView extends State<UISecurityRestoreView> {
color: ConfigColors.gray,
fontWeight: FontWeight.bold,
fontSize: _fSizeInput),
filled: true,
fillColor: Colors.white,
border: UnderlineInputBorder(
enabledBorder: UnderlineInputBorder(
borderSide: BorderSide(
color: ConfigColors.mardiGras,
width: 2,
style: BorderStyle.solid)),
focusedBorder: UnderlineInputBorder(
borderSide: BorderSide(
color: ConfigColors.mardiGras,
width: 2,
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: CODE NAME TIKI BAR

publish_to: 'none'

version: 0.0.3+1
version: 0.0.4+1

environment:
sdk: ">=2.7.0 <3.0.0"
Expand Down

0 comments on commit dde79d3

Please sign in to comment.