Ecosystem/cake_wallet
1
0
Fork 0
mirror of https://github.com/cake-tech/cake_wallet.git synced 2024-12-22 03:29:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed app font to Lato. Changes for anrdoid version

Browse source
This commit is contained in:
M 2020-11-11 17:55:18 +02:00
parent 882c57a132
commit ad3142aeb9
33 changed files with 75 additions and 103 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
android/app/src/main/AndroidManifest.xml
View file

@ -1,16 +1,10 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.cakewallet.cake_wallet">
<!-- io.flutter.app.FlutterApplication is an android.app.Application that
calls FlutterMain.startInitialization(this); in its onCreate method.
In most cases you can leave this as-is, but you if you want to provide
additional functionality it is fine to subclass or reimplement
FlutterApplication and put your custom class here. -->
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.USE_FINGERPRINT"/>
<application
android:name="io.flutter.app.FlutterApplication"
android:label="Cake Wallet"
android:icon="@mipmap/ic_launcher">
<activity
@ -21,17 +15,27 @@
android:hardwareAccelerated="true"
android:windowSoftInputMode="adjustResize"
android:screenOrientation="portrait">
<!-- This keeps the window background of the activity showing
until Flutter renders its first frame. It can be removed if
there is no splash screen (such as the default splash screen
defined in @style/LaunchTheme). -->
<!-- <meta-data-->
<!-- android:name="io.flutter.embedding.android.NormalTheme"-->
<!-- android:resource="@style/NormalTheme"-->
<!-- />-->
<!-- Displays an Android View that continues showing the launch screen
Drawable until Flutter paints its first frame, then this splash
screen fades out. A splash screen is useful to avoid any visual
gap between the end of Android's launch screen and the painting of
Flutter's first frame. -->
<meta-data
android:name="io.flutter.app.android.SplashScreenUntilFirstFrame"
android:value="true" />
android:name="io.flutter.embedding.android.SplashScreenDrawable"
android:resource="@drawable/launch_background"
/>
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<meta-data
android:name="flutterEmbedding"
android:value="2" />
</application>
</manifest>

11
android/app/src/main/java/com/cakewallet/cake_wallet/MainActivity.java
View file

@ -1,13 +1,6 @@
package com.cakewallet.cake_wallet;
import android.os.Bundle;
import io.flutter.app.FlutterFragmentActivity;
import io.flutter.plugins.GeneratedPluginRegistrant;
import io.flutter.embedding.android.FlutterActivity;
public class MainActivity extends FlutterFragmentActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
GeneratedPluginRegistrant.registerWith(this);
}
public class MainActivity extends FlutterActivity {
}

1
android/settings_aar.gradle Normal file
View file

@ -0,0 +1 @@
include ':app'

BIN
assets/fonts/Lato-Bold.ttf
View file

Binary file not shown.

BIN
assets/fonts/Lato-Medium.ttf Normal file
View file

Binary file not shown.

BIN
assets/fonts/Lato-Regular.ttf
View file

Binary file not shown.

BIN
assets/fonts/Lato-Semibold.ttf
View file

Binary file not shown.

BIN
assets/fonts/Montserrat-Bold.ttf
View file

Binary file not shown.

BIN
assets/fonts/Montserrat-Regular.ttf
View file

Binary file not shown.

BIN
assets/fonts/Montserrat-SemiBold.ttf
View file

Binary file not shown.

BIN
assets/fonts/Poppins-Bold.ttf
View file

Binary file not shown.

BIN
assets/fonts/Poppins-Medium.ttf
View file

Binary file not shown.

BIN
assets/fonts/Poppins-Regular.ttf
View file

Binary file not shown.

BIN
assets/fonts/Poppins-SemiBold.ttf
View file

Binary file not shown.

44
cw_monero/android/src/main/kotlin/com/cakewallet/monero/CwMoneroPlugin.kt
View file

