Merge pull request #10 from HMBSbige/kotlin

Convert to Kotlin

.gitignore

@@ -84,7 +84,8 @@ lint/tmp/
 # NDK
 
 .gradle
-.idea
+.idea/*
+!.idea/codeStyles/
 **/*.iml
 local.properties
 build

README.md

@@ -1,11 +1,25 @@
-# ShadowsocksRR
-A ShadowsocksRR client for Android, written in Java.
-
-
+# ShadowsocksR
+A ShadowsocksR client for Android, written in Kotlin.
 
 ### PREREQUISITES
 
 * JDK 1.8
-* AndroidStudio 3.4
-* Android Build Tools 29+
-* Android NDK 19+
+* Android Studio 3.5.2
+
+# LICENSE
+
+Copyright (C) 2016 by Max Lv <<max.c.lv@gmail.com>>  
+Copyright (C) 2016 by Mygod Studio <<mygodstudio@gmail.com>>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.

app/build.gradle

@@ -5,7 +5,7 @@ apply plugin: 'kotlin-android-extensions'
 android {
     compileSdkVersion rootProject.compileSdkVersion
     defaultConfig {
-        applicationId "com.github.shadowsocksr_hmbsbige"
+        applicationId "com.bige0.shadowsocksr"
         minSdkVersion rootProject.minSdkVersion
         targetSdkVersion rootProject.sdkVersion
         versionCode rootProject.versionCode
@@ -18,26 +18,16 @@ android {
             // 增加java堆内存大小
             javaMaxHeapSize "4g"
         }
-        externalNativeBuild {
-            cmake {
-                cppFlags "-frtti -fexceptions"
-                abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
-            }
-        }
         multiDexEnabled true
         proguardFiles
+        vectorDrawables.useSupportLibrary = true
     }
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    externalNativeBuild {
-        cmake {
-            path "CMakeLists.txt"
-        }
-    }
     sourceSets {
         main {
             jniLibs.srcDirs = ['libs']
@@ -55,38 +45,26 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    //noinspection GradleCompatible
+
     implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'com.google.android.material:material:1.0.0'
     implementation 'androidx.gridlayout:gridlayout:1.0.0'
-    implementation 'androidx.coordinatorlayout:coordinatorlayout:1.0.0'
-
     implementation 'androidx.recyclerview:recyclerview:1.0.0'
-
-    implementation 'com.evernote:android-job:1.3.0-rc1'
-    implementation "android.arch.work:work-runtime:1.0.1"
+    implementation 'com.evernote:android-job:1.4.2'
+    implementation 'androidx.work:work-runtime:2.2.0'
     implementation "com.github.clans:fab:1.6.4"
     implementation "com.github.jorgecastilloprz:fabprogresscircle:1.01"
     implementation "com.google.android.gms:play-services-analytics:17.0.0"
-    implementation "com.google.android.gms:play-services-gcm:17.0.0"
     implementation "com.j256.ormlite:ormlite-android:5.1"
-    implementation "com.mikepenz:fastadapter:4.0.1"
-    implementation "com.mikepenz:iconics-core:4.0.0"
+    implementation 'com.mikepenz:iconics-core:4.0.2'
     implementation "com.mikepenz:materialdrawer:6.1.2"
-    implementation 'com.mikepenz:materialize:1.2.1'
     implementation "com.twofortyfouram:android-plugin-api-for-locale:1.0.4"
     implementation "dnsjava:dnsjava:2.1.9"
-    implementation "eu.chainfire:libsuperuser:1.1.0.201907261845"
     implementation "me.dm7.barcodescanner:zxing:1.9.13"
     implementation "net.glxn.qrgen:android:2.0"
-    implementation 'com.squareup.okhttp3:okhttp:4.2.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.2.2'
     implementation "com.google.code.findbugs:jsr305:3.0.2"
-
-
 }
 
-
 repositories {
     mavenCentral()
 }

app/proguard-rules.pro

@@ -20,14 +20,11 @@
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
 
--keep class com.github.shadowsocks.System { *; }
 -keep class okhttp3.** { *; }
 -keep interface okhttp3.** { *; }
 -keep class okio.** { *; }
 -keep interface okio.** { *; }
 -dontwarn okio.**
 -dontwarn com.google.android.gms.internal.**
 -dontwarn com.j256.ormlite.**
--dontwarn org.xbill.**
--dontwarn javax.annotation.Nullable
--dontwarn javax.annotation.ParametersAreNonnullByDefault
+-dontwarn org.xbill.**