Skip to content

Commit

Permalink
Renaming classes and formatting. caduandrade#62
Browse files Browse the repository at this point in the history
  • Loading branch information
caduandrade committed Jan 15, 2023
1 parent 16a4dfc commit 6158874
Show file tree
Hide file tree
Showing 42 changed files with 446 additions and 453 deletions.
4 changes: 2 additions & 2 deletions example/analysis_options.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ linter:
# `// ignore_for_file: name_of_lint` syntax on the line or in the file
# producing the lint.
rules:
# avoid_print: false # Uncomment to disable the `avoid_print` rule
# prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule
# avoid_print: false # Uncomment to disable the `avoid_print` rule
# prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule

# Additional information about this file can be found at
# https://dart.dev/guides/language/analysis-options
2 changes: 1 addition & 1 deletion example/android/app/src/debug/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
<!-- Flutter needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
-->
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.INTERNET" />
</manifest>
12 changes: 6 additions & 6 deletions example/android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.example">
<application

<application
android:label="example"
android:name="${applicationName}"
android:icon="@mipmap/ic_launcher">
Expand All @@ -17,12 +18,11 @@
while the Flutter UI initializes. After that, this theme continues
to determine the Window background behind the Flutter UI. -->
<meta-data
android:name="io.flutter.embedding.android.NormalTheme"
android:resource="@style/NormalTheme"
/>
android:name="io.flutter.embedding.android.NormalTheme"
android:resource="@style/NormalTheme" />
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<!-- Don't delete the meta-data below.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ package com.example.example

import io.flutter.embedding.android.FlutterActivity

