Skip to content

Help button #1415

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Apr 30, 2018
Merged

Help button #1415

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c5d6d19
Help button added to tutorial
97balakrishnan Apr 2, 2018
5792c08
debug typo removed
97balakrishnan Apr 2, 2018
0357b81
Help changed to more info
97balakrishnan Apr 8, 2018
f3fbdf8
Merge branch 'master' of https://github.com/commons-app/apps-android-…
97balakrishnan Apr 8, 2018
369f1be
More option moved to bottom
97balakrishnan Apr 29, 2018
b5289b0
Alignment changes made
97balakrishnan Apr 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Help changed to more info
  • Loading branch information
@97balakrishnan
97balakrishnan committed Apr 8, 2018
commit 0357b81588fe217077737390a48b85c7480b6cc1
2 changes: 1 addition & 1 deletion app/src/main/java/fr/free/nrw/commons/WelcomePagerAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ void onClicked() {
}

@Optional
@OnClick(R.id.welcomeHelpButton)
@OnClick(R.id.welcomeInfo)
void onHelpClicked () {
try {
Utils.handleWebUrl(container.getContext(),Uri.parse("https://commons.wikimedia.org/wiki/Help:Contents" ));
Expand Down
36 changes: 21 additions & 15 deletions app/src/main/res/layout-land/welcome_final.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#0c609c"
android:gravity="center"
>

>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/welcome_help_button_text"
android:id="@+id/welcomeInfo"
android:layout_gravity="end|top"
android:layout_marginTop="@dimen/standard_gap"
android:layout_marginRight="@dimen/standard_gap"
android:layout_marginEnd="@dimen/standard_gap"
android:textSize="@dimen/normal_text"
android:textColor="@android:color/white"
/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:gravity="center">
<!-- Sorry about the hardcoded sizes here. They're image-related. -->
<LinearLayout
android:layout_width="wrap_content"
Expand Down Expand Up @@ -59,18 +75,8 @@
android:textColor="#0c609c"
android:textStyle="bold"
/>
<Button
android:layout_width="120dp"
android:layout_height="@dimen/overflow_button_dimen"
android:layout_marginTop="@dimen/standard_gap"
android:text="@string/welcome_help_button_text"
android:id="@+id/welcomeHelpButton"
android:textSize="@dimen/normal_text"
android:layout_gravity="center"
android:background="@android:color/white"
android:textColor="#0c609c"
android:textStyle="bold"
/>

</LinearLayout>
</LinearLayout>

</LinearLayout>
34 changes: 19 additions & 15 deletions app/src/main/res/layout/welcome_final.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,26 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#0c609c"
android:gravity="center_vertical"
>

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top|end"
android:layout_marginTop="@dimen/standard_gap"
android:layout_marginRight="@dimen/standard_gap"
android:layout_marginEnd="@dimen/standard_gap"
android:id="@+id/welcomeInfo"
android:textSize="@dimen/normal_text"
android:textColor="@android:color/white"
android:text="@string/welcome_help_button_text"
/>
<LinearLayout
android:gravity="center"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:gravity="center_vertical">
<LinearLayout
android:gravity="center_vertical"
android:layout_width="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_height="180dp"
Expand Down Expand Up @@ -59,17 +74,6 @@
android:textColor="#0c609c"
android:textStyle="bold"
/>
<Button
android:layout_width="120dp"
android:layout_height="@dimen/overflow_button_dimen"
android:layout_marginTop="@dimen/standard_gap"
android:text="@string/welcome_help_button_text"
android:id="@+id/welcomeHelpButton"
android:textSize="@dimen/normal_text"
android:layout_gravity="center"
android:background="@android:color/white"
android:textColor="#0c609c"
android:textStyle="bold"
/>

</LinearLayout>
</LinearLayout>
2 changes: 1 addition & 1 deletion app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
<string name="welcome_copyright_subtext">Avoid copyrighted materials you found from the Internet as well as images of posters, book covers, etc.</string>
<string name="welcome_final_text">You think you got it?</string>
<string name="welcome_final_button_text">Yes!</string>
<string name="welcome_help_button_text">More Help</string>
<string name="welcome_help_button_text"><u>More Information</u></string>
<string name="detail_panel_cats_label">Categories</string>
<string name="detail_panel_cats_loading">Loading…</string>
<string name="detail_panel_cats_none">None selected</string>
Expand Down