ChildGuard/child_guard
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rca/fix UI #15

Merged
r-ca merged 30 commits from rca/fix_ui into main 2024-01-17 10:27:28 +00:00
Conversation 0 Commits 30 Files Changed 11 +9 -13
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 272931c037 - Show all commits

20
app/src/main/java/com/example/childguard/GeneratedQrFragment.java → app/src/main/java/com/example/childguard/GenerateQrFragment.java
View File

@ -8,22 +8,18 @@ import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import com.google.android.material.appbar.MaterialToolbar;
import java.util.Objects;
/** /**
* A simple {@link Fragment} subclass. * A simple {@link Fragment} subclass.
* Use the {@link GeneratedQrFragment#newInstance} factory method to * Use the {@link GenerateQrFragment#newInstance} factory method to
* create an instance of this fragment. * create an instance of this fragment.
*/ */
public class GeneratedQrFragment extends Fragment { public class GenerateQrFragment extends Fragment {
public GeneratedQrFragment() { public GenerateQrFragment() {
// Required empty public constructor // Required empty public constructor
} }
public static GeneratedQrFragment newInstance() { public static GenerateQrFragment newInstance() {
GeneratedQrFragment fragment = new GeneratedQrFragment(); GenerateQrFragment fragment = new GenerateQrFragment();
Bundle args = new Bundle(); Bundle args = new Bundle();
fragment.setArguments(args); fragment.setArguments(args);
return fragment; return fragment;
@ -38,13 +34,13 @@ public class GeneratedQrFragment extends Fragment {
public View onCreateView(LayoutInflater inflater, ViewGroup container, public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) { Bundle savedInstanceState) {
// Inflate the layout for this fragment // Inflate the layout for this fragment
return inflater.inflate(R.layout.fragment_generated_qr, container, false); return inflater.inflate(R.layout.fragment_generate_qr, container, false);
} }
@Override @Override
public void onViewCreated(View view, Bundle savedInstanceState) { public void onViewCreated(View view, Bundle savedInstanceState) {
MaterialToolbar toolbar = view.findViewById(R.id.toolbar);
toolbar.back
} }
} }

2
app/src/main/res/layout/fragment_generated_qr.xml → app/src/main/res/layout/fragment_generate_qr.xml
View File

@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".GeneratedQrFragment" > tools:context=".GenerateQrFragment" >
<ImageView <ImageView
android:id="@+id/result_bitmap_image_view" android:id="@+id/result_bitmap_image_view"