mirror of
https://github.com/nextcloud/android.git
synced 2024-11-26 23:28:42 +03:00
Merge pull request #4458 from nextcloud/community
rename participate -> community
This commit is contained in:
commit
7bc162ba34
11 changed files with 101 additions and 96 deletions
6
drawable_resources/nav_community.svg
Normal file
6
drawable_resources/nav_community.svg
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
|
||||||
|
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="24" height="24" viewBox="0 0 24 24">
|
||||||
|
<path
|
||||||
|
d="M1.5,4V5.5C1.5,9.65 3.71,13.28 7,15.3V20H22V18C22,15.34 16.67,14 14,14C14,14 13.83,14 13.75,14C9,14 5,10 5,5.5V4M14,4A4,4 0 0,0 10,8A4,4 0 0,0 14,12A4,4 0 0,0 18,8A4,4 0 0,0 14,4Z" />
|
||||||
|
</svg>
|
After Width: | Height: | Size: 451 B |
|
@ -1 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M1.5,4V5.5C1.5,9.65 3.71,13.28 7,15.3V20H22V18C22,15.34 16.67,14 14,14C14,14 13.83,14 13.75,14C9,14 5,10 5,5.5V4M14,4A4,4 0 0,0 10,8A4,4 0 0,0 14,12A4,4 0 0,0 18,8A4,4 0 0,0 14,4Z" /></svg>
|
|
Before Width: | Height: | Size: 475 B |
|
@ -122,7 +122,7 @@
|
||||||
<activity android:name=".ui.activity.ManageAccountsActivity" />
|
<activity android:name=".ui.activity.ManageAccountsActivity" />
|
||||||
<activity android:name=".ui.activity.UserInfoActivity" />
|
<activity android:name=".ui.activity.UserInfoActivity" />
|
||||||
<activity android:name=".ui.activity.NotificationsActivity"/>
|
<activity android:name=".ui.activity.NotificationsActivity"/>
|
||||||
<activity android:name=".ui.activity.ParticipateActivity" />
|
<activity android:name=".ui.activity.CommunityActivity" />
|
||||||
<activity android:name=".ui.activities.ActivitiesActivity"
|
<activity android:name=".ui.activities.ActivitiesActivity"
|
||||||
android:configChanges="orientation|screenSize|keyboardHidden" />
|
android:configChanges="orientation|screenSize|keyboardHidden" />
|
||||||
<activity android:name=".ui.activity.SyncedFoldersActivity"/>
|
<activity android:name=".ui.activity.SyncedFoldersActivity"/>
|
||||||
|
|
|
@ -37,6 +37,7 @@ import com.owncloud.android.services.AccountManagerService;
|
||||||
import com.owncloud.android.services.OperationsService;
|
import com.owncloud.android.services.OperationsService;
|
||||||
import com.owncloud.android.ui.activities.ActivitiesActivity;
|
import com.owncloud.android.ui.activities.ActivitiesActivity;
|
||||||
import com.owncloud.android.ui.activity.BaseActivity;
|
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.ConflictsResolveActivity;
|
||||||
import com.owncloud.android.ui.activity.ContactsPreferenceActivity;
|
import com.owncloud.android.ui.activity.ContactsPreferenceActivity;
|
||||||
import com.owncloud.android.ui.activity.CopyToClipboardActivity;
|
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.ManageAccountsActivity;
|
||||||
import com.owncloud.android.ui.activity.ManageSpaceActivity;
|
import com.owncloud.android.ui.activity.ManageSpaceActivity;
|
||||||
import com.owncloud.android.ui.activity.NotificationsActivity;
|
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.PassCodeActivity;
|
||||||
import com.owncloud.android.ui.activity.ReceiveExternalFilesActivity;
|
import com.owncloud.android.ui.activity.ReceiveExternalFilesActivity;
|
||||||
import com.owncloud.android.ui.activity.RequestCredentialsActivity;
|
import com.owncloud.android.ui.activity.RequestCredentialsActivity;
|
||||||
|
@ -107,7 +107,9 @@ abstract class ComponentsModule {
|
||||||
@ContributesAndroidInjector abstract ManageAccountsActivity manageAccountsActivity();
|
@ContributesAndroidInjector abstract ManageAccountsActivity manageAccountsActivity();
|
||||||
@ContributesAndroidInjector abstract ManageSpaceActivity manageSpaceActivity();
|
@ContributesAndroidInjector abstract ManageSpaceActivity manageSpaceActivity();
|
||||||
@ContributesAndroidInjector abstract NotificationsActivity notificationsActivity();
|
@ContributesAndroidInjector abstract NotificationsActivity notificationsActivity();
|
||||||
@ContributesAndroidInjector abstract ParticipateActivity participateActivity();
|
|
||||||
|
@ContributesAndroidInjector
|
||||||
|
abstract CommunityActivity participateActivity();
|
||||||
@ContributesAndroidInjector abstract PassCodeActivity passCodeActivity();
|
@ContributesAndroidInjector abstract PassCodeActivity passCodeActivity();
|
||||||
@ContributesAndroidInjector abstract PreviewImageActivity previewImageActivity();
|
@ContributesAndroidInjector abstract PreviewImageActivity previewImageActivity();
|
||||||
@ContributesAndroidInjector abstract PreviewVideoActivity previewVideoActivity();
|
@ContributesAndroidInjector abstract PreviewVideoActivity previewVideoActivity();
|
||||||
|
|
|
@ -38,62 +38,62 @@ import com.owncloud.android.utils.ThemeUtils;
|
||||||
/**
|
/**
|
||||||
* Activity providing information about ways to participate in the app's development.
|
* Activity providing information about ways to participate in the app's development.
|
||||||
*/
|
*/
|
||||||
public class ParticipateActivity extends FileActivity {
|
public class CommunityActivity extends FileActivity {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
|
|
||||||
setContentView(R.layout.participate_layout);
|
setContentView(R.layout.community_layout);
|
||||||
|
|
||||||
// setup toolbar
|
// setup toolbar
|
||||||
setupToolbar();
|
setupToolbar();
|
||||||
|
|
||||||
// setup drawer
|
// 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();
|
setupContent();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void 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());
|
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.setMovementMethod(LinkMovementMethod.getInstance());
|
||||||
contributeIrcView.setText(Html.fromHtml(getString(R.string.participate_contribute_irc_text) + " " +
|
contributeIrcView.setText(Html.fromHtml(getString(R.string.community_contribute_irc_text) + " " +
|
||||||
getString(R.string.participate_contribute_irc_text_link,
|
getString(R.string.community_contribute_irc_text_link,
|
||||||
ThemeUtils.colorToHexString(ThemeUtils.primaryColor(this, true)),
|
ThemeUtils.colorToHexString(ThemeUtils.primaryColor(this, true)),
|
||||||
getString(R.string.irc_weblink))));
|
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.setMovementMethod(LinkMovementMethod.getInstance());
|
||||||
contributeForumView.setText(Html.fromHtml(getString(R.string.participate_contribute_forum_text) + " " +
|
contributeForumView.setText(Html.fromHtml(getString(R.string.community_contribute_forum_text) + " " +
|
||||||
getString(R.string.participate_contribute_forum_text_link,
|
getString(R.string.community_contribute_forum_text_link,
|
||||||
ThemeUtils.colorToHexString(ThemeUtils.primaryColor(this, true)),
|
ThemeUtils.colorToHexString(ThemeUtils.primaryColor(this, true)),
|
||||||
getString(R.string.help_link), getString(R.string.participate_contribute_forum_forum))));
|
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.setMovementMethod(LinkMovementMethod.getInstance());
|
||||||
contributeTranslationView.setText(Html.fromHtml(
|
contributeTranslationView.setText(Html.fromHtml(
|
||||||
getString(R.string.participate_contribute_translate_link,
|
getString(R.string.community_contribute_translate_link,
|
||||||
ThemeUtils.colorToHexString(ThemeUtils.primaryColor(this, true)),
|
ThemeUtils.colorToHexString(ThemeUtils.primaryColor(this, true)),
|
||||||
getString(R.string.translation_link),
|
getString(R.string.translation_link),
|
||||||
getString(R.string.participate_contribute_translate_translate)) + " " +
|
getString(R.string.community_contribute_translate_translate)) + " " +
|
||||||
getString(R.string.participate_contribute_translate_text)));
|
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.setMovementMethod(LinkMovementMethod.getInstance());
|
||||||
contributeGithubView.setText(Html.fromHtml(
|
contributeGithubView.setText(Html.fromHtml(
|
||||||
getString(R.string.participate_contribute_github_text,
|
getString(R.string.community_contribute_github_text,
|
||||||
getString(R.string.participate_contribute_github_text_link,
|
getString(R.string.community_contribute_github_text_link,
|
||||||
ThemeUtils.colorToHexString(ThemeUtils.primaryColor(this, true)),
|
ThemeUtils.colorToHexString(ThemeUtils.primaryColor(this, true)),
|
||||||
getString(R.string.contributing_link)))));
|
getString(R.string.contributing_link)))));
|
||||||
|
|
||||||
MaterialButton reportButton = findViewById(R.id.participate_testing_report);
|
MaterialButton reportButton = findViewById(R.id.community_testing_report);
|
||||||
reportButton.getBackground().setColorFilter(ThemeUtils.primaryColor(this), PorterDuff.Mode.SRC_ATOP);
|
reportButton.getBackground().setColorFilter(ThemeUtils.primaryColor(this, true), PorterDuff.Mode.SRC_ATOP);
|
||||||
reportButton.setOnClickListener(v -> DisplayUtils.startLinkIntent(this, R.string.report_issue_link));
|
reportButton.setOnClickListener(v -> DisplayUtils.startLinkIntent(this, R.string.report_issue_link));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -146,6 +146,6 @@ public class ParticipateActivity extends FileActivity {
|
||||||
protected void onResume() {
|
protected void onResume() {
|
||||||
super.onResume();
|
super.onResume();
|
||||||
|
|
||||||
setDrawerMenuItemChecked(R.id.nav_participate);
|
setDrawerMenuItemChecked(R.id.nav_community);
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -375,8 +375,8 @@ public abstract class DrawerActivity extends ToolbarActivity
|
||||||
|
|
||||||
DrawerMenuUtil.setupHomeMenuItem(menu, getResources());
|
DrawerMenuUtil.setupHomeMenuItem(menu, getResources());
|
||||||
|
|
||||||
DrawerMenuUtil.removeMenuItem(menu, R.id.nav_participate,
|
DrawerMenuUtil.removeMenuItem(menu, R.id.nav_community,
|
||||||
!getResources().getBoolean(R.bool.participate_enabled));
|
!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_shared, !getResources().getBoolean(R.bool.shared_enabled));
|
||||||
DrawerMenuUtil.removeMenuItem(menu, R.id.nav_contacts, !getResources().getBoolean(R.bool.contacts_backup)
|
DrawerMenuUtil.removeMenuItem(menu, R.id.nav_contacts, !getResources().getBoolean(R.bool.contacts_backup)
|
||||||
|| !getResources().getBoolean(R.bool.show_drawer_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:
|
case R.id.nav_settings:
|
||||||
startActivity(SettingsActivity.class);
|
startActivity(SettingsActivity.class);
|
||||||
break;
|
break;
|
||||||
case R.id.nav_participate:
|
case R.id.nav_community:
|
||||||
startActivity(ParticipateActivity.class);
|
startActivity(CommunityActivity.class);
|
||||||
break;
|
break;
|
||||||
case R.id.nav_logout:
|
case R.id.nav_logout:
|
||||||
mCheckedMenuItem = -1;
|
mCheckedMenuItem = -1;
|
||||||
|
|
|
@ -47,89 +47,89 @@
|
||||||
android:padding="@dimen/standard_padding">
|
android:padding="@dimen/standard_padding">
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/participate_headline"
|
android:id="@+id/community_headline"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/participate_testing_headline"
|
android:text="@string/community_testing_headline"
|
||||||
android:textAppearance="?android:attr/textAppearanceLarge"/>
|
android:textAppearance="?android:attr/textAppearanceLarge"/>
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/participate_testing_bug_text"
|
android:id="@+id/community_testing_bug_text"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:paddingBottom="@dimen/standard_half_padding"
|
android:paddingBottom="@dimen/standard_half_padding"
|
||||||
android:text="@string/participate_testing_bug_text"
|
android:text="@string/community_testing_bug_text"
|
||||||
android:textAppearance="?android:attr/textAppearanceMedium"/>
|
android:textAppearance="?android:attr/textAppearanceMedium"/>
|
||||||
|
|
||||||
<com.google.android.material.button.MaterialButton
|
<com.google.android.material.button.MaterialButton
|
||||||
android:id="@+id/participate_testing_report"
|
android:id="@+id/community_testing_report"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/participate_testing_report_text"
|
android:text="@string/community_testing_report_text"
|
||||||
android:theme="@style/Button.Primary"
|
android:theme="@style/Button.Primary"
|
||||||
app:cornerRadius="@dimen/button_corner_radius" />
|
app:cornerRadius="@dimen/button_corner_radius" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/participate_text"
|
android:id="@+id/community_text"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:paddingBottom="@dimen/standard_half_padding"
|
android:paddingBottom="@dimen/standard_half_padding"
|
||||||
android:paddingTop="@dimen/standard_half_padding"
|
android:paddingTop="@dimen/standard_half_padding"
|
||||||
android:text="@string/participate_testing_version_text"
|
android:text="@string/community_testing_version_text"
|
||||||
android:textAppearance="?android:attr/textAppearanceMedium"/>
|
android:textAppearance="?android:attr/textAppearanceMedium"/>
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/participate_contribute_headline"
|
android:id="@+id/community_contribute_headline"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:paddingTop="@dimen/standard_padding"
|
android:paddingTop="@dimen/standard_padding"
|
||||||
android:text="@string/participate_contribute_headline"
|
android:text="@string/community_contribute_headline"
|
||||||
android:textAppearance="?android:attr/textAppearanceLarge" />
|
android:textAppearance="?android:attr/textAppearanceLarge" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/participate_contribute_irc_text"
|
android:id="@+id/community_contribute_irc_text"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/participate_contribute_irc_text"
|
android:text="@string/community_contribute_irc_text"
|
||||||
android:paddingBottom="@dimen/standard_quarter_padding"
|
android:paddingBottom="@dimen/standard_quarter_padding"
|
||||||
android:textAppearance="?android:attr/textAppearanceMedium"/>
|
android:textAppearance="?android:attr/textAppearanceMedium"/>
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/participate_contribute_forum_text"
|
android:id="@+id/community_contribute_forum_text"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/participate_contribute_forum_text"
|
android:text="@string/community_contribute_forum_text"
|
||||||
android:paddingBottom="@dimen/standard_quarter_padding"
|
android:paddingBottom="@dimen/standard_quarter_padding"
|
||||||
android:textAppearance="?android:attr/textAppearanceMedium"/>
|
android:textAppearance="?android:attr/textAppearanceMedium"/>
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/participate_contribute_translate_text"
|
android:id="@+id/community_contribute_translate_text"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/participate_contribute_translate_text"
|
android:text="@string/community_contribute_translate_text"
|
||||||
android:paddingBottom="@dimen/standard_quarter_padding"
|
android:paddingBottom="@dimen/standard_quarter_padding"
|
||||||
android:textAppearance="?android:attr/textAppearanceMedium"/>
|
android:textAppearance="?android:attr/textAppearanceMedium"/>
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/participate_contribute_github_text"
|
android:id="@+id/community_contribute_github_text"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/participate_contribute_github_text"
|
android:text="@string/community_contribute_github_text"
|
||||||
android:textAppearance="?android:attr/textAppearanceMedium"/>
|
android:textAppearance="?android:attr/textAppearanceMedium"/>
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/participate_release_candidate_headline"
|
android:id="@+id/community_release_candidate_headline"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:paddingTop="@dimen/standard_padding"
|
android:paddingTop="@dimen/standard_padding"
|
||||||
android:text="@string/participate_release_candidate_headline"
|
android:text="@string/community_release_candidate_headline"
|
||||||
android:textAppearance="?android:attr/textAppearanceLarge" />
|
android:textAppearance="?android:attr/textAppearanceLarge" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/participate_release_candidate_text"
|
android:id="@+id/community_release_candidate_text"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/participate_release_candidate_text"
|
android:text="@string/community_release_candidate_text"
|
||||||
android:textAppearance="?android:attr/textAppearanceMedium"/>
|
android:textAppearance="?android:attr/textAppearanceMedium"/>
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
|
@ -137,40 +137,40 @@
|
||||||
android:layout_height="wrap_content">
|
android:layout_height="wrap_content">
|
||||||
|
|
||||||
<ImageButton
|
<ImageButton
|
||||||
android:id="@+id/participate_release_candidate_fdroid"
|
android:id="@+id/community_release_candidate_fdroid"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:background="@color/white"
|
android:background="@color/white"
|
||||||
android:onClick="onGetRCFDroidClick"
|
android:onClick="onGetRCFDroidClick"
|
||||||
android:padding="@dimen/zero"
|
android:padding="@dimen/zero"
|
||||||
android:src="@drawable/fdroid"
|
android:src="@drawable/fdroid"
|
||||||
android:contentDescription="@string/participate_rc_fdroid"/>
|
android:contentDescription="@string/community_rc_fdroid" />
|
||||||
|
|
||||||
<ImageButton
|
<ImageButton
|
||||||
android:id="@+id/participate_release_candidate_playstore"
|
android:id="@+id/community_release_candidate_playstore"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:background="@color/white"
|
android:background="@color/white"
|
||||||
android:onClick="onGetRCPlayStoreClick"
|
android:onClick="onGetRCPlayStoreClick"
|
||||||
android:padding="@dimen/zero"
|
android:padding="@dimen/zero"
|
||||||
android:src="@drawable/playstore"
|
android:src="@drawable/playstore"
|
||||||
android:contentDescription="@string/participate_rc_play_store"/>
|
android:contentDescription="@string/community_rc_play_store" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/participate_beta_headline"
|
android:id="@+id/community_beta_headline"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:paddingTop="@dimen/standard_padding"
|
android:paddingTop="@dimen/standard_padding"
|
||||||
android:text="@string/participate_beta_headline"
|
android:text="@string/community_beta_headline"
|
||||||
android:textAppearance="?android:attr/textAppearanceLarge" />
|
android:textAppearance="?android:attr/textAppearanceLarge" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/participate_beta_text"
|
android:id="@+id/community_beta_text"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/participate_beta_text"
|
android:text="@string/community_beta_text"
|
||||||
android:textAppearance="?android:attr/textAppearanceMedium"/>
|
android:textAppearance="?android:attr/textAppearanceMedium"/>
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
|
@ -178,24 +178,24 @@
|
||||||
android:layout_height="wrap_content">
|
android:layout_height="wrap_content">
|
||||||
|
|
||||||
<ImageButton
|
<ImageButton
|
||||||
android:id="@+id/participate_beta_fdroid"
|
android:id="@+id/community_beta_fdroid"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:background="@color/white"
|
android:background="@color/white"
|
||||||
android:onClick="onGetBetaFDroidClick"
|
android:onClick="onGetBetaFDroidClick"
|
||||||
android:padding="@dimen/zero"
|
android:padding="@dimen/zero"
|
||||||
android:src="@drawable/fdroid"
|
android:src="@drawable/fdroid"
|
||||||
android:contentDescription="@string/participate_dev_fdroid"/>
|
android:contentDescription="@string/community_dev_fdroid" />
|
||||||
|
|
||||||
<ImageButton
|
<ImageButton
|
||||||
android:id="@+id/participate_beta_apk"
|
android:id="@+id/community_beta_apk"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:background="@color/white"
|
android:background="@color/white"
|
||||||
android:onClick="onGetBetaApkClick"
|
android:onClick="onGetBetaApkClick"
|
||||||
android:padding="@dimen/zero"
|
android:padding="@dimen/zero"
|
||||||
android:src="@drawable/apk"
|
android:src="@drawable/apk"
|
||||||
android:contentDescription="@string/participate_dev_direct_download"/>
|
android:contentDescription="@string/community_dev_direct_download" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
|
@ -138,10 +138,10 @@
|
||||||
android:orderInCategory="4"
|
android:orderInCategory="4"
|
||||||
android:title="@string/actionbar_settings"/>
|
android:title="@string/actionbar_settings"/>
|
||||||
<item
|
<item
|
||||||
android:id="@+id/nav_participate"
|
android:id="@+id/nav_community"
|
||||||
android:icon="@drawable/nav_participate"
|
android:icon="@drawable/nav_community"
|
||||||
android:orderInCategory="4"
|
android:orderInCategory="4"
|
||||||
android:title="@string/drawer_participate"/>
|
android:title="@string/drawer_community" />
|
||||||
<item
|
<item
|
||||||
android:id="@+id/nav_logout"
|
android:id="@+id/nav_logout"
|
||||||
android:icon="@drawable/nav_logout"
|
android:icon="@drawable/nav_logout"
|
||||||
|
|
|
@ -91,14 +91,12 @@
|
||||||
<string name="privacy_url">https://nextcloud.com/privacy</string>
|
<string name="privacy_url">https://nextcloud.com/privacy</string>
|
||||||
<bool name="imprint_enabled">false</bool>
|
<bool name="imprint_enabled">false</bool>
|
||||||
<bool name="recommend_enabled">true</bool>
|
<bool name="recommend_enabled">true</bool>
|
||||||
<bool name="feedback_enabled">true</bool>
|
|
||||||
<bool name="logger_enabled">false</bool>
|
<bool name="logger_enabled">false</bool>
|
||||||
<bool name="sourcecode_enabled">true</bool>
|
<bool name="sourcecode_enabled">true</bool>
|
||||||
<string name="sourcecode_url" translatable="false">https://github.com/nextcloud/android</string>
|
<string name="sourcecode_url" translatable="false">https://github.com/nextcloud/android</string>
|
||||||
<bool name="license_enabled">true</bool>
|
<bool name="license_enabled">true</bool>
|
||||||
<string name="license_url" translatable="false">https://www.gnu.org/licenses/gpl-2.0.html</string>
|
<string name="license_url" translatable="false">https://www.gnu.org/licenses/gpl-2.0.html</string>
|
||||||
<string name="url_imprint"></string>
|
<string name="url_imprint"></string>
|
||||||
<string name="mail_feedback">android@nextcloud.com</string>
|
|
||||||
<string name="url_app_download">"https://play.google.com/store/apps/details?id=com.nextcloud.client"</string>
|
<string name="url_app_download">"https://play.google.com/store/apps/details?id=com.nextcloud.client"</string>
|
||||||
<string name="url_server_install">https://nextcloud.com/install</string>
|
<string name="url_server_install">https://nextcloud.com/install</string>
|
||||||
|
|
||||||
|
|
|
@ -526,30 +526,30 @@
|
||||||
<string name="files_drop_not_supported">This is a Nextcloud feature, please upgrade.</string>
|
<string name="files_drop_not_supported">This is a Nextcloud feature, please upgrade.</string>
|
||||||
<string name="learn_more">Learn more</string>
|
<string name="learn_more">Learn more</string>
|
||||||
<string name="drawer_synced_folders">Auto upload</string>
|
<string name="drawer_synced_folders">Auto upload</string>
|
||||||
<string name="drawer_participate">Community</string>
|
<string name="drawer_community">Community</string>
|
||||||
<string name="participate_testing_headline">Help by testing</string>
|
<string name="community_testing_headline">Help by testing</string>
|
||||||
<string name="participate_testing_bug_text">Found a bug? Oddments?</string>
|
<string name="community_testing_bug_text">Found a bug? Oddments?</string>
|
||||||
<string name="participate_testing_report_text">Report an issue on GitHub</string>
|
<string name="community_testing_report_text">Report an issue on GitHub</string>
|
||||||
<string name="participate_testing_version_text">Interested in helping out by testing what will be the next version?</string>
|
<string name="community_testing_version_text">Interested in helping out by testing what will be the next version?</string>
|
||||||
<string name="participate_beta_headline">Test the dev version</string>
|
<string name="community_beta_headline">Test the dev version</string>
|
||||||
<string name="participate_beta_text">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.</string>
|
<string name="community_beta_text">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.</string>
|
||||||
<string name="participate_release_candidate_headline">Release candidate</string>
|
<string name="community_release_candidate_headline">Release candidate</string>
|
||||||
<string name="participate_release_candidate_text">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.</string>
|
<string name="community_release_candidate_text">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.</string>
|
||||||
<string name="participate_contribute_headline">Actively Contribute</string>
|
<string name="community_contribute_headline">Actively Contribute</string>
|
||||||
<string name="participate_contribute_irc_text">Join the chat on IRC:</string>
|
<string name="community_contribute_irc_text">Join the chat on IRC:</string>
|
||||||
<string name="participate_contribute_irc_text_link" translatable="false"> <font color=\"%1$s\"><a href=\"%2$s\">#nextcloud-mobile</a></font></string>
|
<string name="community_contribute_irc_text_link" translatable="false"> <font color=\"%1$s\"><a href=\"%2$s\">#nextcloud-mobile</a></font></string>
|
||||||
<string name="participate_contribute_forum_text">Help others on the</string>
|
<string name="community_contribute_forum_text">Help others on the</string>
|
||||||
<string name="participate_contribute_forum_forum">forum</string>
|
<string name="community_contribute_forum_forum">forum</string>
|
||||||
<string name="participate_contribute_forum_text_link" translatable="false"><font color=\"%1$s\"><a href=\"%2$s\">%3$s</a></font></string>
|
<string name="community_contribute_forum_text_link" translatable="false"><font color=\"%1$s\"><a href=\"%2$s\">%3$s</a></font></string>
|
||||||
<string name="participate_contribute_translate_translate">Translate</string>
|
<string name="community_contribute_translate_translate">Translate</string>
|
||||||
<string name="participate_contribute_translate_text">the app</string>
|
<string name="community_contribute_translate_text">the app</string>
|
||||||
<string name="participate_contribute_translate_link" translatable="false"><font color=\"%1$s\"><a href=\"%2$s\">%3$s</a></font></string>
|
<string name="community_contribute_translate_link" translatable="false"><font color=\"%1$s\"><a href=\"%2$s\">%3$s</a></font></string>
|
||||||
<string name="participate_contribute_github_text">Review, amend and write code, see %1$s for details</string>
|
<string name="community_contribute_github_text">Review, amend and write code, see %1$s for details</string>
|
||||||
<string name="participate_contribute_github_text_link" translatable="false"><font color=\"%1$s\"><a href=\"%2$s\">CONTRIBUTING.md</a></font></string>
|
<string name="community_contribute_github_text_link" translatable="false"><font color=\"%1$s\"><a href=\"%2$s\">CONTRIBUTING.md</a></font></string>
|
||||||
<string name="participate_rc_play_store">Get release candidate from Google Play store</string>
|
<string name="community_rc_play_store">Get release candidate from Google Play store</string>
|
||||||
<string name="participate_rc_fdroid">Get release candidate from F-Droid app</string>
|
<string name="community_rc_fdroid">Get release candidate from F-Droid app</string>
|
||||||
<string name="participate_dev_fdroid">Get development release from F-Droid app</string>
|
<string name="community_dev_fdroid">Get development release from F-Droid app</string>
|
||||||
<string name="participate_dev_direct_download">Download development release directly</string>
|
<string name="community_dev_direct_download">Download development release directly</string>
|
||||||
<string name="move_to">Move to…</string>
|
<string name="move_to">Move to…</string>
|
||||||
<string name="copy_to">Copy to…</string>
|
<string name="copy_to">Copy to…</string>
|
||||||
<string name="choose_remote_folder">Choose remote folder…</string>
|
<string name="choose_remote_folder">Choose remote folder…</string>
|
||||||
|
|
Loading…
Reference in a new issue