nicolas
/
DCAv2GUI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CR between log lines

This commit is contained in:
Nicolás Sánchez 2024-12-19 07:45:17 -03:00
parent 8a9e86efeb
commit 87d0d1ed94
3 changed files with 1 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/example/dcav2gui/InstanceInterface.java
View File

@ -263,9 +263,8 @@ public class InstanceInterface {
for (int i = logsArray.size()-1; i >= 0; i--) { for (int i = logsArray.size()-1; i >= 0; i--) {
logList.add(logsArray.get(i).getAsString()); logList.add(logsArray.get(i).getAsString());
} }
//Collections.reverse(logList);
return joinWithLineLimit(" ",globalSettings.amountOfLogLines,logList); return joinWithLineLimit("\n",globalSettings.amountOfLogLines,logList);
} }
} }

19
app/src/main/java/com/example/dcav2gui/MainActivity.java
View File

@ -36,7 +36,6 @@ public class MainActivity extends AppCompatActivity {
private AppBarConfiguration mAppBarConfiguration; private AppBarConfiguration mAppBarConfiguration;
private ActivityMainBinding binding; private ActivityMainBinding binding;
private Button addButton;
public static SettingsData globalSettings; public static SettingsData globalSettings;
public HomeFragment.HomeCache homeViewCache; public HomeFragment.HomeCache homeViewCache;
public static InstanceInterface.ExchangeStatsData binanceCache; public static InstanceInterface.ExchangeStatsData binanceCache;
@ -84,16 +83,6 @@ public class MainActivity extends AppCompatActivity {
setContentView(binding.getRoot()); setContentView(binding.getRoot());
setSupportActionBar(binding.appBarMain.toolbar); 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; DrawerLayout drawer = binding.drawerLayout;
NavigationView navigationView = binding.navView; NavigationView navigationView = binding.navView;
mAppBarConfiguration = new AppBarConfiguration.Builder( mAppBarConfiguration = new AppBarConfiguration.Builder(
@ -116,14 +105,6 @@ public class MainActivity extends AppCompatActivity {
if (globalSettings==null) { if (globalSettings==null) {
Toast.makeText(this, "Please enter your credentials in the settings menu", Toast.LENGTH_LONG).show(); 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() { public static SettingsData getGlobalSettings() {

12
app/src/main/res/layout/app_bar_main.xml
View File

@ -17,18 +17,6 @@
android:layout_height="?attr/actionBarSize" android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary" android:background="?attr/colorPrimary"
app:popupTheme="@style/Theme.DCAv2GUI.PopupOverlay"> app:popupTheme="@style/Theme.DCAv2GUI.PopupOverlay">
<Button
android:id="@+id/action_add"
android:layout_width="60dp"
android:layout_height="80dp"
android:gravity="center_horizontal"
android:text="+"
android:textSize="20dp"
android:textColor="@color/white"
android:layout_gravity="end"
android:padding="9dp"/>
</androidx.appcompat.widget.Toolbar> </androidx.appcompat.widget.Toolbar>
</com.google.android.material.appbar.AppBarLayout> </com.google.android.material.appbar.AppBarLayout>