diff options
| author | Alex Ning <chineseperson5@gmail.com> | 2021-09-23 12:18:56 +0000 |
|---|---|---|
| committer | Alex Ning <chineseperson5@gmail.com> | 2021-09-23 12:18:56 +0000 |
| commit | 643d9395a48145011bedc041c6a7af18429bad9e (patch) | |
| tree | 7b0b8ed310d97fe94ddeb500a16c77045d1b0abf /app/src/main/res | |
| parent | 3482ab36e9954be164e9ee4ae88ff188bb636100 (diff) | |
| parent | a24c2930280c8dfb1ea51c1c711b05073ffef91a (diff) | |
| download | infinity-for-reddit-643d9395a48145011bedc041c6a7af18429bad9e.tar infinity-for-reddit-643d9395a48145011bedc041c6a7af18429bad9e.tar.gz infinity-for-reddit-643d9395a48145011bedc041c6a7af18429bad9e.tar.bz2 infinity-for-reddit-643d9395a48145011bedc041c6a7af18429bad9e.tar.lz infinity-for-reddit-643d9395a48145011bedc041c6a7af18429bad9e.tar.xz infinity-for-reddit-643d9395a48145011bedc041c6a7af18429bad9e.tar.zst infinity-for-reddit-643d9395a48145011bedc041c6a7af18429bad9e.zip | |
Merge branch 'master' of github.com:Docile-Alligator/Infinity-For-Reddit
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/drawable/ic_keyboard_double_arrow_up_24.xml | 13 | ||||
| -rw-r--r-- | app/src/main/res/menu/view_subreddit_detail_activity.xml | 6 | ||||
| -rw-r--r-- | app/src/main/res/values/arrays.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 3 |
4 files changed, 24 insertions, 0 deletions
diff --git a/app/src/main/res/drawable/ic_keyboard_double_arrow_up_24.xml b/app/src/main/res/drawable/ic_keyboard_double_arrow_up_24.xml new file mode 100644 index 00000000..fd6c2ac9 --- /dev/null +++ b/app/src/main/res/drawable/ic_keyboard_double_arrow_up_24.xml @@ -0,0 +1,13 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> + <path + android:fillColor="@android:color/black" + android:pathData="M6,17.59l1.41,1.41l4.59,-4.58l4.59,4.58l1.41,-1.41l-6,-6z"/> + <path + android:fillColor="@android:color/black" + android:pathData="M6,11l1.41,1.41l4.59,-4.58l4.59,4.58l1.41,-1.41l-6,-6z"/> +</vector> 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/arrays.xml b/app/src/main/res/values/arrays.xml index f8097c33..50c7b6c6 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -283,6 +283,7 @@ <item>@string/hidden</item> <item>@string/saved</item> <item>@string/gilded</item> + <item>@string/go_to_top</item> </string-array> <string-array name="settings_other_activities_bottom_app_bar_options"> @@ -306,6 +307,7 @@ <item>@string/hidden</item> <item>@string/saved</item> <item>@string/gilded</item> + <item>@string/go_to_top</item> </string-array> <string-array name="settings_bottom_app_bar_fab_options"> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 68ab820b..7b44a036 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1191,4 +1191,7 @@ <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> |