diff --git a/.idea/misc.xml b/.idea/misc.xml index 4352e68..6540694 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -63,11 +63,25 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/qtagger/Activity/Test/PhotographFragment.java b/app/src/main/java/com/qtagger/Activity/Test/PhotographFragment.java index c98f2de..57aa466 100644 --- a/app/src/main/java/com/qtagger/Activity/Test/PhotographFragment.java +++ b/app/src/main/java/com/qtagger/Activity/Test/PhotographFragment.java @@ -1,12 +1,17 @@ package com.qtagger.Activity.Test; +import android.graphics.drawable.Drawable; +import android.os.Build; import android.os.Bundle; +import androidx.annotation.RequiresApi; import androidx.fragment.app.Fragment; +import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.Button; import com.qtagger.R; @@ -16,7 +21,7 @@ import com.qtagger.R; * create an instance of this fragment. */ public class PhotographFragment extends Fragment { - + View view; // TODO: Rename parameter arguments, choose names that match // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER private static final String ARG_PARAM1 = "param1"; @@ -60,7 +65,31 @@ public class PhotographFragment extends Fragment { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + view = inflater.inflate(R.layout.fragment_photograph, container, false); + Button t1 = view.findViewById(R.id.button_picture1_test); + + t1.setOnLongClickListener(new View.OnLongClickListener() { + @RequiresApi(api = Build.VERSION_CODES.M) + @Override + public boolean onLongClick(View v) { + t1.setForeground(getActivity().getDrawable(R.drawable.circle_foreground)); + t1.setForegroundGravity(Gravity.TOP|Gravity.RIGHT); + + view.findViewById(R.id.linearlayout_tool).setVisibility(View.VISIBLE); + return false; + //linearlayout_tool + } + }); + t1.setOnClickListener(new View.OnClickListener() { + @RequiresApi(api = Build.VERSION_CODES.M) + @Override + public void onClick(View v) { + t1.setForeground(getActivity().getDrawable(R.drawable.circle_check_foreground)); + t1.setForegroundGravity(Gravity.TOP|Gravity.RIGHT); + } + }); + // Inflate the layout for this fragment - return inflater.inflate(R.layout.fragment_photograph, container, false); + return view; } } \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/weight_test_image.png b/app/src/main/res/drawable-v24/weight_test_image.png new file mode 100644 index 0000000..7642103 Binary files /dev/null and b/app/src/main/res/drawable-v24/weight_test_image.png differ diff --git a/app/src/main/res/drawable/circle_check_foreground.xml b/app/src/main/res/drawable/circle_check_foreground.xml new file mode 100644 index 0000000..aecc04b --- /dev/null +++ b/app/src/main/res/drawable/circle_check_foreground.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/circle_foreground.xml b/app/src/main/res/drawable/circle_foreground.xml new file mode 100644 index 0000000..031ea48 --- /dev/null +++ b/app/src/main/res/drawable/circle_foreground.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/default_fragment_background.xml b/app/src/main/res/drawable/default_fragment_background.xml new file mode 100644 index 0000000..cda4f28 --- /dev/null +++ b/app/src/main/res/drawable/default_fragment_background.xml @@ -0,0 +1,17 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml index 2fd9ee8..775219f 100644 --- a/app/src/main/res/layout/activity_search.xml +++ b/app/src/main/res/layout/activity_search.xml @@ -1,65 +1,69 @@ - - + - + - + + + - + + + > + android:layout_height="match_parent" + android:background="#F5F5F5" /> - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_test2.xml b/app/src/main/res/layout/activity_test2.xml index 8cd3a51..603ac8c 100644 --- a/app/src/main/res/layout/activity_test2.xml +++ b/app/src/main/res/layout/activity_test2.xml @@ -1,72 +1,76 @@ - + tools:context=".Activity.TestActivity" + android:orientation="vertical"> - + + - + - + - + + + + + app:tabMode="scrollable"> - app:layout_constraintTop_toBottomOf="@+id/tabs" /> - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_barcode.xml b/app/src/main/res/layout/fragment_barcode.xml index a05c4c2..c08d28b 100644 --- a/app/src/main/res/layout/fragment_barcode.xml +++ b/app/src/main/res/layout/fragment_barcode.xml @@ -3,6 +3,8 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" + android:layout_margin="10dp" + android:background="@drawable/default_fragment_background" xmlns:app="http://schemas.android.com/apk/res-auto" tools:context=".Activity.Search.BarcodeFragment"> diff --git a/app/src/main/res/layout/fragment_capture.xml b/app/src/main/res/layout/fragment_capture.xml index e752e28..164ec94 100644 --- a/app/src/main/res/layout/fragment_capture.xml +++ b/app/src/main/res/layout/fragment_capture.xml @@ -3,6 +3,8 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" + android:layout_margin="10dp" + android:background="@drawable/default_fragment_background" tools:context=".Activity.Test.CaptureFragment"> diff --git a/app/src/main/res/layout/fragment_photograph.xml b/app/src/main/res/layout/fragment_photograph.xml index 86cc75c..8506b9e 100644 --- a/app/src/main/res/layout/fragment_photograph.xml +++ b/app/src/main/res/layout/fragment_photograph.xml @@ -11,6 +11,8 @@ + android:layout_marginBottom="10dp" + android:textColor="@color/black" + android:textSize="24sp" + android:text="사진"> @@ -40,7 +44,7 @@ android:layout_height="wrap_content"> + android:foregroundGravity="top|right" + + android:background="@drawable/fill_test" /> + android:background="@drawable/capture_test_image" + android:foregroundGravity="top|right" + android:adjustViewBounds="true"/> + android:background="@drawable/capture_test_image2" + android:foregroundGravity="top|right" + android:adjustViewBounds="true" /> + android:background="@drawable/fill_test" + android:foregroundGravity="top|right" + android:adjustViewBounds="true" /> + android:background="@drawable/fill_test" + android:foregroundGravity="top|right" + android:adjustViewBounds="true" /> + android:background="@drawable/image_squrebutton_background" /> + android:background="@drawable/image_squrebutton_background" /> + android:background="@drawable/image_squrebutton_background" /> @@ -141,19 +144,22 @@ -