@ -4,7 +4,7 @@ import android.app.Activity
import android.os.AsyncTask
import android.os.Looper
import android.os.Handler
import android.os.Process
import android.os.Process
import io.flutter.plugin.common.MethodCall
import io.flutter.plugin.common.MethodChannel
@ -22,10 +22,10 @@ class doAsync(val handler: () -> Unit) : AsyncTask<Void, Void, Void>() {
class CwMoneroPlugin: MethodCallHandler {
companion object {
val moneroApi = MoneroApi()
// val moneroApi = MoneroApi()
val main = Handler(Looper.getMainLooper());
init {
init {
System.loadLibrary("cw_monero")
}
@ -43,31 +43,31 @@ class CwMoneroPlugin: MethodCallHandler {
val password = call.argument("password") ?: ""
val useSSL = false
val isLightWallet = false
doAsync {
try {
moneroApi.setNodeAddressJNI(uri, login, password, useSSL, isLightWallet)
main.post({
result.success(true)
});
} catch(e: Throwable) {
main.post({
result.error("CONNECTION_ERROR", e.message, null)
});
}
}.execute()
// doAsync {
// try {
// moneroApi.setNodeAddressJNI(uri, login, password, useSSL, isLightWallet)
// main.post({
// result.success(true)
// });
// } catch(e: Throwable) {
// main.post({
// result.error("CONNECTION_ERROR", e.message, null)
// });
// }
// }.execute()
}
if (call.method == "startSync") {
doAsync {
moneroApi.startSyncJNI()
main.post({
result.success(true)
});
}.execute()
// doAsync {
// moneroApi.startSyncJNI()
// main.post({
// result.success(true)
// });
// }.execute()
}
if (call.method == "loadWallet") {
val path = call.argument("path") ?: ""
val password = call.argument("password") ?: ""
moneroApi.loadWalletJNI(path, password)
// moneroApi.loadWalletJNI(path, password)
result.success(true)
}
}

14
cw_monero/android/src/main/kotlin/com/cakewallet/monero/MoneroApi.kt
View file

@ -1,14 +0,0 @@
package com.cakewallet.monero
class MoneroApi {
external fun setNodeAddressJNI(uri: String, login: String, password: String, use_ssl: Boolean, is_light_wallet: Boolean)
external fun connectToNodeJNI()
external fun startSyncJNI()
external fun loadWalletJNI(path: String, password: String)
companion object {
init {
System.loadLibrary("cw_monero")
}
}
}

2
cw_monero/lib/wallet.dart
View file

@ -11,8 +11,6 @@ import 'package:flutter/services.dart';
int _boolToInt(bool value) => value ? 1 : 0;
final moneroAPIChannel = const MethodChannel('cw_monero');
final getFileNameNative = moneroApi
.lookup<NativeFunction<get_filename>>('get_filename')
.asFunction<GetFilename>();

6
ios/Runner.xcodeproj/project.pbxproj
View file

@ -354,7 +354,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 1;
CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_TEAM = 32J6BB6VUS;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@ -494,7 +494,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 1;
CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_TEAM = 32J6BB6VUS;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@ -528,7 +528,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 1;
CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_TEAM = 32J6BB6VUS;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (

2
lib/src/screens/base_page.dart
View file

@ -76,7 +76,7 @@ abstract class BasePage extends StatelessWidget {
style: TextStyle(
fontSize: 18.0,
fontWeight: FontWeight.bold,
fontFamily: 'Poppins',
fontFamily: 'Lato',
color: titleColor ??
Theme.of(context).primaryTextTheme.title.color),
);

6
lib/src/screens/dashboard/widgets/filter_widget.dart
View file

@ -33,7 +33,7 @@ class FilterWidget extends StatelessWidget {
color: Colors.white,
fontSize: 18,
fontWeight: FontWeight.bold,
fontFamily: 'Poppins',
fontFamily: 'Lato',
decoration: TextDecoration.none,
),
),
@ -74,7 +74,7 @@ class FilterWidget extends StatelessWidget {
color: Theme.of(context).accentTextTheme.subhead.color,
fontSize: 16,
fontWeight: FontWeight.w500,
fontFamily: 'Poppins',
fontFamily: 'Lato',
decoration: TextDecoration.none
),
),
@ -127,7 +127,7 @@ class FilterWidget extends StatelessWidget {
style: TextStyle(
color: Theme.of(context).primaryTextTheme.title.color,
fontSize: 18,
fontFamily: 'Poppins',
fontFamily: 'Lato',
fontWeight: FontWeight.w500,
decoration: TextDecoration.none
),

4
lib/src/screens/exchange/widgets/currency_picker.dart
View file

@ -74,7 +74,7 @@ class CurrencyPickerState extends State<CurrencyPicker> {
textAlign: TextAlign.center,
style: TextStyle(
fontSize: 18,
fontFamily: 'Poppins',
fontFamily: 'Lato',
fontWeight: FontWeight.bold,
decoration: TextDecoration.none,
color: Colors.white
@ -137,7 +137,7 @@ class CurrencyPickerState extends State<CurrencyPicker> {
item.toString(),
style: TextStyle(
fontSize: 15,
fontFamily: 'Poppins',
fontFamily: 'Lato',
fontWeight: FontWeight.w600,
decoration: TextDecoration.none,
color: textColor

2
lib/src/screens/exchange_trade/information_page.dart
View file

@ -33,7 +33,7 @@ class InformationPage extends StatelessWidget {
style: TextStyle(
fontSize: 14,
fontWeight: FontWeight.normal,
fontFamily: 'Poppins',
fontFamily: 'Lato',
decoration: TextDecoration.none,
color: Theme.of(context).accentTextTheme.caption.decorationColor
),

4
lib/src/screens/monero_accounts/monero_account_list_page.dart
View file

@ -53,7 +53,7 @@ class MoneroAccountListPage extends StatelessWidget {
style: TextStyle(
fontSize: 18,
fontWeight: FontWeight.bold,
fontFamily: 'Poppins',
fontFamily: 'Lato',
decoration: TextDecoration.none,
color: Colors.white
),
@ -141,7 +141,7 @@ class MoneroAccountListPage extends StatelessWidget {
style: TextStyle(
fontSize: 15,
fontWeight: FontWeight.w600,
fontFamily: 'Poppins',
fontFamily: 'Lato',
color: Colors.white,
decoration: TextDecoration.none,
),

2
lib/src/screens/monero_accounts/widgets/account_tile.dart
View file

@ -32,7 +32,7 @@ class AccountTile extends StatelessWidget {
style: TextStyle(
fontSize: 18,
fontWeight: FontWeight.w600,
fontFamily: 'Poppins',
fontFamily: 'Lato',
color: textColor,
decoration: TextDecoration.none,
),

2
lib/src/screens/restore/wallet_restore_page.dart
View file

@ -42,7 +42,7 @@ class WalletRestorePage extends BasePage {
style: TextStyle(
fontSize: 18.0,
fontWeight: FontWeight.bold,
fontFamily: 'Poppins',
fontFamily: 'Lato',
color: titleColor ??
Theme.of(context).primaryTextTheme.title.color),
));

4
lib/src/screens/seed_language/widgets/seed_language_picker.dart
View file

@ -77,7 +77,7 @@ class SeedLanguagePickerState extends State<SeedLanguagePicker> {
style: TextStyle(
fontSize: 18,
fontWeight: FontWeight.bold,
fontFamily: 'Poppins',
fontFamily: 'Lato',
decoration: TextDecoration.none,
color: Colors.white
),
@ -172,7 +172,7 @@ class SeedLanguagePickerState extends State<SeedLanguagePicker> {
style: TextStyle(
fontSize: 18,
fontWeight: FontWeight.w600,
fontFamily: 'Poppins',
fontFamily: 'Lato',
decoration: TextDecoration.none,
color: textColor
),

8
lib/src/screens/send/widgets/confirm_sending_alert.dart
View file

@ -55,7 +55,7 @@ class ConfirmSendingAlert extends BaseAlertDialog {
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.w600,
fontFamily: 'Poppins',
fontFamily: 'Lato',
color: Theme.of(context).primaryTextTheme.title.color,
decoration: TextDecoration.none,
),
@ -65,7 +65,7 @@ class ConfirmSendingAlert extends BaseAlertDialog {
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.w600,
fontFamily: 'Poppins',
fontFamily: 'Lato',
color: Theme.of(context).primaryTextTheme.title.color,
decoration: TextDecoration.none,
),
@ -81,7 +81,7 @@ class ConfirmSendingAlert extends BaseAlertDialog {
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.w600,
fontFamily: 'Poppins',
fontFamily: 'Lato',
color: Theme.of(context).primaryTextTheme.title.color,
decoration: TextDecoration.none,
),
@ -91,7 +91,7 @@ class ConfirmSendingAlert extends BaseAlertDialog {
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.w600,
fontFamily: 'Poppins',
fontFamily: 'Lato',
color: Theme.of(context).primaryTextTheme.title.color,
decoration: TextDecoration.none,
),

2
lib/src/screens/wallet_list/widgets/wallet_menu_alert.dart
View file

@ -89,7 +89,7 @@ class WalletMenuAlert extends StatelessWidget {
style: TextStyle(
color: Theme.of(context).primaryTextTheme.title.color,
fontSize: 18,
fontFamily: 'Poppins',
fontFamily: 'Lato',
fontWeight: FontWeight.w500,
decoration: TextDecoration.none
),

8
lib/src/widgets/base_alert_dialog.dart
View file

@ -17,7 +17,7 @@ class BaseAlertDialog extends StatelessWidget {
textAlign: TextAlign.center,
style: TextStyle(
fontSize: 20,
fontFamily: 'Poppins',
fontFamily: 'Lato',
fontWeight: FontWeight.w600,
color: Theme.of(context).primaryTextTheme.title.color,
decoration: TextDecoration.none,
@ -32,7 +32,7 @@ class BaseAlertDialog extends StatelessWidget {
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.normal,
fontFamily: 'Poppins',
fontFamily: 'Lato',
color: Theme.of(context).primaryTextTheme.title.color,
decoration: TextDecoration.none,
),
@ -59,7 +59,7 @@ class BaseAlertDialog extends StatelessWidget {
textAlign: TextAlign.center,
style: TextStyle(
fontSize: 15,
fontFamily: 'Poppins',
fontFamily: 'Lato',
fontWeight: FontWeight.w600,
color: Colors.white,
decoration: TextDecoration.none,
@ -84,7 +84,7 @@ class BaseAlertDialog extends StatelessWidget {
textAlign: TextAlign.center,
style: TextStyle(
fontSize: 15,
fontFamily: 'Poppins',
fontFamily: 'Lato',
fontWeight: FontWeight.w600,
color: Colors.white,
decoration: TextDecoration.none,

2
lib/src/widgets/checkbox_widget.dart
View file

@ -68,7 +68,7 @@ class CheckboxWidgetState extends State<CheckboxWidget> {
style: TextStyle(
color: Theme.of(context).primaryTextTheme.title.color,
fontSize: 18,
fontFamily: 'Poppins',
fontFamily: 'Lato',
fontWeight: FontWeight.w500,
decoration: TextDecoration.none
),

6
lib/src/widgets/picker.dart
View file

@ -70,7 +70,7 @@ class PickerState<Item> extends State<Picker> {
textAlign: TextAlign.center,
style: TextStyle(
fontSize: 18,
fontFamily: 'Poppins',
fontFamily: 'Lato',
fontWeight: FontWeight.bold,
decoration: TextDecoration.none,
color: Colors.white
@ -135,7 +135,7 @@ class PickerState<Item> extends State<Picker> {
item.toString(),
style: TextStyle(
fontSize: 18,
fontFamily: 'Poppins',
fontFamily: 'Lato',
fontWeight: FontWeight.w600,
color: textColor,
decoration: TextDecoration.none,
@ -160,7 +160,7 @@ class PickerState<Item> extends State<Picker> {
style: TextStyle(
fontSize: 12,
fontWeight: FontWeight.w500,
fontFamily: 'Poppins',
fontFamily: 'Lato',
decoration: TextDecoration.none,
color: Theme.of(context).primaryTextTheme
.title.color

4
lib/themes.dart
View file

@ -4,7 +4,7 @@ import 'palette.dart';
class Themes {
static final ThemeData lightTheme = ThemeData(
fontFamily: 'Poppins',
fontFamily: 'Lato',
brightness: Brightness.light,
backgroundColor: Colors.white,
accentColor: Palette.blueCraiola, // first gradient color
@ -179,7 +179,7 @@ class Themes {
static final ThemeData darkTheme = ThemeData(
fontFamily: 'Poppins',
fontFamily: 'Lato',
brightness: Brightness.dark,
backgroundColor: PaletteDark.backgroundColor,
accentColor: PaletteDark.backgroundColor, // first gradient color

16
pubspec.yaml
View file

@ -11,7 +11,7 @@ description: Cake Wallet.
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
# Read more about iOS versioning at
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
version: 1.0.5+5
version: 4.0.3
environment:
sdk: ">=2.7.0 <3.0.0"
@ -104,19 +104,9 @@ flutter:
- family: Lato
fonts:
- asset: assets/fonts/Lato-Regular.ttf
- asset: assets/fonts/Lato-Medium.ttf
- asset: assets/fonts/Lato-SemiBold.ttf
- asset: assets/fonts/Lato-Bold.ttf
- asset: assets/fonts/Lato-Semibold.ttf
- family: Montserrat
fonts:
- asset: assets/fonts/Montserrat-Regular.ttf
- asset: assets/fonts/Montserrat-Bold.ttf
- asset: assets/fonts/Montserrat-SemiBold.ttf
- family: Poppins
fonts:
- asset: assets/fonts/Poppins-Regular.ttf
- asset: assets/fonts/Poppins-Medium.ttf
- asset: assets/fonts/Poppins-SemiBold.ttf
- asset: assets/fonts/Poppins-Bold.ttf
# To add assets to your application, add an assets section, like this: