diff --git a/MobileApp/.idea/deploymentTargetDropDown.xml b/MobileApp/.idea/deploymentTargetDropDown.xml new file mode 100644 index 0000000..4e0641c --- /dev/null +++ b/MobileApp/.idea/deploymentTargetDropDown.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MobileApp/.idea/misc.xml b/MobileApp/.idea/misc.xml index f5f63c4..16b4708 100644 --- a/MobileApp/.idea/misc.xml +++ b/MobileApp/.idea/misc.xml @@ -13,6 +13,7 @@ + diff --git a/MobileApp/app/src/main/AndroidManifest.xml b/MobileApp/app/src/main/AndroidManifest.xml index ea737bf..b968f1b 100644 --- a/MobileApp/app/src/main/AndroidManifest.xml +++ b/MobileApp/app/src/main/AndroidManifest.xml @@ -3,6 +3,9 @@ xmlns:tools="http://schemas.android.com/tools" package="com.example.lfrmobileapp"> + + + + + \ No newline at end of file diff --git a/MobileApp/app/src/main/java/com/example/lfrmobileapp/Communication.java b/MobileApp/app/src/main/java/com/example/lfrmobileapp/Communication.java index 179370f..f96ee32 100644 --- a/MobileApp/app/src/main/java/com/example/lfrmobileapp/Communication.java +++ b/MobileApp/app/src/main/java/com/example/lfrmobileapp/Communication.java @@ -1,2 +1,22 @@ -package com.example.lfrmobileapp;public class Communication { -} +package com.example.lfrmobileapp; + +import android.accounts.NetworkErrorException; + +import java.io.DataOutputStream; +import java.io.IOException; +import java.net.Socket; + +public class Communication { + public boolean sendData(String data) { + try { + Socket socket = new Socket("192.168.0.1", 1755); + DataOutputStream DOS = new DataOutputStream(socket.getOutputStream()); + DOS.writeUTF(data); + socket.close(); + } catch (Exception e) { + e.printStackTrace(); + } + return true; + } + +} \ No newline at end of file diff --git a/MobileApp/app/src/main/java/com/example/lfrmobileapp/MainActivity.java b/MobileApp/app/src/main/java/com/example/lfrmobileapp/MainActivity.java index 34ac80a..cc6b114 100644 --- a/MobileApp/app/src/main/java/com/example/lfrmobileapp/MainActivity.java +++ b/MobileApp/app/src/main/java/com/example/lfrmobileapp/MainActivity.java @@ -34,4 +34,5 @@ public class MainActivity extends AppCompatActivity { NavigationUI.setupWithNavController(binding.navView, navController); } + } \ No newline at end of file diff --git a/MobileApp/app/src/main/java/com/example/lfrmobileapp/ui/home/HomeFragment.java b/MobileApp/app/src/main/java/com/example/lfrmobileapp/ui/home/HomeFragment.java index a19e9c3..51f4845 100644 --- a/MobileApp/app/src/main/java/com/example/lfrmobileapp/ui/home/HomeFragment.java +++ b/MobileApp/app/src/main/java/com/example/lfrmobileapp/ui/home/HomeFragment.java @@ -13,6 +13,7 @@ import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProvider; +import com.example.lfrmobileapp.Communication; import com.example.lfrmobileapp.databinding.FragmentManuellBinding; import io.github.controlwear.virtual.joystick.android.JoystickView; @@ -33,10 +34,12 @@ public class HomeFragment extends Fragment { homeViewModel.getText().observe(getViewLifecycleOwner(), textView::setText); JoystickView joystick = (JoystickView) binding.joystick; + Communication com = new Communication(); joystick.setOnMoveListener(new JoystickView.OnMoveListener() { @Override public void onMove(int angle, int strength) { homeViewModel.setText(Integer.toString(angle), Integer.toString(strength)); + com.sendData("Vanessa stinkt, Baran nicht"); } }); diff --git a/MobileApp/app/src/main/java/com/example/lfrmobileapp/ui/notifications/NotificationsFragment.java b/MobileApp/app/src/main/java/com/example/lfrmobileapp/ui/notifications/NotificationsFragment.java index eaaf556..1536bbd 100644 --- a/MobileApp/app/src/main/java/com/example/lfrmobileapp/ui/notifications/NotificationsFragment.java +++ b/MobileApp/app/src/main/java/com/example/lfrmobileapp/ui/notifications/NotificationsFragment.java @@ -24,8 +24,6 @@ public class NotificationsFragment extends Fragment { binding = FragmentEinstellungenBinding.inflate(inflater, container, false); View root = binding.getRoot(); - final TextView textView = binding.textNotifications; - notificationsViewModel.getText().observe(getViewLifecycleOwner(), textView::setText); return root; } diff --git a/MobileApp/app/src/main/res/layout/fragment_automatik.xml b/MobileApp/app/src/main/res/layout/fragment_automatik.xml index 42dc441..00ed1e9 100644 --- a/MobileApp/app/src/main/res/layout/fragment_automatik.xml +++ b/MobileApp/app/src/main/res/layout/fragment_automatik.xml @@ -15,7 +15,7 @@ android:layout_marginEnd="16dp" android:checked="false" android:fontFamily="sans-serif-medium" - android:text="Roboter aktivieren " + android:text="Roboter losfahren " android:textSize="16sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/MobileApp/app/src/main/res/layout/fragment_einstellungen.xml b/MobileApp/app/src/main/res/layout/fragment_einstellungen.xml index d417935..c412593 100644 --- a/MobileApp/app/src/main/res/layout/fragment_einstellungen.xml +++ b/MobileApp/app/src/main/res/layout/fragment_einstellungen.xml @@ -6,16 +6,28 @@ android:layout_height="match_parent" tools:context=".ui.notifications.NotificationsFragment"> - + + diff --git a/MobileApp/app/src/main/res/layout/fragment_manuell.xml b/MobileApp/app/src/main/res/layout/fragment_manuell.xml index cd3b54d..46ce4a4 100644 --- a/MobileApp/app/src/main/res/layout/fragment_manuell.xml +++ b/MobileApp/app/src/main/res/layout/fragment_manuell.xml @@ -8,16 +8,15 @@ @@ -26,7 +25,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="8dp" - android:layout_marginTop="8dp" android:layout_marginEnd="8dp" android:textAlignment="center" android:textSize="15sp" diff --git a/MobileApp/app/src/main/res/layout/fragment_manuell.xml~ b/MobileApp/app/src/main/res/layout/fragment_manuell.xml~ new file mode 100644 index 0000000..7772f26 Binary files /dev/null and b/MobileApp/app/src/main/res/layout/fragment_manuell.xml~ differ