Skip to content

Commit c28620e

Browse files
committed
fix(app): update to android X
1 parent 1ccb2a6 commit c28620e

File tree

160 files changed

+713
-199
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

160 files changed

+713
-199
lines changed

.gitignore

+9-44
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,15 @@
1+
*.iml
12
.gradle
23
/local.properties
3-
/.idea/workspace.xml
4+
/.idea/caches
45
/.idea/libraries
6+
/.idea/modules.xml
7+
/.idea/workspace.xml
8+
/.idea/navEditor.xml
9+
/.idea/assetWizardSettings.xml
10+
.DS_Store
511
/build
612
/captures
7-
8-
# generated files
9-
bin/
10-
gen/
11-
12-
# Local configuration file (sdk path, etc)
13+
.externalNativeBuild
14+
.cxx
1315
local.properties
14-
15-
# Windows thumbnail db
16-
Thumbs.db
17-
18-
# OSX files
19-
.DS_Store
20-
21-
# Eclipse project files
22-
.classpath
23-
.project
24-
25-
# Android Studio
26-
*.iml
27-
28-
#NDK
29-
obj/
30-
31-
# Built application files
32-
*.apk
33-
*.ap_
34-
35-
# Files for the Dalvik VM
36-
*.dex
37-
38-
# Java class files
39-
*.class
40-
41-
# Gradle files
42-
.gradle/
43-
build/
44-
/*/build/
45-
46-
# Proguard folder generated by Eclipse
47-
proguard/
48-
49-
# Log Files
50-
*.log

.idea/.gitignore

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

.idea/.name

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

.idea/compiler.xml

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

.idea/gradle.xml

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

.idea/misc.xml

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

.idea/vcs.xml

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

LICENSE

-22
This file was deleted.

README.md

-48
This file was deleted.

app/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/build

app/build.gradle

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
plugins {
2+
id 'com.android.application'
3+
}
4+
5+
android {
6+
compileSdk 31
7+
8+
defaultConfig {
9+
applicationId "com.cybersource.webcheckout"
10+
minSdk 21
11+
targetSdk 31
12+
versionCode 1
13+
versionName "1.0"
14+
15+
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
16+
}
17+
18+
buildTypes {
19+
release {
20+
minifyEnabled false
21+
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
22+
}
23+
}
24+
compileOptions {
25+
sourceCompatibility JavaVersion.VERSION_1_8
26+
targetCompatibility JavaVersion.VERSION_1_8
27+
}
28+
}
29+
30+
dependencies {
31+
32+
implementation 'com.android.support:appcompat-v7:28.0.0'
33+
testImplementation 'junit:junit:'
34+
androidTestImplementation 'com.android.support.test:runner:1.0.2'
35+
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
36+
implementation 'com.google.android.gms:play-services-wallet:18.1.3'
37+
implementation 'com.cybersource:inappsdk:+'
38+
}

app/proguard-rules.pro

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Add project specific ProGuard rules here.
2+
# You can control the set of applied configuration files using the
3+
# proguardFiles setting in build.gradle.
4+
#
5+
# For more details, see
6+
# http://developer.android.com/guide/developing/tools/proguard.html
7+
8+
# If your project uses WebView with JS, uncomment the following
9+
# and specify the fully qualified class name to the JavaScript interface
10+
# class:
11+
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
12+
# public *;
13+
#}
14+
15+
# Uncomment this to preserve the line number information for
16+
# debugging stack traces.
17+
#-keepattributes SourceFile,LineNumberTable
18+
19+
# If you keep the line number information, uncomment this to
20+
# hide the original source file name.
21+
#-renamesourcefileattribute SourceFile
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
package com.cybersource.webcheckout;
2+
3+
import android.content.Context;
4+
import android.support.test.InstrumentationRegistry;
5+
import android.support.test.runner.AndroidJUnit4;
6+
7+
import org.junit.Test;
8+
import org.junit.runner.RunWith;
9+
10+
import static org.junit.Assert.*;
11+
12+
/**
13+
* Instrumented test, which will execute on an Android device.
14+
*
15+
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
16+
*/
17+
@RunWith(AndroidJUnit4.class)
18+
public class ExampleInstrumentedTest {
19+
@Test
20+
public void useAppContext() {
21+
// Context of the app under test.
22+
Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
23+
assertEquals("com.cybersource.webcheckout", appContext.getPackageName());
24+
}
25+
}

src/main/AndroidManifest.xml renamed to app/src/main/AndroidManifest.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
<activity
1111
android:name="com.cybersource.webcheckout.MainActivity"
1212
android:label="@string/app_name"
13-
android:screenOrientation="portrait">
13+
android:screenOrientation="portrait"
14+
android:exported="true">
1415
<intent-filter>
1516
<action android:name="android.intent.action.MAIN" />
1617
<category android:name="android.intent.category.LAUNCHER" />

