diff --git a/app/src/main/java/com/example/dcav2gui/InstanceInterface.java b/app/src/main/java/com/example/dcav2gui/InstanceInterface.java index 595bb89..055cd30 100644 --- a/app/src/main/java/com/example/dcav2gui/InstanceInterface.java +++ b/app/src/main/java/com/example/dcav2gui/InstanceInterface.java @@ -263,9 +263,8 @@ public class InstanceInterface { for (int i = logsArray.size()-1; i >= 0; i--) { logList.add(logsArray.get(i).getAsString()); } - //Collections.reverse(logList); - return joinWithLineLimit(" ",globalSettings.amountOfLogLines,logList); + return joinWithLineLimit("\n",globalSettings.amountOfLogLines,logList); } } diff --git a/app/src/main/java/com/example/dcav2gui/MainActivity.java b/app/src/main/java/com/example/dcav2gui/MainActivity.java index 9756c81..d0eb363 100644 --- a/app/src/main/java/com/example/dcav2gui/MainActivity.java +++ b/app/src/main/java/com/example/dcav2gui/MainActivity.java @@ -36,7 +36,6 @@ public class MainActivity extends AppCompatActivity { private AppBarConfiguration mAppBarConfiguration; private ActivityMainBinding binding; - private Button addButton; public static SettingsData globalSettings; public HomeFragment.HomeCache homeViewCache; public static InstanceInterface.ExchangeStatsData binanceCache; @@ -84,16 +83,6 @@ public class MainActivity extends AppCompatActivity { setContentView(binding.getRoot()); setSupportActionBar(binding.appBarMain.toolbar); - addButton = findViewById(R.id.action_add); -// binding.appBarMain.fab.setOnClickListener(new View.OnClickListener() { -// @Override -// public void onClick(View view) { -// Snackbar.make(view, "General commands", Snackbar.LENGTH_LONG) -// .setAction("Action", null) -// .setAnchorView(R.id.fab).show(); -// } -// }); - DrawerLayout drawer = binding.drawerLayout; NavigationView navigationView = binding.navView; mAppBarConfiguration = new AppBarConfiguration.Builder( @@ -116,14 +105,6 @@ public class MainActivity extends AppCompatActivity { if (globalSettings==null) { Toast.makeText(this, "Please enter your credentials in the settings menu", Toast.LENGTH_LONG).show(); } - - navController.addOnDestinationChangedListener((controller, destination, arguments) -> { - if (destination.getId() == R.id.nav_home) { - addButton.setVisibility(View.GONE); - } else { - addButton.setVisibility(View.VISIBLE); - } - }); } public static SettingsData getGlobalSettings() { diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml index f43939a..f646af3 100644 --- a/app/src/main/res/layout/app_bar_main.xml +++ b/app/src/main/res/layout/app_bar_main.xml @@ -17,18 +17,6 @@ android:layout_height="?attr/actionBarSize" android:background="?attr/colorPrimary" app:popupTheme="@style/Theme.DCAv2GUI.PopupOverlay"> - -