Skip to content

Commit

Permalink
Merge pull request #28 from eggheadgames/release-1.4.9
Browse files Browse the repository at this point in the history
Release 1.4.9
  • Loading branch information
eggheadgames authored Oct 8, 2017
2 parents 3ef27de + 5506b3c commit d5907fd
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 20 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ Choose what works best for your scenario. We chose _not_ to "screenscrape" the G
- The **right picture** gives the user the option to skip the current update.
- These options are controlled by the `SirenAlertType` enum.

<img src="https://github.com/EggheadGames/Siren/blob/master/extras/force.png?raw=true" height=480">
<img src="https://github.com/EggheadGames/Siren/blob/master/extras/option.png?raw=true" height=480">
<img src="https://github.com/EggheadGames/Siren/blob/master/extras/skip.png?raw=true" height=480">
![Force update](/extras/force.png)
![Optional update](/extras/option.png)
![Skip update](/extras/skip.png)


## Setup
Expand Down
Binary file modified extras/force.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified extras/option.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified extras/skip.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ android {
defaultConfig {
minSdkVersion 15
targetSdkVersion 25
versionCode 9
versionName "1.4.8"
versionCode 10
versionName "1.4.9"
}
buildTypes {
release {
Expand Down
23 changes: 12 additions & 11 deletions library/src/main/res/layout/siren_dialog.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:layout_height="match_parent">

<TextView
android:id="@+id/tvSirenAlertMessage"
Expand All @@ -19,12 +18,14 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginTop="20dp">
android:layout_gravity="center"
android:layout_below="@+id/tvSirenAlertMessage">

<Button
android:id="@+id/btnSirenNextTime"
android:layout_width="0dp"
android:layout_height="@dimen/button_height"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginLeft="@dimen/half_margin"
android:layout_marginRight="@dimen/half_margin"
android:layout_weight="1"
Expand All @@ -35,23 +36,23 @@
<Button
android:id="@+id/btnSirenUpdate"
android:layout_width="0dp"
android:layout_height="@dimen/button_height"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginLeft="@dimen/half_margin"
android:layout_marginRight="@dimen/half_margin"
android:layout_weight="1"
android:text="@string/update"
tools:ignore="ButtonStyle" />


</LinearLayout>
<Button
android:id="@+id/btnSirenSkip"
android:layout_width="match_parent"
android:layout_height="@dimen/button_height"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/half_margin"
android:layout_marginRight="@dimen/half_margin"
android:text="@string/skip_this_version"
android:visibility="gone"/>

android:visibility="gone"
android:layout_below="@+id/llSirenButtonsContainer" />

</LinearLayout>
</RelativeLayout>
4 changes: 0 additions & 4 deletions library/src/main/res/values/dimen.xml

This file was deleted.

0 comments on commit d5907fd

Please sign in to comment.