Skip to content

Commit

Permalink
update banner, do not build if the proper api file is there
Browse files Browse the repository at this point in the history
  • Loading branch information
cpg committed Jun 28, 2017
1 parent de1ee8f commit fba0be4
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 7 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,5 @@ fabric.properties

# Key
signing.properties

.DS*
File renamed without changes.
7 changes: 2 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ android {
defaultConfig {
def versionMajor = 2
def versionMinor = 5
def versionPatch = 1
def versionPatch = 3

versionName buildVersionName(versionMajor, versionMinor, versionPatch)
versionCode buildVersionCode(versionMajor, versionMinor, versionPatch)
Expand All @@ -49,13 +49,10 @@ android {
targetSdkVersion 25

def apiFile = file("api.properties")
def fakeApiFile = file("fakeApi.properties")
def apiProperties = new Properties()

if (apiFile.exists()) {
apiProperties.load(apiFile.newInputStream())
} else {
apiProperties.load(fakeApiFile.newInputStream())
}
buildConfigField "String", "API_URL_AMAHI", formatStringField(apiProperties["url.amahi"])
buildConfigField "String", "API_URL_PROXY", formatStringField(apiProperties["url.proxy"])
Expand Down Expand Up @@ -155,4 +152,4 @@ android.applicationVariants.all { variant ->
linksOffline "http://d.android.com/reference", "${android.sdkDirectory}/docs/reference"
}
}
}
}
4 changes: 2 additions & 2 deletions src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
android:label="@string/application_name"
android:resizeableActivity="true"
android:theme="@style/Theme.Amahi"
android:banner="@drawable/ic_app_logo">
android:banner="@drawable/tv_banner">

<activity
android:name=".tv.activity.MainTVActivity"
Expand Down Expand Up @@ -170,4 +170,4 @@

</application>

</manifest>
</manifest>
Binary file added src/main/res/drawable-xhdpi/tv_banner.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit fba0be4

Please sign in to comment.