Skip to content

Commit b2f286a

Browse files
committed
Fix bugs hopefully
1 parent 385cc1b commit b2f286a

File tree

5 files changed

+15
-18
lines changed

5 files changed

+15
-18
lines changed

app/src/main/java/com/commit451/gitlab/activity/AddIssueActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import com.commit451.teleprinter.Teleprinter
2424
import com.google.android.material.snackbar.Snackbar
2525
import io.reactivex.Single
2626
import kotlinx.android.synthetic.main.activity_add_issue.*
27-
import kotlinx.android.synthetic.main.progress.*
27+
import kotlinx.android.synthetic.main.progress_fullscreen.*
2828
import timber.log.Timber
2929
import java.util.*
3030

app/src/main/java/com/commit451/gitlab/model/api/Tag.kt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,29 @@ import com.squareup.moshi.Json
55
/**
66
* A tag in Git
77
*/
8-
class Tag {
9-
8+
data class Tag(
109
@Json(name = "name")
11-
var name: String? = null
10+
var name: String? = null,
1211
@Json(name = "message")
13-
var message: String? = null
12+
var message: String? = null,
1413
@Json(name = "commit")
15-
var commit: Commit? = null
14+
var commit: Commit? = null,
1615
@Json(name = "release")
1716
var release: Release? = null
17+
) {
1818

19-
class Commit {
2019

20+
data class Commit(
2121
@Json(name = "id")
22-
var id: String? = null
22+
var id: String? = null,
2323
@Json(name = "message")
2424
var message: String? = null
25-
}
25+
)
2626

27-
class Release {
27+
data class Release(
2828
@Json(name = "tag_name")
29-
var tagName: String? = null
29+
var tagName: String? = null,
3030
@Json(name = "description")
3131
var description: String? = null
32-
}
32+
)
3333
}

app/src/main/res/layout/progress.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<com.commit451.gitlab.view.LabCoatProgressView
3-
xmlns:android="http://schemas.android.com/apk/res/android"
4-
xmlns:app="http://schemas.android.com/apk/res-auto"
2+
<com.commit451.gitlab.view.LabCoatProgressView xmlns:android="http://schemas.android.com/apk/res/android"
53
android:id="@+id/progress"
64
android:layout_width="wrap_content"
75
android:layout_height="wrap_content"

app/src/main/res/layout/progress_fullscreen.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
3-
xmlns:app="http://schemas.android.com/apk/res-auto"
43
android:id="@+id/progress"
54
android:layout_width="match_parent"
65
android:layout_height="match_parent"
@@ -14,4 +13,4 @@
1413
android:layout_gravity="center"
1514
android:indeterminate="true" />
1615

17-
</FrameLayout>
16+
</FrameLayout>

buildSrc/src/main/kotlin/BuildHelper.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ object BuildHelper {
77
private var locatedFile: Boolean? = null
88

99
fun appVersionName(): String {
10-
return "2.7.0"
10+
return "2.7.1"
1111
}
1212

1313
fun appVersionCode(): Int {

0 commit comments

Comments
 (0)