diff --git a/app/build.gradle b/app/build.gradle index 3ad8468..9ea4da4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,8 +11,8 @@ android { applicationId "github.daisukiKaffuChino.MomoQR" minSdk 26 targetSdk 34 - versionCode 240303 - versionName "1.0.3" + versionCode 240305 + versionName "1.0.4" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index b7d93d5..d2fecb6 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -11,8 +11,8 @@ "type": "SINGLE", "filters": [], "attributes": [], - "versionCode": 240226, - "versionName": "1.0.2", + "versionCode": 240303, + "versionName": "1.0.3", "outputFile": "app-release.apk" } ], diff --git a/app/src/main/java/github/daisukiKaffuChino/MomoQR/CaptureActivity.java b/app/src/main/java/github/daisukiKaffuChino/MomoQR/CaptureActivity.java index 551fe4b..c740c77 100644 --- a/app/src/main/java/github/daisukiKaffuChino/MomoQR/CaptureActivity.java +++ b/app/src/main/java/github/daisukiKaffuChino/MomoQR/CaptureActivity.java @@ -1,6 +1,5 @@ package github.daisukiKaffuChino.MomoQR; - import android.content.Context; import android.content.SharedPreferences; import android.hardware.camera2.CameraAccessException; diff --git a/app/src/main/java/github/daisukiKaffuChino/MomoQR/ui/fragment/AboutDialogFragment.java b/app/src/main/java/github/daisukiKaffuChino/MomoQR/ui/fragment/AboutDialogFragment.java new file mode 100644 index 0000000..99963ae --- /dev/null +++ b/app/src/main/java/github/daisukiKaffuChino/MomoQR/ui/fragment/AboutDialogFragment.java @@ -0,0 +1,6 @@ +package github.daisukiKaffuChino.MomoQR.ui.fragment; + +import androidx.fragment.app.DialogFragment; + +public class AboutDialogFragment extends DialogFragment { +} diff --git a/app/src/main/java/github/daisukiKaffuChino/MomoQR/ui/dialog/EditTextDialog.java b/app/src/main/java/github/daisukiKaffuChino/MomoQR/ui/fragment/EditTextDialogFragment.java similarity index 97% rename from app/src/main/java/github/daisukiKaffuChino/MomoQR/ui/dialog/EditTextDialog.java rename to app/src/main/java/github/daisukiKaffuChino/MomoQR/ui/fragment/EditTextDialogFragment.java index 36cb33d..bd0723f 100644 --- a/app/src/main/java/github/daisukiKaffuChino/MomoQR/ui/dialog/EditTextDialog.java +++ b/app/src/main/java/github/daisukiKaffuChino/MomoQR/ui/fragment/EditTextDialogFragment.java @@ -1,4 +1,4 @@ -package github.daisukiKaffuChino.MomoQR.ui.dialog; +package github.daisukiKaffuChino.MomoQR.ui.fragment; import android.annotation.SuppressLint; import android.app.Dialog; @@ -23,7 +23,7 @@ import github.daisukiKaffuChino.MomoQR.R; import github.daisukiKaffuChino.MomoQR.logic.utils.MyUtil; -public class EditTextDialog extends DialogFragment { +public class EditTextDialogFragment extends DialogFragment { public final static String MODE_INPUT_ONLY = "MODE_INPUT_ONLY"; public final static String MODE_INPUT_WITH_CHECKBOX = "MODE_INPUT_WITH_CHECKBOX"; diff --git a/app/src/main/java/github/daisukiKaffuChino/MomoQR/ui/fragment/HomeFragment.java b/app/src/main/java/github/daisukiKaffuChino/MomoQR/ui/fragment/HomeFragment.java index ccd5505..5dfcc34 100644 --- a/app/src/main/java/github/daisukiKaffuChino/MomoQR/ui/fragment/HomeFragment.java +++ b/app/src/main/java/github/daisukiKaffuChino/MomoQR/ui/fragment/HomeFragment.java @@ -27,7 +27,6 @@ import github.daisukiKaffuChino.MomoQR.databinding.FragmentHomeBinding; import github.daisukiKaffuChino.MomoQR.logic.utils.MyUtil; import github.daisukiKaffuChino.MomoQR.logic.utils.QRCodeUtil; -import github.daisukiKaffuChino.MomoQR.ui.dialog.EditTextDialog; public class HomeFragment extends BaseBindingFragment { //private HomeViewModel viewModel; @@ -56,7 +55,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat }); binding.makeQRCodeBtn.setOnClickListener(v -> { Bundle bundle = new Bundle(); - bundle.putString("mode", EditTextDialog.MODE_INPUT_ONLY); + bundle.putString("mode", EditTextDialogFragment.MODE_INPUT_ONLY); getNavController().navigate(R.id.nav_edt_dialog, bundle); }); } diff --git a/app/src/main/java/github/daisukiKaffuChino/MomoQR/ui/fragment/ResultFragment.java b/app/src/main/java/github/daisukiKaffuChino/MomoQR/ui/fragment/ResultFragment.java index 9299189..070973b 100644 --- a/app/src/main/java/github/daisukiKaffuChino/MomoQR/ui/fragment/ResultFragment.java +++ b/app/src/main/java/github/daisukiKaffuChino/MomoQR/ui/fragment/ResultFragment.java @@ -37,7 +37,6 @@ import github.daisukiKaffuChino.MomoQR.databinding.FragmentResultBinding; import github.daisukiKaffuChino.MomoQR.logic.utils.MyUtil; import github.daisukiKaffuChino.MomoQR.logic.utils.QRCodeUtil; -import github.daisukiKaffuChino.MomoQR.ui.dialog.EditTextDialog; import github.daisukiKaffuChino.MomoQR.ui.model.ResultViewModel; public class ResultFragment extends BaseBindingFragment { @@ -60,7 +59,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat MyUtil.copyContent(Objects.requireNonNull(binding.resultText.getText()).toString())); binding.addFavBtn.setOnClickListener(v -> { Bundle bundle = new Bundle(); - bundle.putString("mode", EditTextDialog.MODE_INPUT_WITH_CHECKBOX); + bundle.putString("mode", EditTextDialogFragment.MODE_INPUT_WITH_CHECKBOX); bundle.putString("content",viewModel.contentLiveData.getValue()); bundle.putString("imgPath",myUtil.saveImageViewImage(binding.remakeCodeImg)); getNavController().navigate(R.id.nav_edt_dialog, bundle); diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml index 1fbf280..159cb54 100644 --- a/app/src/main/res/navigation/nav_graph.xml +++ b/app/src/main/res/navigation/nav_graph.xml @@ -41,6 +41,6 @@ + android:name="github.daisukiKaffuChino.MomoQR.ui.fragment.EditTextDialogFragment"/> \ No newline at end of file