Skip to content

Commit

Permalink
Changed app font to Lato. Changes for anrdoid version
Browse files Browse the repository at this point in the history
  • Loading branch information
@mkyq
mkyq committed Nov 11, 2020
1 parent 882c57a commit ad3142a
Show file tree
Hide file tree
Showing 33 changed files with 75 additions and 103 deletions.
28 changes: 16 additions & 12 deletions android/app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 changes: 2 additions & 9 deletions android/app/src/main/java/com/cakewallet/cake_wallet/MainActivity.java
View file
Original file line number Diff line number Diff line change
@@ -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 change: 1 addition & 0 deletions android/settings_aar.gradle
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
include ':app'
Binary file modified assets/fonts/Lato-Bold.ttf
View file
Binary file not shown.
Binary file added assets/fonts/Lato-Medium.ttf
View file
Binary file not shown.
Binary file modified assets/fonts/Lato-Regular.ttf
View file
Binary file not shown.
Binary file modified assets/fonts/Lato-Semibold.ttf
View file
Binary file not shown.
Binary file removed assets/fonts/Montserrat-Bold.ttf
View file
Binary file not shown.
Binary file removed assets/fonts/Montserrat-Regular.ttf
View file
Binary file not shown.
Binary file removed assets/fonts/Montserrat-SemiBold.ttf
View file
Binary file not shown.
Binary file removed assets/fonts/Poppins-Bold.ttf
View file
Binary file not shown.
Binary file removed assets/fonts/Poppins-Medium.ttf
View file
Binary file not shown.
Binary file removed assets/fonts/Poppins-Regular.ttf
View file
Binary file not shown.
Binary file removed assets/fonts/Poppins-SemiBold.ttf
View file
Binary file not shown.
44 changes: 22 additions & 22 deletions cw_monero/android/src/main/kotlin/com/cakewallet/monero/CwMoneroPlugin.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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")
}

Expand All @@ -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)
}
}
Expand Down
14 changes: 0 additions & 14 deletions cw_monero/android/src/main/kotlin/com/cakewallet/monero/MoneroApi.kt
View file

This file was deleted.

2 changes: 0 additions & 2 deletions cw_monero/lib/wallet.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>();
Expand Down
6 changes: 3 additions & 3 deletions ios/Runner.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 = (
Expand Down Expand Up @@ -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 = (
Expand Down Expand Up @@ -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 = (
Expand Down
2 changes: 1 addition & 1 deletion lib/src/screens/base_page.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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),
);
Expand Down
6 changes: 3 additions & 3 deletions lib/src/screens/dashboard/widgets/filter_widget.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class FilterWidget extends StatelessWidget {
color: Colors.white,
fontSize: 18,
fontWeight: FontWeight.bold,
fontFamily: 'Poppins',
fontFamily: 'Lato',
decoration: TextDecoration.none,
),
),
Expand Down Expand Up @@ -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
),
),
Expand Down Expand Up @@ -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
),
Expand Down
4 changes: 2 additions & 2 deletions lib/src/screens/exchange/widgets/currency_picker.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/src/screens/exchange_trade/information_page.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
),
Expand Down
4 changes: 2 additions & 2 deletions lib/src/screens/monero_accounts/monero_account_list_page.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
),
Expand Down Expand Up @@ -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,
),
Expand Down
2 changes: 1 addition & 1 deletion lib/src/screens/monero_accounts/widgets/account_tile.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class AccountTile extends StatelessWidget {
style: TextStyle(
fontSize: 18,
fontWeight: FontWeight.w600,
fontFamily: 'Poppins',
fontFamily: 'Lato',
color: textColor,
decoration: TextDecoration.none,
),
Expand Down
2 changes: 1 addition & 1 deletion lib/src/screens/restore/wallet_restore_page.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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),
));
Expand Down
4 changes: 2 additions & 2 deletions lib/src/screens/seed_language/widgets/seed_language_picker.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
),
Expand Down Expand Up @@ -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
),
Expand Down
8 changes: 4 additions & 4 deletions lib/src/screens/send/widgets/confirm_sending_alert.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
),
Expand All @@ -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,
),
Expand All @@ -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,
),
Expand All @@ -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,
),
Expand Down
2 changes: 1 addition & 1 deletion lib/src/screens/wallet_list/widgets/wallet_menu_alert.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
),
Expand Down
8 changes: 4 additions & 4 deletions lib/src/widgets/base_alert_dialog.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
),
Expand All @@ -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,
Expand All @@ -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,
Expand Down
Loading

0 comments on commit ad3142a

Please sign in to comment.