class MainActivity: FlutterActivity() {
class MainActivity : FlutterActivity() {
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Modify this file to customize your launch splash screen -->
<?xml version="1.0" encoding="utf-8"?><!-- Modify this file to customize your launch splash screen -->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="?android:colorBackground" />

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Modify this file to customize your launch splash screen -->
<?xml version="1.0" encoding="utf-8"?><!-- Modify this file to customize your launch splash screen -->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@android:color/white" />

Expand Down
2 changes: 1 addition & 1 deletion example/android/app/src/profile/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
<!-- Flutter needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
-->
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.INTERNET" />
</manifest>
160 changes: 80 additions & 80 deletions example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
Original file line number Diff line number Diff line change
@@ -1,122 +1,122 @@
{
"images" : [
"images": [
{
"size" : "20x20",
"idiom" : "iphone",
"filename" : "[email protected]",
"scale" : "2x"
"size": "20x20",
"idiom": "iphone",
"filename": "[email protected]",
"scale": "2x"
},
{
"size" : "20x20",
"idiom" : "iphone",
"filename" : "[email protected]",
"scale" : "3x"
"size": "20x20",
"idiom": "iphone",
"filename": "[email protected]",
"scale": "3x"
},
{
"size" : "29x29",
"idiom" : "iphone",
"filename" : "[email protected]",
"scale" : "1x"
"size": "29x29",
"idiom": "iphone",
"filename": "[email protected]",
"scale": "1x"
},
{
"size" : "29x29",
"idiom" : "iphone",
"filename" : "[email protected]",
"scale" : "2x"
"size": "29x29",
"idiom": "iphone",
"filename": "[email protected]",
"scale": "2x"
},
{
"size" : "29x29",
"idiom" : "iphone",
"filename" : "[email protected]",
"scale" : "3x"
"size": "29x29",
"idiom": "iphone",
"filename": "[email protected]",
"scale": "3x"
},
{
"size" : "40x40",
"idiom" : "iphone",
"filename" : "[email protected]",
"scale" : "2x"
"size": "40x40",
"idiom": "iphone",
"filename": "[email protected]",
"scale": "2x"
},
{
"size" : "40x40",
"idiom" : "iphone",
"filename" : "[email protected]",
"scale" : "3x"
"size": "40x40",
"idiom": "iphone",
"filename": "[email protected]",
"scale": "3x"
},
{
"size" : "60x60",
"idiom" : "iphone",
"filename" : "[email protected]",
"scale" : "2x"
"size": "60x60",
"idiom": "iphone",
"filename": "[email protected]",
"scale": "2x"
},
{
"size" : "60x60",
"idiom" : "iphone",
"filename" : "[email protected]",
"scale" : "3x"
"size": "60x60",
"idiom": "iphone",
"filename": "[email protected]",
"scale": "3x"
},
{
"size" : "20x20",
"idiom" : "ipad",
"filename" : "[email protected]",
"scale" : "1x"
"size": "20x20",
"idiom": "ipad",
"filename": "[email protected]",
"scale": "1x"
},
{
"size" : "20x20",
"idiom" : "ipad",
"filename" : "[email protected]",
"scale" : "2x"
"size": "20x20",
"idiom": "ipad",
"filename": "[email protected]",
"scale": "2x"
},
{
"size" : "29x29",
"idiom" : "ipad",
"filename" : "[email protected]",
"scale" : "1x"
"size": "29x29",
"idiom": "ipad",
"filename": "[email protected]",
"scale": "1x"
},
{
"size" : "29x29",
"idiom" : "ipad",
"filename" : "[email protected]",
"scale" : "2x"
"size": "29x29",
"idiom": "ipad",
"filename": "[email protected]",
"scale": "2x"
},
{
"size" : "40x40",
"idiom" : "ipad",
"filename" : "[email protected]",
"scale" : "1x"
"size": "40x40",
"idiom": "ipad",
"filename": "[email protected]",
"scale": "1x"
},
{
"size" : "40x40",
"idiom" : "ipad",
"filename" : "[email protected]",
"scale" : "2x"
"size": "40x40",
"idiom": "ipad",
"filename": "[email protected]",
"scale": "2x"
},
{
"size" : "76x76",
"idiom" : "ipad",
"filename" : "[email protected]",
"scale" : "1x"
"size": "76x76",
"idiom": "ipad",
"filename": "[email protected]",
"scale": "1x"
},
{
"size" : "76x76",
"idiom" : "ipad",
"filename" : "[email protected]",
"scale" : "2x"
"size": "76x76",
"idiom": "ipad",
"filename": "[email protected]",
"scale": "2x"
},
{
"size" : "83.5x83.5",
"idiom" : "ipad",
"filename" : "[email protected]",
"scale" : "2x"
"size": "83.5x83.5",
"idiom": "ipad",
"filename": "[email protected]",
"scale": "2x"
},
{
"size" : "1024x1024",
"idiom" : "ios-marketing",
"filename" : "[email protected]",
"scale" : "1x"
"size": "1024x1024",
"idiom": "ios-marketing",
"filename": "[email protected]",
"scale": "1x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"info": {
"version": 1,
"author": "xcode"
}
}
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
{
"images" : [
"images": [
{
"idiom" : "universal",
"filename" : "LaunchImage.png",
"scale" : "1x"
"idiom": "universal",
"filename": "LaunchImage.png",
"scale": "1x"
},
{
"idiom" : "universal",
"filename" : "[email protected]",
"scale" : "2x"
"idiom": "universal",
"filename": "[email protected]",
"scale": "2x"
},
{
"idiom" : "universal",
"filename" : "[email protected]",
"scale" : "3x"
"idiom": "universal",
"filename": "[email protected]",
"scale": "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"info": {
"version": 1,
"author": "xcode"
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Launch Screen Assets

You can customize the launch screen with your own desired assets by replacing the image files in this directory.
You can customize the launch screen with your own desired assets by replacing the image files in
this directory.

You can also do it by opening your Flutter project's Xcode project with `open ios/Runner.xcworkspace`, selecting `Runner/Assets.xcassets` in the Project Navigator and dropping in the desired images.
You can also do it by opening your Flutter project's Xcode project
with `open ios/Runner.xcworkspace`, selecting `Runner/Assets.xcassets` in the Project Navigator and
dropping in the desired images.
23 changes: 10 additions & 13 deletions example/lib/demo/demo.dart
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class DemoApp extends StatelessWidget {
Widget build(BuildContext context) {
return const MaterialApp(
debugShowCheckedModeBanner: false,
title: 'EasyTable Demo',
title: 'Davi Demo',
home: Scaffold(body: HomePage()));
}
}
Expand All @@ -39,8 +39,7 @@ class _HomePageState extends State<HomePage> {
bool _nullValueColor = true;
bool _lastRowWidget = false;
bool _lastRowDividerVisible = RowThemeDataDefaults.lastDividerVisible;
bool _columnDividerFillHeight =
DaviThemeDataDefaults.columnDividerFillHeight;
bool _columnDividerFillHeight = DaviThemeDataDefaults.columnDividerFillHeight;
RowThemeColor _demoBackground = RowThemeColor.none;
bool _columnsWithIcon = true;

Expand Down Expand Up @@ -80,12 +79,12 @@ class _HomePageState extends State<HomePage> {
? CellIcon(icon: Icons.male, color: Colors.blue[700]!)
: CellIcon(icon: Icons.female, color: Colors.pink[600]!)));
}
list.add(DaviColumn(
name: 'Race', width: 100, stringValue: (row) => row.race));
list.add(DaviColumn(
name: 'Class', width: 110, stringValue: (row) => row.cls));
list.add(DaviColumn(
name: 'Level', width: 70, intValue: (row) => row.level));
list.add(
DaviColumn(name: 'Race', width: 100, stringValue: (row) => row.race));
list.add(
DaviColumn(name: 'Class', width: 110, stringValue: (row) => row.cls));
list.add(
DaviColumn(name: 'Level', width: 70, intValue: (row) => row.level));
if (_columnsWithIcon) {
list.add(DaviColumn(
name: 'Skills',
Expand All @@ -100,10 +99,8 @@ class _HomePageState extends State<HomePage> {
name: 'Dexterity', width: 80, intValue: (row) => row.dexterity));
list.add(DaviColumn(
name: 'Intelligence', width: 90, intValue: (row) => row.intelligence));
list.add(
DaviColumn(name: 'Life', width: 70, intValue: (row) => row.life));
list.add(
DaviColumn(name: 'Mana', width: 70, intValue: (row) => row.mana));
list.add(DaviColumn(name: 'Life', width: 70, intValue: (row) => row.life));
list.add(DaviColumn(name: 'Mana', width: 70, intValue: (row) => row.mana));
list.add(DaviColumn(
name: 'Gold',
width: 110,
Expand Down
2 changes: 1 addition & 1 deletion example/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class ExampleApp extends StatelessWidget {
Widget build(BuildContext context) {
return const MaterialApp(
debugShowCheckedModeBanner: false,
title: 'EasyTable Example',
title: 'Davi Example',
home: HomePage(),
);
}
Expand Down
Loading

0 comments on commit 6158874

Please sign in to comment.