Skip to content

Commit 0796ced

Browse files
committed
Add Google repository to project-level build
1 parent e5a309f commit 0796ced

File tree

5 files changed

+5
-3
lines changed

5 files changed

+5
-3
lines changed

Diff for: app/src/main/java/pl/rmakowiecki/smartalarm/ui/screens/main/alarmincidents/AlarmIncidentsNavigator.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class AlarmIncidentsNavigator @Inject constructor(
1717
AlertDialog.Builder(activity)
1818
.setMessage(R.string.delete_confirmation_message)
1919
.setPositiveButton(R.string.delete, { _, _ -> emitter.onSuccess(true) })
20-
.setNegativeButton(android.R.string.cancel, { _, _ -> emitter.onComplete() })
20+
.setNegativeButton(R.string.cancel, { _, _ -> emitter.onComplete() })
2121
.create()
2222
.show()
2323
}

Diff for: app/src/main/java/pl/rmakowiecki/smartalarm/ui/screens/main/settings/SettingsNavigator.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class SettingsNavigator @Inject constructor(
3030
AlertDialog.Builder(activity)
3131
.setMessage(R.string.logout_confirmation_message)
3232
.setPositiveButton(R.string.logout, { _, _ -> emitter.onSuccess(true) })
33-
.setNegativeButton(android.R.string.cancel, { _, _ -> emitter.onComplete() })
33+
.setNegativeButton(R.string.cancel, { _, _ -> emitter.onComplete() })
3434
.create()
3535
.show()
3636
}

Diff for: app/src/main/res/layout/activity_auth.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
android:layout_width="match_parent"
113113
android:layout_height="wrap_content"
114114
android:hint="@string/input_hint_repeat_password"
115-
android:inputType="textEmailAddress" />
115+
android:inputType="textPassword"/>
116116
</android.support.design.widget.TextInputLayout>
117117

118118
<FrameLayout

Diff for: app/src/main/res/values/strings.xml

+1
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,6 @@
4242
<string name="reset_password_complete">Password reset process complete. We\'ve sent you an email with further instructions.</string>
4343
<string name="setup_connect_text">Connect the smartphone to\nyour Core Device via USB cable\nin order to safely pair up.\nWe care for your privacy and safety.</string>
4444
<string name="connect_to_wifi">Connect</string>
45+
<string name="cancel">Cancel</string>
4546

4647
</resources>

Diff for: build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ buildscript {
22
ext.kotlin_version = '1.1.51'
33
repositories {
44
jcenter()
5+
google()
56
mavenCentral()
67
}
78
dependencies {

0 commit comments

Comments
 (0)