archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Move "Help & Feedback" into settings menu

Browse Source
pull/281/head
Alex Baker 9 years ago
parent de45243710
commit bc91832cc0
14 changed files with 63 additions and 116 deletions
Show Stats Download Patch File Download Diff File

5
src/main/AndroidManifest.xml
Unescape Escape View File

@ -184,11 +184,6 @@
android:label="@string/backup_BPr_header"
android:theme="@style/Tasks" />
<activity
android:name=".preferences.HelpAndFeedbackActivity"
android:label="@string/help_and_feedback"
android:theme="@style/Tasks" />
<!-- Activity that configures widget -->
<activity android:name="com.todoroo.astrid.widget.WidgetConfigActivity">
<intent-filter>

2
src/main/java/org/tasks/injection/ActivityModule.java
Unescape Escape View File

@ -35,7 +35,6 @@ import org.tasks.activities.PurgeDeletedActivity;
import org.tasks.preferences.AppearancePreferences;
import org.tasks.preferences.BackupPreferences;
import org.tasks.preferences.BasicPreferences;
import org.tasks.preferences.HelpAndFeedbackActivity;
import org.tasks.preferences.MiscellaneousPreferences;
import org.tasks.reminders.SnoozeActivity;
import org.tasks.voice.VoiceCommandActivity;
@ -80,7 +79,6 @@ import dagger.Provides;
DeleteAllCalendarEventsActivity.class,
ClearGtaskDataActivity.class,
ReminderPreferences.class,
HelpAndFeedbackActivity.class,
AppearancePreferences.class,
BackupPreferences.class
})

21
src/main/java/org/tasks/preferences/BasicPreferences.java
Unescape Escape View File

@ -1,16 +1,21 @@
package org.tasks.preferences;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.preference.Preference;
import org.tasks.R;
import org.tasks.injection.InjectingPreferenceActivity;
import javax.inject.Inject;
public class BasicPreferences extends InjectingPreferenceActivity {
private static final int RC_PREFS = 10001;
@Inject DeviceInfo deviceInfo;
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@ -26,6 +31,18 @@ public class BasicPreferences extends InjectingPreferenceActivity {
return true;
}
});
findPreference(getString(R.string.contact_developer)).setIntent(
new Intent(Intent.ACTION_SENDTO, Uri.fromParts("mailto", "Alex Baker<baker.alex+tasks@gmail.com>", null)) {{
putExtra(Intent.EXTRA_SUBJECT, "Tasks Feedback");
putExtra(Intent.EXTRA_TEXT, deviceInfo.getDebugInfo());
}});
if (!deviceInfo.supportsBilling()) {
remove(R.string.TLA_menu_donate);
}
if (!deviceInfo.isPlayStoreAvailable()) {
remove(R.string.rate_tasks);
}
}
@Override
@ -36,4 +53,8 @@ public class BasicPreferences extends InjectingPreferenceActivity {
super.onActivityResult(requestCode, resultCode, data);
}
}
private void remove(int resId) {
getPreferenceScreen().removePreference(findPreference(getString(resId)));
}
}

38
src/main/java/org/tasks/preferences/HelpAndFeedbackActivity.java
Unescape Escape View File

@ -1,38 +0,0 @@
package org.tasks.preferences;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import org.tasks.R;
import org.tasks.injection.InjectingPreferenceActivity;
import javax.inject.Inject;
public class HelpAndFeedbackActivity extends InjectingPreferenceActivity {
@Inject DeviceInfo deviceInfo;
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
addPreferencesFromResource(R.xml.preferences_help);
findPreference(getString(R.string.contact_developer)).setIntent(
new Intent(Intent.ACTION_SENDTO, Uri.fromParts("mailto", "Alex Baker<baker.alex+tasks@gmail.com>", null)) {{
putExtra(Intent.EXTRA_SUBJECT, "Tasks Feedback");
putExtra(Intent.EXTRA_TEXT, deviceInfo.getDebugInfo());
}});
if (!deviceInfo.supportsBilling()) {
remove(R.string.TLA_menu_donate);
}
if (!deviceInfo.isPlayStoreAvailable()) {
remove(R.string.rate_tasks);
}
}
private void remove(int resId) {
getPreferenceScreen().removePreference(findPreference(getString(resId)));
}
}

8
src/main/java/org/tasks/ui/NavigationDrawerFragment.java
Unescape Escape View File

@ -45,7 +45,6 @@ import org.tasks.injection.ForApplication;
import org.tasks.injection.InjectingFragment;
import org.tasks.preferences.AppearancePreferences;
import org.tasks.preferences.BasicPreferences;
import org.tasks.preferences.HelpAndFeedbackActivity;
import org.tasks.preferences.Preferences;
import javax.inject.Inject;
@ -145,13 +144,6 @@ public class NavigationDrawerFragment extends InjectingFragment {
startActivityForResult(new Intent(getActivity(), BasicPreferences.class), ACTIVITY_SETTINGS);
}
});
layout.findViewById(R.id.help_row).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
closeMenu();
startActivity(new Intent(getActivity(), HelpAndFeedbackActivity.class));
}
});
mDrawerListView.setItemChecked(mCurrentSelectedPosition, true);
return layout;
}

