From ccbe2a54e2f79abe07411d48a2a3ab38ff3879f4 Mon Sep 17 00:00:00 2001 From: HopeBaron Date: Fri, 10 Apr 2020 17:06:01 +0300 Subject: [PATCH] Update gitignore and add api module --- .gitignore | 18 +- .idea/gradle.xml | 2 + .idea/jarRepositories.xml | 25 ++ .idea/misc.xml | 2 +- Vanced Manager.iml | 19 ++ api/.gitignore | 1 + api/api.iml | 179 +++++++++++++ api/build.gradle | 36 +++ api/consumer-rules.pro | 0 api/proguard-rules.pro | 21 ++ .../com/vanced/api/ExampleInstrumentedTest.kt | 24 ++ api/src/main/AndroidManifest.xml | 2 + api/src/main/java/com/vanced/api/.gitkeep | 0 api/src/main/res/values/strings.xml | 3 + .../java/com/vanced/api/ExampleUnitTest.kt | 17 ++ app/app.iml | 238 ++++++++++++++++++ .../gen/com/vanced/manager/BuildConfig.java | 8 + .../main/gen/com/vanced/manager/Manifest.java | 7 + app/src/main/gen/com/vanced/manager/R.java | 7 + app/src/main/main.iml | 11 + build.gradle | 2 +- local.properties | 8 + settings.gradle | 2 +- 23 files changed, 615 insertions(+), 17 deletions(-) create mode 100644 .idea/jarRepositories.xml create mode 100644 Vanced Manager.iml create mode 100644 api/.gitignore create mode 100644 api/api.iml create mode 100644 api/build.gradle create mode 100644 api/consumer-rules.pro create mode 100644 api/proguard-rules.pro create mode 100644 api/src/androidTest/java/com/vanced/api/ExampleInstrumentedTest.kt create mode 100644 api/src/main/AndroidManifest.xml create mode 100644 api/src/main/java/com/vanced/api/.gitkeep create mode 100644 api/src/main/res/values/strings.xml create mode 100644 api/src/test/java/com/vanced/api/ExampleUnitTest.kt create mode 100644 app/app.iml create mode 100644 app/src/main/gen/com/vanced/manager/BuildConfig.java create mode 100644 app/src/main/gen/com/vanced/manager/Manifest.java create mode 100644 app/src/main/gen/com/vanced/manager/R.java create mode 100644 app/src/main/main.iml create mode 100644 local.properties diff --git a/.gitignore b/.gitignore index 603b1407..26cc8822 100644 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1,4 @@ -*.iml -.gradle -/local.properties -/.idea/caches -/.idea/libraries -/.idea/modules.xml -/.idea/workspace.xml -/.idea/navEditor.xml -/.idea/assetWizardSettings.xml -.DS_Store -/build -/captures -.externalNativeBuild -.cxx +.gradle/ +.idea/ +build/ +out/ diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 5cd135a0..1052db5d 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -10,10 +10,12 @@ diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 00000000..a5f05cd8 --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 7bfef59d..efb1efdc 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + diff --git a/Vanced Manager.iml b/Vanced Manager.iml new file mode 100644 index 00000000..64456941 --- /dev/null +++ b/Vanced Manager.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/api/.gitignore b/api/.gitignore new file mode 100644 index 00000000..796b96d1 --- /dev/null +++ b/api/.gitignore @@ -0,0 +1 @@ +/build diff --git a/api/api.iml b/api/api.iml new file mode 100644 index 00000000..df274cd5 --- /dev/null +++ b/api/api.iml @@ -0,0 +1,179 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/api/build.gradle b/api/build.gradle new file mode 100644 index 00000000..f4e8b74f --- /dev/null +++ b/api/build.gradle @@ -0,0 +1,36 @@ +apply plugin: 'com.android.library' +apply plugin: 'kotlin-android' +apply plugin: 'kotlin-android-extensions' +android { + compileSdkVersion 29 + buildToolsVersion "29.0.3" + + + defaultConfig { + minSdkVersion 21 + targetSdkVersion 29 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles 'consumer-rules.pro' + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + +} + +dependencies { + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation 'androidx.appcompat:appcompat:1.0.2' + implementation 'androidx.core:core-ktx:1.0.2' + testImplementation 'junit:junit:4.12' + androidTestImplementation 'androidx.test:runner:1.1.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' +} diff --git a/api/consumer-rules.pro b/api/consumer-rules.pro new file mode 100644 index 00000000..e69de29b diff --git a/api/proguard-rules.pro b/api/proguard-rules.pro new file mode 100644 index 00000000..f1b42451 --- /dev/null +++ b/api/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile diff --git a/api/src/androidTest/java/com/vanced/api/ExampleInstrumentedTest.kt b/api/src/androidTest/java/com/vanced/api/ExampleInstrumentedTest.kt new file mode 100644 index 00000000..13bb8c23 --- /dev/null +++ b/api/src/androidTest/java/com/vanced/api/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package com.vanced.api + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("com.vanced.api.test", appContext.packageName) + } +} diff --git a/api/src/main/AndroidManifest.xml b/api/src/main/AndroidManifest.xml new file mode 100644 index 00000000..6c5f580b --- /dev/null +++ b/api/src/main/AndroidManifest.xml @@ -0,0 +1,2 @@ + diff --git a/api/src/main/java/com/vanced/api/.gitkeep b/api/src/main/java/com/vanced/api/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/api/src/main/res/values/strings.xml b/api/src/main/res/values/strings.xml new file mode 100644 index 00000000..d241cd52 --- /dev/null +++ b/api/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + api + diff --git a/api/src/test/java/com/vanced/api/ExampleUnitTest.kt b/api/src/test/java/com/vanced/api/ExampleUnitTest.kt new file mode 100644 index 00000000..6f2341ee --- /dev/null +++ b/api/src/test/java/com/vanced/api/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package com.vanced.api + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} diff --git a/app/app.iml b/app/app.iml new file mode 100644 index 00000000..ef0a82b6 --- /dev/null +++ b/app/app.iml @@ -0,0 +1,238 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/gen/com/vanced/manager/BuildConfig.java b/app/src/main/gen/com/vanced/manager/BuildConfig.java new file mode 100644 index 00000000..10d6badb --- /dev/null +++ b/app/src/main/gen/com/vanced/manager/BuildConfig.java @@ -0,0 +1,8 @@ +/*___Generated_by_IDEA___*/ + +package com.vanced.manager; + +/* This stub is only used by the IDE. It is NOT the BuildConfig class actually packed into the APK */ +public final class BuildConfig { + public final static boolean DEBUG = Boolean.parseBoolean(null); +} \ No newline at end of file diff --git a/app/src/main/gen/com/vanced/manager/Manifest.java b/app/src/main/gen/com/vanced/manager/Manifest.java new file mode 100644 index 00000000..16546b5f --- /dev/null +++ b/app/src/main/gen/com/vanced/manager/Manifest.java @@ -0,0 +1,7 @@ +/*___Generated_by_IDEA___*/ + +package com.vanced.manager; + +/* This stub is only used by the IDE. It is NOT the Manifest class actually packed into the APK */ +public final class Manifest { +} \ No newline at end of file diff --git a/app/src/main/gen/com/vanced/manager/R.java b/app/src/main/gen/com/vanced/manager/R.java new file mode 100644 index 00000000..07610650 --- /dev/null +++ b/app/src/main/gen/com/vanced/manager/R.java @@ -0,0 +1,7 @@ +/*___Generated_by_IDEA___*/ + +package com.vanced.manager; + +/* This stub is only used by the IDE. It is NOT the R class actually packed into the APK */ +public final class R { +} \ No newline at end of file diff --git a/app/src/main/main.iml b/app/src/main/main.iml new file mode 100644 index 00000000..aa1ec54f --- /dev/null +++ b/app/src/main/main.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index eb87dbab..877521df 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ allprojects { repositories { google() jcenter() - + } } diff --git a/local.properties b/local.properties new file mode 100644 index 00000000..2804a1cb --- /dev/null +++ b/local.properties @@ -0,0 +1,8 @@ +## This file must *NOT* be checked into Version Control Systems, +# as it contains information specific to your local configuration. +# +# Location of the SDK. This is only used by Gradle. +# For customization when using a Version Control System, please read the +# header note. +#Wed Mar 18 20:50:18 EET 2020 +sdk.dir=/home/hope/Android/Sdk diff --git a/settings.gradle b/settings.gradle index 0828cd2b..b098ff85 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,2 @@ rootProject.name='Vanced Manager' -include ':app' +include ':app', ':api', ':api'