Skip to content

Commit 5ccae87

Browse files
imkivaimkiva
authored
Merge pull request #59 from PWN-Hunter/master
OPTIONAL: Add support for Android studio 4.1.3 and included some fixes
2 parents c2a0fd4 + 30f413c commit 5ccae87

File tree

92 files changed

+304
-459
lines changed

Some content is hidden

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

92 files changed

+304
-459
lines changed

‎NeoTermBridge/build.gradle‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ android {
1313
versionCode libraryVersionCode
1414
versionName libraryVersionName
1515

16-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
16+
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
1717

1818
}
1919

@@ -27,7 +27,8 @@ android {
2727

2828
dependencies {
2929
implementation fileTree(dir: 'libs', include: ['*.jar'])
30-
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
30+
implementation 'androidx.appcompat:appcompat:1.0.0'
31+
androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
3132
exclude group: 'com.android.support', module: 'support-annotations'
3233
})
3334
testImplementation rootProject.ext.deps["junit"]

‎NeoTermBridge/src/androidTest/java/io/neoterm/bridge/ExampleInstrumentedTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package io.neoterm.bridge;
22

33
import android.content.Context;
4-
import android.support.test.InstrumentationRegistry;
5-
import android.support.test.runner.AndroidJUnit4;
4+
import androidx.test.platform.app.InstrumentationRegistry;
5+
import androidx.test.ext.junit.runners.AndroidJUnit4;
66

77
import org.junit.Test;
88
import org.junit.runner.RunWith;

‎NeoTermBridgeExample/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ android {
1212
versionCode 1
1313
versionName "1.0"
1414

15-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
15+
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
1616

1717
}
1818

@@ -28,7 +28,7 @@ android {
2828
dependencies {
2929
implementation fileTree(dir: 'libs', include: ['*.jar'])
3030
testImplementation 'junit:junit:4.12'
31-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
32-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
31+
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
32+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
3333
implementation project(':NeoTermBridge')
3434
}

‎NeoTermBridgeExample/src/androidTest/java/io/neoterm/bridge/example/ExampleInstrumentedTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package io.neoterm.bridge.example;
22

33
import android.content.Context;
4-
import android.support.test.InstrumentationRegistry;
5-
import android.support.test.runner.AndroidJUnit4;
4+
import androidx.test.platform.app.InstrumentationRegistry;
5+
import androidx.test.ext.junit.runners.AndroidJUnit4;
66

77
import org.junit.Test;
88
import org.junit.runner.RunWith;

‎NeoTermBridgeExample/src/main/res/values/styles.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<resources>
22

33
<!-- Base application theme. -->
4-
<style name="AppTheme" parent="android:Theme.Material.Light.DarkActionBar">
4+
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
55
<!-- Customize your theme here. -->
66
</style>
77

‎Xorg/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ android {
1010
versionCode 1
1111
versionName "1.0"
1212

13-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
13+
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
1414

1515
}
1616

@@ -34,7 +34,7 @@ dependencies {
3434
implementation rootProject.ext.deps["appcompat-v7"]
3535
testImplementation rootProject.ext.deps["junit"]
3636

37-
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
37+
androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
3838
exclude group: 'com.android.support', module: 'support-annotations'
3939
})
4040
}

‎Xorg/src/androidTest/java/io/neoterm/ExampleInstrumentedTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package io.neoterm;
22

33
import android.content.Context;
4-
import android.support.test.InstrumentationRegistry;
5-
import android.support.test.runner.AndroidJUnit4;
4+
import androidx.test.platform.app.InstrumentationRegistry;
5+
import androidx.test.ext.junit.runners.AndroidJUnit4;
66

77
import org.junit.Test;
88
import org.junit.runner.RunWith;

‎Xorg/src/main/java/io/neoterm/Accelerometer.java‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,14 @@ Java source code (C) 2009-2014 Sergii Pylypenko
2222

2323
package io.neoterm;
2424

25-
import android.app.Activity;
2625
import android.content.Context;
27-
import android.os.Bundle;
28-
import android.view.MotionEvent;
29-
import android.view.KeyEvent;
30-
import android.view.Window;
31-
import android.view.WindowManager;
32-
import android.os.Vibrator;
33-
import android.hardware.SensorManager;
34-
import android.hardware.SensorEventListener;
3526
import android.hardware.Sensor;
3627
import android.hardware.SensorEvent;
28+
import android.hardware.SensorEventListener;
29+
import android.hardware.SensorManager;
30+
import androidx.appcompat.app.AppCompatActivity;
3731
import android.util.Log;
38-
import android.widget.TextView;
39-
import android.os.Build;
32+
4033
import java.util.Arrays;
4134

4235

