diff --git a/app/src/main/java/com/example/dcav2gui/MainActivity.java b/app/src/main/java/com/example/dcav2gui/MainActivity.java index 20cffa2..c65ecb1 100644 --- a/app/src/main/java/com/example/dcav2gui/MainActivity.java +++ b/app/src/main/java/com/example/dcav2gui/MainActivity.java @@ -8,6 +8,7 @@ import androidx.navigation.Navigation;// import android.os.Bundle; import android.view.View; import android.view.Menu; +import android.widget.Button; import android.widget.Toast; import com.example.dcav2gui.ui.home.HomeFragment; @@ -33,6 +34,7 @@ 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; @@ -80,6 +82,7 @@ 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) { @@ -112,6 +115,13 @@ public class MainActivity extends AppCompatActivity { 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); + } + }); } diff --git a/app/src/main/java/com/example/dcav2gui/ui/exchanges/BinanceFragment.java b/app/src/main/java/com/example/dcav2gui/ui/exchanges/BinanceFragment.java index fc13fee..84a50c9 100644 --- a/app/src/main/java/com/example/dcav2gui/ui/exchanges/BinanceFragment.java +++ b/app/src/main/java/com/example/dcav2gui/ui/exchanges/BinanceFragment.java @@ -1,11 +1,14 @@ // BinanceFragment.java package com.example.dcav2gui.ui.exchanges; +import android.content.Intent; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.Button; import android.widget.TextView; +import android.widget.Toast; import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; @@ -56,6 +59,7 @@ public class BinanceFragment extends Fragment { } }); + return root; } diff --git a/app/src/main/res/drawable/ic_add_icon.png b/app/src/main/res/drawable/ic_add_icon.png new file mode 100644 index 0000000..9666261 Binary files /dev/null and b/app/src/main/res/drawable/ic_add_icon.png differ diff --git a/app/src/main/res/drawable/ic_plus_sign.png b/app/src/main/res/drawable/ic_plus_sign.png new file mode 100644 index 0000000..864f8b4 Binary files /dev/null and b/app/src/main/res/drawable/ic_plus_sign.png differ diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml index 4d77054..d57884f 100644 --- a/app/src/main/res/layout/app_bar_main.xml +++ b/app/src/main/res/layout/app_bar_main.xml @@ -16,7 +16,19 @@ android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" android:background="?attr/colorPrimary" - app:popupTheme="@style/Theme.DCAv2GUI.PopupOverlay" /> + app:popupTheme="@style/Theme.DCAv2GUI.PopupOverlay"> + +