Skip to content

Commit f336fde

Browse files
committed
updated code
1 parent c778d3a commit f336fde

10 files changed

+183
-5
lines changed

.idea/caches/build_file_checksums.ser

100 Bytes
Binary file not shown.

.idea/gradle.xml

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules.xml

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ android {
5656
dependencies {
5757
implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
5858
implementation 'com.android.support:appcompat-v7:28.0.0'
59-
59+
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
6060
// implementation 'com.android.support.constraint:constraint-layout:1.1.2'
6161

6262

app/src/main/AndroidManifest.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
android:icon="@mipmap/ic_launcher"
88
android:label="@string/app_name"
99
android:roundIcon="@mipmap/ic_launcher_round"
10-
android:supportsRtl="true"
11-
android:theme="@style/AppTheme">
10+
android:supportsRtl="true">
1211
<activity android:name="com.haotran.testing.MainActivity"
1312
android:screenOrientation="portrait">
1413
<intent-filter>

app/src/main/java/com/haotran/testing/MainActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ protected void onCreate(Bundle savedInstanceState) {
2121
super.onCreate(savedInstanceState);
2222
setContentView(R.layout.activity_main);
2323

24-
scannedImageView = findViewById(R.id.scanned_image);
24+
// scannedImageView = findViewById(R.id.scanned_image);
2525

2626
// startScan();
2727
startCapture();

app/src/main/res/layout/activity_main.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
android:background="@android:color/black"
88
tools:context="com.haotran.testing.MainActivity">
99

10-
<com.haotran.capture.view.TouchImageView
10+
<View
1111
android:id="@+id/scanned_image"
1212
android:layout_width="match_parent"
1313
android:layout_height="match_parent"

build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
buildscript {
44
ext.kotlin_version = '1.3.31'
5+
apply from: 'versions.gradle'
56
repositories {
67
google()
78
jcenter()

settings.gradle

+2
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,5 @@ include ':opencv3_4_4_contrib'
44
include ':opencv3_4_1'
55
include ':capture'
66
project(':capture').projectDir = new File('D:\\working\\cisbox_invoice_app_android\\com.cisbox.core\\capture')
7+
include ':core'
8+
project(':core').projectDir = new File('D:\\working\\cisbox_invoice_app_android\\com.cisbox.core\\core')

versions.gradle

+174
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,174 @@
1+
/**
2+
* Shared file between builds so that they can all use the same dependencies and
3+
* maven repositories.
4+
**/
5+
ext.deps = [:]
6+
def versions = [:]
7+
versions.arch = hasProperty("ARCH_VERSION") ? getProperty("ARCH_VERSION") : "1.1.0"
8+
versions.support = "28.0.0"
9+
versions.multidex = "1.0.1"
10+
versions.constraint = "1.0.2"
11+
versions.dagger = "2.11"
12+
versions.junit = "4.12"
13+
versions.espresso = "3.0.2"
14+
versions.retrofit = "2.4.0"
15+
versions.okhttp3 = "3.11.0"
16+
versions.okhttp_logging_interceptor = "3.11.0"
17+
versions.mockwebserver = "3.8.1"
18+
versions.apache_commons = "2.5"
19+
versions.mockito = "2.7.19"
20+
versions.mockito_all = "1.10.19"
21+
versions.dexmaker = "2.2.0"
22+
versions.constraint_layout = "1.1.0-beta5"
23+
versions.glide = "4.8.0"
24+
versions.timber = "4.5.1"
25+
versions.android_gradle_plugin = '3.3.2'
26+
versions.rxjava2 = "2.1.3"
27+
versions.rx_android = "2.0.1"
28+
versions.atsl_runner = "1.0.1"
29+
versions.atsl_rules = "1.0.1"
30+
versions.hamcrest = "1.3"
31+
versions.kotlin = "1.2.51"
32+
versions.paging = "1.0.1"
33+
versions.anko = "0.10.4"
34+
versions.stetho = "1.5.0"
35+
versions.zxing = "3.6.0"
36+
versions.firebase = "12.0.1"
37+
versions.google_services = "4.2.0"
38+
versions.room = "1.1.1"
39+
versions.butterknife = "9.0.0-rc1"
40+
versions.butterknife_old = "8.4.0"
41+
versions.eventbus = "3.1.1"
42+
versions.sectioned_recyclerview = "1.2.6"
43+
def deps = [:]
44+
45+
def support = [:]
46+
support.annotations = "com.android.support:support-annotations:$versions.support"
47+
support.app_compat = "com.android.support:appcompat-v7:$versions.support"
48+
support.recyclerview = "com.android.support:recyclerview-v7:$versions.support"
49+
support.cardview = "com.android.support:cardview-v7:$versions.support"
50+
support.design = "com.android.support:design:$versions.support"
51+
support.v4 = "com.android.support:support-v4:$versions.support"
52+
support.core_utils = "com.android.support:support-core-utils:$versions.support"
53+
support.constraint = "com.android.support.constraint:constraint-layout:$versions.constraint"
54+
support.multidex = "com.android.support:multidex:$versions.multidex"
55+
deps.support = support
56+
57+
def room = [:]
58+
room.runtime = "android.arch.persistence.room:runtime:$versions.room"
59+
room.compiler = "android.arch.persistence.room:compiler:$versions.room"
60+
room.rxjava2 = "android.arch.persistence.room:rxjava2:$versions.room"
61+
room.testing = "android.arch.persistence.room:testing:$versions.room"
62+
deps.room = room
63+
64+
def lifecycle = [:]
65+
lifecycle.runtime = "android.arch.lifecycle:runtime:$versions.arch"
66+
lifecycle.extensions = "android.arch.lifecycle:extensions:$versions.arch"
67+
lifecycle.java8 = "android.arch.lifecycle:common-java8:$versions.arch"
68+
lifecycle.compiler = "android.arch.lifecycle:compiler:$versions.arch"
69+
lifecycle.compiler_annotation = "android.arch.lifecycle:compiler:$versions.arch"
70+
deps.lifecycle = lifecycle
71+
72+
def arch_core = [:]
73+
arch_core.testing = "android.arch.core:core-testing:$versions.arch"
74+
deps.arch_core = arch_core
75+
76+
def butterknife = [:]
77+
butterknife.core = "com.jakewharton:butterknife:$versions.butterknife"
78+
butterknife.compiler = "com.jakewharton:butterknife-compiler:$versions.butterknife"
79+
butterknife.compiler_old = "com.jakewharton:butterknife-compiler:$versions.butterknife_old"
80+
deps.butterknife = butterknife
81+
82+
def retrofit = [:]
83+
retrofit.runtime = "com.squareup.retrofit2:retrofit:$versions.retrofit"
84+
retrofit.gson = "com.squareup.retrofit2:converter-gson:$versions.retrofit"
85+
retrofit.mock = "com.squareup.retrofit2:retrofit-mock:$versions.retrofit"
86+
retrofit.adapter_rxjava2 = "com.squareup.retrofit2:adapter-rxjava2:$versions.retrofit"
87+
retrofit.okhttp3 = "com.squareup.okhttp3:okhttp:$versions.okhttp3"
88+
deps.retrofit = retrofit
89+
deps.okhttp_logging_interceptor = "com.squareup.okhttp3:logging-interceptor:${versions.okhttp_logging_interceptor}"
90+
91+
def dagger = [:]
92+
dagger.runtime = "com.google.dagger:dagger:$versions.dagger"
93+
dagger.android = "com.google.dagger:dagger-android:$versions.dagger"
94+
dagger.android_support = "com.google.dagger:dagger-android-support:$versions.dagger"
95+
dagger.compiler = "com.google.dagger:dagger-compiler:$versions.dagger"
96+
dagger.android_support_compiler = "com.google.dagger:dagger-android-processor:$versions.dagger"
97+
98+
deps.dagger = dagger
99+
100+
def espresso = [:]
101+
espresso.core = "com.android.support.test.espresso:espresso-core:$versions.espresso"
102+
espresso.contrib = "com.android.support.test.espresso:espresso-contrib:$versions.espresso"
103+
espresso.intents = "com.android.support.test.espresso:espresso-intents:$versions.espresso"
104+
deps.espresso = espresso
105+
106+
def atsl = [:]
107+
atsl.runner = "com.android.support.test:runner:$versions.atsl_runner"
108+
atsl.rules = "com.android.support.test:rules:$versions.atsl_runner"
109+
deps.atsl = atsl
110+
111+
def eventbus = [:]
112+
eventbus.core = "org.greenrobot:eventbus:$versions.eventbus"
113+
deps.eventbus = eventbus
114+
115+
def mockito = [:]
116+
mockito.core = "org.mockito:mockito-core:$versions.mockito"
117+
mockito.all = "org.mockito:mockito-all:$versions.mockito_all"
118+
deps.mockito = mockito
119+
120+
def kotlin = [:]
121+
kotlin.stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jre7:$versions.kotlin"
122+
kotlin.test = "org.jetbrains.kotlin:kotlin-test-junit:$versions.kotlin"
123+
kotlin.plugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlin"
124+
125+
deps.kotlin = kotlin
126+
deps.paging = "android.arch.paging:runtime:$versions.paging"
127+
deps.glide = "com.github.bumptech.glide:glide:$versions.glide"
128+
deps.dexmaker = "com.linkedin.dexmaker:dexmaker-mockito:$versions.dexmaker"
129+
deps.constraint_layout = "com.android.support.constraint:constraint-layout:$versions.constraint_layout"
130+
deps.timber = "com.jakewharton.timber:timber:$versions.timber"
131+
deps.junit = "junit:junit:$versions.junit"
132+
deps.mock_web_server = "com.squareup.okhttp3:mockwebserver:$versions.mockwebserver"
133+
deps.rxjava2 = "io.reactivex.rxjava2:rxjava:$versions.rxjava2"
134+
deps.rx_android = "io.reactivex.rxjava2:rxandroid:$versions.rx_android"
135+
deps.hamcrest = "org.hamcrest:hamcrest-all:$versions.hamcrest"
136+
deps.android_gradle_plugin = "com.android.tools.build:gradle:$versions.android_gradle_plugin"
137+
deps.google_services = "com.google.gms:google-services:$versions.google_services"
138+
139+
deps.sectioned_recyclerview = "com.github.haocse:Sectioned-RecyclerView:$versions.sectioned_recyclerview"
140+
deps.docscanner = "com.github.haocse.documentscanner:documentscanner:1.0.16"
141+
142+
def anko = [:]
143+
anko.common = "org.jetbrains.anko:anko-commons:$versions.anko"
144+
deps.anko = anko
145+
146+
def stetho = [:]
147+
stetho.common = "com.facebook.stetho:stetho:$versions.stetho"
148+
stetho.okhttp = "com.facebook.stetho:stetho-okhttp3:$versions.stetho"
149+
deps.stetho = stetho
150+
deps.zxing = "com.journeyapps:zxing-android-embedded:$versions.zxing"
151+
152+
ext.deps = deps
153+
def firebase = [:]
154+
firebase.core = "com.google.firebase:firebase-core:$versions.firebase"
155+
firebase.messaging = "com.google.firebase:firebase-messaging:$versions.firebase"
156+
deps.firebase = firebase
157+
158+
def build_versions = [:]
159+
build_versions.min_sdk = 17
160+
build_versions.target_sdk = 28
161+
build_versions.build_tools = "28.0.0"
162+
ext.build_versions = build_versions
163+
164+
def addRepos(RepositoryHandler handler) {
165+
handler.google()
166+
handler.jcenter()
167+
handler.maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
168+
handler.maven { url 'https://maven.google.com' }
169+
handler.maven { url 'https://maven.fabric.io/public' }
170+
handler.maven { url 'https://jitpack.io' }
171+
172+
}
173+
174+
ext.addRepos = this.&addRepos

0 commit comments

Comments
 (0)