BIN
src/main/res/drawable-hdpi/ic_action_help.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.3 KiB

BIN
src/main/res/drawable-xhdpi/ic_action_help.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.8 KiB

BIN
src/main/res/drawable-xxhdpi/ic_action_help.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.7 KiB

BIN
src/main/res/drawable/ic_action_help.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 882 B

18
src/main/res/layout/fragment_navigation_drawer.xml
Unescape Escape View File

@ -50,24 +50,6 @@
android:gravity="center_vertical"
android:text="@string/TLA_menu_settings"/>
<TextView
android:id="@+id/help_row"
android:layout_width="match_parent"
android:layout_height="45dp"
android:clickable="true"
android:longClickable="false"
android:background="?attr/asFilterRowSelected"
android:drawableLeft="?attr/ic_action_help"
android:paddingLeft="10dp"
android:drawablePadding="10dp"
android:textAppearance="@style/TextAppearance.FLA_Filter"
android:checked="false"
android:lines="1"
android:singleLine="true"
android:ellipsize="end"
android:gravity="center_vertical"
android:text="@string/help_and_feedback"/>
</LinearLayout>
</LinearLayout>

1
src/main/res/values/attrs.xml
Unescape Escape View File

@ -45,7 +45,6 @@
<attr name="ic_action_alarm" format="reference" />
<attr name="ic_action_reload" format="reference" />
<attr name="ic_action_calendar_month" format="reference"/>
<attr name="ic_action_help" format="reference"/>
<attr name="drawer_text" format="color"/>
<attr name="importance_background_selected" format="reference"/>
<attr name="asFilterRowSelected" format="reference"/>

2
src/main/res/values/styles.xml
Unescape Escape View File

@ -63,7 +63,6 @@
<item name="ic_action_alarm">@drawable/ic_action_alarm</item>
<item name="ic_action_reload">@drawable/ic_action_reload</item>
<item name="ic_action_calendar_month">@drawable/ic_action_calendar_month</item>
<item name="ic_action_help">@drawable/ic_action_help</item>
<item name="fab_background">?attr/asAbBackgroundColor</item>
<item name="fab_background_pressed">#476472</item>
@ -98,7 +97,6 @@
<item name="ic_action_alarm">@drawable/ic_action_alarm_white</item>
<item name="ic_action_reload">@drawable/ic_action_reload_white</item>
<item name="ic_action_calendar_month">@drawable/ic_action_calendar_month_white</item>
<item name="ic_action_help">@drawable/ic_action_help_white</item>
<item name="ic_action_cancel">@drawable/ic_action_cancel_white</item>
<item name="asDueDateColor">#c3c3c3</item>

42
src/main/res/xml/preferences.xml
Unescape Escape View File

@ -43,4 +43,46 @@
android:targetPackage="org.tasks" />
</Preference>
<PreferenceCategory android:title="@string/help_and_feedback">
<Preference
android:key="@string/TLA_menu_donate"
android:title="@string/TLA_menu_donate">
<intent
android:targetClass="org.tasks.activities.DonationActivity"
android:targetPackage="org.tasks" />
</Preference>
<Preference android:title="@string/source_code">
<intent
android:action="android.intent.action.VIEW"
android:data="https://github.com/abaker/tasks" />
</Preference>
<Preference android:title="@string/translations">
<intent
android:action="android.intent.action.VIEW"
android:data="https://github.com/abaker/tasks/wiki/Translations" />
</Preference>
<Preference android:title="@string/report_an_issue">
<intent
android:action="android.intent.action.VIEW"
android:data="https://github.com/abaker/tasks/issues" />
</Preference>
<Preference
android:key="@string/rate_tasks"
android:title="@string/rate_tasks">
<intent
android:action="android.intent.action.VIEW"
android:data="market://details?id=org.tasks" />
</Preference>
<Preference
android:key="@string/contact_developer"
android:title="@string/contact_developer" />
</PreferenceCategory>
</PreferenceScreen>

42
src/main/res/xml/preferences_help.xml
Unescape Escape View File

@ -1,42 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<Preference
android:key="@string/TLA_menu_donate"
android:title="@string/TLA_menu_donate">
<intent
android:targetClass="org.tasks.activities.DonationActivity"
android:targetPackage="org.tasks" />
</Preference>
<Preference android:title="@string/source_code">
<intent
android:action="android.intent.action.VIEW"
android:data="https://github.com/abaker/tasks" />
</Preference>
<Preference android:title="@string/translations">
<intent
android:action="android.intent.action.VIEW"
android:data="https://github.com/abaker/tasks/wiki/Translations" />
</Preference>
<Preference android:title="@string/report_an_issue">
<intent
android:action="android.intent.action.VIEW"
android:data="https://github.com/abaker/tasks/issues" />
</Preference>
<Preference
android:key="@string/rate_tasks"
android:title="@string/rate_tasks">
<intent
android:action="android.intent.action.VIEW"
android:data="market://details?id=org.tasks" />
</Preference>
<Preference
android:key="@string/contact_developer"
android:title="@string/contact_developer" />
</PreferenceScreen>
Write Preview
Loading…
Cancel
Save