-
Notifications
You must be signed in to change notification settings - Fork 17
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 #29 from fs/refactoring
Refactoring
- Loading branch information
Showing
7 changed files
with
123 additions
and
81 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
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,19 +1,47 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <lint> | ||
| <issue id="UnusedResources"> | ||
| <ignore path="src/main/res/values/com_crashlytics_export_strings.xml"/> | ||
| </issue> | ||
| <issue id="IconExpectedSize" severity="fatal"/> | ||
| <issue id="EasterEgg" severity="fatal"/> | ||
| <issue id="StopShip" severity="fatal"/> | ||
| <issue id="TypographyQuotes" severity="fatal"/> | ||
|
|
||
| <issue id="TypographyDashes"> | ||
| <ignore path="src/main/res/values/com_crashlytics_export_strings.xml"/> | ||
| </issue> | ||
| <issue id="CommitPrefEdits"> | ||
| <ignore regexp="build/generated/source/apt/.*"/> | ||
| </issue> | ||
| <issue id="PrivateResource" severity="ignore" /> | ||
| <issue id="FieldGetter" severity="ignore" /> | ||
|
|
||
| <!--lint does not see allowBackup option in manifest for some reason--> | ||
| <issue id="AllowBackup" severity="ignore" /> | ||
| <!-- uncomment if your app has deep links--> | ||
| <issue id="GoogleAppIndexingWarning" severity="ignore" /> | ||
| </lint> | ||
|
|
||
| <issue id="IconMissingDensityFolder" severity="ignore"> | ||
| <ignore path="src/main/res/drawable-xxxdpi"/> | ||
| </issue> | ||
|
|
||
| <issue id="InvalidPackage" severity="ignore"/> | ||
| <issue id="GradleDependency" severity="ignore"/> | ||
| <issue id="GradleDynamicVersion" severity="ignore"/> | ||
| <issue id="PrivateResource" severity="ignore"/> | ||
|
|
||
| <!--I know when I can use compoundDrawables!--> | ||
| <issue id="UseCompoundDrawables" severity="ignore"/> | ||
|
|
||
| <!--due to retrolambda unused resources work incorrectly--> | ||
| <issue id="UnusedResources" severity="ignore"/> | ||
|
|
||
| <issue id="ContentDescription" severity="ignore"/> | ||
| <!--<issue id="UnusedIds" severity="ignore"/>--> | ||
| <!--<issue id="Overdraw" severity="ignore"/>--> | ||
| <!--<issue id="RtlSymmetry" severity="ignore"/>--> | ||
| <!--<issue id="RtlHardcoded" severity="ignore"/>--> | ||
| <!--<issue id="RtlEnabled" severity="ignore"/>--> | ||
| <!--<issue id="IconColors" severity="ignore"/>--> | ||
| <!--<issue id="RelativeOverlap" severity="ignore"/>--> | ||
|
|
||
| <issue id="ClickableViewAccessibility" severity="ignore"/> | ||
| <issue id="SelectableText" severity="ignore"/> | ||
| <issue id="GoogleAppIndexingWarning" severity="ignore"/> | ||
| <issue id="AllowBackup" severity="ignore"/> | ||
| <issue id="Typos" severity="ignore"/> | ||
| <issue id="ShowToast" severity="ignore"/> | ||
| <issue id="Registered" severity="ignore"/> | ||
|
|
||
| </lint> |
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
9 changes: 0 additions & 9 deletions
9
app/src/main/java/com/flatstack/android/utils/TimberCrashReportingTree.java
This file was deleted.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1,16 @@ | ||
| // project wide version settings for all submodules | ||
| ext { | ||
| MIN_SDK_VERSION = 14 | ||
| TARGET_SDK_VERSION = 25 | ||
| BUILD_TOOLS_VERSION = '25.0.1' | ||
| SUPPORT_LIBRARY_VERSION = '25.1.0' | ||
| } | ||
|
|
||
| buildscript { | ||
| repositories { | ||
| jcenter() | ||
| } | ||
| repositories { | ||
| jcenter() | ||
| } | ||
|
|
||
| dependencies { | ||
| // android plugin | ||
| classpath 'com.android.tools.build:gradle:2.2.3' | ||
| // use Java 8 lambdas on android | ||
| // TODO replace with jack and jill in near future | ||
| classpath 'me.tatarka:gradle-retrolambda:3.2.5' | ||
| } | ||
| dependencies { | ||
| classpath 'com.android.tools.build:gradle:2.2.3' | ||
| classpath 'me.tatarka:gradle-retrolambda:3.2.5' // use Java 8 lambdas on android | ||
| } | ||
| } | ||
|
|
||
| allprojects { | ||
| repositories { | ||
| jcenter() | ||
| } | ||
| repositories { | ||
| jcenter() | ||
| } | ||
| } |
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 |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| ext { | ||
| versions = [ | ||
| okHttp : '3.3.1', | ||
| support : '25.1.0', | ||
| retrofit : '2.0.2', | ||
| espressoVersion : '2.2.2', | ||
| BUILD_TOOLS_VERSION: '25.0.1', | ||
| MIN_SDK_VERSION : 14, | ||
| TARGET_SDK_VERSION : 25 | ||
| ] | ||
| supportDeps = [ | ||
| appcompatV7 : "com.android.support:appcompat-v7:$versions.support", | ||
| recyclerView : "com.android.support:recyclerview-v7:$versions.support", | ||
| supportAnnotation: "com.android.support:support-annotations:$versions.support", | ||
| // design : "com.android.support:design:$versions.support", | ||
| // gridLayout : "com.android.support:gridlayout-v7:$versions.support" | ||
| // cardView : "com.android.support:cardview-v7:$versions.support" | ||
| // palette : "com.android.support:palette-v7:$versions.support" | ||
| ] | ||
| rxJava = [ | ||
| rxJava : 'io.reactivex:rxjava:1.1.6', | ||
| rxAndroid: 'io.reactivex:rxandroid:1.2.1' | ||
| ] | ||
| retrofit = [ | ||
| retrofit : "com.squareup.retrofit2:retrofit:$versions.retrofit", | ||
| rxAdapter : "com.squareup.retrofit2:adapter-rxjava:$versions.retrofit", | ||
| gsonConverter: "com.squareup.retrofit2:converter-gson:$versions.retrofit" | ||
| ] | ||
| okHttp = [ | ||
| logger: "com.squareup.okhttp3:logging-interceptor:$versions.okHttp", | ||
| self : "com.squareup.okhttp3:okhttp:$versions.okHttp" | ||
| ] | ||
| unitTests = [ | ||
| supportAnnotation: "com.android.support:support-annotations:$versions.support", | ||
| junit : 'junit:junit:4.12', | ||
| robolectric : 'org.robolectric:robolectric:3.0', | ||
| assertj : 'com.squareup.assertj:assertj-android:1.0.0' | ||
| ] | ||
| androidTests = [ | ||
| espressoCore : "com.android.support.test.espresso:espresso-core:$versions.espressoVersion", | ||
| espressoContrib: "com.android.support.test.espresso:espresso-contrib:$versions.espressoVersion", | ||
| espressoIntents: "com.android.support.test.espresso:espresso-intents:$versions.espressoVersion", | ||
| testRunner : "com.android.support.test:runner:0.5", | ||
| testRules : "com.android.support.test:rules:0.5" | ||
| ] | ||
|
|
||
| supportLibs = supportDeps.values() | ||
| retrofitLibs = retrofit.values() | ||
| okHttpLibs = okHttp.values() | ||
| rxJavaLibs = rxJava.values() | ||
| unitTestLibs = unitTests.values() | ||
| androidTestsLibs = androidTests.values() + supportLibs | ||
| } |