From 8c8ee9bd9cb5504bc001c931c246877aa91f3ec8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= <66072112+r-ca@users.noreply.github.com> Date: Mon, 18 Dec 2023 14:24:58 +0900 Subject: [PATCH 001/512] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 1146cd08..ffd0e435 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,8 @@ WIP ![Untitled Diagram(2)](https://github.com/lacerta-doc/Lacerta/assets/66072112/9daabaca-5cdc-49f8-ac66-196c588a47c9) +## メモ +- アイコン: Google Material Icons https://fonts.google.com/icons ## コーディング規則/推奨(WIP) ### 規則 From 20aab465a835bfb50960f9fa465919dd5890edd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= <66072112+r-ca@users.noreply.github.com> Date: Mon, 18 Dec 2023 14:25:49 +0900 Subject: [PATCH 002/512] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ffd0e435..8f9e28fc 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ WIP ![Untitled Diagram(2)](https://github.com/lacerta-doc/Lacerta/assets/66072112/9daabaca-5cdc-49f8-ac66-196c588a47c9) ## メモ -- アイコン: Google Material Icons https://fonts.google.com/icons +- アイコン: Google Material Icons https://fonts.google.com/icons (Weight:300, Grade:0, Optical size: 24px) ## コーディング規則/推奨(WIP) ### 規則 From 6a326072d40d1a52c30f0eecadf4b3ce811fc4b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Tue, 19 Dec 2023 11:01:23 +0900 Subject: [PATCH 003/512] =?UTF-8?q?buildTypes=E3=81=ABdebug=E3=81=A8beta?= =?UTF-8?q?=5Frelease=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/app/build.gradle b/app/build.gradle index e0a75c39..d76d5482 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,6 +18,19 @@ android { } buildTypes { + debug { // 開発メンバー用 + debuggable true + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + applicationIdSuffix ".debug" + } + beta_release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + applicationIdSuffix ".beta" + } release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' From bed4011b406c3fb1d646c7f1558a50e0ed312d07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Tue, 19 Dec 2023 11:05:16 +0900 Subject: [PATCH 004/512] =?UTF-8?q?debug,=20beta=5Frelease=E3=81=ABfallbac?= =?UTF-8?q?k=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/build.gradle b/app/build.gradle index d76d5482..2538a406 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -24,12 +24,14 @@ android { proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' applicationIdSuffix ".debug" + matchingFallbacks = ['release'] } beta_release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' applicationIdSuffix ".beta" + matchingFallbacks = ['release'] } release { minifyEnabled false From cfd31536203e078d44629e42a9291d46b857295e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Tue, 19 Dec 2023 11:44:11 +0900 Subject: [PATCH 005/512] =?UTF-8?q?=E5=86=85=E9=83=A8=E3=83=AA=E3=83=AA?= =?UTF-8?q?=E3=83=BC=E3=82=B9=E7=94=A8=E3=81=AE=E8=A8=AD=E5=AE=9A=E3=82=92?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/build.gradle b/app/build.gradle index 2538a406..61e4f8d8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -26,6 +26,13 @@ android { applicationIdSuffix ".debug" matchingFallbacks = ['release'] } + internal_release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + applicationIdSuffix ".internal" + matchingFallbacks = ['release'] + } beta_release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' From e87056a12f96a51ea27e09fa3338330866725a05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Tue, 19 Dec 2023 11:47:32 +0900 Subject: [PATCH 006/512] =?UTF-8?q?=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7?= =?UTF-8?q?=E3=83=B3=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 61e4f8d8..654d10cd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,7 +11,7 @@ android { applicationId "one.nem.lacerta" minSdk 26 targetSdk 33 - versionCode 1 + versionCode 100 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" From c8c0c2f42c613c83d63c1c593293d6d0451bfe16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Tue, 19 Dec 2023 11:50:32 +0900 Subject: [PATCH 007/512] =?UTF-8?q?=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7?= =?UTF-8?q?=E3=83=B3=E5=A4=89=E6=9B=B4,=20=E3=82=B3=E3=83=A1=E3=83=B3?= =?UTF-8?q?=E3=83=88=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 654d10cd..a26793d1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,8 +11,10 @@ android { applicationId "one.nem.lacerta" minSdk 26 targetSdk 33 - versionCode 100 - versionName "1.0" + + // Develop上では次回のリリースバージョンを指定 + versionCode 1000 + versionName "1.0.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } From 0d21f7a783a0bb78a5707dcefb9adb347d289af5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Wed, 20 Dec 2023 10:16:07 +0900 Subject: [PATCH 008/512] =?UTF-8?q?=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7?= =?UTF-8?q?=E3=83=B3=E5=90=8D=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a26793d1..3045cf3e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,8 +13,10 @@ android { targetSdk 33 // Develop上では次回のリリースバージョンを指定 - versionCode 1000 - versionName "1.0.0" + // ベータ, Internal, Release問わず毎回インクリメントする + // https://developer.android.com/studio/publish/versioning#versioningsettings + versionCode 2 + versionName "0.1 Internal release 2" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } From 2843ed749d90e1c8d95bc3b361df8584ef8b49b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Wed, 20 Dec 2023 10:42:50 +0900 Subject: [PATCH 009/512] =?UTF-8?q?PlayConsole=E3=81=A7=E5=88=A5=E3=81=AE?= =?UTF-8?q?=E3=82=A2=E3=83=97=E3=83=AA=E3=81=AB=E3=81=AA=E3=81=A3=E3=81=A6?= =?UTF-8?q?=E3=81=97=E3=81=BE=E3=81=86=E3=81=AE=E3=81=A7Suffix=E3=82=92?= =?UTF-8?q?=E5=BB=83=E6=AD=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 3045cf3e..be1c3e78 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -27,21 +27,18 @@ android { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - applicationIdSuffix ".debug" matchingFallbacks = ['release'] } internal_release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - applicationIdSuffix ".internal" matchingFallbacks = ['release'] } beta_release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - applicationIdSuffix ".beta" matchingFallbacks = ['release'] } release { From b02c0a421c660a4ba1686fe7ce859cb5298f6349 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Wed, 20 Dec 2023 10:45:45 +0900 Subject: [PATCH 010/512] =?UTF-8?q?=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7?= =?UTF-8?q?=E3=83=B3=E3=82=B3=E3=83=BC=E3=83=89=E4=BF=AE=E6=AD=A3=E3=81=AA?= =?UTF-8?q?=E3=81=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index be1c3e78..4db4c74d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,11 +12,10 @@ android { minSdk 26 targetSdk 33 - // Develop上では次回のリリースバージョンを指定 // ベータ, Internal, Release問わず毎回インクリメントする // https://developer.android.com/studio/publish/versioning#versioningsettings - versionCode 2 - versionName "0.1 Internal release 2" + versionCode 1 + versionName "0.1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } From fc716df189063c78c21ae916fc5fe9a806e32105 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Wed, 20 Dec 2023 11:42:30 +0900 Subject: [PATCH 011/512] =?UTF-8?q?=E4=B8=80=E6=97=A6=E9=81=8E=E5=8E=BB?= =?UTF-8?q?=E3=81=AB=E4=BD=9C=E6=88=90=E3=81=97=E3=81=9F=E3=83=95=E3=83=A9?= =?UTF-8?q?=E3=82=B0=E3=83=A1=E3=83=B3=E3=83=88=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scanner/ScannerScanFragment.java | 75 ---------- .../scanner/ScannerScanResultFragment.java | 64 --------- .../main/res/layout/fragment_scanner_scan.xml | 14 -- .../layout/fragment_scanner_scan_result.xml | 133 ------------------ 4 files changed, 286 deletions(-) delete mode 100644 component/scanner/src/main/java/one/nem/lacerta/component/scanner/ScannerScanFragment.java delete mode 100644 component/scanner/src/main/java/one/nem/lacerta/component/scanner/ScannerScanResultFragment.java delete mode 100644 component/scanner/src/main/res/layout/fragment_scanner_scan.xml delete mode 100644 component/scanner/src/main/res/layout/fragment_scanner_scan_result.xml diff --git a/component/scanner/src/main/java/one/nem/lacerta/component/scanner/ScannerScanFragment.java b/component/scanner/src/main/java/one/nem/lacerta/component/scanner/ScannerScanFragment.java deleted file mode 100644 index 54ba513e..00000000 --- a/component/scanner/src/main/java/one/nem/lacerta/component/scanner/ScannerScanFragment.java +++ /dev/null @@ -1,75 +0,0 @@ -package one.nem.lacerta.component.scanner; - -import android.graphics.BitmapFactory; -import android.os.Bundle; - -import androidx.constraintlayout.utils.widget.ImageFilterView; -import androidx.fragment.app.Fragment; - -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -import com.websitebeaver.documentscanner.DocumentScanner; - -/** - * A simple {@link Fragment} subclass. - * Use the {@link ScannerScanFragment#newInstance} factory method to - * create an instance of this fragment. - */ -public class ScannerScanFragment extends Fragment { - - // TODO: Rename parameter arguments, choose names that match - // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER -// private static final String MAX_SCAN_COUNT = "max_scan_count"; // 規定値 - - // TODO: Rename and change types of parameters - private String mParam1; - - - public ScannerScanFragment() { - // Required empty public constructor - } - - public static ScannerScanFragment newInstance(String param1) { - ScannerScanFragment fragment = new ScannerScanFragment(); - Bundle args = new Bundle(); -// args.putString(MAX_SCAN_COUNT, param1); - fragment.setArguments(args); - return fragment; - } - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - if (getArguments() != null) { -// mParam1 = getArguments().getString(MAX_SCAN_COUNT); -// scan(Integer.parseInt(mParam1)); - } - } - - - public DocumentScanner getDocumentScanner() { - return new DocumentScanner( - this, - (croppedImageResults) -> { - // display the first cropped image - croppedImageView.setImageBitmap( - BitmapFactory.decodeFile(croppedImageResults.get(0)) - ); - return null; - }, - (errorMessage) -> { - // an error happened - return null; - }, - () -> { - // user canceled document scan - return null; - }, - null, - null, - null - ); - } -} \ No newline at end of file diff --git a/component/scanner/src/main/java/one/nem/lacerta/component/scanner/ScannerScanResultFragment.java b/component/scanner/src/main/java/one/nem/lacerta/component/scanner/ScannerScanResultFragment.java deleted file mode 100644 index beffe3d0..00000000 --- a/component/scanner/src/main/java/one/nem/lacerta/component/scanner/ScannerScanResultFragment.java +++ /dev/null @@ -1,64 +0,0 @@ -package one.nem.lacerta.component.scanner; - -import android.os.Bundle; - -import androidx.fragment.app.Fragment; - -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -/** - * A simple {@link Fragment} subclass. - * Use the {@link ScannerScanResultFragment#newInstance} factory method to - * create an instance of this fragment. - */ -public class ScannerScanResultFragment extends Fragment { - - // TODO: Rename parameter arguments, choose names that match - // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER - private static final String ARG_PARAM1 = "param1"; - private static final String ARG_PARAM2 = "param2"; - - // TODO: Rename and change types of parameters - private String mParam1; - private String mParam2; - - public ScannerScanResultFragment() { - // Required empty public constructor - } - - /** - * Use this factory method to create a new instance of - * this fragment using the provided parameters. - * - * @param param1 Parameter 1. - * @param param2 Parameter 2. - * @return A new instance of fragment ScannerScanResultFragment. - */ - // TODO: Rename and change types and number of parameters - public static ScannerScanResultFragment newInstance(String param1, String param2) { - ScannerScanResultFragment fragment = new ScannerScanResultFragment(); - Bundle args = new Bundle(); - args.putString(ARG_PARAM1, param1); - args.putString(ARG_PARAM2, param2); - fragment.setArguments(args); - return fragment; - } - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - if (getArguments() != null) { - mParam1 = getArguments().getString(ARG_PARAM1); - mParam2 = getArguments().getString(ARG_PARAM2); - } - } - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - // Inflate the layout for this fragment - return inflater.inflate(R.layout.fragment_scanner_scan_result, container, false); - } -} \ No newline at end of file diff --git a/component/scanner/src/main/res/layout/fragment_scanner_scan.xml b/component/scanner/src/main/res/layout/fragment_scanner_scan.xml deleted file mode 100644 index cf20c76f..00000000 --- a/component/scanner/src/main/res/layout/fragment_scanner_scan.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/component/scanner/src/main/res/layout/fragment_scanner_scan_result.xml b/component/scanner/src/main/res/layout/fragment_scanner_scan_result.xml deleted file mode 100644 index 2ecaf967..00000000 --- a/component/scanner/src/main/res/layout/fragment_scanner_scan_result.xml +++ /dev/null @@ -1,133 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -