From 341b3edc35b59f04f07b76131fd5f84de3abf74b Mon Sep 17 00:00:00 2001 From: zwicki Date: Sat, 12 Jun 2021 16:21:13 +0200 Subject: [PATCH] dynamic content update --- app/build.gradle | 1 + ...Dialog.java => AddButtonDialogSingle.java} | 32 +++- ...ialog.java => AddButtonsDialogDouble.java} | 41 +++- .../de/jg_cody/Teraplex/MainActivity.java | 45 +---- .../Teraplex/ui/Flur/FlurFragment.java | 181 +++++++----------- .../Teraplex/ui/rooms/IViewHolder.java | 8 + .../Teraplex/ui/rooms/ListAdapter.java | 85 ++++++++ .../jg_cody/Teraplex/ui/rooms/ListItem.java | 29 +++ .../Teraplex/ui/rooms/ListItemDouble.java | 55 ++++++ .../Teraplex/ui/rooms/ListItemSingle.java | 29 +++ .../Teraplex/ui/rooms/RoomFragment.java | 6 + .../ui/rooms/ViewHolderDoubleButton.java | 47 +++++ .../ui/rooms/ViewHolderSingleButton.java | 40 ++++ app/src/main/res/layout-v23/app_bar_main.xml | 25 +-- app/src/main/res/layout/addbuttondialog.xml | 31 --- .../res/layout/addbuttondialog_single.xml | 31 +++ app/src/main/res/layout/addbuttonsdialog.xml | 50 ----- .../res/layout/addbuttonsdialog_double.xml | 48 +++++ app/src/main/res/layout/doublebutton.xml | 9 +- app/src/main/res/layout/fragment_flur.xml | 74 ++----- app/src/main/res/layout/fragment_main.xml | 18 ++ app/src/main/res/layout/singlebutton.xml | 12 +- app/src/main/res/values/strings.xml | 2 + 23 files changed, 562 insertions(+), 337 deletions(-) rename app/src/main/java/de/jg_cody/Teraplex/{AddButtonDialog.java => AddButtonDialogSingle.java} (72%) rename app/src/main/java/de/jg_cody/Teraplex/{AddButtonsDialog.java => AddButtonsDialogDouble.java} (61%) create mode 100644 app/src/main/java/de/jg_cody/Teraplex/ui/rooms/IViewHolder.java create mode 100644 app/src/main/java/de/jg_cody/Teraplex/ui/rooms/ListAdapter.java create mode 100644 app/src/main/java/de/jg_cody/Teraplex/ui/rooms/ListItem.java create mode 100644 app/src/main/java/de/jg_cody/Teraplex/ui/rooms/ListItemDouble.java create mode 100644 app/src/main/java/de/jg_cody/Teraplex/ui/rooms/ListItemSingle.java create mode 100644 app/src/main/java/de/jg_cody/Teraplex/ui/rooms/RoomFragment.java create mode 100644 app/src/main/java/de/jg_cody/Teraplex/ui/rooms/ViewHolderDoubleButton.java create mode 100644 app/src/main/java/de/jg_cody/Teraplex/ui/rooms/ViewHolderSingleButton.java delete mode 100644 app/src/main/res/layout/addbuttondialog.xml create mode 100644 app/src/main/res/layout/addbuttondialog_single.xml delete mode 100644 app/src/main/res/layout/addbuttonsdialog.xml create mode 100644 app/src/main/res/layout/addbuttonsdialog_double.xml diff --git a/app/build.gradle b/app/build.gradle index 04b1a5f..1a0d49b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -40,6 +40,7 @@ dependencies { implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.3.1' implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1' implementation 'com.jcraft:jsch:0.1.55' + implementation 'androidx.legacy:legacy-support-v4:1.0.0' testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.2' androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' diff --git a/app/src/main/java/de/jg_cody/Teraplex/AddButtonDialog.java b/app/src/main/java/de/jg_cody/Teraplex/AddButtonDialogSingle.java similarity index 72% rename from app/src/main/java/de/jg_cody/Teraplex/AddButtonDialog.java rename to app/src/main/java/de/jg_cody/Teraplex/AddButtonDialogSingle.java index 1d3704f..9436d5c 100644 --- a/app/src/main/java/de/jg_cody/Teraplex/AddButtonDialog.java +++ b/app/src/main/java/de/jg_cody/Teraplex/AddButtonDialogSingle.java @@ -13,16 +13,28 @@ import android.widget.EditText; import androidx.fragment.app.DialogFragment; -public class AddButtonDialog extends DialogFragment { +public class AddButtonDialogSingle extends DialogFragment { private EditText editTextUsername; private EditText editTextPassword; + + private EditText command, name, button_name; private AddButtonDialogListener listener; + /** + * + * @param savedInstanceState + * @return + */ @Override public Dialog onCreateDialog(Bundle savedInstanceState) { AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); LayoutInflater inflater = getActivity().getLayoutInflater(); - View view = inflater.inflate(R.layout.addbuttondialog, null); + View view = inflater.inflate(R.layout.addbuttondialog_single, null); + + command = getActivity().findViewById(R.id.dialogSingle_editText_command); + name = getActivity().findViewById(R.id.dialogSingle_editText_name); + button_name = getActivity().findViewById(R.id.dialogSingle_editText_buttonName); + builder.setView(view) .setTitle("SINGLE BUTTON") @@ -42,8 +54,6 @@ public class AddButtonDialog extends DialogFragment { }); - editTextUsername = view.findViewById(R.id.button_name); - editTextPassword = view.findViewById(R.id.button_command); AlertDialog mDialog = builder.create(); mDialog.getWindow().setBackgroundDrawableResource(R.drawable.button_round); return mDialog; @@ -61,7 +71,21 @@ public class AddButtonDialog extends DialogFragment { } } + public interface AddButtonDialogListener { void applyTexts(String username, String password); } + + public String getName() + { + return name.getText().toString(); + } + public String getButtonName() + { + return button_name.getText().toString(); + } + public String getCommand() + { + return command.getText().toString(); + } } \ No newline at end of file diff --git a/app/src/main/java/de/jg_cody/Teraplex/AddButtonsDialog.java b/app/src/main/java/de/jg_cody/Teraplex/AddButtonsDialogDouble.java similarity index 61% rename from app/src/main/java/de/jg_cody/Teraplex/AddButtonsDialog.java rename to app/src/main/java/de/jg_cody/Teraplex/AddButtonsDialogDouble.java index 7e618cf..c7e1490 100644 --- a/app/src/main/java/de/jg_cody/Teraplex/AddButtonsDialog.java +++ b/app/src/main/java/de/jg_cody/Teraplex/AddButtonsDialogDouble.java @@ -12,17 +12,17 @@ import android.widget.EditText; import androidx.fragment.app.DialogFragment; -public class AddButtonsDialog extends DialogFragment { - private EditText editTextUsername; - private EditText editTextPassword; +public class AddButtonsDialogDouble extends DialogFragment { private AddButtonsDialogListener listener; + private EditText name, command1, button1, command2, button2; + @Override public Dialog onCreateDialog(Bundle savedInstanceState) { AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); LayoutInflater inflater = getActivity().getLayoutInflater(); - View view = inflater.inflate(R.layout.addbuttonsdialog, null); + View view = inflater.inflate(R.layout.addbuttonsdialog_double, null); builder.setView(view) .setTitle("ON/OFF BUTTON") @@ -35,15 +35,15 @@ public class AddButtonsDialog extends DialogFragment { .setPositiveButton("ADD", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialogInterface, int i) { - String username = editTextUsername.getText().toString(); - String password = editTextPassword.getText().toString(); - listener.applyTexts(username, password); + } }); - editTextUsername = view.findViewById(R.id.button_name); - editTextPassword = view.findViewById(R.id.button_command); - + name = getActivity().findViewById(R.id.dialogDouble_editText_name); + command1 = getActivity().findViewById(R.id.dialogDouble_editText_command1); + command2 = getActivity().findViewById(R.id.dialogDouble_editText_command2); + button1 = getActivity().findViewById(R.id.dialogDouble_editText_button1); + button2 = getActivity().findViewById(R.id.dialogDouble_editText_button2); AlertDialog mDialog = builder.create(); mDialog.getWindow().setBackgroundDrawableResource(R.drawable.button_round); return mDialog; @@ -63,4 +63,25 @@ public class AddButtonsDialog extends DialogFragment { public interface AddButtonsDialogListener { void applyTexts(String username, String password); } + + public String getName() + { + return name.getText().toString(); + } + public String getCommand1() + { + return command1.getText().toString(); + } + public String getButton1() + { + return button1.getText().toString(); + } + public String getCommand2() + { + return command2.getText().toString(); + } + public String getButton2() + { + return button2.getText().toString(); + } } \ No newline at end of file diff --git a/app/src/main/java/de/jg_cody/Teraplex/MainActivity.java b/app/src/main/java/de/jg_cody/Teraplex/MainActivity.java index 49ccc2e..6f5feff 100644 --- a/app/src/main/java/de/jg_cody/Teraplex/MainActivity.java +++ b/app/src/main/java/de/jg_cody/Teraplex/MainActivity.java @@ -1,9 +1,7 @@ package de.jg_cody.Teraplex; import android.app.Activity; -import android.app.AlertDialog; import android.content.Context; -import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; import android.content.res.Configuration; @@ -48,7 +46,6 @@ import java.io.IOException; import java.io.InputStream; import java.util.Base64; import java.util.Locale; -import java.util.Objects; import de.jg_cody.Teraplex.ui.Credits.CreditsFragment; import de.jg_cody.Teraplex.ui.Einstellungen.EinstellungenFragment; @@ -56,7 +53,7 @@ import de.jg_cody.Teraplex.ui.Konsole.KonsoleFragment; import de.jg_cody.Teraplex.ui.home.HomeFragment; -public class MainActivity extends AppCompatActivity implements AddButtonDialog.AddButtonDialogListener { +public class MainActivity extends AppCompatActivity implements AddButtonDialogSingle.AddButtonDialogListener { public static int RESULT_LOAD_IMAGE = 0; private AppBarConfiguration mAppBarConfiguration; @@ -109,13 +106,7 @@ public class MainActivity extends AppCompatActivity implements AddButtonDialog.A Toolbar toolbar = findViewById(R.id.toolbar); toolbar.setBackgroundResource(R.drawable.toolbartop); setSupportActionBar(toolbar); - FloatingActionButton addfab = findViewById(R.id.addbutton_fab); - addfab.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - showChooseElement(); - } - }); + FloatingActionButton mfab = findViewById(R.id.fab); mfab.setOnClickListener(new View.OnClickListener() { @@ -143,6 +134,7 @@ public class MainActivity extends AppCompatActivity implements AddButtonDialog.A } + /*static public class DemoPreferenceFragment extends PreferenceFragmentCompat { @Override public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { @@ -192,15 +184,7 @@ public class MainActivity extends AppCompatActivity implements AddButtonDialog.A startActivity(startMain); } - public void openDialog1() { - AddButtonDialog AddButtonDialog = new AddButtonDialog(); - AddButtonDialog.show(getSupportFragmentManager(), "example dialog"); - } - public void openDialog2() { - AddButtonsDialog AddButtonsDialog = new AddButtonsDialog(); - AddButtonsDialog.show(getSupportFragmentManager(), "example dialog"); - } @Override public void applyTexts(String username, String password) { @@ -238,30 +222,7 @@ public class MainActivity extends AppCompatActivity implements AddButtonDialog.A } } - private void showChooseElement() { - final String[] listItems = {"SINGLE BUTTON", "DOUBLE BUTTON", "ÜBERSCHRIFT", "PLATZHALTER"}; - AlertDialog.Builder mBuilder = new AlertDialog.Builder(MainActivity.this); - mBuilder.setTitle("CHOOSE ELEMENT"); - mBuilder.setSingleChoiceItems(listItems, -5, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialogInterface, int i) { - if (i == 0) { - openDialog1(); - } else if (i == 1) { - openDialog2(); - } else if (i == 2) { - } else if (i == 3) { - - } - - dialogInterface.dismiss(); - } - }); - AlertDialog mDialog = mBuilder.create(); - Objects.requireNonNull(mDialog.getWindow()).setBackgroundDrawableResource(R.drawable.button_round); - mDialog.show(); - } @RequiresApi(api = Build.VERSION_CODES.O) @Override diff --git a/app/src/main/java/de/jg_cody/Teraplex/ui/Flur/FlurFragment.java b/app/src/main/java/de/jg_cody/Teraplex/ui/Flur/FlurFragment.java index ad4c322..b9c7b69 100644 --- a/app/src/main/java/de/jg_cody/Teraplex/ui/Flur/FlurFragment.java +++ b/app/src/main/java/de/jg_cody/Teraplex/ui/Flur/FlurFragment.java @@ -1,7 +1,8 @@ package de.jg_cody.Teraplex.ui.Flur; import android.app.Activity; -import android.content.Intent; +import android.app.AlertDialog; +import android.content.DialogInterface; import android.content.SharedPreferences; import android.graphics.BitmapFactory; import android.graphics.drawable.BitmapDrawable; @@ -10,39 +11,40 @@ import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.ArrayAdapter; -import android.widget.Button; -import android.widget.EditText; import android.widget.ImageView; -import android.widget.LinearLayout; -import android.widget.Toast; +import android.widget.ListView; import androidx.annotation.NonNull; import androidx.annotation.RequiresApi; -import androidx.appcompat.widget.AppCompatSpinner; import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProvider; +import com.google.android.material.floatingactionbutton.FloatingActionButton; + import java.util.ArrayList; import java.util.Base64; -import java.util.List; import java.util.Objects; -import de.jg_cody.Teraplex.ActivityCricketers; +import de.jg_cody.Teraplex.AddButtonDialogSingle; +import de.jg_cody.Teraplex.AddButtonsDialogDouble; import de.jg_cody.Teraplex.Cricketer; import de.jg_cody.Teraplex.MainActivity; import de.jg_cody.Teraplex.R; +import de.jg_cody.Teraplex.ui.rooms.*; - -public class FlurFragment extends Fragment implements View.OnClickListener { +public class FlurFragment extends Fragment{ private FlurViewModel flurViewModel; - LinearLayout layoutList; - Button buttonAdd; - Button buttonSubmitList; - List teamList = new ArrayList<>(); + String[] commands = {"Hello1","Hello2","Hello3","Hello4","Hello5"}; + int[] type = {0,1,0,0,1}; + + ListView listView; + ListAdapter listAdapter; + + ArrayList items; + ArrayList cricketersList = new ArrayList<>(); @RequiresApi(api = Build.VERSION_CODES.O) @@ -60,119 +62,70 @@ public class FlurFragment extends Fragment implements View.OnClickListener { I.setScaleType(ImageView.ScaleType.CENTER_CROP); } - layoutList = root.findViewById(R.id.layout_list); - buttonAdd = root.findViewById(R.id.button_add); - buttonSubmitList = root.findViewById(R.id.button_submit_list); - - buttonAdd.setOnClickListener(this); - buttonSubmitList.setOnClickListener(this); - teamList.add("Team"); - teamList.add("India"); - teamList.add("Australia"); - teamList.add("England"); + listView = root.findViewById(R.id.listView); - return root; - } - @Override - public void onClick(View v) { - - switch (v.getId()){ - - case R.id.button_add: - - addView(); - - break; - - case R.id.button_submit_list: - - if(checkIfValidAndRead()){ - - Intent intent = new Intent( getContext(), ActivityCricketers.class); - Bundle bundle = new Bundle(); - bundle.putSerializable("list",cricketersList); - intent.putExtras(bundle); - startActivity(intent); - - } - - break; - - } + items = new ArrayList(); - } - private boolean checkIfValidAndRead() { - cricketersList.clear(); - boolean result = true; + listAdapter= new ListAdapter(getContext(), R.id.text, items); + listView.setAdapter(listAdapter); - for(int i=0;i objects; + + + @Override + public int getViewTypeCount() + { + return 3; + + } + public int getItemViewType(int position){ + return objects.get(position).getType(); + } + + public ListAdapter(Context context, int resource, ArrayList objects) + { + super(context, resource, objects); + this.objects = objects; + + } + @Override + public View getView(int position, View convertView, ViewGroup parent) { + + IViewHolder viewHolder= null; + ListItem listViewItem = objects.get(position); + int listViewItemType = getItemViewType(position); + + + if (convertView == null) { + + if (listViewItemType == SINGLEBUTTON) { + convertView = LayoutInflater.from(getContext()).inflate(R.layout.singlebutton, null); + + Button bRun = convertView.findViewById(R.id.bRun); + Button text = convertView.findViewById(R.id.TEXT); + bRun.setText(listViewItem.getText()); + //text.setText(listViewItemType.get) + + viewHolder = new ViewHolderSingleButton(bRun , listViewItem.getText()); + convertView.setTag(viewHolder); + + } + else if (listViewItemType == DOUBLEBUTTON) { + convertView = LayoutInflater.from(getContext()).inflate(R.layout.doublebutton, null); + Button bLeft = (Button) convertView.findViewById(R.id.bLeft); + Button bRight = (Button) convertView.findViewById(R.id.bRight); + + viewHolder = new ViewHolderDoubleButton(bLeft,bRight,listViewItem.getText()); + + convertView.setTag(viewHolder); + + } + else if(listViewItemType == OPTION3BUTTON) + { + + } + } + else{ + viewHolder = (IViewHolder) convertView.getTag(); + } + + return convertView; + } + + +} diff --git a/app/src/main/java/de/jg_cody/Teraplex/ui/rooms/ListItem.java b/app/src/main/java/de/jg_cody/Teraplex/ui/rooms/ListItem.java new file mode 100644 index 0000000..2e96c22 --- /dev/null +++ b/app/src/main/java/de/jg_cody/Teraplex/ui/rooms/ListItem.java @@ -0,0 +1,29 @@ +package de.jg_cody.Teraplex.ui.rooms; + +public class ListItem { + private String text; + private int type; + + public ListItem(int type) { + this.type = type; + } + + + + public String getText() { + return text; + } + + public void setText(String text) { + this.text = text; + } + + public int getType() { + return type; + } + + public void setType(int type) { + this.type = type; + } + +} diff --git a/app/src/main/java/de/jg_cody/Teraplex/ui/rooms/ListItemDouble.java b/app/src/main/java/de/jg_cody/Teraplex/ui/rooms/ListItemDouble.java new file mode 100644 index 0000000..065e550 --- /dev/null +++ b/app/src/main/java/de/jg_cody/Teraplex/ui/rooms/ListItemDouble.java @@ -0,0 +1,55 @@ +package de.jg_cody.Teraplex.ui.rooms; + +public class ListItemDouble extends ListItem{ + + private String name, command1, command2,button1, button2; + public ListItemDouble( int type, String name, String command1, String command2, String button1, String button2) { + super( type); + this.name = name; + this.command1 = command1; + this.command2 = command2; + this.button1 = button1; + this.button2 = button2; + } + public void setName(String name) + { + this.name = name; + } + public void setCommand1(String command1) + { + this.command1 = command1; + } + public void setCommand2(String command2) + { + this.command2 = command2; + } + public void setButton1(String button1) + { + this.button1 = button1; + } + public void setButton2(String button2) + { + this.button2 = button2; + } + public String getName() + { + return name; + } + public String getCommand1() + { + return command1; + } + public String getCommand2() + { + return command2; + } + public String getButton1() + { + return button1; + } + public String getButton2() + { + return button2; + } + +} diff --git a/app/src/main/java/de/jg_cody/Teraplex/ui/rooms/ListItemSingle.java b/app/src/main/java/de/jg_cody/Teraplex/ui/rooms/ListItemSingle.java new file mode 100644 index 0000000..3fc5a30 --- /dev/null +++ b/app/src/main/java/de/jg_cody/Teraplex/ui/rooms/ListItemSingle.java @@ -0,0 +1,29 @@ +package de.jg_cody.Teraplex.ui.rooms; + +public class ListItemSingle extends ListItem{ + String buttonName; + String name; + + public ListItemSingle(String command, int type, String buttonName, String name) { + super(type); + this.name = name; + this.buttonName = buttonName; + + } + public void setButtonName(String buttonName) + { + this.buttonName = buttonName; + } + public void setName(String name) + { + this.name = name; + } + public String getButtonName() + { + return buttonName; + } + public String getName() + { + return name; + } +} diff --git a/app/src/main/java/de/jg_cody/Teraplex/ui/rooms/RoomFragment.java b/app/src/main/java/de/jg_cody/Teraplex/ui/rooms/RoomFragment.java new file mode 100644 index 0000000..0679fa5 --- /dev/null +++ b/app/src/main/java/de/jg_cody/Teraplex/ui/rooms/RoomFragment.java @@ -0,0 +1,6 @@ +package de.jg_cody.Teraplex.ui.rooms; + +import androidx.fragment.app.Fragment; + +public class RoomFragment extends Fragment { +} diff --git a/app/src/main/java/de/jg_cody/Teraplex/ui/rooms/ViewHolderDoubleButton.java b/app/src/main/java/de/jg_cody/Teraplex/ui/rooms/ViewHolderDoubleButton.java new file mode 100644 index 0000000..8c81ea5 --- /dev/null +++ b/app/src/main/java/de/jg_cody/Teraplex/ui/rooms/ViewHolderDoubleButton.java @@ -0,0 +1,47 @@ +package de.jg_cody.Teraplex.ui.rooms; + +import android.view.View; +import android.widget.Button; +import android.widget.Toast; + +public class ViewHolderDoubleButton implements IViewHolder{ + String command; + Button bLeft, bRight; + + public ViewHolderDoubleButton(Button bLeft, Button bRight, String command) { + this.bLeft = bLeft; + this.bRight = bRight; + this.command = command; + + bLeft.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Toast.makeText(bLeft.getContext(),command + " ON",Toast.LENGTH_SHORT).show(); + } + }); + bRight.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Toast.makeText(bRight.getContext(),command + " ON",Toast.LENGTH_SHORT).show(); + } + }); + + + } + @Override + public String getCommand() { + return command; + } + public Button getbLeft() { + return bLeft; + } + public Button getbRight(){return bRight;} + @Override + public View[] getViews() + { + View[] views = {getbLeft(),getbRight()}; + return views; + + + } +} diff --git a/app/src/main/java/de/jg_cody/Teraplex/ui/rooms/ViewHolderSingleButton.java b/app/src/main/java/de/jg_cody/Teraplex/ui/rooms/ViewHolderSingleButton.java new file mode 100644 index 0000000..4de7159 --- /dev/null +++ b/app/src/main/java/de/jg_cody/Teraplex/ui/rooms/ViewHolderSingleButton.java @@ -0,0 +1,40 @@ +package de.jg_cody.Teraplex.ui.rooms; + +import android.view.View; +import android.widget.Button; +import android.widget.Toast; + +public class ViewHolderSingleButton implements IViewHolder { + + String command; + Button bRun; + + public ViewHolderSingleButton(Button bRun, String command) { + this.bRun = bRun; + this.command = command; + + bRun.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Toast.makeText(bRun.getContext(),command + " ON",Toast.LENGTH_SHORT).show(); + } + }); + + + } + @Override + public String getCommand() { + return command; + } + public Button getbRun() { + return bRun; + } + @Override + public View[] getViews() + { + View[] views = {getbRun(),}; + return views; + + + } +} diff --git a/app/src/main/res/layout-v23/app_bar_main.xml b/app/src/main/res/layout-v23/app_bar_main.xml index 2a9b4b0..5c828ed 100644 --- a/app/src/main/res/layout-v23/app_bar_main.xml +++ b/app/src/main/res/layout-v23/app_bar_main.xml @@ -20,24 +20,15 @@ app:layout_anchor="@+id/include" app:layout_anchorGravity="center" /> - + + - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/addbuttondialog_single.xml b/app/src/main/res/layout/addbuttondialog_single.xml new file mode 100644 index 0000000..b80bdca --- /dev/null +++ b/app/src/main/res/layout/addbuttondialog_single.xml @@ -0,0 +1,31 @@ + + + + + + + + + diff --git a/app/src/main/res/layout/addbuttonsdialog.xml b/app/src/main/res/layout/addbuttonsdialog.xml deleted file mode 100644 index be3623a..0000000 --- a/app/src/main/res/layout/addbuttonsdialog.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/addbuttonsdialog_double.xml b/app/src/main/res/layout/addbuttonsdialog_double.xml new file mode 100644 index 0000000..981e4fe --- /dev/null +++ b/app/src/main/res/layout/addbuttonsdialog_double.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/doublebutton.xml b/app/src/main/res/layout/doublebutton.xml index 010fecd..d7f4548 100644 --- a/app/src/main/res/layout/doublebutton.xml +++ b/app/src/main/res/layout/doublebutton.xml @@ -2,13 +2,14 @@ + android:layout_height="wrap_content" + android:orientation="horizontal"> + android:layout_height="742dp" + android:visibility="visible"/> - - \ No newline at end of file + + diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml index 2ce0a32..8524f92 100644 --- a/app/src/main/res/layout/fragment_main.xml +++ b/app/src/main/res/layout/fragment_main.xml @@ -8,4 +8,22 @@ tools:context=".ui.kueche.KuecheFragment"> + + + \ No newline at end of file diff --git a/app/src/main/res/layout/singlebutton.xml b/app/src/main/res/layout/singlebutton.xml index 29b9ea1..2b96f2b 100644 --- a/app/src/main/res/layout/singlebutton.xml +++ b/app/src/main/res/layout/singlebutton.xml @@ -1,10 +1,10 @@ + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:orientation="horizontal" + android:layout_width="match_parent" + android:layout_height="wrap_content">