src/main/java/com/cybersource/webcheckout/MainActivity.java renamed to app/src/main/java/com/cybersource/webcheckout/MainActivity.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,16 @@
33
import android.app.Activity;
44
import android.content.Intent;
55
import android.os.Handler;
6-
import android.support.v4.app.Fragment;
7-
import android.support.v4.app.FragmentManager;
86
import android.os.Bundle;
9-
import android.support.v7.app.AppCompatActivity;
107
import android.util.Log;
118
import android.view.Menu;
129
import android.view.MenuItem;
1310
import android.widget.Toast;
1411

12+
import androidx.appcompat.app.AppCompatActivity;
13+
import androidx.fragment.app.Fragment;
14+
import androidx.fragment.app.FragmentManager;
15+
1516
import com.cybersource.webcheckout.fragments.MainFragment;
1617
import com.cybersource.webcheckout.fragments.WebCheckoutFragment;
1718
import com.cybersource.webcheckout.receivers.MessageSignatureResultReceiver;

src/main/java/com/cybersource/webcheckout/fragments/MainFragment.java renamed to app/src/main/java/com/cybersource/webcheckout/fragments/MainFragment.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@
33
import android.app.Activity;
44
import android.content.Intent;
55
import android.os.Bundle;
6-
import android.support.annotation.NonNull;
7-
import android.support.annotation.Nullable;
8-
import android.support.v4.app.Fragment;
9-
import android.support.v4.app.FragmentManager;
106
import android.text.Spannable;
117
import android.text.SpannableStringBuilder;
128
import android.util.Base64;
@@ -20,6 +16,11 @@
2016
import android.widget.TextView;
2117
import android.widget.Toast;
2218

19+
import androidx.annotation.NonNull;
20+
import androidx.annotation.Nullable;
21+
import androidx.fragment.app.Fragment;
22+
import androidx.fragment.app.FragmentManager;
23+
2324
import com.cybersource.webcheckout.R;
2425
import com.cybersource.webcheckout.utils.GooglePay;
2526
import com.google.android.gms.common.api.Status;

src/main/java/com/cybersource/webcheckout/fragments/MessageSignatureHeadlessFragment.java renamed to app/src/main/java/com/cybersource/webcheckout/fragments/MessageSignatureHeadlessFragment.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22

33

44
import android.os.Bundle;
5-
import android.support.v4.app.Fragment;
65
import android.view.LayoutInflater;
76
import android.view.View;
87
import android.view.ViewGroup;
98

9+
import androidx.fragment.app.Fragment;
10+
1011
import com.cybersource.inappsdk.connectors.inapp.InAppSDKApiClient;
1112
import com.cybersource.inappsdk.connectors.inapp.receivers.TransactionResultReceiver;
1213

src/main/java/com/cybersource/webcheckout/fragments/WebCheckoutFragment.java renamed to app/src/main/java/com/cybersource/webcheckout/fragments/WebCheckoutFragment.java

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

44
import android.app.ProgressDialog;
55
import android.os.Bundle;
6-
import android.support.v4.app.Fragment;
76
import android.text.Editable;
87
import android.text.TextWatcher;
98
import android.util.Log;
@@ -17,6 +16,8 @@
1716
import android.widget.TextView;
1817
import android.widget.Toast;
1918

19+
import androidx.fragment.app.Fragment;
20+
2021
import com.cybersource.inappsdk.common.error.SDKError;
2122
import com.cybersource.inappsdk.common.exceptions.SDKInvalidCardException;
2223
import com.cybersource.inappsdk.connectors.inapp.InAppSDKApiClient;
File renamed without changes.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
xmlns:aapt="http://schemas.android.com/aapt"
3+
android:width="108dp"
4+
android:height="108dp"
5+
android:viewportWidth="108"
6+
android:viewportHeight="108">
7+
<path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
8+
<aapt:attr name="android:fillColor">
9+
<gradient
10+
android:endX="85.84757"
11+
android:endY="92.4963"
12+
android:startX="42.9492"
13+
android:startY="49.59793"
14+
android:type="linear">
15+
<item
16+
android:color="#44000000"
17+
android:offset="0.0" />
18+
<item
19+
android:color="#00000000"
20+
android:offset="1.0" />
21+
</gradient>
22+
</aapt:attr>
23+
</path>
24+
<path
25+
android:fillColor="#FFFFFF"
26+
android:fillType="nonZero"
27+
android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
28+
android:strokeWidth="1"
29+
android:strokeColor="#00000000" />
30+
</vector>

0 commit comments

Comments
 (0)