@@ -294,12 +287,12 @@ else if( data[i] > filterMax[i] )
294287
public void onAccuracyChanged(Sensor s, int a)
295288
{
296289
}
297-
public boolean available(Activity context)
290+
public boolean available(AppCompatActivity context)
298291
{
299292
SensorManager manager = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE);
300293
return ( manager != null && manager.getDefaultSensor(Sensor.TYPE_GYROSCOPE) != null );
301294
}
302-
public void registerListener(Activity context, SensorEventListener l)
295+
public void registerListener(AppCompatActivity context, SensorEventListener l)
303296
{
304297
SensorManager manager = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE);
305298
if ( manager == null && manager.getDefaultSensor(Sensor.TYPE_GYROSCOPE) == null )
@@ -308,7 +301,7 @@ public void registerListener(Activity context, SensorEventListener l)
308301
Globals.AppUsesOrientationSensor ? Sensor.TYPE_GAME_ROTATION_VECTOR : Sensor.TYPE_GYROSCOPE),
309302
SensorManager.SENSOR_DELAY_GAME);
310303
}
311-
public void unregisterListener(Activity context,SensorEventListener l)
304+
public void unregisterListener(AppCompatActivity context, SensorEventListener l)
312305
{
313306
SensorManager manager = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE);
314307
if ( manager == null )

‎Xorg/src/main/java/io/neoterm/MainActivity.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ Java source code (C) 2009-2014 Sergii Pylypenko
2424

2525
import android.Manifest;
2626
import android.annotation.SuppressLint;
27-
import android.app.Activity;
2827
import android.app.KeyguardManager;
2928
import android.app.ProgressDialog;
3029
import android.app.UiModeManager;
@@ -40,6 +39,7 @@ Java source code (C) 2009-2014 Sergii Pylypenko
4039
import android.inputmethodservice.KeyboardView;
4140
import android.os.Bundle;
4241
import android.os.SystemClock;
42+
import androidx.appcompat.app.AppCompatActivity;
4343
import android.text.InputType;
4444
import android.text.SpannedString;
4545
import android.util.DisplayMetrics;
@@ -72,7 +72,7 @@ Java source code (C) 2009-2014 Sergii Pylypenko
7272
import io.neoterm.xorg.R;
7373

7474

75-
public class MainActivity extends Activity implements NeoXorgViewClient {
75+
public class MainActivity extends AppCompatActivity implements NeoXorgViewClient {
7676
@Override
7777
protected void onCreate(Bundle savedInstanceState) {
7878
super.onCreate(savedInstanceState);

‎Xorg/src/main/java/io/neoterm/SettingsMenu.java‎

Lines changed: 2 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -22,57 +22,10 @@ Java source code (C) 2009-2014 Sergii Pylypenko
2222

2323
package io.neoterm;
2424

25-
import android.app.Activity;
26-
import android.content.Context;
27-
import android.os.Bundle;
28-
import android.view.MotionEvent;
29-
import android.view.KeyEvent;
30-
import android.view.Window;
31-
import android.view.WindowManager;
32-
import android.widget.TextView;
33-
import android.util.Log;
34-
import java.io.*;
35-
import android.app.AlertDialog;
3625
import android.content.DialogInterface;
37-
import android.os.Environment;
38-
import android.os.StatFs;
39-
import java.util.Locale;
26+
import androidx.appcompat.app.AlertDialog;
27+
4028
import java.util.ArrayList;
41-
import java.util.Arrays;
42-
import java.util.zip.GZIPInputStream;
43-
import java.util.Collections;
44-
import android.content.Context;
45-
import android.content.res.Configuration;
46-
import android.content.res.Resources;
47-
import java.lang.String;
48-
import android.graphics.Matrix;
49-
import android.graphics.RectF;
50-
import android.view.ViewGroup;
51-
import android.widget.ImageView;
52-
import android.widget.FrameLayout;
53-
import android.graphics.drawable.BitmapDrawable;
54-
import android.graphics.BitmapFactory;
55-
import android.graphics.Bitmap;
56-
import android.widget.TextView;
57-
import android.widget.EditText;
58-
import android.widget.ScrollView;
59-
import android.widget.Button;
60-
import android.view.View;
61-
import android.widget.LinearLayout;
62-
import android.text.Editable;
63-
import android.text.SpannedString;
64-
import android.content.Intent;
65-
import android.app.PendingIntent;
66-
import android.app.AlarmManager;
67-
import android.util.DisplayMetrics;
68-
import android.net.Uri;
69-
import java.util.concurrent.Semaphore;
70-
import java.util.Arrays;
71-
import android.graphics.Color;
72-
import android.hardware.SensorEventListener;
73-
import android.hardware.SensorEvent;
74-
import android.hardware.Sensor;
75-
import android.widget.Toast;
7629

7730
import io.neoterm.xorg.R;
7831

0 commit comments

Comments
 (0)