mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-23 21:55:48 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3725 from nextcloud/ssoDialog

Browse source 
make SSO dialog nicer
This commit is contained in:
Andy Scherzinger 2019-03-08 13:24:21 +01:00 committed by GitHub
commit 62534afba7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 59 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
src/main/res/layout/activity_sso_grant_permission.xml
View file

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!-- <?xml version="1.0" encoding="utf-8"?>
<!--
Nextcloud Android client application Nextcloud Android client application
Copyright (C) 2018 Andy Scherzinger Copyright (C) 2018 Andy Scherzinger
@ -16,12 +17,13 @@
You should have received a copy of the GNU Affero General Public You should have received a copy of the GNU Affero General Public
License along with this program. If not, see <http://www.gnu.org/licenses/>. License along with this program. If not, see <http://www.gnu.org/licenses/>.
--> -->
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:layout_margin="@dimen/standard_margin" android:layout_margin="@dimen/standard_margin"
android:orientation="horizontal"
tools:context="com.owncloud.android.ui.activity.SsoGrantPermissionActivity"> tools:context="com.owncloud.android.ui.activity.SsoGrantPermissionActivity">
<ImageView <ImageView
@ -29,36 +31,40 @@
android:layout_width="@dimen/user_icon_size" android:layout_width="@dimen/user_icon_size"
android:layout_height="@dimen/user_icon_size" android:layout_height="@dimen/user_icon_size"
android:layout_gravity="top|start" android:layout_gravity="top|start"
android:layout_marginEnd="@dimen/standard_margin"
android:layout_marginRight="@dimen/standard_margin"
android:contentDescription="@null" android:contentDescription="@null"
android:src="@drawable/background" android:src="@drawable/background"
app:layout_constraintTop_toTopOf="@+id/permissionText"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/permissionText"/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView <TextView
android:id="@+id/permissionText" android:id="@+id/permissionText"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingEnd="@dimen/zero"
android:paddingStart="@dimen/zero" android:paddingStart="@dimen/zero"
android:paddingRight="@dimen/zero"
android:paddingLeft="@dimen/zero" android:paddingLeft="@dimen/zero"
android:paddingEnd="@dimen/zero"
android:paddingRight="@dimen/zero"
android:paddingBottom="@dimen/standard_padding" android:paddingBottom="@dimen/standard_padding"
android:textSize="@dimen/permission_dialog_text_size" android:textSize="@dimen/permission_dialog_text_size"
app:layout_constraintBottom_toTopOf="@+id/btnGrant" app:layout_constraintBottom_toTopOf="@+id/btnGrant"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
tools:text="Grant Nextcloud News access to your Nextcloud account incrediblyLong_username_with_123456789_number@Nextcloud_dummy.com?"/> tools:text="Grant Nextcloud News access to your Nextcloud account incrediblyLong_username_with_123456789_number@Nextcloud_dummy.com?"/>
<com.google.android.material.button.MaterialButton <LinearLayout
android:id="@+id/btnGrant" android:layout_width="match_parent"
style="@style/Button.Borderless"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/permission_allow" android:gravity="end"
app:layout_constraintBottom_toBottomOf="parent" android:orientation="horizontal">
app:layout_constraintEnd_toEndOf="parent" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/btnDecline" android:id="@+id/btnDecline"
@ -71,4 +77,15 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/btnGrant"/> app:layout_constraintEnd_toStartOf="@+id/btnGrant"/>
</androidx.constraintlayout.widget.ConstraintLayout> <com.google.android.material.button.MaterialButton
android:id="@+id/btnGrant"
style="@style/Button.Borderless"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/permission_allow"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
</LinearLayout>
</LinearLayout>
</LinearLayout>