diff options
| author | Docile-Alligator <chineseperson5@gmail.com> | 2021-09-23 12:02:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-23 12:02:10 +0000 |
| commit | ccd80a3e15edc675e7296215f3828e5ff281d722 (patch) | |
| tree | f3d357b3f7e2f89f1c5f91307be3067275d66bc1 /app/src/main/res | |
| parent | 97d630392cd8161c1428d1451f1690ee2a667830 (diff) | |
| parent | cf9829046ac7ba92aa42db67468d23dd5b25cf97 (diff) | |
| download | infinity-for-reddit-ccd80a3e15edc675e7296215f3828e5ff281d722.tar infinity-for-reddit-ccd80a3e15edc675e7296215f3828e5ff281d722.tar.gz infinity-for-reddit-ccd80a3e15edc675e7296215f3828e5ff281d722.tar.bz2 infinity-for-reddit-ccd80a3e15edc675e7296215f3828e5ff281d722.tar.lz infinity-for-reddit-ccd80a3e15edc675e7296215f3828e5ff281d722.tar.xz infinity-for-reddit-ccd80a3e15edc675e7296215f3828e5ff281d722.tar.zst infinity-for-reddit-ccd80a3e15edc675e7296215f3828e5ff281d722.zip | |
Merge branch 'master' into go-to-top-of-page-button
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/menu/view_subreddit_detail_activity.xml | 6 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/app/src/main/res/menu/view_subreddit_detail_activity.xml b/app/src/main/res/menu/view_subreddit_detail_activity.xml index c1631814..cb92de44 100644 --- a/app/src/main/res/menu/view_subreddit_detail_activity.xml +++ b/app/src/main/res/menu/view_subreddit_detail_activity.xml @@ -58,4 +58,10 @@ android:orderInCategory="9" android:title="@string/action_share" app:showAsAction="never" /> + + <item + android:id="@+id/action_go_to_wiki_activity" + android:orderInCategory="10" + android:title="@string/action_go_to_wiki" + app:showAsAction="never" /> </menu> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b94cac10..7b44a036 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1190,6 +1190,8 @@ <string name="app_lock_timeout_6_hours">6 hours</string> <string name="app_lock_timeout_12_hours">12 hours</string> <string name="app_lock_timeout_24_hours">24 hours</string> + <string name="go_to_top">Go To Top</string> + <string name="action_go_to_wiki">Go to Wiki</string> </resources> |