@samitouri / QOSAMI-cakewallet-1 / commits / ad3142aeb

Changed app font to Lato. Changes for anrdoid version

M committed Nov 11, 2020 at 17:55 UTC ad3142aeb93f85550933c47f1cd763931828bee7
33 files changed +75 -103
android/app/src/main/AndroidManifest.xml
+16 -12
@@ -1,16 +1,10 @@
1 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
2 package="com.cakewallet.cake_wallet">
3 - <!-- io.flutter.app.FlutterApplication is an android.app.Application that
4 - calls FlutterMain.startInitialization(this); in its onCreate method.
5 - In most cases you can leave this as-is, but you if you want to provide
6 - additional functionality it is fine to subclass or reimplement
7 - FlutterApplication and put your custom class here. -->
3
4 <uses-permission android:name="android.permission.INTERNET"/>
5 <uses-permission android:name="android.permission.USE_FINGERPRINT"/>
6
7 <application
13 - android:name="io.flutter.app.FlutterApplication"
8 android:label="Cake Wallet"
9 android:icon="@mipmap/ic_launcher">
10 <activity
@@ -21,17 +15,27 @@
15 android:hardwareAccelerated="true"
16 android:windowSoftInputMode="adjustResize"
17 android:screenOrientation="portrait">
24 - <!-- This keeps the window background of the activity showing
25 - until Flutter renders its first frame. It can be removed if
26 - there is no splash screen (such as the default splash screen
27 - defined in @style/LaunchTheme). -->
18 +<!-- <meta-data-->
19 +<!-- android:name="io.flutter.embedding.android.NormalTheme"-->
20 +<!-- android:resource="@style/NormalTheme"-->
21 +<!-- />-->
22 + <!-- Displays an Android View that continues showing the launch screen
23 + Drawable until Flutter paints its first frame, then this splash
24 + screen fades out. A splash screen is useful to avoid any visual
25 + gap between the end of Android's launch screen and the painting of
26 + Flutter's first frame. -->
27 <meta-data
29 - android:name="io.flutter.app.android.SplashScreenUntilFirstFrame"
30 - android:value="true" />
28 + android:name="io.flutter.embedding.android.SplashScreenDrawable"
29 + android:resource="@drawable/launch_background"
30 + />
31 <intent-filter>
32 <action android:name="android.intent.action.MAIN"/>
33 <category android:name="android.intent.category.LAUNCHER"/>
34 </intent-filter>
35 </activity>
36 +
37 + <meta-data
38 + android:name="flutterEmbedding"
39 + android:value="2" />
40 </application>
41 </manifest>
android/app/src/main/java/com/cakewallet/cake_wallet/MainActivity.java
+2 -9
@@ -1,13 +1,6 @@
1 package com.cakewallet.cake_wallet;
2
3 -import android.os.Bundle;
4 -import io.flutter.app.FlutterFragmentActivity;
5 -import io.flutter.plugins.GeneratedPluginRegistrant;
3 +import io.flutter.embedding.android.FlutterActivity;
4
7 -public class MainActivity extends FlutterFragmentActivity {
8 - @Override
9 - protected void onCreate(Bundle savedInstanceState) {
10 - super.onCreate(savedInstanceState);
11 - GeneratedPluginRegistrant.registerWith(this);
12 - }
5 +public class MainActivity extends FlutterActivity {
6 }
android/settings_aar.gradle new
+1
@@ -0,0 +1 @@
1 +include ':app'
assets/fonts/Lato-Bold.ttf
Binary files a/assets/fonts/Lato-Bold.ttf and b/assets/fonts/Lato-Bold.ttf differ
assets/fonts/Lato-Medium.ttf
Binary files /dev/null and b/assets/fonts/Lato-Medium.ttf differ
assets/fonts/Lato-Regular.ttf
Binary files a/assets/fonts/Lato-Regular.ttf and b/assets/fonts/Lato-Regular.ttf differ
assets/fonts/Lato-Semibold.ttf
Binary files a/assets/fonts/Lato-Semibold.ttf and b/assets/fonts/Lato-Semibold.ttf differ
assets/fonts/Montserrat-Bold.ttf
Binary files a/assets/fonts/Montserrat-Bold.ttf and /dev/null differ
assets/fonts/Montserrat-Regular.ttf
Binary files a/assets/fonts/Montserrat-Regular.ttf and /dev/null differ
assets/fonts/Montserrat-SemiBold.ttf
Binary files a/assets/fonts/Montserrat-SemiBold.ttf and /dev/null differ
assets/fonts/Poppins-Bold.ttf
Binary files a/assets/fonts/Poppins-Bold.ttf and /dev/null differ
assets/fonts/Poppins-Medium.ttf
Binary files a/assets/fonts/Poppins-Medium.ttf and /dev/null differ
assets/fonts/Poppins-Regular.ttf
Binary files a/assets/fonts/Poppins-Regular.ttf and /dev/null differ
assets/fonts/Poppins-SemiBold.ttf
Binary files a/assets/fonts/Poppins-SemiBold.ttf and /dev/null differ
cw_monero/android/src/main/kotlin/com/cakewallet/monero/CwMoneroPlugin.kt
+22 -22
@@ -4,7 +4,7 @@ import android.app.Activity
4 import android.os.AsyncTask
5 import android.os.Looper
6 import android.os.Handler
7 -import android.os.Process
7 +import android.os.Process
8
9 import io.flutter.plugin.common.MethodCall
10 import io.flutter.plugin.common.MethodChannel
@@ -22,10 +22,10 @@ class doAsync(val handler: () -> Unit) : AsyncTask<Void, Void, Void>() {
22
23 class CwMoneroPlugin: MethodCallHandler {
24 companion object {
25 - val moneroApi = MoneroApi()
25 +// val moneroApi = MoneroApi()
26 val main = Handler(Looper.getMainLooper());
27
28 - init {
28 + init {
29 System.loadLibrary("cw_monero")
30 }
31
@@ -43,31 +43,31 @@ class CwMoneroPlugin: MethodCallHandler {
43 val password = call.argument("password") ?: ""
44 val useSSL = false
45 val isLightWallet = false
46 - doAsync {
47 - try {
48 - moneroApi.setNodeAddressJNI(uri, login, password, useSSL, isLightWallet)
49 - main.post({
50 - result.success(true)
51 - });
52 - } catch(e: Throwable) {
53 - main.post({
54 - result.error("CONNECTION_ERROR", e.message, null)
55 - });
56 - }
57 - }.execute()
46 +// doAsync {
47 +// try {
48 +// moneroApi.setNodeAddressJNI(uri, login, password, useSSL, isLightWallet)
49 +// main.post({
50 +// result.success(true)
51 +// });
52 +// } catch(e: Throwable) {
53 +// main.post({
54 +// result.error("CONNECTION_ERROR", e.message, null)
55 +// });
56 +// }
57 +// }.execute()
58 }
59 if (call.method == "startSync") {
60 - doAsync {
61 - moneroApi.startSyncJNI()
62 - main.post({
63 - result.success(true)
64 - });
65 - }.execute()
60 +// doAsync {
61 +// moneroApi.startSyncJNI()
62 +// main.post({
63 +// result.success(true)
64 +// });
65 +// }.execute()
66 }
67 if (call.method == "loadWallet") {
68 val path = call.argument("path") ?: ""
69 val password = call.argument("password") ?: ""
70 - moneroApi.loadWalletJNI(path, password)
70 +// moneroApi.loadWalletJNI(path, password)
71 result.success(true)
72 }
73 }
cw_monero/android/src/main/kotlin/com/cakewallet/monero/MoneroApi.kt deleted
-14
@@ -1,14 +0,0 @@
1 -package com.cakewallet.monero
2 -
3 -class MoneroApi {
4 - external fun setNodeAddressJNI(uri: String, login: String, password: String, use_ssl: Boolean, is_light_wallet: Boolean)
5 - external fun connectToNodeJNI()
6 - external fun startSyncJNI()
7 - external fun loadWalletJNI(path: String, password: String)
8 -
9 - companion object {
10 - init {
11 - System.loadLibrary("cw_monero")
12 - }
13 - }
14 -}
\ No newline at end of file
cw_monero/lib/wallet.dart
-2
@@ -11,8 +11,6 @@ import 'package:flutter/services.dart';
11
12 int _boolToInt(bool value) => value ? 1 : 0;
13
14 -final moneroAPIChannel = const MethodChannel('cw_monero');
15 -
14 final getFileNameNative = moneroApi
15 .lookup<NativeFunction<get_filename>>('get_filename')
16 .asFunction<GetFilename>();
ios/Runner.xcodeproj/project.pbxproj
+3 -3
@@ -354,7 +354,7 @@
354 buildSettings = {
355 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
356 CLANG_ENABLE_MODULES = YES;
357 - CURRENT_PROJECT_VERSION = 1;
357 + CURRENT_PROJECT_VERSION = 3;
358 DEVELOPMENT_TEAM = 32J6BB6VUS;
359 ENABLE_BITCODE = NO;
360 FRAMEWORK_SEARCH_PATHS = (
@@ -494,7 +494,7 @@
494 buildSettings = {
495 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
496 CLANG_ENABLE_MODULES = YES;
497 - CURRENT_PROJECT_VERSION = 1;
497 + CURRENT_PROJECT_VERSION = 3;
498 DEVELOPMENT_TEAM = 32J6BB6VUS;
499 ENABLE_BITCODE = NO;
500 FRAMEWORK_SEARCH_PATHS = (
@@ -528,7 +528,7 @@
528 buildSettings = {
529 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
530 CLANG_ENABLE_MODULES = YES;
531 - CURRENT_PROJECT_VERSION = 1;
531 + CURRENT_PROJECT_VERSION = 3;
532 DEVELOPMENT_TEAM = 32J6BB6VUS;
533 ENABLE_BITCODE = NO;
534 FRAMEWORK_SEARCH_PATHS = (
lib/src/screens/base_page.dart
+1 -1
@@ -76,7 +76,7 @@ abstract class BasePage extends StatelessWidget {
76 style: TextStyle(
77 fontSize: 18.0,
78 fontWeight: FontWeight.bold,
79 - fontFamily: 'Poppins',
79 + fontFamily: 'Lato',
80 color: titleColor ??
81 Theme.of(context).primaryTextTheme.title.color),
82 );
lib/src/screens/dashboard/widgets/filter_widget.dart
+3 -3
@@ -33,7 +33,7 @@ class FilterWidget extends StatelessWidget {
33 color: Colors.white,
34 fontSize: 18,
35 fontWeight: FontWeight.bold,
36 - fontFamily: 'Poppins',
36 + fontFamily: 'Lato',
37 decoration: TextDecoration.none,
38 ),
39 ),
@@ -74,7 +74,7 @@ class FilterWidget extends StatelessWidget {
74 color: Theme.of(context).accentTextTheme.subhead.color,
75 fontSize: 16,
76 fontWeight: FontWeight.w500,
77 - fontFamily: 'Poppins',
77 + fontFamily: 'Lato',
78 decoration: TextDecoration.none
79 ),
80 ),
@@ -127,7 +127,7 @@ class FilterWidget extends StatelessWidget {
127 style: TextStyle(
128 color: Theme.of(context).primaryTextTheme.title.color,
129 fontSize: 18,
130 - fontFamily: 'Poppins',
130 + fontFamily: 'Lato',
131 fontWeight: FontWeight.w500,
132 decoration: TextDecoration.none
133 ),
lib/src/screens/exchange/widgets/currency_picker.dart
+2 -2
@@ -74,7 +74,7 @@ class CurrencyPickerState extends State<CurrencyPicker> {
74 textAlign: TextAlign.center,
75 style: TextStyle(
76 fontSize: 18,
77 - fontFamily: 'Poppins',
77 + fontFamily: 'Lato',
78 fontWeight: FontWeight.bold,
79 decoration: TextDecoration.none,
80 color: Colors.white
@@ -137,7 +137,7 @@ class CurrencyPickerState extends State<CurrencyPicker> {
137 item.toString(),
138 style: TextStyle(
139 fontSize: 15,
140 - fontFamily: 'Poppins',
140 + fontFamily: 'Lato',
141 fontWeight: FontWeight.w600,
142 decoration: TextDecoration.none,
143 color: textColor
lib/src/screens/exchange_trade/information_page.dart
+1 -1
@@ -33,7 +33,7 @@ class InformationPage extends StatelessWidget {
33 style: TextStyle(
34 fontSize: 14,
35 fontWeight: FontWeight.normal,
36 - fontFamily: 'Poppins',
36 + fontFamily: 'Lato',
37 decoration: TextDecoration.none,
38 color: Theme.of(context).accentTextTheme.caption.decorationColor
39 ),
lib/src/screens/monero_accounts/monero_account_list_page.dart
+2 -2
@@ -53,7 +53,7 @@ class MoneroAccountListPage extends StatelessWidget {
53 style: TextStyle(
54 fontSize: 18,
55 fontWeight: FontWeight.bold,
56 - fontFamily: 'Poppins',
56 + fontFamily: 'Lato',
57 decoration: TextDecoration.none,
58 color: Colors.white
59 ),
@@ -141,7 +141,7 @@ class MoneroAccountListPage extends StatelessWidget {
141 style: TextStyle(
142 fontSize: 15,
143 fontWeight: FontWeight.w600,
144 - fontFamily: 'Poppins',
144 + fontFamily: 'Lato',
145 color: Colors.white,
146 decoration: TextDecoration.none,
147 ),
lib/src/screens/monero_accounts/widgets/account_tile.dart
+1 -1
@@ -32,7 +32,7 @@ class AccountTile extends StatelessWidget {
32 style: TextStyle(
33 fontSize: 18,
34 fontWeight: FontWeight.w600,
35 - fontFamily: 'Poppins',
35 + fontFamily: 'Lato',
36 color: textColor,
37 decoration: TextDecoration.none,
38 ),
lib/src/screens/restore/wallet_restore_page.dart
+1 -1
@@ -42,7 +42,7 @@ class WalletRestorePage extends BasePage {
42 style: TextStyle(
43 fontSize: 18.0,
44 fontWeight: FontWeight.bold,
45 - fontFamily: 'Poppins',
45 + fontFamily: 'Lato',
46 color: titleColor ??
47 Theme.of(context).primaryTextTheme.title.color),
48 ));
lib/src/screens/seed_language/widgets/seed_language_picker.dart
+2 -2
@@ -77,7 +77,7 @@ class SeedLanguagePickerState extends State<SeedLanguagePicker> {
77 style: TextStyle(
78 fontSize: 18,
79 fontWeight: FontWeight.bold,
80 - fontFamily: 'Poppins',
80 + fontFamily: 'Lato',
81 decoration: TextDecoration.none,
82 color: Colors.white
83 ),
@@ -172,7 +172,7 @@ class SeedLanguagePickerState extends State<SeedLanguagePicker> {
172 style: TextStyle(
173 fontSize: 18,
174 fontWeight: FontWeight.w600,
175 - fontFamily: 'Poppins',
175 + fontFamily: 'Lato',
176 decoration: TextDecoration.none,
177 color: textColor
178 ),
lib/src/screens/send/widgets/confirm_sending_alert.dart
+4 -4
@@ -55,7 +55,7 @@ class ConfirmSendingAlert extends BaseAlertDialog {
55 style: TextStyle(
56 fontSize: 16,
57 fontWeight: FontWeight.w600,
58 - fontFamily: 'Poppins',
58 + fontFamily: 'Lato',
59 color: Theme.of(context).primaryTextTheme.title.color,
60 decoration: TextDecoration.none,
61 ),
@@ -65,7 +65,7 @@ class ConfirmSendingAlert extends BaseAlertDialog {
65 style: TextStyle(
66 fontSize: 16,
67 fontWeight: FontWeight.w600,
68 - fontFamily: 'Poppins',
68 + fontFamily: 'Lato',
69 color: Theme.of(context).primaryTextTheme.title.color,
70 decoration: TextDecoration.none,
71 ),
@@ -81,7 +81,7 @@ class ConfirmSendingAlert extends BaseAlertDialog {
81 style: TextStyle(
82 fontSize: 16,
83 fontWeight: FontWeight.w600,
84 - fontFamily: 'Poppins',
84 + fontFamily: 'Lato',
85 color: Theme.of(context).primaryTextTheme.title.color,
86 decoration: TextDecoration.none,
87 ),
@@ -91,7 +91,7 @@ class ConfirmSendingAlert extends BaseAlertDialog {
91 style: TextStyle(
92 fontSize: 16,
93 fontWeight: FontWeight.w600,
94 - fontFamily: 'Poppins',
94 + fontFamily: 'Lato',
95 color: Theme.of(context).primaryTextTheme.title.color,
96 decoration: TextDecoration.none,
97 ),
lib/src/screens/wallet_list/widgets/wallet_menu_alert.dart
+1 -1
@@ -89,7 +89,7 @@ class WalletMenuAlert extends StatelessWidget {
89 style: TextStyle(
90 color: Theme.of(context).primaryTextTheme.title.color,
91 fontSize: 18,
92 - fontFamily: 'Poppins',
92 + fontFamily: 'Lato',
93 fontWeight: FontWeight.w500,
94 decoration: TextDecoration.none
95 ),
lib/src/widgets/base_alert_dialog.dart
+4 -4
@@ -17,7 +17,7 @@ class BaseAlertDialog extends StatelessWidget {
17 textAlign: TextAlign.center,
18 style: TextStyle(
19 fontSize: 20,
20 - fontFamily: 'Poppins',
20 + fontFamily: 'Lato',
21 fontWeight: FontWeight.w600,
22 color: Theme.of(context).primaryTextTheme.title.color,
23 decoration: TextDecoration.none,
@@ -32,7 +32,7 @@ class BaseAlertDialog extends StatelessWidget {
32 style: TextStyle(
33 fontSize: 16,
34 fontWeight: FontWeight.normal,
35 - fontFamily: 'Poppins',
35 + fontFamily: 'Lato',
36 color: Theme.of(context).primaryTextTheme.title.color,
37 decoration: TextDecoration.none,
38 ),
@@ -59,7 +59,7 @@ class BaseAlertDialog extends StatelessWidget {
59 textAlign: TextAlign.center,
60 style: TextStyle(
61 fontSize: 15,
62 - fontFamily: 'Poppins',
62 + fontFamily: 'Lato',
63 fontWeight: FontWeight.w600,
64 color: Colors.white,
65 decoration: TextDecoration.none,
@@ -84,7 +84,7 @@ class BaseAlertDialog extends StatelessWidget {
84 textAlign: TextAlign.center,
85 style: TextStyle(
86 fontSize: 15,
87 - fontFamily: 'Poppins',
87 + fontFamily: 'Lato',
88 fontWeight: FontWeight.w600,
89 color: Colors.white,
90 decoration: TextDecoration.none,
lib/src/widgets/checkbox_widget.dart
+1 -1
@@ -68,7 +68,7 @@ class CheckboxWidgetState extends State<CheckboxWidget> {
68 style: TextStyle(
69 color: Theme.of(context).primaryTextTheme.title.color,
70 fontSize: 18,
71 - fontFamily: 'Poppins',
71 + fontFamily: 'Lato',
72 fontWeight: FontWeight.w500,
73 decoration: TextDecoration.none
74 ),
lib/src/widgets/picker.dart
+3 -3
@@ -70,7 +70,7 @@ class PickerState<Item> extends State<Picker> {
70 textAlign: TextAlign.center,
71 style: TextStyle(
72 fontSize: 18,
73 - fontFamily: 'Poppins',
73 + fontFamily: 'Lato',
74 fontWeight: FontWeight.bold,
75 decoration: TextDecoration.none,
76 color: Colors.white
@@ -135,7 +135,7 @@ class PickerState<Item> extends State<Picker> {
135 item.toString(),
136 style: TextStyle(
137 fontSize: 18,
138 - fontFamily: 'Poppins',
138 + fontFamily: 'Lato',
139 fontWeight: FontWeight.w600,
140 color: textColor,
141 decoration: TextDecoration.none,
@@ -160,7 +160,7 @@ class PickerState<Item> extends State<Picker> {
160 style: TextStyle(
161 fontSize: 12,
162 fontWeight: FontWeight.w500,
163 - fontFamily: 'Poppins',
163 + fontFamily: 'Lato',
164 decoration: TextDecoration.none,
165 color: Theme.of(context).primaryTextTheme
166 .title.color
lib/themes.dart
+2 -2
@@ -4,7 +4,7 @@ import 'palette.dart';
4 class Themes {
5
6 static final ThemeData lightTheme = ThemeData(
7 - fontFamily: 'Poppins',
7 + fontFamily: 'Lato',
8 brightness: Brightness.light,
9 backgroundColor: Colors.white,
10 accentColor: Palette.blueCraiola, // first gradient color
@@ -179,7 +179,7 @@ class Themes {
179
180
181 static final ThemeData darkTheme = ThemeData(
182 - fontFamily: 'Poppins',
182 + fontFamily: 'Lato',
183 brightness: Brightness.dark,
184 backgroundColor: PaletteDark.backgroundColor,
185 accentColor: PaletteDark.backgroundColor, // first gradient color
pubspec.yaml
+3 -13
@@ -11,7 +11,7 @@ description: Cake Wallet.
11 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
12 # Read more about iOS versioning at
13 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
14 -version: 1.0.5+5
14 +version: 4.0.3
15
16 environment:
17 sdk: ">=2.7.0 <3.0.0"
@@ -104,19 +104,9 @@ flutter:
104 - family: Lato
105 fonts:
106 - asset: assets/fonts/Lato-Regular.ttf
107 + - asset: assets/fonts/Lato-Medium.ttf
108 + - asset: assets/fonts/Lato-SemiBold.ttf
109 - asset: assets/fonts/Lato-Bold.ttf
108 - - asset: assets/fonts/Lato-Semibold.ttf
109 - - family: Montserrat
110 - fonts:
111 - - asset: assets/fonts/Montserrat-Regular.ttf
112 - - asset: assets/fonts/Montserrat-Bold.ttf
113 - - asset: assets/fonts/Montserrat-SemiBold.ttf
114 - - family: Poppins
115 - fonts:
116 - - asset: assets/fonts/Poppins-Regular.ttf
117 - - asset: assets/fonts/Poppins-Medium.ttf
118 - - asset: assets/fonts/Poppins-SemiBold.ttf
119 - - asset: assets/fonts/Poppins-Bold.ttf
110
111
112 # To add assets to your application, add an assets section, like this: