Verified Commit c1cf381b authored by Sarath's avatar Sarath
Browse files

androidx migration

parent 86c2cfdc
......@@ -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 androidx.annotation.IntDef;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.google.zxing.BarcodeFormat;
import com.google.zxing.DecodeHintType;
......
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;
......
......@@ -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 androidx.annotation.MainThread;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import android.view.SurfaceHolder;
import com.google.zxing.BarcodeFormat;
......
......@@ -24,8 +24,8 @@
package com.samourai.sentinel.codescanner;
import android.os.Build;
import android.support.annotation.Nullable;
import android.support.annotation.RequiresApi;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
/**
* Common class for code scanner runtime exceptions
......
......@@ -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 androidx.annotation.AttrRes;
import androidx.annotation.ColorInt;
import androidx.annotation.FloatRange;
import androidx.annotation.Nullable;
import androidx.annotation.Px;
import androidx.annotation.RequiresApi;
import androidx.annotation.StyleRes;
import android.util.AttributeSet;
import android.view.MotionEvent;
import android.view.SurfaceView;
......
......@@ -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 androidx.annotation.NonNull;
import androidx.annotation.WorkerThread;
import com.google.zxing.Result;
......
......@@ -23,8 +23,8 @@
*/
package com.samourai.sentinel.codescanner;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.google.zxing.MultiFormatReader;
import com.google.zxing.PlanarYUVLuminanceSource;
......
......@@ -24,8 +24,8 @@
package com.samourai.sentinel.codescanner;
import android.os.Process;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.google.zxing.BarcodeFormat;
import com.google.zxing.DecodeHintType;
......
......@@ -24,7 +24,7 @@
package com.samourai.sentinel.codescanner;
import android.hardware.Camera;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
final class DecoderWrapper {
......
......@@ -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 androidx.annotation.NonNull;
import androidx.annotation.WorkerThread;
/**
......
......@@ -24,7 +24,7 @@
package com.samourai.sentinel.codescanner;
import android.graphics.Matrix;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
final class Rect {
......
......@@ -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 androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import android.view.Surface;
import android.view.WindowManager;
......
......@@ -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 androidx.annotation.ColorInt;
import androidx.annotation.FloatRange;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.Px;
import android.view.View;
final class ViewFinderView extends View {
......
// 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"
}
}
}
......@@ -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
#Sat Dec 08 16:52:46 CET 2018
#Wed Aug 19 10:44:16 IST 2020
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
include ':app', ':tor'
include ':app', ':torservice'
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment