Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ax 197 0.3 #254

Closed
wants to merge 32 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
ab975a2
refactor: purged 'html' library + related calls
user2745 Jan 29, 2022
79368e6
refactor: purged 'html' library + related calls
user2745 Jan 29, 2022
73f262d
Merge branch 'ax-197-0.3' of github.com:SportsToken/ax_dapp into ax-1…
user2745 Jan 29, 2022
64ccac7
chore: changed Android package name and bundleId to athletexdapp and …
mretana1999 Jan 29, 2022
3afe729
created keystore properties and upload keystore file and added them t…
mretana1999 Jan 30, 2022
437f6f1
fix: added missing images to pubspec.yaml
mretana1999 Feb 8, 2022
ae7af55
Merged develop into this branch
mretana1999 Feb 10, 2022
0071aad
feat: Added PageView for mobile dApp
mretana1999 Feb 10, 2022
da11bc6
Added svg icons to assets
mretana1999 Feb 11, 2022
cdbcfa5
chore: top nav bar will now render depending on if the application is…
rbharath99 Feb 11, 2022
de5136c
chore: worked on the landing page for mobile
rbharath99 Feb 11, 2022
98cd4e1
feat: started working on top navbar for mobile, changed icons for bot…
mretana1999 Feb 11, 2022
a95d10f
working on bottom and top navbar
mretana1999 Feb 11, 2022
25acd42
update to bottom nav
pearlson16 Feb 12, 2022
e952d14
added dropdown menu file inside service folder
mretana1999 Feb 12, 2022
280db78
feat: added top navbar DropDownMenu widget to mobile UI
mretana1999 Feb 13, 2022
fdd869a
chore: merged develop into mobile UI branch (197.03)
mretana1999 Feb 14, 2022
71193c5
fix: fixed bottom navbar buttons functionality issue
mretana1999 Feb 14, 2022
e2cd941
started working on farm section for mobile UI
mretana1999 Feb 14, 2022
834b45d
Working on farm page tokens list
mretana1999 Feb 15, 2022
7434c3e
Uncommented wallet and controller functionality
mretana1999 Feb 16, 2022
6565b41
fix: made all farms items responsive
mretana1999 Feb 16, 2022
e8a0aec
Added comments for wallet functionality code that must be commented/d…
mretana1999 Feb 16, 2022
dbcd0af
fix: simplified code for farm layouts by making a single widget that …
mretana1999 Feb 16, 2022
495fcf5
feat: made desktop responsive to mobile UI
mretana1999 Feb 16, 2022
04eaf73
Updated connect button
bekchanovj Feb 16, 2022
798012d
fix: fixed unsafe to call dialog from popped ancestor issue on Dialog…
mretana1999 Feb 16, 2022
c71659c
fix: fixed farm lists length when building listview on DesktopFarm
mretana1999 Feb 16, 2022
69f388b
chore: fixed the search bar functionality on the farm page
rbharath99 Feb 16, 2022
22275aa
fix: fixed overflow issues with toggle button on desktop farm
mretana1999 Feb 16, 2022
a88583b
chore: displayed the mobile version of the landing page
rbharath99 Feb 18, 2022
489a6f7
Landing Page <chore>: Added padding for the image logo, button size, …
rbharath99 Feb 18, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions android/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ GeneratedPluginRegistrant.java
# Remember to never publicly share your keystore.
# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
key.properties
app/upload-keystore.jks
29 changes: 21 additions & 8 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@ apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

def keystoreProperties = new Properties()
def keystorePropertiesFile = rootProject.file('key.properties')
if (keystorePropertiesFile.exists()) {
keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
}

android {
compileSdkVersion 30

Expand All @@ -34,20 +40,27 @@ android {

defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "com.example.ae_dapp"
applicationId "com.athletexmarkets.athletexdapp"
minSdkVersion 16
targetSdkVersion 30
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
}

buildTypes {
release {
// TODO: Add your own signing config for the release build.
// Signing with the debug keys for now, so `flutter run --release` works.
signingConfig signingConfigs.debug
}
}
signingConfigs {
release {
keyAlias keystoreProperties['keyAlias']
keyPassword keystoreProperties['keyPassword']
storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
storePassword keystoreProperties['storePassword']
}
}
buildTypes {
release {
signingConfig signingConfigs.release
}
}

}

flutter {
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/debug/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.ae_dapp">
package="com.example.athletexdapp">
<!-- Flutter needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
-->
Expand Down
4 changes: 2 additions & 2 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.ae_dapp">
package="com.example.athletexdapp">
<application
android:label="ae_dapp"
android:label="AthleteX dApp"
android:icon="@mipmap/ic_launcher">
<activity
android:name=".MainActivity"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.ae_dapp
package com.example.athletexdapp

import io.flutter.embedding.android.FlutterActivity

Expand Down
2 changes: 1 addition & 1 deletion android/app/src/profile/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.ae_dapp">
package="com.example.athletexdapp">
<!-- Flutter needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
-->
Expand Down
Binary file added assets/images/barn.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions assets/images/barn_icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/coins.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions assets/images/coins_icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/search.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 added assets/images/swap.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions assets/images/swap_icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.example.aeDapp;
PRODUCT_BUNDLE_IDENTIFIER = com.athletexmarkets.athletexdapp;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
Expand Down Expand Up @@ -415,7 +415,7 @@
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.example.aeDapp;
PRODUCT_BUNDLE_IDENTIFIER = com.athletexmarkets.athletexdapp;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
Expand All @@ -434,7 +434,7 @@
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.example.aeDapp;
PRODUCT_BUNDLE_IDENTIFIER = com.athletexmarkets.athletexdapp;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
Expand Down
2 changes: 1 addition & 1 deletion ios/Runner/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>ae_dapp</string>
<string>AthleteX dApp</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
Expand Down
1 change: 1 addition & 0 deletions lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ class MyApp extends StatelessWidget {
debugShowCheckedModeBanner: false,
initialRoute: "/",
theme: ThemeData(
canvasColor: Colors.transparent,
brightness: Brightness.dark,
primaryColor: Colors.yellow[700],
colorScheme: ColorScheme.fromSwatch(brightness: Brightness.dark)
Expand Down
Loading