diff options
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/drawable/ic_help_24dp.xml | 9 | ||||
| -rw-r--r-- | app/src/main/res/drawable/ic_login_24dp.xml | 9 | ||||
| -rw-r--r-- | app/src/main/res/layout/activity_login.xml | 3 | ||||
| -rw-r--r-- | app/src/main/res/layout/activity_login_chrome_custom_tab.xml | 33 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 6 |
5 files changed, 43 insertions, 17 deletions
diff --git a/app/src/main/res/drawable/ic_help_24dp.xml b/app/src/main/res/drawable/ic_help_24dp.xml deleted file mode 100644 index 81e329b9..00000000 --- a/app/src/main/res/drawable/ic_help_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" - android:viewportWidth="24" - android:viewportHeight="24"> - <path - android:pathData="M11,18h2v-2h-2v2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM12,6c-2.21,0 -4,1.79 -4,4h2c0,-1.1 0.9,-2 2,-2s2,0.9 2,2c0,2 -3,1.75 -3,5h2c0,-2.25 3,-2.5 3,-5 0,-2.21 -1.79,-4 -4,-4z" - android:fillColor="#ffffff"/> -</vector> diff --git a/app/src/main/res/drawable/ic_login_24dp.xml b/app/src/main/res/drawable/ic_login_24dp.xml new file mode 100644 index 00000000..2e5aa22b --- /dev/null +++ b/app/src/main/res/drawable/ic_login_24dp.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="960" + android:viewportHeight="960"> + <path + android:pathData="M480,840v-80h280v-560L480,200v-80h280q33,0 56.5,23.5T840,200v560q0,33 -23.5,56.5T760,840L480,840ZM400,680 L345,622 447,520L120,520v-80h327L345,338l55,-58 200,200 -200,200Z" + android:fillColor="#e8eaed"/> +</vector> diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 4c4d3e9f..1f7ef7c6 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -4,7 +4,6 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:id="@+id/coordinator_layout_login_activity" tools:application="ml.docilealligator.infinityforreddit.activities.LoginActivity"> <com.google.android.material.appbar.AppBarLayout @@ -52,6 +51,6 @@ android:layout_height="wrap_content" android:layout_margin="@dimen/fab_margin" android:layout_gravity="bottom|end" - android:src="@drawable/ic_help_24dp" /> + android:src="@drawable/ic_login_24dp" /> </androidx.coordinatorlayout.widget.CoordinatorLayout> diff --git a/app/src/main/res/layout/activity_login_chrome_custom_tab.xml b/app/src/main/res/layout/activity_login_chrome_custom_tab.xml index 534433ff..0bf28118 100644 --- a/app/src/main/res/layout/activity_login_chrome_custom_tab.xml +++ b/app/src/main/res/layout/activity_login_chrome_custom_tab.xml @@ -1,10 +1,37 @@ <?xml version="1.0" encoding="utf-8"?> -<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" +<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" - android:id="@+id/main" android:layout_width="match_parent" android:layout_height="match_parent" tools:context=".activities.LoginChromeCustomTabActivity"> -</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file + <com.google.android.material.appbar.AppBarLayout + android:id="@+id/appbar_layout_login_chrome_custom_tab_activity" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:theme="@style/AppTheme.AppBarOverlay"> + + <androidx.appcompat.widget.Toolbar + android:id="@+id/toolbar_login_chrome_custom_tab_activity" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="?attr/actionBarSize" + app:popupTheme="@style/AppTheme.PopupOverlay" + app:navigationIcon="?attr/homeAsUpIndicator" /> + + </com.google.android.material.appbar.AppBarLayout> + + <com.google.android.material.button.MaterialButton + android:id="@+id/open_webpage_button_login_chrome_custom_tab_activity" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" + android:text="@string/open_login_page" + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" + app:layout_behavior="@string/appbar_scrolling_view_behavior" /> + +</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8049801c..f15f2893 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1049,7 +1049,7 @@ <string name="top_score">%1$s pts</string> - <string name="login_activity_2fa_prompt">If you have 2-factor authentication enabled, kindly type your password like the following: <password>:<2FA code>.\nExample: yourpass:123456</string> + <string name="login_activity_2fa_prompt">2-factor authentication: <password>:<2FA code>.\nExample: yourpass:123456\nGoogle login or having trouble login: click the bottom right button.</string> <string name="block_user">Block User</string> <string name="block_user_success">Blocked</string> @@ -1157,8 +1157,8 @@ <string name="choose_a_user">Choose a user</string> - <string name="have_trouble_login_title">Having Trouble Login</string> - <string name="have_trouble_login_message">Do you want to try another way to login?</string> + <string name="open_login_page">Open login page</string> + <string name="custom_tab_not_available">Chrome custom tab not available. Is Chrome or Firefox installed?</string> <string name="vote">Vote</string> |