Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Wallet
sentinel-android
Commits
c1cf381b
Verified
Commit
c1cf381b
authored
Aug 19, 2020
by
Sarath
⚔
Browse files
androidx migration
parent
86c2cfdc
Changes
17
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
47 additions
and
39 deletions
+47
-39
app/src/main/java/com/samourai/sentinel/codescanner/BarcodeUtils.java
.../java/com/samourai/sentinel/codescanner/BarcodeUtils.java
+3
-3
app/src/main/java/com/samourai/sentinel/codescanner/CameraFragmentBottomSheet.java
...ourai/sentinel/codescanner/CameraFragmentBottomSheet.java
+4
-3
app/src/main/java/com/samourai/sentinel/codescanner/CodeScanner.java
...n/java/com/samourai/sentinel/codescanner/CodeScanner.java
+3
-3
app/src/main/java/com/samourai/sentinel/codescanner/CodeScannerException.java
...m/samourai/sentinel/codescanner/CodeScannerException.java
+2
-2
app/src/main/java/com/samourai/sentinel/codescanner/CodeScannerView.java
...va/com/samourai/sentinel/codescanner/CodeScannerView.java
+7
-7
app/src/main/java/com/samourai/sentinel/codescanner/DecodeCallback.java
...ava/com/samourai/sentinel/codescanner/DecodeCallback.java
+2
-2
app/src/main/java/com/samourai/sentinel/codescanner/DecodeTask.java
...in/java/com/samourai/sentinel/codescanner/DecodeTask.java
+2
-2
app/src/main/java/com/samourai/sentinel/codescanner/Decoder.java
.../main/java/com/samourai/sentinel/codescanner/Decoder.java
+2
-2
app/src/main/java/com/samourai/sentinel/codescanner/DecoderWrapper.java
...ava/com/samourai/sentinel/codescanner/DecoderWrapper.java
+1
-1
app/src/main/java/com/samourai/sentinel/codescanner/ErrorCallback.java
...java/com/samourai/sentinel/codescanner/ErrorCallback.java
+2
-2
app/src/main/java/com/samourai/sentinel/codescanner/Rect.java
...src/main/java/com/samourai/sentinel/codescanner/Rect.java
+1
-1
app/src/main/java/com/samourai/sentinel/codescanner/Utils.java
...rc/main/java/com/samourai/sentinel/codescanner/Utils.java
+2
-2
app/src/main/java/com/samourai/sentinel/codescanner/ViewFinderView.java
...ava/com/samourai/sentinel/codescanner/ViewFinderView.java
+5
-5
build.gradle
build.gradle
+6
-1
gradle.properties
gradle.properties
+2
-0
gradle/wrapper/gradle-wrapper.properties
gradle/wrapper/gradle-wrapper.properties
+2
-2
settings.gradle
settings.gradle
+1
-1
No files found.
app/src/main/java/com/samourai/sentinel/codescanner/BarcodeUtils.java
View file @
c1cf381b
...
...
@@ -25,9 +25,9 @@ package com.samourai.sentinel.codescanner;
import
android.graphics.Bitmap
;
import
android.graphics.Color
;
import
android
.support
.annotation.IntDef
;
import
android
.support
.annotation.NonNull
;
import
android
.support
.annotation.Nullable
;
import
android
x
.annotation.IntDef
;
import
android
x
.annotation.NonNull
;
import
android
x
.annotation.Nullable
;
import
com.google.zxing.BarcodeFormat
;
import
com.google.zxing.DecodeHintType
;
...
...
app/src/main/java/com/samourai/sentinel/codescanner/CameraFragmentBottomSheet.java
View file @
c1cf381b
package
com.samourai.sentinel.codescanner
;
import
android.os.Bundle
;
import
android.support.design.widget.BottomSheetBehavior
;
import
android.support.design.widget.BottomSheetDialogFragment
;
import
android.support.design.widget.CoordinatorLayout
;
import
com.google.android.material.bottomsheet.BottomSheetBehavior
;
import
com.google.android.material.bottomsheet.BottomSheetDialogFragment
;
import
android.view.LayoutInflater
;
import
android.view.View
;
import
android.view.ViewGroup
;
import
androidx.coordinatorlayout.widget.CoordinatorLayout
;
import
com.samourai.sentinel.R
;
...
...
app/src/main/java/com/samourai/sentinel/codescanner/CodeScanner.java
View file @
c1cf381b
...
...
@@ -10,9 +10,9 @@ import android.hardware.Camera.CameraInfo;
import
android.hardware.Camera.Parameters
;
import
android.os.Handler
;
import
android.os.Process
;
import
android
.support
.annotation.MainThread
;
import
android
.support
.annotation.NonNull
;
import
android
.support
.annotation.Nullable
;
import
android
x
.annotation.MainThread
;
import
android
x
.annotation.NonNull
;
import
android
x
.annotation.Nullable
;
import
android.view.SurfaceHolder
;
import
com.google.zxing.BarcodeFormat
;
...
...
app/src/main/java/com/samourai/sentinel/codescanner/CodeScannerException.java
View file @
c1cf381b
...
...
@@ -24,8 +24,8 @@
package
com.samourai.sentinel.codescanner
;
import
android.os.Build
;
import
android
.support
.annotation.Nullable
;
import
android
.support
.annotation.RequiresApi
;
import
android
x
.annotation.Nullable
;
import
android
x
.annotation.RequiresApi
;
/**
* Common class for code scanner runtime exceptions
...
...
app/src/main/java/com/samourai/sentinel/codescanner/CodeScannerView.java
View file @
c1cf381b
...
...
@@ -28,13 +28,13 @@ import android.content.Context;
import
android.content.res.TypedArray
;
import
android.graphics.Color
;
import
android.os.Build
;
import
android
.support
.annotation.AttrRes
;
import
android
.support
.annotation.ColorInt
;
import
android
.support
.annotation.FloatRange
;
import
android
.support
.annotation.Nullable
;
import
android
.support
.annotation.Px
;
import
android
.support
.annotation.RequiresApi
;
import
android
.support
.annotation.StyleRes
;
import
android
x
.annotation.AttrRes
;
import
android
x
.annotation.ColorInt
;
import
android
x
.annotation.FloatRange
;
import
android
x
.annotation.Nullable
;
import
android
x
.annotation.Px
;
import
android
x
.annotation.RequiresApi
;
import
android
x
.annotation.StyleRes
;
import
android.util.AttributeSet
;
import
android.view.MotionEvent
;
import
android.view.SurfaceView
;
...
...
app/src/main/java/com/samourai/sentinel/codescanner/DecodeCallback.java
View file @
c1cf381b
...
...
@@ -26,8 +26,8 @@ package com.samourai.sentinel.codescanner;
import
android.app.Activity
;
import
android.os.Handler
;
import
android.os.Looper
;
import
android
.support
.annotation.NonNull
;
import
android
.support
.annotation.WorkerThread
;
import
android
x
.annotation.NonNull
;
import
android
x
.annotation.WorkerThread
;
import
com.google.zxing.Result
;
...
...
app/src/main/java/com/samourai/sentinel/codescanner/DecodeTask.java
View file @
c1cf381b
...
...
@@ -23,8 +23,8 @@
*/
package
com.samourai.sentinel.codescanner
;
import
android
.support
.annotation.NonNull
;
import
android
.support
.annotation.Nullable
;
import
android
x
.annotation.NonNull
;
import
android
x
.annotation.Nullable
;
import
com.google.zxing.MultiFormatReader
;
import
com.google.zxing.PlanarYUVLuminanceSource
;
...
...
app/src/main/java/com/samourai/sentinel/codescanner/Decoder.java
View file @
c1cf381b
...
...
@@ -24,8 +24,8 @@
package
com.samourai.sentinel.codescanner
;
import
android.os.Process
;
import
android
.support
.annotation.NonNull
;
import
android
.support
.annotation.Nullable
;
import
android
x
.annotation.NonNull
;
import
android
x
.annotation.Nullable
;
import
com.google.zxing.BarcodeFormat
;
import
com.google.zxing.DecodeHintType
;
...
...
app/src/main/java/com/samourai/sentinel/codescanner/DecoderWrapper.java
View file @
c1cf381b
...
...
@@ -24,7 +24,7 @@
package
com.samourai.sentinel.codescanner
;
import
android.hardware.Camera
;
import
android
.support
.annotation.NonNull
;
import
android
x
.annotation.NonNull
;
final
class
DecoderWrapper
{
...
...
app/src/main/java/com/samourai/sentinel/codescanner/ErrorCallback.java
View file @
c1cf381b
...
...
@@ -26,8 +26,8 @@ package com.samourai.sentinel.codescanner;
import
android.app.Activity
;
import
android.os.Handler
;
import
android.os.Looper
;
import
android
.support
.annotation.NonNull
;
import
android
.support
.annotation.WorkerThread
;
import
android
x
.annotation.NonNull
;
import
android
x
.annotation.WorkerThread
;
/**
...
...
app/src/main/java/com/samourai/sentinel/codescanner/Rect.java
View file @
c1cf381b
...
...
@@ -24,7 +24,7 @@
package
com.samourai.sentinel.codescanner
;
import
android.graphics.Matrix
;
import
android
.support
.annotation.NonNull
;
import
android
x
.annotation.NonNull
;
final
class
Rect
{
...
...
app/src/main/java/com/samourai/sentinel/codescanner/Utils.java
View file @
c1cf381b
...
...
@@ -28,8 +28,8 @@ import android.hardware.Camera.Area;
import
android.hardware.Camera.CameraInfo
;
import
android.hardware.Camera.Parameters
;
import
android.hardware.Camera.Size
;
import
android
.support
.annotation.NonNull
;
import
android
.support
.annotation.Nullable
;
import
android
x
.annotation.NonNull
;
import
android
x
.annotation.Nullable
;
import
android.view.Surface
;
import
android.view.WindowManager
;
...
...
app/src/main/java/com/samourai/sentinel/codescanner/ViewFinderView.java
View file @
c1cf381b
...
...
@@ -27,11 +27,11 @@ import android.content.Context;
import
android.graphics.Canvas
;
import
android.graphics.Paint
;
import
android.graphics.Path
;
import
android
.support
.annotation.ColorInt
;
import
android
.support
.annotation.FloatRange
;
import
android
.support
.annotation.NonNull
;
import
android
.support
.annotation.Nullable
;
import
android
.support
.annotation.Px
;
import
android
x
.annotation.ColorInt
;
import
android
x
.annotation.FloatRange
;
import
android
x
.annotation.NonNull
;
import
android
x
.annotation.Nullable
;
import
android
x
.annotation.Px
;
import
android.view.View
;
final
class
ViewFinderView
extends
View
{
...
...
build.gradle
View file @
c1cf381b
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript
{
ext
.
kotlin_version
=
'1.4.0'
repositories
{
jcenter
()
google
()
}
dependencies
{
classpath
'com.android.tools.build:gradle:3.2.1'
classpath
'com.android.tools.build:gradle:4.0.1'
classpath
"org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
...
...
@@ -17,5 +19,8 @@ allprojects {
repositories
{
jcenter
()
google
()
maven
{
url
"https://raw.githubusercontent.com/guardianproject/gpmaven/master"
}
}
}
gradle.properties
View file @
c1cf381b
...
...
@@ -35,3 +35,5 @@ org.gradle.parallel=true
# Only relevant projects are configured which results in faster builds for large multi-projects.
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:configuration_on_demand
org.gradle.configureondemand
=
true
android.useAndroidX
=
true
android.enableJetifier
=
true
gradle/wrapper/gradle-wrapper.properties
View file @
c1cf381b
#
Sat Dec 08 16:52:46 CE
T 20
18
#
Wed Aug 19 10:44:16 IS
T 20
20
distributionBase
=
GRADLE_USER_HOME
distributionPath
=
wrapper/dists
zipStoreBase
=
GRADLE_USER_HOME
zipStorePath
=
wrapper/dists
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
4.6
-all.zip
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
6.1.1
-all.zip
settings.gradle
View file @
c1cf381b
include
':app'
,
':tor'
include
':app'
,
':tor
service
'
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment