From 7fae76294a453e42cf132a2f0e2134b0de1ebdb9 Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Wed, 4 Sep 2019 08:26:03 +0200 Subject: [PATCH] rename participate -> community Signed-off-by: tobiasKaminsky --- drawable_resources/nav_community.svg | 6 ++ drawable_resources/nav_participate.svg | 1 - src/main/AndroidManifest.xml | 2 +- .../nextcloud/client/di/ComponentsModule.java | 6 +- ...teActivity.java => CommunityActivity.java} | 50 +++++++------- .../android/ui/activity/DrawerActivity.java | 8 +-- ...{nav_participate.xml => nav_community.xml} | 0 ...cipate_layout.xml => community_layout.xml} | 68 +++++++++---------- src/main/res/menu/drawer_menu.xml | 6 +- src/main/res/values/setup.xml | 2 - src/main/res/values/strings.xml | 48 ++++++------- 11 files changed, 101 insertions(+), 96 deletions(-) create mode 100644 drawable_resources/nav_community.svg delete mode 100644 drawable_resources/nav_participate.svg rename src/main/java/com/owncloud/android/ui/activity/{ParticipateActivity.java => CommunityActivity.java} (69%) rename src/main/res/drawable/{nav_participate.xml => nav_community.xml} (100%) rename src/main/res/layout/{participate_layout.xml => community_layout.xml} (75%) diff --git a/drawable_resources/nav_community.svg b/drawable_resources/nav_community.svg new file mode 100644 index 0000000000..96911a3c6b --- /dev/null +++ b/drawable_resources/nav_community.svg @@ -0,0 +1,6 @@ + + + + diff --git a/drawable_resources/nav_participate.svg b/drawable_resources/nav_participate.svg deleted file mode 100644 index adc595d884..0000000000 --- a/drawable_resources/nav_participate.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index ef091b6e02..8ddccdbd0b 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -122,7 +122,7 @@ - + diff --git a/src/main/java/com/nextcloud/client/di/ComponentsModule.java b/src/main/java/com/nextcloud/client/di/ComponentsModule.java index 51dec74ff7..b200807360 100644 --- a/src/main/java/com/nextcloud/client/di/ComponentsModule.java +++ b/src/main/java/com/nextcloud/client/di/ComponentsModule.java @@ -37,6 +37,7 @@ import com.owncloud.android.services.AccountManagerService; import com.owncloud.android.services.OperationsService; import com.owncloud.android.ui.activities.ActivitiesActivity; import com.owncloud.android.ui.activity.BaseActivity; +import com.owncloud.android.ui.activity.CommunityActivity; import com.owncloud.android.ui.activity.ConflictsResolveActivity; import com.owncloud.android.ui.activity.ContactsPreferenceActivity; import com.owncloud.android.ui.activity.CopyToClipboardActivity; @@ -49,7 +50,6 @@ import com.owncloud.android.ui.activity.FolderPickerActivity; import com.owncloud.android.ui.activity.ManageAccountsActivity; import com.owncloud.android.ui.activity.ManageSpaceActivity; import com.owncloud.android.ui.activity.NotificationsActivity; -import com.owncloud.android.ui.activity.ParticipateActivity; import com.owncloud.android.ui.activity.PassCodeActivity; import com.owncloud.android.ui.activity.ReceiveExternalFilesActivity; import com.owncloud.android.ui.activity.RequestCredentialsActivity; @@ -107,7 +107,9 @@ abstract class ComponentsModule { @ContributesAndroidInjector abstract ManageAccountsActivity manageAccountsActivity(); @ContributesAndroidInjector abstract ManageSpaceActivity manageSpaceActivity(); @ContributesAndroidInjector abstract NotificationsActivity notificationsActivity(); - @ContributesAndroidInjector abstract ParticipateActivity participateActivity(); + + @ContributesAndroidInjector + abstract CommunityActivity participateActivity(); @ContributesAndroidInjector abstract PassCodeActivity passCodeActivity(); @ContributesAndroidInjector abstract PreviewImageActivity previewImageActivity(); @ContributesAndroidInjector abstract PreviewVideoActivity previewVideoActivity(); diff --git a/src/main/java/com/owncloud/android/ui/activity/ParticipateActivity.java b/src/main/java/com/owncloud/android/ui/activity/CommunityActivity.java similarity index 69% rename from src/main/java/com/owncloud/android/ui/activity/ParticipateActivity.java rename to src/main/java/com/owncloud/android/ui/activity/CommunityActivity.java index d822d9eabe..04fb42d90f 100644 --- a/src/main/java/com/owncloud/android/ui/activity/ParticipateActivity.java +++ b/src/main/java/com/owncloud/android/ui/activity/CommunityActivity.java @@ -38,62 +38,62 @@ import com.owncloud.android.utils.ThemeUtils; /** * Activity providing information about ways to participate in the app's development. */ -public class ParticipateActivity extends FileActivity { +public class CommunityActivity extends FileActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.participate_layout); + setContentView(R.layout.community_layout); // setup toolbar setupToolbar(); // setup drawer - setupDrawer(R.id.nav_participate); + setupDrawer(R.id.nav_community); - ThemeUtils.setColoredTitle(getSupportActionBar(), R.string.drawer_participate, this); + ThemeUtils.setColoredTitle(getSupportActionBar(), R.string.drawer_community, this); setupContent(); } private void setupContent() { - TextView rcView = findViewById(R.id.participate_release_candidate_text); + TextView rcView = findViewById(R.id.community_release_candidate_text); rcView.setMovementMethod(LinkMovementMethod.getInstance()); - TextView contributeIrcView = findViewById(R.id.participate_contribute_irc_text); + TextView contributeIrcView = findViewById(R.id.community_contribute_irc_text); contributeIrcView.setMovementMethod(LinkMovementMethod.getInstance()); - contributeIrcView.setText(Html.fromHtml(getString(R.string.participate_contribute_irc_text) + " " + - getString(R.string.participate_contribute_irc_text_link, + contributeIrcView.setText(Html.fromHtml(getString(R.string.community_contribute_irc_text) + " " + + getString(R.string.community_contribute_irc_text_link, ThemeUtils.colorToHexString(ThemeUtils.primaryColor(this, true)), getString(R.string.irc_weblink)))); - TextView contributeForumView = findViewById(R.id.participate_contribute_forum_text); + TextView contributeForumView = findViewById(R.id.community_contribute_forum_text); contributeForumView.setMovementMethod(LinkMovementMethod.getInstance()); - contributeForumView.setText(Html.fromHtml(getString(R.string.participate_contribute_forum_text) + " " + - getString(R.string.participate_contribute_forum_text_link, - ThemeUtils.colorToHexString(ThemeUtils.primaryColor(this, true)), - getString(R.string.help_link), getString(R.string.participate_contribute_forum_forum)))); + contributeForumView.setText(Html.fromHtml(getString(R.string.community_contribute_forum_text) + " " + + getString(R.string.community_contribute_forum_text_link, + ThemeUtils.colorToHexString(ThemeUtils.primaryColor(this, true)), + getString(R.string.help_link), getString(R.string.community_contribute_forum_forum)))); - TextView contributeTranslationView = findViewById(R.id.participate_contribute_translate_text); + TextView contributeTranslationView = findViewById(R.id.community_contribute_translate_text); contributeTranslationView.setMovementMethod(LinkMovementMethod.getInstance()); contributeTranslationView.setText(Html.fromHtml( - getString(R.string.participate_contribute_translate_link, - ThemeUtils.colorToHexString(ThemeUtils.primaryColor(this, true)), - getString(R.string.translation_link), - getString(R.string.participate_contribute_translate_translate)) + " " + - getString(R.string.participate_contribute_translate_text))); + getString(R.string.community_contribute_translate_link, + ThemeUtils.colorToHexString(ThemeUtils.primaryColor(this, true)), + getString(R.string.translation_link), + getString(R.string.community_contribute_translate_translate)) + " " + + getString(R.string.community_contribute_translate_text))); - TextView contributeGithubView = findViewById(R.id.participate_contribute_github_text); + TextView contributeGithubView = findViewById(R.id.community_contribute_github_text); contributeGithubView.setMovementMethod(LinkMovementMethod.getInstance()); contributeGithubView.setText(Html.fromHtml( - getString(R.string.participate_contribute_github_text, - getString(R.string.participate_contribute_github_text_link, + getString(R.string.community_contribute_github_text, + getString(R.string.community_contribute_github_text_link, ThemeUtils.colorToHexString(ThemeUtils.primaryColor(this, true)), getString(R.string.contributing_link))))); - MaterialButton reportButton = findViewById(R.id.participate_testing_report); - reportButton.getBackground().setColorFilter(ThemeUtils.primaryColor(this), PorterDuff.Mode.SRC_ATOP); + MaterialButton reportButton = findViewById(R.id.community_testing_report); + reportButton.getBackground().setColorFilter(ThemeUtils.primaryColor(this, true), PorterDuff.Mode.SRC_ATOP); reportButton.setOnClickListener(v -> DisplayUtils.startLinkIntent(this, R.string.report_issue_link)); } @@ -146,6 +146,6 @@ public class ParticipateActivity extends FileActivity { protected void onResume() { super.onResume(); - setDrawerMenuItemChecked(R.id.nav_participate); + setDrawerMenuItemChecked(R.id.nav_community); } } diff --git a/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java b/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java index a249a123ff..c96740ca86 100644 --- a/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java +++ b/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java @@ -375,8 +375,8 @@ public abstract class DrawerActivity extends ToolbarActivity DrawerMenuUtil.setupHomeMenuItem(menu, getResources()); - DrawerMenuUtil.removeMenuItem(menu, R.id.nav_participate, - !getResources().getBoolean(R.bool.participate_enabled)); + DrawerMenuUtil.removeMenuItem(menu, R.id.nav_community, + !getResources().getBoolean(R.bool.participate_enabled)); DrawerMenuUtil.removeMenuItem(menu, R.id.nav_shared, !getResources().getBoolean(R.bool.shared_enabled)); DrawerMenuUtil.removeMenuItem(menu, R.id.nav_contacts, !getResources().getBoolean(R.bool.contacts_backup) || !getResources().getBoolean(R.bool.show_drawer_contacts_backup)); @@ -457,8 +457,8 @@ public abstract class DrawerActivity extends ToolbarActivity case R.id.nav_settings: startActivity(SettingsActivity.class); break; - case R.id.nav_participate: - startActivity(ParticipateActivity.class); + case R.id.nav_community: + startActivity(CommunityActivity.class); break; case R.id.nav_logout: mCheckedMenuItem = -1; diff --git a/src/main/res/drawable/nav_participate.xml b/src/main/res/drawable/nav_community.xml similarity index 100% rename from src/main/res/drawable/nav_participate.xml rename to src/main/res/drawable/nav_community.xml diff --git a/src/main/res/layout/participate_layout.xml b/src/main/res/layout/community_layout.xml similarity index 75% rename from src/main/res/layout/participate_layout.xml rename to src/main/res/layout/community_layout.xml index b890f9ed2b..74cdd671d5 100755 --- a/src/main/res/layout/participate_layout.xml +++ b/src/main/res/layout/community_layout.xml @@ -47,89 +47,89 @@ android:padding="@dimen/standard_padding"> + android:contentDescription="@string/community_rc_fdroid" /> + android:contentDescription="@string/community_rc_play_store" /> + android:contentDescription="@string/community_dev_fdroid" /> + android:contentDescription="@string/community_dev_direct_download" /> diff --git a/src/main/res/menu/drawer_menu.xml b/src/main/res/menu/drawer_menu.xml index e2fdc0f453..33f5bc1d04 100644 --- a/src/main/res/menu/drawer_menu.xml +++ b/src/main/res/menu/drawer_menu.xml @@ -138,10 +138,10 @@ android:orderInCategory="4" android:title="@string/actionbar_settings"/> + android:title="@string/drawer_community" /> https://nextcloud.com/privacy false true - true false true https://github.com/nextcloud/android true https://www.gnu.org/licenses/gpl-2.0.html - android@nextcloud.com "https://play.google.com/store/apps/details?id=com.nextcloud.client" https://nextcloud.com/install diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 61a1c6e9ac..9e7532baf8 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -526,30 +526,30 @@ This is a Nextcloud feature, please upgrade. Learn more Auto upload - Community - Help by testing - Found a bug? Oddments? - Report an issue on GitHub - Interested in helping out by testing what will be the next version? - Test the dev version - This includes all upcoming features and it is on the very bleeding edge. Bugs/errors can occur, if and when they do, please report of your findings. - Release candidate - The release candidate (RC) is a snapshot of the upcoming release and is expected to be stable. Testing your individual setup could help ensure this. Sign up for testing on the Play store or manually look in the \"Version\" section of F-Droid. - Actively Contribute - Join the chat on IRC: - <font color=\"%1$s\"><a href=\"%2$s\">#nextcloud-mobile</a></font> - Help others on the - forum - <font color=\"%1$s\"><a href=\"%2$s\">%3$s</a></font> - Translate - the app - <font color=\"%1$s\"><a href=\"%2$s\">%3$s</a></font> - Review, amend and write code, see %1$s for details - <font color=\"%1$s\"><a href=\"%2$s\">CONTRIBUTING.md</a></font> - Get release candidate from Google Play store - Get release candidate from F-Droid app - Get development release from F-Droid app - Download development release directly + Community + Help by testing + Found a bug? Oddments? + Report an issue on GitHub + Interested in helping out by testing what will be the next version? + Test the dev version + This includes all upcoming features and it is on the very bleeding edge. Bugs/errors can occur, if and when they do, please report of your findings. + Release candidate + The release candidate (RC) is a snapshot of the upcoming release and is expected to be stable. Testing your individual setup could help ensure this. Sign up for testing on the Play store or manually look in the \"Version\" section of F-Droid. + Actively Contribute + Join the chat on IRC: + <font color=\"%1$s\"><a href=\"%2$s\">#nextcloud-mobile</a></font> + Help others on the + forum + <font color=\"%1$s\"><a href=\"%2$s\">%3$s</a></font> + Translate + the app + <font color=\"%1$s\"><a href=\"%2$s\">%3$s</a></font> + Review, amend and write code, see %1$s for details + <font color=\"%1$s\"><a href=\"%2$s\">CONTRIBUTING.md</a></font> + Get release candidate from Google Play store + Get release candidate from F-Droid app + Get development release from F-Droid app + Download development release directly Move to… Copy to… Choose remote folder…