Skip to content

Refactored to target API 28 and to use the ButterKnife library. #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
danielPerez97 wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

Refactored to target API 28 and to use the ButterKnife library. #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c7c3a4b
Refactored code to target Android API 28, and refactored all findView…
Nov 17, 2018
9bf3f7b
Set up refreshing bus routes to use RxJava, Retrofit, and refactored …
Nov 18, 2018
d52bf17
Stream of busses working on the Google Map
Dec 3, 2018
ec7d894
Added disk caching using Glide and removed the flicker between buses …
Jan 15, 2019
5de42ac
Began work on route filtering.
Jan 17, 2019
d9dd27e
Cleaned up RxJava streams using FlowableTransformers, route filtering…
Mar 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 0 additions & 52 deletions .idea/assetWizardSettings.xml
View file
Open in desktop

This file was deleted.

Binary file modified .idea/caches/build_file_checksums.ser
View file
Open in desktop
Binary file not shown.
16 changes: 13 additions & 3 deletions .idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

58 changes: 43 additions & 15 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-kapt'

android {
compileSdkVersion 27
buildToolsVersion "27.0.3"
compileSdkVersion 28
buildToolsVersion '28.0.3'
defaultConfig {
applicationId "razorbacktransit.arcu.razorbacktransit"
minSdkVersion 19
targetSdkVersion 27
minSdkVersion 21
targetSdkVersion 28
versionCode 17
versionName "4.2.1"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

buildTypes {
Expand All @@ -23,23 +25,49 @@ android {
// signingConfig signingConfigs.config
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
}

dependencies {
def lifecycle_version = "2.0.0"
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'com.google.firebase:firebase-messaging:17.3.0'
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
implementation 'com.google.firebase:firebase-core:16.0.5'
implementation 'com.google.firebase:firebase-messaging:17.3.4'
androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
exclude group: 'com.android.support', module: 'support-annotations'
})
implementation 'com.android.support:appcompat-v7:27.1.1'
implementation 'com.github.barteksc:android-pdf-viewer:2.8.1'
implementation 'com.android.support:design:27.1.1'
implementation 'com.android.support.constraint:constraint-layout:1.1.2'
implementation 'com.android.support:support-v4:27.1.1'
implementation 'com.google.firebase:firebase-core:15.0.0'
implementation 'com.google.android.gms:play-services-maps:15.0.0'
implementation 'com.squareup.okhttp3:okhttp:3.10.0'
testImplementation 'junit:junit:4.12'
implementation 'androidx.appcompat:appcompat:1.0.2'
implementation 'com.github.barteksc:android-pdf-viewer:2.8.1'
implementation 'com.google.android.material:material:1.1.0-alpha02'
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha3'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'com.google.android.gms:play-services-maps:16.0.0'
implementation 'com.squareup.okhttp3:okhttp:3.12.0'
implementation 'com.squareup.retrofit2:retrofit:2.5.0'
implementation 'com.squareup.retrofit2:adapter-rxjava2:2.5.0'
implementation 'com.squareup.retrofit2:converter-moshi:2.4.0'
implementation 'com.squareup.moshi:moshi-kotlin:1.8.0'
implementation 'io.reactivex.rxjava2:rxjava:2.2.6'
implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
implementation 'com.jakewharton.rxbinding3:rxbinding-core:3.0.0-alpha1'
implementation 'io.reactivex.rxjava2:rxkotlin:2.3.0'
implementation 'com.jakewharton:butterknife:9.0.0'
kapt 'com.jakewharton:butterknife-compiler:9.0.0'
implementation 'androidx.core:core-ktx:1.0.1'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
implementation "android.arch.lifecycle:extensions:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
implementation 'com.github.bumptech.glide:glide:4.8.0'
kapt 'com.github.bumptech.glide:compiler:4.8.0'

}

apply plugin: 'com.google.gms.google-services'
apply plugin: 'kotlin-android'
repositories {
mavenCentral()
}
6 changes: 3 additions & 3 deletions app/src/androidTest/java/razorbacktransit/arcu/razorbacktransit/ExampleInstrumentedTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package razorbacktransit.arcu.razorbacktransit;

import android.content.Context;
import android.support.test.InstrumentationRegistry;
import android.support.test.runner.AndroidJUnit4;
import androidx.test.InstrumentationRegistry;
import androidx.test.runner.AndroidJUnit4;

import org.junit.Test;
import org.junit.runner.RunWith;
Expand All @@ -18,7 +18,7 @@
public class ExampleInstrumentedTest {
@Test
public void useAppContext() throws Exception {
// Context of the app under test.
// Context of the applivation under test.
Context appContext = InstrumentationRegistry.getTargetContext();

assertEquals("razorbacktransit.arcu.razorbacktransit", appContext.getPackageName());
Expand Down
2 changes: 1 addition & 1 deletion app/src/debug/res/values/google_maps_api.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
string in this file.
-->
<string name="google_maps_key" templateMergeStrategy="preserve" translatable="false">
AIzaSyCw6Ph5uz-2fnVzVMFDIZs0B8aBXONywOk
AIzaSyCJ_t16aFkINz-nsI1T2BMoP6EPrz1iM80
</string>
</resources>
Loading