commit 8ad1879ac3655f448d9db95a1d5fbc4c9563e75f parent 9861577589682028c56a1aa173f27a0fe5cd82d0 Author: t3sserakt <t3ss@posteo.de> Date: Thu, 10 Apr 2025 16:00:23 +0200 More connection to backend interface. Diffstat:
5 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/GNUnetMessenger/.idea/misc.xml b/GNUnetMessenger/.idea/misc.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> <component name="ExternalStorageConfigurationManager" enabled="true" /> - <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK"> + <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK"> <output url="file://$PROJECT_DIR$/build/classes" /> </component> <component name="ProjectType"> diff --git a/GNUnetMessenger/app/src/main/java/org/gnunet/gnunetmessenger/MainActivity.kt b/GNUnetMessenger/app/src/main/java/org/gnunet/gnunetmessenger/MainActivity.kt @@ -55,12 +55,6 @@ class MainActivity : AppCompatActivity() { // Set up ActionBar with NavController NavigationUI.setupActionBarWithNavController(this, navController, appBarConfiguration) - val hamburgerIcon = findViewById<ImageView>(R.id.hamburger_icon) - hamburgerIcon.setOnClickListener { - // Handle click event for the hamburger icon - // For example, you can open a custom menu, navigate, etc. - // Here, you can display a Toast or handle any action like showing a custom menu. - } } override fun onCreateOptionsMenu(menu: Menu?): Boolean { diff --git a/GNUnetMessenger/app/src/main/java/org/gnunet/gnunetmessenger/ui/account/AccountDetailsFragment.kt b/GNUnetMessenger/app/src/main/java/org/gnunet/gnunetmessenger/ui/account/AccountDetailsFragment.kt @@ -5,6 +5,7 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment +import org.gnunet.gnunetmessenger.MainActivity import org.gnunet.gnunetmessenger.R import org.gnunet.gnunetmessenger.databinding.FragmentAccountDetailsBinding @@ -19,6 +20,8 @@ class AccountDetailsFragment : Fragment() { ): View? { _binding = FragmentAccountDetailsBinding.inflate(inflater, container, false) + val currentAccount = (activity as MainActivity).currentAccount + // Set up the account details (dummy data for now) // This could be loaded from a ViewModel or passed through arguments binding.accountName.text = "Account Name: John Doe" diff --git a/GNUnetMessenger/app/src/main/res/layout/activity_main.xml b/GNUnetMessenger/app/src/main/res/layout/activity_main.xml @@ -17,12 +17,6 @@ app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent"> - <ImageView - android:id="@+id/hamburger_icon" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/ic_menu" - android:layout_gravity="end|center_vertical" /> </androidx.appcompat.widget.Toolbar> <!-- NavHost Fragment for Navigation --> diff --git a/GNUnetMessenger/app/src/main/res/menu/main_menu.xml b/GNUnetMessenger/app/src/main/res/menu/main_menu.xml @@ -16,13 +16,11 @@ app:showAsAction="never" /> <item android:id="@+id/menu_settings" - android:icon="@android:drawable/ic_menu_preferences" android:title="@string/settings" app:showAsAction="always" /> <item android:id="@+id/menu_about" - android:icon="@android:drawable/ic_menu_info_details" android:title="@string/about" app:showAsAction="ifRoom" /> </menu>