Skip to content

Commit

Permalink
Update version and change log
Browse files Browse the repository at this point in the history
  • Loading branch information
@spacecowboy
spacecowboy committed Oct 25, 2015
1 parent 6cbaec1 commit 20b5a22
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 75 deletions.
2 changes: 1 addition & 1 deletion app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ repositories {
def versionMajor = 5 // Major UI overhauls
def versionMinor = 7 // Some new functionality
def versionPatch = 1 // Bug fixes
def versionBuild = 2 // Bump for dogfood builds, public betas, etc.
def versionBuild = 3 // Bump for dogfood builds, public betas, etc.

// Version name from git
def getVersionName = { ->
Expand Down
88 changes: 14 additions & 74 deletions app/src/main/res/layout/changelog.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,67 +67,7 @@
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="\nVersion 5.6.0"
android:fontFamily="sans-serif-condensed"
android:textColor="@android:color/holo_blue_dark"
android:textStyle="bold" />

<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:text="@string/changelog_5_6_0" />

<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="\nVersion 5.5.5"
android:fontFamily="sans-serif-condensed"
android:textColor="@android:color/holo_blue_dark"
android:textStyle="bold" />

<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:text="@string/changelog_5_5_5" />

<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="\nVersion 5.5.4"
android:fontFamily="sans-serif-condensed"
android:textColor="@android:color/holo_blue_dark"
android:textStyle="bold" />

<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:text="@string/changelog_5_5_4" />

<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="\nVersion 5.5.3"
android:fontFamily="sans-serif-condensed"
android:textColor="@android:color/holo_blue_dark"
android:textStyle="bold" />

<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:text="@string/changelog_5_5_3" />

<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="\nVersion 5.4.1"
android:text="\nVersion 5.7.1"
android:fontFamily="sans-serif-condensed"
android:textColor="@android:color/holo_blue_dark"
android:textStyle="bold" />
Expand All @@ -137,12 +77,12 @@
android:layout_height="wrap_content"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:text="@string/changelog_5_4_1" />
android:text="@string/changelog_5_7_1" />

<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="\nVersion 5.4"
android:text="\nVersion 5.6.0"
android:fontFamily="sans-serif-condensed"
android:textColor="@android:color/holo_blue_dark"
android:textStyle="bold" />
Expand All @@ -152,12 +92,12 @@
android:layout_height="wrap_content"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:text="@string/changelog_5_4" />
android:text="@string/changelog_5_6_0" />

<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="\nVersion 5.3"
android:text="\nVersion 5.5.5"
android:fontFamily="sans-serif-condensed"
android:textColor="@android:color/holo_blue_dark"
android:textStyle="bold" />
Expand All @@ -167,12 +107,12 @@
android:layout_height="wrap_content"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:text="@string/changelog_5_3" />
android:text="@string/changelog_5_5_5" />

<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="\nVersion 5.2"
android:text="\nVersion 5.5.4"
android:fontFamily="sans-serif-condensed"
android:textColor="@android:color/holo_blue_dark"
android:textStyle="bold" />
Expand All @@ -182,12 +122,12 @@
android:layout_height="wrap_content"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:text="@string/changelog_5_2" />
android:text="@string/changelog_5_5_4" />

<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="\nVersion 5.1.3"
android:text="\nVersion 5.5.3"
android:fontFamily="sans-serif-condensed"
android:textColor="@android:color/holo_blue_dark"
android:textStyle="bold" />
Expand All @@ -197,12 +137,12 @@
android:layout_height="wrap_content"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:text="@string/changelog_5_1_3" />
android:text="@string/changelog_5_5_3" />

<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="\nVersion 5.1"
android:text="\nVersion 5.4.1"
android:fontFamily="sans-serif-condensed"
android:textColor="@android:color/holo_blue_dark"
android:textStyle="bold" />
Expand All @@ -212,12 +152,12 @@
android:layout_height="wrap_content"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:text="@string/changelog_5_1" />
android:text="@string/changelog_5_4_1" />

<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="\nVersion 5.0"
android:text="\nVersion 5.4"
android:fontFamily="sans-serif-condensed"
android:textColor="@android:color/holo_blue_dark"
android:textStyle="bold" />
Expand All @@ -227,7 +167,7 @@
android:layout_height="wrap_content"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:text="@string/changelog_5_0" />
android:text="@string/changelog_5_4" />

</LinearLayout>

Expand Down
3 changes: 3 additions & 0 deletions app/src/main/res/values/changelog_strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
-->

<resources>
<string name="changelog_5_7_1">
\nFix Google Tasks sync.
\nFix bug which would delete all notes during Google Tasks sync.</string>
<string name="changelog_5_6_0">
\nNew setting: enable/disable first line in notes to be bigger font.
\nReminders: Now default to today instead of tomorrow.</string>
Expand Down

0 comments on commit 20b5a22

Please sign in to comment.