vanitasvitae/dandelion
1
0
Fork 0
mirror of https://github.com/gsantner/dandelion synced 2025-09-15 13:19:42 +02:00
Code Issues Releases Wiki Activity

Merge 2b12747ddf into d17d89f7f9

Browse source
This commit is contained in:
vanitasvitae 2016-11-04 22:38:08 +00:00 • committed by GitHub
commit fd82b736a7
8 changed files with 111 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

17
app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
View file

@ -397,6 +397,7 @@ public class MainActivity extends ThemedActivity
navMenu.findItem(R.id.nav_profile).setVisible(appSettings.isVisibleInNavProfile()); navMenu.findItem(R.id.nav_profile).setVisible(appSettings.isVisibleInNavProfile());
navMenu.findItem(R.id.nav_public).setVisible(appSettings.isVisibleInNavPublic_activities()); navMenu.findItem(R.id.nav_public).setVisible(appSettings.isVisibleInNavPublic_activities());
navMenu.findItem(R.id.nav_stream).setVisible(true); navMenu.findItem(R.id.nav_stream).setVisible(true);
navMenu.findItem(R.id.nav_reports).setVisible(appSettings.isVisibleInNavReports());
// Hide whole group (for logged in use) if no pod was selected // Hide whole group (for logged in use) if no pod was selected
@ -1027,8 +1028,8 @@ public class MainActivity extends ThemedActivity
} else { } else {
snackbarNoInternet.show(); snackbarNoInternet.show();
} }
break;
} }
break;
case R.id.nav_public: { case R.id.nav_public: {
if (WebHelper.isOnline(MainActivity.this)) { if (WebHelper.isOnline(MainActivity.this)) {
@ -1036,14 +1037,24 @@ public class MainActivity extends ThemedActivity
} else { } else {
snackbarNoInternet.show(); snackbarNoInternet.show();
} }
break;
} }
break;
case R.id.nav_reports: {
AppLog.d(this, "NAV_REPORTS!");
if(WebHelper.isOnline(MainActivity.this)) {
openDiasporaUrl(urls.getReportsUrl());
} else {
snackbarNoInternet.show();
}
}
break;
case R.id.nav_exit: { case R.id.nav_exit: {
moveTaskToBack(true); moveTaskToBack(true);
finish(); finish();
break;
} }
break;
case R.id.nav_settings: { case R.id.nav_settings: {
startActivity(new Intent(this, SettingsActivity.class)); startActivity(new Intent(this, SettingsActivity.class));

4
app/src/main/java/com/github/dfa/diaspora_android/util/AppSettings.java
View file

@ -380,6 +380,10 @@ public class AppSettings {
return getBoolean(prefApp, R.string.pref_key__visibility_nav__contacts, false); return getBoolean(prefApp, R.string.pref_key__visibility_nav__contacts, false);
} }
public boolean isVisibleInNavReports() {
return getBoolean(prefApp, R.string.pref_key__visibility_nav__reports, false);
}
public void setPrimaryColorSettings(int base, int shade) { public void setPrimaryColorSettings(int base, int shade) {
setInt(prefApp, R.string.pref_key__primary_color_base, base); setInt(prefApp, R.string.pref_key__primary_color_base, base);
setInt(prefApp, R.string.pref_key__primary_color_shade, shade); setInt(prefApp, R.string.pref_key__primary_color_shade, shade);

11
app/src/main/java/com/github/dfa/diaspora_android/util/DiasporaUrlHelper.java
View file

@ -60,6 +60,7 @@ public class DiasporaUrlHelper {
public static final String SUBURL_NOTIFICATIONS_MENTIONED = "/notifications?type=mentioned"; public static final String SUBURL_NOTIFICATIONS_MENTIONED = "/notifications?type=mentioned";
public static final String SUBURL_NOTIFICATIONS_RESHARED = "/notifications?type=reshared"; public static final String SUBURL_NOTIFICATIONS_RESHARED = "/notifications?type=reshared";
public static final String SUBURL_NOTIFICATIONS_STARTED_SHARING = "/notifications?type=started_sharing"; public static final String SUBURL_NOTIFICATIONS_STARTED_SHARING = "/notifications?type=started_sharing";
public static final String SUBURL_REPORTS = "/reports";
public DiasporaUrlHelper(AppSettings settings) { public DiasporaUrlHelper(AppSettings settings) {
this.settings = settings; this.settings = settings;
@ -273,6 +274,16 @@ public class DiasporaUrlHelper {
return getPodUrl() + SUBURL_MANAGE_CONTACTS; return getPodUrl() + SUBURL_MANAGE_CONTACTS;
} }
/**
* Return a url that points to the report page of the pod.
* Note: Only admins/moderators do have access to that url.
*
* @return https://(pod-domain.tld)/reports
*/
public String getReportsUrl() {
return getPodUrl() + SUBURL_REPORTS;
}
public String getSuburlNotificationsAlsoCommentedUrl() { public String getSuburlNotificationsAlsoCommentedUrl() {
return getPodUrl() + SUBURL_NOTIFICATIONS_ALSO_COMMENTED; return getPodUrl() + SUBURL_NOTIFICATIONS_ALSO_COMMENTED;
} }

15
app/src/main/res/drawable/ic_report_black_48px.xml Normal file
View file

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#000000"
android:pathData="M15.73 3H8.27L3 8.27v7.46L8.27 21h7.46L21 15.73V8.27L15.73 3zM12 17.3c-.72
0-1.3-.58-1.3-1.3 0-.72 .58 -1.3 1.3-1.3 .72 0 1.3 .58 1.3 1.3 0 .72-.58 1.3-1.3
1.3zm1-4.3h-2V7h2v6z" />
<path
android:pathData="M0 0h24v24H0z" />
</vector>

5
app/src/main/res/menu/main__navdrawer.xml
View file

@ -53,6 +53,11 @@
android:icon="@drawable/ic_public_black_48px" android:icon="@drawable/ic_public_black_48px"
android:title="@string/nav_public_activities" /> android:title="@string/nav_public_activities" />
<item
android:id="@+id/nav_reports"
android:icon="@drawable/ic_report_black_48px"
android:title="@string/nav_reports" />
<item <item
android:id="@+id/nav_exit" android:id="@+id/nav_exit"
android:icon="@drawable/ic_cancel_black_48px" android:icon="@drawable/ic_cancel_black_48px"

3
app/src/main/res/values/strings-preferences.xml
View file

@ -34,6 +34,7 @@
<!-- Navigiation Slider --> <!-- Navigiation Slider -->
<string name="pref_catkey__visibility_nav" translatable="false">pref_catkey__visibility_navslider</string> <string name="pref_catkey__visibility_nav" translatable="false">pref_catkey__visibility_navslider</string>
<string name="pref_cat__visibility_nav_items__general">General</string>
<string name="pref_key__visibility_nav__exit" translatable="false">pref_key__visibility_navslider__exit</string> <string name="pref_key__visibility_nav__exit" translatable="false">pref_key__visibility_navslider__exit</string>
<string name="pref_key__visibility_nav__help_license" translatable="false">pref_key__visibility_nav__help_license</string> <string name="pref_key__visibility_nav__help_license" translatable="false">pref_key__visibility_nav__help_license</string>
<string name="pref_key__visibility_nav__public_activities" translatable="false">pref_key__visibility_nav__public_activities</string> <string name="pref_key__visibility_nav__public_activities" translatable="false">pref_key__visibility_nav__public_activities</string>
@ -45,6 +46,8 @@
<string name="pref_key__visibility_nav__followed_tags" translatable="false">pref_key__visibility_nav__followed_tags</string> <string name="pref_key__visibility_nav__followed_tags" translatable="false">pref_key__visibility_nav__followed_tags</string>
<string name="pref_key__visibility_nav__profile" translatable="false">pref_key__visibility_nav__profile</string> <string name="pref_key__visibility_nav__profile" translatable="false">pref_key__visibility_nav__profile</string>
<string name="pref_key__visibility_nav__contacts" translatable="false">pref_key__visibility_nav__contacts</string> <string name="pref_key__visibility_nav__contacts" translatable="false">pref_key__visibility_nav__contacts</string>
<string name="pref_cat__visibility_nav_items__admin">Admin</string>
<string name="pref_key__visibility_nav__reports" translatable="false">pref_key__visibility_nav__report</string>
<!-- PodProfile --> <!-- PodProfile -->
<string name="pref_key__podprofile_avatar_url" translatable="false">podUserProfile_avatar</string> <string name="pref_key__podprofile_avatar_url" translatable="false">podUserProfile_avatar</string>

1
app/src/main/res/values/strings.xml
View file

@ -70,6 +70,7 @@
<string name="nav_followed_tags">Followed Tags</string> <string name="nav_followed_tags">Followed Tags</string>
<string name="nav_public_activities">Public activities</string> <string name="nav_public_activities">Public activities</string>
<string name="nav_contacts" translatable="false">@string/contacts</string> <string name="nav_contacts" translatable="false">@string/contacts</string>
<string name="nav_reports">Report</string>
<string name="share__share_link_as_text">Share link as text</string> <string name="share__share_link_as_text">Share link as text</string>
<string name="share__share_screenshot">Share screenshot of webpage</string> <string name="share__share_screenshot">Share screenshot of webpage</string>

106
app/src/main/res/xml/preferences__sub_navslider_vis.xml
View file

@ -1,54 +1,64 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory <com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory
android:key="@string/pref_key__title__visibility_nav" android:key="@string/pref_key__title__visibility_nav"
android:title="@string/pref_cat__visibility_nav_items"> android:title="@string/pref_cat__visibility_nav_items__general">
<com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference <com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
android:defaultValue="true" android:defaultValue="true"
android:key="@string/pref_key__visibility_nav__profile" android:key="@string/pref_key__visibility_nav__profile"
android:title="@string/nav_profile"/> android:title="@string/nav_profile"/>
<com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference <com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
android:defaultValue="true" android:defaultValue="true"
android:key="@string/pref_key__visibility_nav__followed_tags" android:key="@string/pref_key__visibility_nav__followed_tags"
android:title="@string/nav_followed_tags"/> android:title="@string/nav_followed_tags"/>
<com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference <com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
android:defaultValue="true" android:defaultValue="true"
android:key="@string/pref_key__visibility_nav__aspects" android:key="@string/pref_key__visibility_nav__aspects"
android:title="@string/nav_aspects"/> android:title="@string/nav_aspects"/>
<com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference <com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
android:defaultValue="false" android:defaultValue="false"
android:key="@string/pref_key__visibility_nav__contacts" android:key="@string/pref_key__visibility_nav__contacts"
android:title="@string/nav_contacts" /> android:title="@string/nav_contacts" />
<com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference <com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
android:defaultValue="false" android:defaultValue="false"
android:key="@string/pref_key__visibility_nav__activities" android:key="@string/pref_key__visibility_nav__activities"
android:title="@string/nav_activities"/> android:title="@string/nav_activities"/>
<com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference <com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
android:defaultValue="true" android:defaultValue="true"
android:key="@string/pref_key__visibility_nav__liked" android:key="@string/pref_key__visibility_nav__liked"
android:title="@string/nav_liked"/> android:title="@string/nav_liked"/>
<com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference <com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
android:defaultValue="true" android:defaultValue="true"
android:key="@string/pref_key__visibility_nav__commented" android:key="@string/pref_key__visibility_nav__commented"
android:title="@string/nav_commented"/> android:title="@string/nav_commented"/>
<com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference <com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
android:defaultValue="false" android:defaultValue="false"
android:key="@string/pref_key__visibility_nav__mentions" android:key="@string/pref_key__visibility_nav__mentions"
android:title="@string/nav_mentions"/> android:title="@string/nav_mentions"/>
<com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference <com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
android:defaultValue="false" android:defaultValue="false"
android:key="@string/pref_key__visibility_nav__public_activities" android:key="@string/pref_key__visibility_nav__public_activities"
android:title="@string/nav_public_activities"/> android:title="@string/nav_public_activities"/>
<com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference <com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
android:defaultValue="false" android:defaultValue="false"
android:key="@string/pref_key__visibility_nav__exit" android:key="@string/pref_key__visibility_nav__exit"
android:title="@string/action_exit_app"/> android:title="@string/action_exit_app"/>
<com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference <com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
android:defaultValue="true" android:defaultValue="true"
android:key="@string/pref_key__visibility_nav__help_license" android:key="@string/pref_key__visibility_nav__help_license"
android:title="@string/nav_help_license"/> android:title="@string/nav_help_license"/>
</com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory> </com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory>
<com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory
android:title="@string/pref_cat__visibility_nav_items__admin">
<com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
android:defaultValue="false"
android:key="@string/pref_key__visibility_nav__reports"
android:title="@string/nav_reports" />
</com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory>
</PreferenceScreen> </PreferenceScreen>