Skip to content

Commit a04ce05

Browse files
bubelovbubelov
committed
Allow manual NC login even if NC app is present
1 parent c928a56 commit a04ce05

File tree

34 files changed

+73
-29
lines changed

34 files changed

+73
-29
lines changed

‎app/src/main/java/auth/AuthFragment.kt

+8-4
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,18 @@ class AuthFragment : AppFragment(
6767
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
6868
super.onViewCreated(view, savedInstanceState)
6969

70-
binding.loginWithNextcloud.setOnClickListener {
71-
showAccountPicker()
72-
}
73-
7470
binding.loginWithMiniflux.setOnClickListener {
7571
findNavController().navigate(R.id.action_authFragment_to_minifluxAuthFragment)
7672
}
7773

74+
binding.loginWithNextcloudApp.setOnClickListener {
75+
showAccountPicker()
76+
}
77+
78+
binding.loginWithNextcloud.setOnClickListener {
79+
findNavController().navigate(R.id.action_authFragment_to_directAuthFragment)
80+
}
81+
7882
binding.standaloneMode.setOnClickListener {
7983
lifecycleScope.launchWhenResumed {
8084
model.saveConf(

‎app/src/main/res/layout/fragment_auth.xml

+12-4
Original file line numberDiff line numberDiff line change
@@ -47,20 +47,28 @@
4747
app:layout_constraintTop_toBottomOf="@id/logo">
4848

4949
<Button
50-
android:id="@+id/loginWithNextcloud"
50+
android:id="@+id/loginWithMiniflux"
5151
android:layout_width="match_parent"
5252
android:layout_height="wrap_content"
5353
android:layout_marginStart="40dp"
5454
android:layout_marginEnd="40dp"
55-
android:text="@string/login_with_nextcloud" />
55+
android:text="@string/login_with_miniflux" />
5656

5757
<Button
58-
android:id="@+id/loginWithMiniflux"
58+
android:id="@+id/loginWithNextcloudApp"
5959
android:layout_width="match_parent"
6060
android:layout_height="wrap_content"
6161
android:layout_marginStart="40dp"
6262
android:layout_marginEnd="40dp"
63-
android:text="@string/login_with_miniflux" />
63+
android:text="@string/login_with_nextcloud_app" />
64+
65+
<Button
66+
android:id="@+id/loginWithNextcloud"
67+
android:layout_width="match_parent"
68+
android:layout_height="wrap_content"
69+
android:layout_marginStart="40dp"
70+
android:layout_marginEnd="40dp"
71+
android:text="@string/login_with_nextcloud" />
6472

6573
<Button
6674
android:id="@+id/standaloneMode"

‎app/src/main/res/values-af-rZA/strings.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
33
<string name="app_name">News</string>
4-
<string name="login_with_nextcloud">Login with Nextcloud</string>
4+
<string name="login_with_nextcloud">Login with Nextcloud (direct)</string>
55
<string name="post_image">Post image</string>
66
<string name="settings">Settings</string>
77
<string name="news">News</string>
@@ -109,6 +109,7 @@
109109
<string name="feed_url">Feed URL</string>
110110
<string name="comments">Comments</string>
111111
<string name="view_comments">View comments</string>
112+
<string name="login_with_nextcloud_app">Login with Nextcloud (app)</string>
112113
<plurals name="d_hours">
113114
<item quantity="one">%d hour</item>
114115
<item quantity="other">%d hours</item>

‎app/src/main/res/values-ar-rSA/strings.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
33
<string name="app_name">News</string>
4-
<string name="login_with_nextcloud">Login with Nextcloud</string>
4+
<string name="login_with_nextcloud">Login with Nextcloud (direct)</string>
55
<string name="post_image">Post image</string>
66
<string name="settings">Settings</string>
77
<string name="news">News</string>
@@ -109,6 +109,7 @@
109109
<string name="feed_url">Feed URL</string>
110110
<string name="comments">Comments</string>
111111
<string name="view_comments">View comments</string>
112+
<string name="login_with_nextcloud_app">Login with Nextcloud (app)</string>
112113
<plurals name="d_hours">
113114
<item quantity="zero">%d hours</item>
114115
<item quantity="one">%d hour</item>

‎app/src/main/res/values-ca-rES/strings.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
33
<string name="app_name">News</string>
4-
<string name="login_with_nextcloud">Login with Nextcloud</string>
4+
<string name="login_with_nextcloud">Login with Nextcloud (direct)</string>
55
<string name="post_image">Post image</string>
66
<string name="settings">Settings</string>
77
<string name="news">News</string>
@@ -109,6 +109,7 @@
109109
<string name="feed_url">Feed URL</string>
110110
<string name="comments">Comments</string>
111111
<string name="view_comments">View comments</string>
112+
<string name="login_with_nextcloud_app">Login with Nextcloud (app)</string>
112113
<plurals name="d_hours">
113114
<item quantity="one">%d hour</item>
114115
<item quantity="other">%d hours</item>

‎app/src/main/res/values-cs-rCZ/strings.xml

+1
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@
109109
<string name="feed_url">Feed URL</string>
110110
<string name="comments">Comments</string>
111111
<string name="view_comments">View comments</string>
112+
<string name="login_with_nextcloud_app">Login with Nextcloud (app)</string>
112113
<plurals name="d_hours">
113114
<item quantity="one">%d hodinu</item>
114115
<item quantity="few">%d hodina</item>

‎app/src/main/res/values-da-rDK/strings.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
33
<string name="app_name">News</string>
4-
<string name="login_with_nextcloud">Login with Nextcloud</string>
4+
<string name="login_with_nextcloud">Login with Nextcloud (direct)</string>
55
<string name="post_image">Post image</string>
66
<string name="settings">Settings</string>
77
<string name="news">News</string>
@@ -109,6 +109,7 @@
109109
<string name="feed_url">Feed URL</string>
110110
<string name="comments">Comments</string>
111111
<string name="view_comments">View comments</string>
112+
<string name="login_with_nextcloud_app">Login with Nextcloud (app)</string>
112113
<plurals name="d_hours">
113114
<item quantity="one">%d hour</item>
114115
<item quantity="other">%d hours</item>

‎app/src/main/res/values-de-rDE/strings.xml

+1
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@
109109
<string name="feed_url">Feed URL</string>
110110
<string name="comments">Comments</string>
111111
<string name="view_comments">View comments</string>
112+
<string name="login_with_nextcloud_app">Login with Nextcloud (app)</string>
112113
<plurals name="d_hours">
113114
<item quantity="one">%d Stunde</item>
114115
<item quantity="other">%d Stunden</item>

‎app/src/main/res/values-el-rGR/strings.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
33
<string name="app_name">News</string>
4-
<string name="login_with_nextcloud">Login with Nextcloud</string>
4+
<string name="login_with_nextcloud">Login with Nextcloud (direct)</string>
55
<string name="post_image">Post image</string>
66
<string name="settings">Settings</string>
77
<string name="news">News</string>
@@ -109,6 +109,7 @@
109109
<string name="feed_url">Feed URL</string>
110110
<string name="comments">Comments</string>
111111
<string name="view_comments">View comments</string>
112+
<string name="login_with_nextcloud_app">Login with Nextcloud (app)</string>
112113
<plurals name="d_hours">
113114
<item quantity="one">%d hour</item>
114115
<item quantity="other">%d hours</item>

‎app/src/main/res/values-en-rUS/strings.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
33
<string name="app_name">News</string>
4-
<string name="login_with_nextcloud">Login with Nextcloud</string>
4+
<string name="login_with_nextcloud">Login with Nextcloud (direct)</string>
55
<string name="post_image">Post image</string>
66
<string name="settings">Settings</string>
77
<string name="news">News</string>
@@ -109,6 +109,7 @@
109109
<string name="feed_url">Feed URL</string>
110110
<string name="comments">Comments</string>
111111
<string name="view_comments">View comments</string>
112+
<string name="login_with_nextcloud_app">Login with Nextcloud (app)</string>
112113
<plurals name="d_hours">
113114
<item quantity="one">%d hour</item>
114115
<item quantity="other">%d hours</item>

‎app/src/main/res/values-es-rES/strings.xml

+1
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@
109109
<string name="feed_url">Feed URL</string>
110110
<string name="comments">Comments</string>
111111
<string name="view_comments">View comments</string>
112+
<string name="login_with_nextcloud_app">Login with Nextcloud (app)</string>
112113
<plurals name="d_hours">
113114
<item quantity="one">%d horas</item>
114115
<item quantity="other">%d horas</item>

‎app/src/main/res/values-fa-rIR/strings.xml

+1
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@
109109
<string name="feed_url">پیوند خوراک</string>
110110
<string name="comments">نظرها</string>
111111
<string name="view_comments">نمایش نظرها</string>
112+
<string name="login_with_nextcloud_app">Login with Nextcloud (app)</string>
112113
<plurals name="d_hours">
113114
<item quantity="one">%d ساعت</item>
114115
<item quantity="other">%d ساعت</item>

‎app/src/main/res/values-fi-rFI/strings.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
33
<string name="app_name">News</string>
4-
<string name="login_with_nextcloud">Login with Nextcloud</string>
4+
<string name="login_with_nextcloud">Login with Nextcloud (direct)</string>
55
<string name="post_image">Post image</string>
66
<string name="settings">Settings</string>
77
<string name="news">News</string>
@@ -109,6 +109,7 @@
109109
<string name="feed_url">Feed URL</string>
110110
<string name="comments">Comments</string>
111111
<string name="view_comments">View comments</string>
112+
<string name="login_with_nextcloud_app">Login with Nextcloud (app)</string>
112113
<plurals name="d_hours">
113114
<item quantity="one">%d hour</item>
114115
<item quantity="other">%d hours</item>

‎app/src/main/res/values-fr-rFR/strings.xml

+1
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@
109109
<string name="feed_url">Feed URL</string>
110110
<string name="comments">Comments</string>
111111
<string name="view_comments">View comments</string>
112+
<string name="login_with_nextcloud_app">Login with Nextcloud (app)</string>
112113
<plurals name="d_hours">
113114
<item quantity="one">%d hour</item>
114115
<item quantity="other">%d hours</item>

‎app/src/main/res/values-hu-rHU/strings.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
33
<string name="app_name">News</string>
4-
<string name="login_with_nextcloud">Login with Nextcloud</string>
4+
<string name="login_with_nextcloud">Login with Nextcloud (direct)</string>
55
<string name="post_image">Post image</string>
66
<string name="settings">Settings</string>
77
<string name="news">News</string>
@@ -109,6 +109,7 @@
109109
<string name="feed_url">Feed URL</string>
110110
<string name="comments">Comments</string>
111111
<string name="view_comments">View comments</string>
112+
<string name="login_with_nextcloud_app">Login with Nextcloud (app)</string>
112113
<plurals name="d_hours">
113114
<item quantity="one">%d hour</item>
114115
<item quantity="other">%d hours</item>

‎app/src/main/res/values-it-rIT/strings.xml

+1
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@
109109
<string name="feed_url">Feed URL</string>
110110
<string name="comments">Comments</string>
111111
<string name="view_comments">View comments</string>
112+
<string name="login_with_nextcloud_app">Login with Nextcloud (app)</string>
112113
<plurals name="d_hours">
113114
<item quantity="one">%d ora</item>
114115
<item quantity="other">%d ore</item>

‎app/src/main/res/values-iw-rIL/strings.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
33
<string name="app_name">News</string>
4-
<string name="login_with_nextcloud">Login with Nextcloud</string>
4+
<string name="login_with_nextcloud">Login with Nextcloud (direct)</string>
55
<string name="post_image">Post image</string>
66
<string name="settings">Settings</string>
77
<string name="news">News</string>
@@ -109,6 +109,7 @@
109109
<string name="feed_url">Feed URL</string>
110110
<string name="comments">Comments</string>
111111
<string name="view_comments">View comments</string>
112+
<string name="login_with_nextcloud_app">Login with Nextcloud (app)</string>
112113
<plurals name="d_hours">
113114
<item quantity="one">%d hour</item>
114115
<item quantity="two">%d hours</item>

‎app/src/main/res/values-ja-rJP/strings.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
33
<string name="app_name">News</string>
4-
<string name="login_with_nextcloud">Login with Nextcloud</string>
4+
<string name="login_with_nextcloud">Login with Nextcloud (direct)</string>
55
<string name="post_image">Post image</string>
66
<string name="settings">Settings</string>
77
<string name="news">News</string>
@@ -109,6 +109,7 @@
109109
<string name="feed_url">Feed URL</string>
110110
<string name="comments">Comments</string>
111111
<string name="view_comments">View comments</string>
112+
<string name="login_with_nextcloud_app">Login with Nextcloud (app)</string>
112113
<plurals name="d_hours">
113114
<item quantity="other">%d hours</item>
114115
</plurals>

‎app/src/main/res/values-ko-rKR/strings.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
33
<string name="app_name">News</string>
4-
<string name="login_with_nextcloud">Login with Nextcloud</string>
4+
<string name="login_with_nextcloud">Login with Nextcloud (direct)</string>
55
<string name="post_image">Post image</string>
66
<string name="settings">Settings</string>
77
<string name="news">News</string>
@@ -109,6 +109,7 @@
109109
<string name="feed_url">Feed URL</string>
110110
<string name="comments">Comments</string>
111111
<string name="view_comments">View comments</string>
112+
<string name="login_with_nextcloud_app">Login with Nextcloud (app)</string>
112113
<plurals name="d_hours">
113114
<item quantity="other">%d hours</item>
114115
</plurals>

‎app/src/main/res/values-nl-rNL/strings.xml

+1
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@
109109
<string name="feed_url">Feed URL</string>
110110
<string name="comments">Comments</string>
111111
<string name="view_comments">View comments</string>
112+
<string name="login_with_nextcloud_app">Login with Nextcloud (app)</string>
112113
<plurals name="d_hours">
113114
<item quantity="one">%d uur</item>
114115
<item quantity="other">%d uren</item>

‎app/src/main/res/values-no-rNO/strings.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
33
<string name="app_name">News</string>
4-
<string name="login_with_nextcloud">Login with Nextcloud</string>
4+
<string name="login_with_nextcloud">Login with Nextcloud (direct)</string>
55
<string name="post_image">Post image</string>
66
<string name="settings">Settings</string>
77
<string name="news">News</string>
@@ -109,6 +109,7 @@
109109
<string name="feed_url">Feed URL</string>
110110
<string name="comments">Comments</string>
111111
<string name="view_comments">View comments</string>
112+
<string name="login_with_nextcloud_app">Login with Nextcloud (app)</string>
112113
<plurals name="d_hours">
113114
<item quantity="one">%d hour</item>
114115
<item quantity="other">%d hours</item>

‎app/src/main/res/values-pl-rPL/strings.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
33
<string name="app_name">News</string>
4-
<string name="login_with_nextcloud">Login with Nextcloud</string>
4+
<string name="login_with_nextcloud">Login with Nextcloud (direct)</string>
55
<string name="post_image">Post image</string>
66
<string name="settings">Settings</string>
77
<string name="news">News</string>
@@ -109,6 +109,7 @@
109109
<string name="feed_url">Feed URL</string>
110110
<string name="comments">Comments</string>
111111
<string name="view_comments">View comments</string>
112+
<string name="login_with_nextcloud_app">Login with Nextcloud (app)</string>
112113
<plurals name="d_hours">
113114
<item quantity="one">%d hour</item>
114115
<item quantity="few">%d hours</item>

‎app/src/main/res/values-pt-rBR/strings.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
33
<string name="app_name">News</string>
4-
<string name="login_with_nextcloud">Login with Nextcloud</string>
4+
<string name="login_with_nextcloud">Login with Nextcloud (direct)</string>
55
<string name="post_image">Post image</string>
66
<string name="settings">Settings</string>
77
<string name="news">News</string>
@@ -109,6 +109,7 @@
109109
<string name="feed_url">Feed URL</string>
110110
<string name="comments">Comments</string>
111111
<string name="view_comments">View comments</string>
112+
<string name="login_with_nextcloud_app">Login with Nextcloud (app)</string>
112113
<plurals name="d_hours">
113114
<item quantity="one">%d hour</item>
114115
<item quantity="other">%d hours</item>

‎app/src/main/res/values-pt-rPT/strings.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
33
<string name="app_name">News</string>
4-
<string name="login_with_nextcloud">Login with Nextcloud</string>
4+
<string name="login_with_nextcloud">Login with Nextcloud (direct)</string>
55
<string name="post_image">Post image</string>
66
<string name="settings">Settings</string>
77
<string name="news">News</string>
@@ -109,6 +109,7 @@
109109
<string name="feed_url">Feed URL</string>
110110
<string name="comments">Comments</string>
111111
<string name="view_comments">View comments</string>
112+
<string name="login_with_nextcloud_app">Login with Nextcloud (app)</string>
112113
<plurals name="d_hours">
113114
<item quantity="one">%d hour</item>
114115
<item quantity="other">%d hours</item>

‎app/src/main/res/values-ro-rRO/strings.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
33
<string name="app_name">News</string>
4-
<string name="login_with_nextcloud">Login with Nextcloud</string>
4+
<string name="login_with_nextcloud">Login with Nextcloud (direct)</string>
55
<string name="post_image">Post image</string>
66
<string name="settings">Settings</string>
77
<string name="news">News</string>
@@ -109,6 +109,7 @@
109109
<string name="feed_url">Feed URL</string>
110110
<string name="comments">Comments</string>
111111
<string name="view_comments">View comments</string>
112+
<string name="login_with_nextcloud_app">Login with Nextcloud (app)</string>
112113
<plurals name="d_hours">
113114
<item quantity="one">%d hour</item>
114115
<item quantity="few">%d hours</item>

‎app/src/main/res/values-ru-rRU/strings.xml

+1
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@
109109
<string name="feed_url">Feed URL</string>
110110
<string name="comments">Comments</string>
111111
<string name="view_comments">View comments</string>
112+
<string name="login_with_nextcloud_app">Login with Nextcloud (app)</string>
112113
<plurals name="d_hours">
113114
<item quantity="one">%d час</item>
114115
<item quantity="few">%d часа</item>

0 commit comments

Comments
 (0)