diff --git a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/dialogs/Dialog.java b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/dialogs/Dialog.java new file mode 100644 index 0000000..2f88c0a --- /dev/null +++ b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/dialogs/Dialog.java @@ -0,0 +1,45 @@ +package org.timecrafters.TimeCraftersConfigurationTool.dialogs; + +import android.app.ActionBar; +import android.content.Context; +import android.graphics.Point; +import android.os.Bundle; +import android.util.DisplayMetrics; +import android.view.View; +import android.view.ViewGroup; +import android.view.Window; +import android.view.WindowManager; +import android.widget.Button; +import android.widget.ImageButton; + +import androidx.annotation.NonNull; + +import org.timecrafters.TimeCraftersConfigurationTool.R; + +public class Dialog extends android.app.Dialog { + public Dialog(@NonNull Context context) { + super(context); + } + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + requestWindowFeature(Window.FEATURE_NO_TITLE); + setContentView(R.layout.dialog_base); + + ImageButton closeButton = findViewById(R.id.dialogCloseButton); + closeButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + dismiss(); + } + }); + } + + @Override + protected void onStart() { + Point point = new Point(); + getWindow().getWindowManager().getDefaultDisplay().getSize(point); + getWindow().setLayout((int) (point.x * 0.75), ViewGroup.LayoutParams.WRAP_CONTENT); + } +} diff --git a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/settings/SettingsFragment.java b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/settings/SettingsFragment.java index 11ebe88..e1cc8bb 100644 --- a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/settings/SettingsFragment.java +++ b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/settings/SettingsFragment.java @@ -23,11 +23,9 @@ public class SettingsFragment extends Fragment { settingsViewModel = ViewModelProviders.of(this).get(SettingsViewModel.class); View root = inflater.inflate(R.layout.fragment_settings, container, false); - final TextView textView = root.findViewById(R.id.text_settings); settingsViewModel.getText().observe(getViewLifecycleOwner(), new Observer() { @Override public void onChanged(@Nullable String s) { - textView.setText(s); } }); return root; diff --git a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/tacnet/TACNETFragment.java b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/tacnet/TACNETFragment.java index 9932e2d..3db896c 100644 --- a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/tacnet/TACNETFragment.java +++ b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/tacnet/TACNETFragment.java @@ -4,6 +4,8 @@ import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.Button; +import android.widget.LinearLayout; import android.widget.TextView; import androidx.annotation.NonNull; @@ -13,6 +15,9 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProviders; import org.timecrafters.TimeCraftersConfigurationTool.R; +import org.timecrafters.TimeCraftersConfigurationTool.dialogs.Dialog; + +import static android.view.View.inflate; public class TACNETFragment extends Fragment { @@ -23,13 +28,25 @@ public class TACNETFragment extends Fragment { TACNETViewModel = ViewModelProviders.of(this).get(TACNETViewModel.class); View root = inflater.inflate(R.layout.fragment_tacnet, container, false); - final TextView textView = root.findViewById(R.id.text_tacnet); TACNETViewModel.getText().observe(getViewLifecycleOwner(), new Observer() { @Override public void onChanged(@Nullable String s) { - textView.setText(s); } }); + + Button connect = root.findViewById(R.id.connect); + connect.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Dialog dialog = new Dialog(getContext()); + dialog.show(); + + ((TextView)dialog.findViewById(R.id.dialogTitle)).setText("Add Variable Variable"); + LinearLayout view = dialog.findViewById(R.id.dialogContent); + view.addView(getLayoutInflater().inflate(R.layout.dialog_edit_variable, null)); + } + }); + return root; } } \ No newline at end of file diff --git a/app/src/main/res/drawable-hdpi/cross.png b/app/src/main/res/drawable-hdpi/cross.png new file mode 100644 index 0000000..21d7091 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/cross.png differ diff --git a/app/src/main/res/drawable-mdpi/cross.png b/app/src/main/res/drawable-mdpi/cross.png new file mode 100644 index 0000000..caffa04 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/cross.png differ diff --git a/app/src/main/res/drawable-xhdpi/cross.png b/app/src/main/res/drawable-xhdpi/cross.png new file mode 100644 index 0000000..a223d1f Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/cross.png differ diff --git a/app/src/main/res/drawable-xxhdpi/cross.png b/app/src/main/res/drawable-xxhdpi/cross.png new file mode 100644 index 0000000..2dc33b5 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/cross.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/cross.png b/app/src/main/res/drawable-xxxhdpi/cross.png new file mode 100644 index 0000000..c237a26 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/cross.png differ diff --git a/app/src/main/res/drawable/dialog.xml b/app/src/main/res/drawable/dialog.xml new file mode 100644 index 0000000..9989c68 --- /dev/null +++ b/app/src/main/res/drawable/dialog.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_base.xml b/app/src/main/res/layout/dialog_base.xml new file mode 100644 index 0000000..445aeda --- /dev/null +++ b/app/src/main/res/layout/dialog_base.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_edit_variable.xml b/app/src/main/res/layout/dialog_edit_variable.xml new file mode 100644 index 0000000..ab67f5c --- /dev/null +++ b/app/src/main/res/layout/dialog_edit_variable.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + +