-
Notifications
You must be signed in to change notification settings - Fork 18
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #23 from shortstack/pr/22
Pr/22
- Loading branch information
Showing
173 changed files
with
10,075 additions
and
4,055 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,30 @@ | ||
| // Top-level build file where you can add configuration options common to all sub-projects/modules. | ||
| // Top-level build file where you can add configuration options common to all sub-projects/modules. | ||
|
|
||
| buildscript { | ||
| ext.kotlin_version = '1.1.2-4' | ||
| repositories { | ||
| mavenCentral() | ||
| maven { url 'https://maven.fabric.io/public' } | ||
| jcenter() | ||
| maven { url 'https://maven.google.com' } | ||
| } | ||
| dependencies { | ||
| classpath 'com.android.tools.build:gradle:2.3.3' | ||
| classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" | ||
|
|
||
| classpath 'io.fabric.tools:gradle:1.22.0' | ||
| // NOTE: Do not place your application dependencies here; they belong | ||
| // in the individual module build.gradle files | ||
| } | ||
| } | ||
|
|
||
| allprojects { | ||
| repositories { | ||
| jcenter() | ||
| maven { url 'https://maven.google.com' } | ||
| } | ||
| } | ||
|
|
||
| task clean(type: Delete) { | ||
| delete rootProject.buildDir | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,110 +1,93 @@ | ||
| buildscript { | ||
| repositories { | ||
| mavenCentral() | ||
| maven { url 'https://maven.fabric.io/public' } | ||
| jcenter() | ||
| } | ||
| dependencies { | ||
| classpath 'com.android.tools.build:gradle:3.0.0-alpha5' | ||
| // These docs use an open ended version so that our plugin | ||
| // can be updated quickly in response to Android tooling updates | ||
|
|
||
| // We recommend changing it to the latest version from our changelog: | ||
| // https://docs.fabric.io/android/changelog.html#fabric-gradle-plugin | ||
| classpath 'io.fabric.tools:gradle:1.22.0' | ||
| } | ||
| } | ||
|
|
||
| apply plugin: 'com.android.application' | ||
| apply plugin: 'kotlin-android' | ||
| apply plugin: 'kotlin-android-extensions' | ||
| apply plugin: 'maven' | ||
| apply plugin: 'io.fabric' | ||
|
|
||
|
|
||
| repositories { | ||
| mavenCentral() | ||
| maven { url "https://jitpack.io" } | ||
| maven { url 'https://maven.fabric.io/public' } | ||
| } | ||
|
|
||
| android { | ||
| compileSdkVersion 25 | ||
| compileSdkVersion 26 | ||
| buildToolsVersion '25.0.2' | ||
| useLibrary 'org.apache.http.legacy' | ||
|
|
||
|
|
||
| useLibrary 'org.apache.http.legacy' | ||
| defaultConfig { | ||
|
|
||
| applicationId "com.shortstack.hackertracker" | ||
| minSdkVersion 16 | ||
| targetSdkVersion 25 | ||
| versionCode 72 | ||
| versionName "4.0.beta.2" | ||
| targetSdkVersion 26 | ||
| versionCode 80 | ||
| versionName "4.0.9" | ||
| } | ||
|
|
||
| buildTypes { | ||
| debug { | ||
| proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' | ||
| } | ||
|
|
||
| release { | ||
| minifyEnabled true | ||
| } | ||
| } | ||
|
|
||
| flavorDimensions "versionCode" | ||
|
|
||
| productFlavors { | ||
| defaultFlavor { | ||
| //proguardFile 'proguard-rules.txt' | ||
| dimension "versionCode" | ||
| } | ||
| } | ||
| packagingOptions { | ||
| exclude 'META-INF/LICENSE.txt' | ||
| } | ||
| sourceSets { | ||
| main.java.srcDirs += 'src/main/kotlin' | ||
| } | ||
| } | ||
|
|
||
| configurations { | ||
| //compile.exclude group: "org.apache.httpcomponents", module: "httpclient" | ||
| // compile.exclude group: "org.apache.httpcomponents", module: "httpclient" | ||
| } | ||
|
|
||
| dependencies { | ||
| compile fileTree(dir: 'libs', include: ['*.jar']) | ||
| compile 'com.android.support:support-v4:25.1.0' | ||
| compile 'com.android.support:design:25.1.0' | ||
| compile 'com.android.support:appcompat-v7:25.1.0' | ||
| compile 'com.android.support:recyclerview-v7:25.1.0' | ||
| compile 'com.android.support:cardview-v7:25.1.0' | ||
| compile 'com.android.support:preference-v7:25.1.0' | ||
| //compile 'org.parceler:parceler-api:0.2.7' | ||
| //provided 'org.parceler:parceler:0.2.7' | ||
| compile ( 'com.uber.sdk:rides-android:0.5.1' ) { | ||
| compile 'org.jetbrains.kotlin:kotlin-stdlib:1.1.2-3' | ||
| compile fileTree(include: ['*.jar'], dir: 'libs') | ||
| // Support Libraries | ||
| compile 'com.android.support:support-v4:26.0.0' | ||
| compile 'com.android.support:design:26.0.0' | ||
| compile 'com.android.support:appcompat-v7:26.0.0' | ||
| compile 'com.android.support:recyclerview-v7:26.0.0' | ||
| compile 'com.android.support:cardview-v7:26.0.0' | ||
| compile 'com.android.support:preference-v7:26.0.0' | ||
| // Uber | ||
| compile('com.uber.sdk:rides-android:0.6.1') { | ||
| exclude group: 'org.apache.httpcomponents' | ||
| } | ||
|
|
||
| // Butterknife for View Binding | ||
| compile 'com.jakewharton:butterknife:8.5.1' | ||
| annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1' | ||
|
|
||
|
|
||
| // Generic Renders for Lists | ||
| compile 'com.github.Shyish:GenericRenderers:1.0.2' | ||
|
|
||
| // Pretty Logger | ||
| compile 'com.orhanobut:logger:1.15' | ||
|
|
||
| // PDF Viewer | ||
| compile 'com.joanzapata.pdfview:android-pdfview:1.0.4@aar' | ||
|
|
||
| // Eventbus | ||
| compile 'com.squareup:otto:1.3.8' | ||
|
|
||
| // Reviews | ||
| compile 'com.github.stkent:amplify:1.4.0' | ||
|
|
||
| // Networking | ||
| compile 'com.squareup.retrofit2:retrofit:2.0.0-beta3' | ||
| compile 'com.squareup.retrofit2:converter-gson:2.1.0' | ||
|
|
||
|
|
||
| // Crash | ||
| compile('com.crashlytics.sdk.android:crashlytics:2.6.5@aar') { | ||
| transitive = true; | ||
| } | ||
|
|
||
| // Firebase Job Dispatcher | ||
| compile 'com.firebase:firebase-jobdispatcher:0.7.0' | ||
|
|
||
| compile 'com.android.support.constraint:constraint-layout:1.0.0-beta4' | ||
| compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" | ||
| } | ||
|
|
||
| repositories { | ||
| mavenCentral() | ||
| maven { url "https://jitpack.io" } | ||
| maven { url 'https://maven.fabric.io/public' } | ||
| maven { url 'https://maven.google.com' } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,56 +1,68 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <manifest xmlns:android="http://schemas.android.com/apk/res/android" | ||
| package="com.shortstack.hackertracker" | ||
| android:installLocation="auto" | ||
| > | ||
| android:installLocation="auto"> | ||
|
|
||
| <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES" /> | ||
| <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> | ||
| <uses-permission android:name="android.permission.INTERNET" /> | ||
| <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> | ||
| <uses-permission android:name="android.permission.VIBRATE" /> | ||
| <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> | ||
|
|
||
|
|
||
|
|
||
| <application | ||
| android:name="com.shortstack.hackertracker.Application.App" | ||
| android:allowBackup="true" | ||
| android:icon="@drawable/ic_launcher" | ||
| android:icon="@mipmap/ic_launcher" | ||
| android:label="@string/app_name" | ||
| android:theme="@style/MyMaterialTheme"> | ||
| <activity | ||
| android:name="com.shortstack.hackertracker.Activity.SplashActivity" | ||
| android:label="@string/app_name" | ||
| android:screenOrientation="portrait"> | ||
|
|
||
|
|
||
| <service android:name=".Task.SyncJob" | ||
| android:exported="false" | ||
| android:permission="android.permission.RECEIVE_BOOT_COMPLETED"> | ||
| <intent-filter> | ||
| <action android:name="android.intent.action.MAIN" /> | ||
| <action android:name="com.firebase.jobdispatcher.ACTION_EXECUTE"/> | ||
| </intent-filter> | ||
| </service> | ||
|
|
||
| <category android:name="android.intent.category.LAUNCHER" /> | ||
| <service android:name=".Task.ReminderJob" | ||
| android:exported="false" | ||
| android:permission="android.permission.RECEIVE_BOOT_COMPLETED"> | ||
| <intent-filter> | ||
| <action android:name="com.firebase.jobdispatcher.ACTION_EXECUTE"/> | ||
| </intent-filter> | ||
| </activity> | ||
|
|
||
| <activity | ||
| android:name="com.shortstack.hackertracker.Activity.TabHomeActivity" | ||
| android:icon="@drawable/skull" | ||
| android:screenOrientation="portrait" /> | ||
| </service> | ||
|
|
||
| <activity android:name=".Activity.SettingsActivity" | ||
| android:theme="@style/PreferenceScreen"> | ||
|
|
||
| </activity> | ||
| <service android:name=".Service.SyncService" /> | ||
|
|
||
| <service android:name=".Service.UpdateDatabaseService" /> | ||
|
|
||
| <activity android:name="com.shortstack.hackertracker.Fragment.InformationFragment" /> | ||
| <activity android:name=".Activity.SplashActivity" /> | ||
|
|
||
| <activity android:name="com.shortstack.hackertracker.Activity.MapsActivity" /> | ||
| <activity | ||
| android:name="com.shortstack.hackertracker.Activity.TabHomeActivity" | ||
| android:launchMode="singleTop" | ||
| android:configChanges="orientation|screenSize|keyboardHidden"> | ||
|
|
||
| <activity android:name="com.shortstack.hackertracker.Activity.VendorsActivity" /> | ||
| <intent-filter> | ||
| <action android:name="android.intent.action.MAIN" /> | ||
|
|
||
| <activity android:name="com.shortstack.hackertracker.Activity.TutorialActivity" /> | ||
| <category android:name="android.intent.category.LAUNCHER" /> | ||
| </intent-filter> | ||
|
|
||
| <activity android:name=".Activity.InformationActivity" /> | ||
| </activity> | ||
|
|
||
| <receiver android:name="com.shortstack.hackertracker.Utils.AlarmReceiver"></receiver> | ||
|
|
||
| <meta-data | ||
| android:name="io.fabric.ApiKey" | ||
| android:value="3439e34f4fcc9d7eabf24f7ce529cd7415acc49d" /> | ||
| <service android:name=".Service.SyncService" /> | ||
| </application> | ||
|
|
||
| </manifest> |
Binary file not shown.
Binary file not shown.
Oops, something went wrong.