diff options
| author | Alex Ning <chineseperson5@gmail.com> | 2021-02-12 11:21:34 +0000 |
|---|---|---|
| committer | Alex Ning <chineseperson5@gmail.com> | 2021-02-12 11:21:34 +0000 |
| commit | ff7281aa890c43a21c90ec49c0e821e98956195a (patch) | |
| tree | 4bd9f9d56ffc336aec84a31cf9cbf0453aabca6f /app/src/main/res | |
| parent | c0cb024eb99be74c36ea422df5731b09a0d5d570 (diff) | |
| parent | 36a142f7b47cdc2dd707ec75c85dcb2998500fc7 (diff) | |
| download | infinity-for-reddit-ff7281aa890c43a21c90ec49c0e821e98956195a.tar infinity-for-reddit-ff7281aa890c43a21c90ec49c0e821e98956195a.tar.gz infinity-for-reddit-ff7281aa890c43a21c90ec49c0e821e98956195a.tar.bz2 infinity-for-reddit-ff7281aa890c43a21c90ec49c0e821e98956195a.tar.lz infinity-for-reddit-ff7281aa890c43a21c90ec49c0e821e98956195a.tar.xz infinity-for-reddit-ff7281aa890c43a21c90ec49c0e821e98956195a.tar.zst infinity-for-reddit-ff7281aa890c43a21c90ec49c0e821e98956195a.zip | |
Merge new features from 4.2.3 to 4.2.5.
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/layout/activity_login.xml | 8 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 3 |
3 files changed, 20 insertions, 0 deletions
diff --git a/app/src/main/res/drawable/ic_help_24dp.xml b/app/src/main/res/drawable/ic_help_24dp.xml new file mode 100644 index 00000000..81e329b9 --- /dev/null +++ b/app/src/main/res/drawable/ic_help_24dp.xml @@ -0,0 +1,9 @@ +<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/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 470a6124..2452a367 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -47,4 +47,12 @@ </LinearLayout> + <com.google.android.material.floatingactionbutton.FloatingActionButton + android:id="@+id/fab_login_activity" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="@dimen/fab_margin" + android:layout_gravity="bottom|end" + android:src="@drawable/ic_help_24dp" /> + </androidx.coordinatorlayout.widget.CoordinatorLayout> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b06b9b52..e965361a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1017,4 +1017,7 @@ <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> + </resources> |