diff --git a/.gitignore b/.gitignore index c2a337223..a264fd219 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,5 @@ fabric.properties # Key signing.properties + +.DS* diff --git a/fakeApi.properties b/api.properties.sample similarity index 100% rename from fakeApi.properties rename to api.properties.sample diff --git a/build.gradle b/build.gradle index d94eac56a..05f2e5c1c 100644 --- a/build.gradle +++ b/build.gradle @@ -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) @@ -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"]) @@ -155,4 +152,4 @@ android.applicationVariants.all { variant -> linksOffline "http://d.android.com/reference", "${android.sdkDirectory}/docs/reference" } } -} \ No newline at end of file +} diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index 0bbdb0152..7e9be819a 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -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"> - \ No newline at end of file + diff --git a/src/main/res/drawable-xhdpi/tv_banner.png b/src/main/res/drawable-xhdpi/tv_banner.png new file mode 100644 index 000000000..f4298679b Binary files /dev/null and b/src/main/res/drawable-xhdpi/tv_banner.png differ