diff --git a/app/src/main/java/com/example/childguard/QrControlActivity.java b/app/src/main/java/com/example/childguard/QrControlActivity.java index 4dcdc44..227a80c 100644 --- a/app/src/main/java/com/example/childguard/QrControlActivity.java +++ b/app/src/main/java/com/example/childguard/QrControlActivity.java @@ -8,14 +8,8 @@ import androidx.core.graphics.Insets; import androidx.core.view.ViewCompat; import androidx.core.view.WindowInsetsCompat; -import com.google.android.material.appbar.MaterialToolbar; - -import java.util.Objects; - public class QrControlActivity extends AppCompatActivity { - - @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -26,25 +20,5 @@ public class QrControlActivity extends AppCompatActivity { v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom); return insets; }); - - MaterialToolbar toolbar = findViewById(R.id.qr_control_toolbar); - setSupportActionBar(toolbar); - Objects.requireNonNull(getSupportActionBar()).setDisplayHomeAsUpEnabled(true); - - - } - - @Override - public boolean onCreateOptionsMenu(android.view.Menu menu) { - getMenuInflater().inflate(R.menu.qr_preview_manu, menu); - return true; - } - - @Override - public boolean onOptionsItemSelected(android.view.MenuItem item) { - if (item.getItemId() == R.id.print_qr) { - - } - return super.onOptionsItemSelected(item); } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_qr_control.xml b/app/src/main/res/layout/activity_qr_control.xml index 3c68328..3aa44dd 100644 --- a/app/src/main/res/layout/activity_qr_control.xml +++ b/app/src/main/res/layout/activity_qr_control.xml @@ -5,29 +5,6 @@ android:id="@+id/main" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".GeneratedQrFragment" > - - - - - + tools:context=".QrControlActivity"> \ No newline at end of file diff --git a/app/src/main/res/menu/qr_preview_manu.xml b/app/src/main/res/menu/qr_preview_manu.xml deleted file mode 100644 index 1b80506..0000000 --- a/app/src/main/res/menu/qr_preview_manu.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file