Add terminal chart

GenesisVision · Sep 15, 2021 · ed85a75 · ed85a75
1 parent d892160
commit ed85a75
Show file tree

Hide file tree

Showing 14 changed files with 551 additions and 16 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,6 +1,8 @@
 apply plugin: 'com.android.application'
 apply plugin: "com.google.gms.google-services"
 apply plugin: 'com.google.firebase.crashlytics'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-kapt'
 
 android {
     compileSdkVersion 30
@@ -27,12 +29,12 @@ android {
 
     defaultConfig {
         applicationId "vision.genesis.clientapp"
-        minSdkVersion 19
+        minSdkVersion 21
         targetSdkVersion 30
         multiDexEnabled true
 
-        versionCode 21030901
-        versionName "2.6.0.2"
+        versionCode 21090301
+        versionName "2.6.3.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         renderscriptTargetApi 30
@@ -131,6 +133,9 @@ ext {
 dependencies {
 
     implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation 'androidx.core:core-ktx:1.3.2'
+
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'com.google.android.material:material:1.2.1'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
@@ -155,6 +160,7 @@ dependencies {
     implementation "tech.schoolhelper:moxy-x-androidx:1.7.0"
     implementation 'tech.schoolhelper:moxy-x-material:1.7.0'
     annotationProcessor 'tech.schoolhelper:moxy-x-compiler:1.7.0'
+    kapt 'tech.schoolhelper:moxy-x-compiler:1.7.0'
 
     implementation "com.jakewharton:butterknife:10.2.1"
     implementation "com.jakewharton.timber:timber:4.7.1"
@@ -203,20 +209,26 @@ dependencies {
 
     implementation 'com.github.stfalcon:stfalcon-imageviewer:1.0.1'
 
+    implementation 'com.tradingview:lightweightcharts:3.5.0'
+
     implementation "com.sumsub.sns:idensic-mobile-sdk:$kyc_version"
     implementation "com.sumsub.sns:idensic-mobile-sdk-liveness3d:$kyc_version"
     implementation "com.sumsub.sns:idensic-mobile-sdk-actions:$kyc_version"
 
     implementation 'com.github.bumptech.glide:glide:4.11.0'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
+    kapt 'com.github.bumptech.glide:compiler:4.11.0'
 
     testImplementation "junit:junit:4.13.1"
     androidTestImplementation 'androidx.test:runner:1.3.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 
     annotationProcessor "com.jakewharton:butterknife-compiler:10.1.0"
+    kapt "com.jakewharton:butterknife-compiler:10.1.0"
     annotationProcessor "com.google.dagger:dagger-compiler:2.11"
-    annotationProcessor 'org.permissionsdispatcher:permissionsdispatcher-processor:4.8.0'
+    kapt "com.google.dagger:dagger-compiler:2.11"
+    annotationProcessor 'com.github.permissions-dispatcher:permissionsdispatcher-processor:4.8.0'
+    kapt "com.github.permissions-dispatcher:permissionsdispatcher-processor:4.8.0"
 
     implementation project(path: ":apiClient")
 }
diff --git a/app/src/main/java/vision/genesis/clientapp/di/components/AppComponent.java b/app/src/main/java/vision/genesis/clientapp/di/components/AppComponent.java
@@ -144,6 +144,7 @@
 import vision.genesis.clientapp.feature.main.terminal.order_history.OrderHistoryPresenter;
 import vision.genesis.clientapp.feature.main.terminal.place_order.PlaceOrderPresenter;
 import vision.genesis.clientapp.feature.main.terminal.symbol_watch.SymbolWatchView;
+import vision.genesis.clientapp.feature.main.terminal.tradingview_chart.ChartView;
 import vision.genesis.clientapp.feature.main.trading_account.TradingAccountDetailsPresenter;
 import vision.genesis.clientapp.feature.main.trading_account.add_demo_funds.AddDemoFundsPresenter;
 import vision.genesis.clientapp.feature.main.trading_account.balance.TradingAccountBalancePresenter;
@@ -545,6 +546,8 @@ public interface AppComponent
 
 	void inject(TerminalChartView terminalChartView);
 
+	void inject(ChartView chartView);
+
 	void inject(OrderBookView orderBookView);
 
 	void inject(MarketTradesView marketTradesView);

diff --git a/app/src/main/java/vision/genesis/clientapp/feature/main/terminal/TerminalActivity.java b/app/src/main/java/vision/genesis/clientapp/feature/main/terminal/TerminalActivity.java
@@ -20,13 +20,14 @@
 import timber.log.Timber;
 import vision.genesis.clientapp.R;
 import vision.genesis.clientapp.feature.BaseSwipeBackActivity;
-import vision.genesis.clientapp.feature.main.terminal.chart.TerminalChartView;
 import vision.genesis.clientapp.feature.main.terminal.info.TerminalInfoView;
 import vision.genesis.clientapp.feature.main.terminal.market_trades.MarketTradesView;
 import vision.genesis.clientapp.feature.main.terminal.order_book.OrderBookView;
 import vision.genesis.clientapp.feature.main.terminal.place_order.PlaceOrderActivity;
 import vision.genesis.clientapp.feature.main.terminal.select_account.SelectAccountBottomSheetFragment;
 import vision.genesis.clientapp.feature.main.terminal.symbol_watch.SymbolWatchView;
+import vision.genesis.clientapp.feature.main.terminal.tradingview_chart.ChartView;
+import vision.genesis.clientapp.model.terminal.binance_socket.KlineModel;
 import vision.genesis.clientapp.ui.CustomTabView;
 import vision.genesis.clientapp.ui.PrimaryButton;
 import vision.genesis.clientapp.ui.ProgramLogoView;
@@ -64,8 +65,8 @@ public static void startWith(Activity activity, String symbol) {
 	@BindView(R.id.view_symbol_watch)
 	public SymbolWatchView symbolWatchView;
 
-	@BindView(R.id.view_chart)
-	public TerminalChartView chartView;
+	//	@BindView(R.id.view_chart)
+	public ChartView chartView;
 
 	@BindView(R.id.tab_layout)
 	public TabLayout tabLayout;
@@ -124,6 +125,8 @@ protected void onCreate(Bundle savedInstanceState) {
 
 		ButterKnife.bind(this);
 
+		chartView = (ChartView) findViewById(R.id.view_chart);
+
 		initTabs();
 		orderBookView.setActivity(this);
 
@@ -146,9 +149,9 @@ protected void onDestroy() {
 		if (symbolWatchView != null) {
 			symbolWatchView.onDestroy();
 		}
-		if (chartView != null) {
-			chartView.onDestroy();
-		}
+//		if (chartView != null) {
+//			chartView.onDestroy();
+//		}
 		if (orderBookView != null) {
 			orderBookView.onDestroy();
 		}
@@ -161,9 +164,9 @@ protected void onResume() {
 		if (symbolWatchView != null) {
 			symbolWatchView.onResume();
 		}
-		if (chartView != null) {
-			chartView.onResume();
-		}
+//		if (chartView != null) {
+//			chartView.onResume();
+//		}
 		if (orderBookView != null) {
 			orderBookView.onResume();
 		}
@@ -300,6 +303,11 @@ public void showPlaceOrderActivity(String selectedSymbol, ExchangeAsset selected
 		PlaceOrderActivity.startWith(this, selectedSymbol, selectedAccount, operationType);
 	}
 
+	@Override
+	public void updateChart(ArrayList<KlineModel> klines) {
+
+	}
+
 	public void showSnackbarMessage(String message) {
 		showSnackbar(message, progressBar);
 	}

diff --git a/app/src/main/java/vision/genesis/clientapp/feature/main/terminal/TerminalView.java b/app/src/main/java/vision/genesis/clientapp/feature/main/terminal/TerminalView.java
@@ -5,6 +5,7 @@
 import java.util.ArrayList;
 
 import io.swagger.client.model.ExchangeAsset;
+import vision.genesis.clientapp.model.terminal.binance_socket.KlineModel;
 
 /**
  * GenesisVisionAndroid
@@ -26,4 +27,6 @@ interface TerminalView extends MvpView
 	void showAccountArrow(boolean show);
 
 	void showPlaceOrderActivity(String selectedSymbol, ExchangeAsset selectedAccount, String operationType);
+
+	void updateChart(ArrayList<KlineModel> klines);
 }