mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-27 09:39:25 +03:00
Code Issues Projects Releases Packages Wiki Activity

WiP

Browse source 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2018-11-01 09:34:15 +01:00
parent ad2c41602b
commit 6da1079ce5
No known key found for this signature in database
GPG key ID: 6CADC7E3523C308B
26 changed files with 158 additions and 154 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/com/owncloud/android/ui/activity/ParticipateActivity.java
View file

@ -30,12 +30,11 @@ import android.view.MenuItem;
import android.view.View;
import android.widget.TextView;
import com.google.android.material.button.MaterialButton;
import com.owncloud.android.R;
import com.owncloud.android.utils.DisplayUtils;
import com.owncloud.android.utils.ThemeUtils;
import androidx.appcompat.widget.AppCompatButton;
/**
* Activity providing information about ways to participate in the app's development.
*/
@ -93,7 +92,7 @@ public class ParticipateActivity extends FileActivity {
ThemeUtils.colorToHexString(ThemeUtils.primaryColor(this, true)),
getString(R.string.contributing_link)))));
AppCompatButton reportButton = findViewById(R.id.participate_testing_report);
MaterialButton reportButton = findViewById(R.id.participate_testing_report);
reportButton.getBackground().setColorFilter(ThemeUtils.primaryAccentColor(this), PorterDuff.Mode.SRC_ATOP);
reportButton.setOnClickListener(v -> DisplayUtils.startLinkIntent(this, R.string.report_issue_link));
}

6
src/main/java/com/owncloud/android/ui/activity/UploadFilesActivity.java
View file

@ -42,6 +42,7 @@ import android.widget.ImageView;
import android.widget.Spinner;
import android.widget.TextView;
import com.google.android.material.button.MaterialButton;
import com.owncloud.android.R;
import com.owncloud.android.db.PreferenceManager;
import com.owncloud.android.lib.common.utils.Log_OC;
@ -62,7 +63,6 @@ import java.util.List;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.widget.AppCompatButton;
import androidx.appcompat.widget.AppCompatSpinner;
import androidx.appcompat.widget.SearchView;
import androidx.core.view.MenuItemCompat;
@ -160,7 +160,7 @@ public class UploadFilesActivity extends FileActivity implements
if (mLocalFolderPickerMode) {
findViewById(R.id.upload_options).setVisibility(View.GONE);
((AppCompatButton) findViewById(R.id.upload_files_btn_upload))
((MaterialButton) findViewById(R.id.upload_files_btn_upload))
.setText(R.string.uploader_btn_alternative_text);
}
@ -169,7 +169,7 @@ public class UploadFilesActivity extends FileActivity implements
// Set input controllers
findViewById(R.id.upload_files_btn_cancel).setOnClickListener(this);
mUploadBtn = (AppCompatButton) findViewById(R.id.upload_files_btn_upload);
mUploadBtn = (MaterialButton) findViewById(R.id.upload_files_btn_upload);
mUploadBtn.getBackground().setColorFilter(ThemeUtils.primaryAccentColor(this), PorterDuff.Mode.SRC_ATOP);
mUploadBtn.setOnClickListener(this);

4
src/main/java/com/owncloud/android/ui/dialog/SortingOrderDialogFragment.java
View file

@ -30,13 +30,13 @@ import android.view.ViewGroup;
import android.widget.ImageButton;
import android.widget.TextView;
import com.google.android.material.button.MaterialButton;
import com.owncloud.android.R;
import com.owncloud.android.lib.common.utils.Log_OC;
import com.owncloud.android.utils.FileSortOrder;
import com.owncloud.android.utils.ThemeUtils;
import androidx.annotation.NonNull;
import androidx.appcompat.widget.AppCompatButton;
import androidx.fragment.app.DialogFragment;
/**
@ -51,7 +51,7 @@ public class SortingOrderDialogFragment extends DialogFragment {
private View mView;
private View[] mTaggedViews;
private AppCompatButton mCancel;
private MaterialButton mCancel;
private String mCurrentSortOrderName;
public static SortingOrderDialogFragment newInstance(FileSortOrder sortOrder) {

6
src/main/java/com/owncloud/android/ui/dialog/SyncedFolderPreferencesDialogFragment.java
View file

@ -34,6 +34,7 @@ import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.widget.TextView;
import com.google.android.material.button.MaterialButton;
import com.owncloud.android.R;
import com.owncloud.android.datamodel.MediaFolderType;
import com.owncloud.android.datamodel.SyncedFolderDisplayItem;
@ -49,7 +50,6 @@ import java.io.File;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.widget.AppCompatButton;
import androidx.appcompat.widget.AppCompatCheckBox;
import androidx.appcompat.widget.SwitchCompat;
import androidx.fragment.app.DialogFragment;
@ -78,8 +78,8 @@ public class SyncedFolderPreferencesDialogFragment extends DialogFragment {
private TextView mRemoteFolderSummary;
private SyncedFolderParcelable mSyncedFolder;
private AppCompatButton mCancel;
private AppCompatButton mSave;
private MaterialButton mCancel;
private MaterialButton mSave;
private boolean behaviourDialogShown;
private AlertDialog behaviourDialog;

8
src/main/java/com/owncloud/android/ui/fragment/ShareFileFragment.java
View file

@ -39,6 +39,7 @@ import android.widget.ListView;
import android.widget.ScrollView;
import android.widget.TextView;
import com.google.android.material.button.MaterialButton;
import com.google.android.material.snackbar.Snackbar;
import com.owncloud.android.R;
import com.owncloud.android.datamodel.OCFile;
@ -60,7 +61,6 @@ import java.util.Date;
import java.util.List;
import androidx.annotation.NonNull;
import androidx.appcompat.widget.AppCompatButton;
import androidx.appcompat.widget.SwitchCompat;
import androidx.fragment.app.Fragment;
@ -717,7 +717,7 @@ public class ShareFileFragment extends Fragment implements ShareUserListAdapter.
}
// GetLink button
AppCompatButton getLinkButton = getGetLinkButton();
MaterialButton getLinkButton = getGetLinkButton();
getLinkButton.getBackground().setColorFilter(ThemeUtils.primaryAccentColor(getContext()),
PorterDuff.Mode.SRC_ATOP);
getLinkButton.setVisibility(View.VISIBLE);
@ -873,8 +873,8 @@ public class ShareFileFragment extends Fragment implements ShareUserListAdapter.
return getView().findViewById(R.id.shareViaLinkHideFileListingPermissionSection);
}
private AppCompatButton getGetLinkButton() {
return (AppCompatButton) getView().findViewById(R.id.shareViaLinkGetLinkButton);
private MaterialButton getGetLinkButton() {
return (MaterialButton) getView().findViewById(R.id.shareViaLinkGetLinkButton);
}
/**

8
src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactsBackupFragment.java
View file

@ -39,6 +39,7 @@ import android.widget.TextView;
import com.evernote.android.job.JobRequest;
import com.evernote.android.job.util.support.PersistableBundleCompat;
import com.google.android.material.button.MaterialButton;
import com.google.android.material.snackbar.Snackbar;
import com.owncloud.android.R;
import com.owncloud.android.datamodel.ArbitraryDataProvider;
@ -63,7 +64,6 @@ import java.util.List;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.widget.AppCompatButton;
import androidx.appcompat.widget.SwitchCompat;
import androidx.fragment.app.Fragment;
import butterknife.BindView;
@ -81,13 +81,13 @@ public class ContactsBackupFragment extends FileFragment implements DatePickerDi
public SwitchCompat backupSwitch;
@BindView(R.id.contacts_datepicker)
public AppCompatButton contactsDatePickerBtn;
public MaterialButton contactsDatePickerBtn;
@BindView(R.id.contacts_last_backup_timestamp)
public TextView lastBackup;
@BindView(R.id.contacts_backup_now)
public AppCompatButton backupNow;
public MaterialButton backupNow;
private Date selectedDate;
private boolean calendarPickerOpen;
@ -183,7 +183,7 @@ public class ContactsBackupFragment extends FileFragment implements DatePickerDi
contactsDatePickerBtn.getBackground().setColorFilter(accentColor, PorterDuff.Mode.SRC_ATOP);
contactsDatePickerBtn.setTextColor(fontColor);
AppCompatButton chooseDate = view.findViewById(R.id.contacts_datepicker);
MaterialButton chooseDate = view.findViewById(R.id.contacts_datepicker);
chooseDate.getBackground().setColorFilter(accentColor, PorterDuff.Mode.SRC_ATOP);
chooseDate.setTextColor(ThemeUtils.fontColor(getContext()));

4
src/main/res/layout-land/account_setup.xml
View file

@ -58,7 +58,7 @@
android:orientation="vertical"
android:padding="@dimen/standard_half_padding" >
<androidx.appcompat.widget.AppCompatButton
<com.google.android.material.button.MaterialButton
android:id="@+id/centeredRefreshButton"
style="@style/ownCloud.Button"
android:layout_width="wrap_content"
@ -281,7 +281,7 @@
android:orientation="vertical"
android:paddingTop="@dimen/standard_half_padding">
<androidx.appcompat.widget.AppCompatButton
<com.google.android.material.button.MaterialButton
android:id="@+id/buttonOK"
android:theme="@style/Button.Login"
style="@style/Button.Login"

4
src/main/res/layout/account_setup.xml
View file

@ -50,7 +50,7 @@
android:orientation="vertical"
android:padding="@dimen/standard_half_padding">
<androidx.appcompat.widget.AppCompatButton
<com.google.android.material.button.MaterialButton
android:id="@+id/centeredRefreshButton"
style="@style/ownCloud.Button"
android:layout_width="wrap_content"
@ -262,7 +262,7 @@
android:textColor="@color/login_text_color"
android:contentDescription="@string/auth_unauthorized"/>
<androidx.appcompat.widget.AppCompatButton
<com.google.android.material.button.MaterialButton
android:id="@+id/buttonOK"
android:theme="@style/Button.Login"
style="@style/Button.Login"

2
src/main/res/layout/activity_manage_space.xml
View file

@ -31,7 +31,7 @@
android:text="@string/manage_space_description"
/>
<androidx.appcompat.widget.AppCompatButton
<com.google.android.material.button.MaterialButton
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/manage_space_clear_data"

4
src/main/res/layout/activity_sso_grant_permission.xml
View file

@ -47,7 +47,7 @@
app:layout_constraintTop_toTopOf="parent"
tools:text="Grant Nextcloud News access to your Nextcloud account incrediblyLong_username_with_123456789_number@Nextcloud_dummy.com?" />
<androidx.appcompat.widget.AppCompatButton
<com.google.android.material.button.MaterialButton
android:id="@+id/btnGrant"
style="@style/Button.Borderless"
android:layout_width="wrap_content"
@ -56,7 +56,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
<androidx.appcompat.widget.AppCompatButton
<com.google.android.material.button.MaterialButton
android:id="@+id/btnDecline"
style="@style/Button.Borderless"
android:layout_width="wrap_content"

2
src/main/res/layout/contactlist_fragment.xml
View file

@ -49,7 +49,7 @@
android:src="@drawable/uploader_list_separator"
android:contentDescription="@null"/>
<androidx.appcompat.widget.AppCompatButton
<com.google.android.material.button.MaterialButton
android:id="@+id/contactlist_restore_selected"
style="@style/Button.Borderless"
android:layout_width="match_parent"

4
src/main/res/layout/contacts_backup_fragment.xml
View file

@ -67,7 +67,7 @@
android:layout_height="match_parent"
android:orientation="horizontal">
<androidx.appcompat.widget.AppCompatButton
<com.google.android.material.button.MaterialButton
android:id="@+id/contacts_backup_now"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -76,7 +76,7 @@
android:text="@string/contacts_backup_button"
android:theme="@style/Button.Primary"/>
<androidx.appcompat.widget.AppCompatButton
<com.google.android.material.button.MaterialButton
android:id="@+id/contacts_datepicker"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

6
src/main/res/layout/files_folder_picker.xml
View file

@ -24,7 +24,7 @@
<include
layout="@layout/toolbar_standard" />
<FrameLayout
<FrameLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
@ -50,7 +50,7 @@
android:orientation="horizontal"
android:padding="@dimen/standard_padding">
<androidx.appcompat.widget.AppCompatButton
<com.google.android.material.button.MaterialButton
android:id="@+id/folder_picker_btn_cancel"
android:theme="@style/Button"
android:layout_width="wrap_content"
@ -60,7 +60,7 @@
android:layout_marginRight="@dimen/standard_half_margin"
android:layout_marginEnd="@dimen/standard_half_margin"/>
<androidx.appcompat.widget.AppCompatButton
<com.google.android.material.button.MaterialButton
android:id="@+id/folder_picker_btn_choose"
android:theme="@style/Button.Primary"
android:layout_width="wrap_content"

13
src/main/res/layout/generic_explanation.xml
View file

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!--
<?xml version="1.0" encoding="utf-8"?>
<!--
ownCloud Android client application
Copyright (C) 2015 ownCloud Inc.
@ -29,10 +30,10 @@
android:layout_weight="2"
android:padding="@dimen/alternate_padding_independent"
android:scrollbarAlwaysDrawVerticalTrack="true"
android:text="@string/placeholder_sentence"
android:text="@string/placeholder_sentence"
/>
<ListView
<ListView
android:id="@+id/list"
android:layout_width="match_parent"
android:layout_height="@dimen/zero"
@ -47,7 +48,7 @@
android:gravity="center"
android:orientation="horizontal" >
<androidx.appcompat.widget.AppCompatButton
<com.google.android.material.button.MaterialButton
android:id="@+id/cancel"
android:theme="@style/Button"
android:layout_width="wrap_content"
@ -55,7 +56,7 @@
android:layout_weight="1"
android:text="@string/common_cancel" />
<androidx.appcompat.widget.AppCompatButton
<com.google.android.material.button.MaterialButton
android:id="@+id/ok"
android:theme="@style/Button.Primary"
android:layout_width="wrap_content"
@ -63,6 +64,6 @@
android:layout_weight="1"
android:text="@string/common_ok" />
</LinearLayout>
</LinearLayout>
</LinearLayout>

4
src/main/res/layout/log_send_file.xml
View file

@ -57,7 +57,7 @@
android:layout_marginLeft="@dimen/standard_margin"
android:layout_marginRight="@dimen/standard_margin">
<androidx.appcompat.widget.AppCompatButton
<com.google.android.material.button.MaterialButton
android:id="@+id/deleteLogHistoryButton"
android:theme="@style/Button"
android:layout_width="fill_parent"
@ -66,7 +66,7 @@
android:layout_weight="1"
android:text="@string/prefs_log_delete_history_button" />
<androidx.appcompat.widget.AppCompatButton
<com.google.android.material.button.MaterialButton
android:id="@+id/sendLogHistoryButton"
android:theme="@style/Button.Primary"
android:layout_width="fill_parent"

2
src/main/res/layout/participate_layout.xml
View file

@ -60,7 +60,7 @@
android:text="@string/participate_testing_bug_text"
android:textAppearance="?android:attr/textAppearanceMedium"/>
<androidx.appcompat.widget.AppCompatButton
<com.google.android.material.button.MaterialButton
android:id="@+id/participate_testing_report"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

2
src/main/res/layout/passcodelock.xml
View file

@ -89,7 +89,7 @@
android:textCursorDrawable="@null" />
</LinearLayout>
<androidx.appcompat.widget.AppCompatButton
<com.google.android.material.button.MaterialButton
android:id="@+id/cancel"
android:theme="@style/Button.Primary"
android:layout_width="wrap_content"

4
src/main/res/layout/share_file_layout.xml
View file

@ -122,7 +122,7 @@
android:text="@string/share_no_users"
android:textSize="@dimen/share_file_layout_text_size"/>
<androidx.appcompat.widget.AppCompatButton
<com.google.android.material.button.MaterialButton
android:id="@+id/addUserButton"
style="@style/ownCloud.Button"
android:layout_width="match_parent"
@ -333,7 +333,7 @@
</RelativeLayout>
<androidx.appcompat.widget.AppCompatButton
<com.google.android.material.button.MaterialButton
android:id="@+id/shareViaLinkGetLinkButton"
style="@style/ownCloud.Button"
android:layout_width="match_parent"

2
src/main/res/layout/sorting_order_fragment.xml
View file

@ -290,7 +290,7 @@
android:layout_height="wrap_content"
android:gravity="end">
<androidx.appcompat.widget.AppCompatButton
<com.google.android.material.button.MaterialButton
android:id="@+id/cancel"
style="@style/Button.Borderless"
android:layout_width="wrap_content"

79
src/main/res/layout/ssl_untrusted_cert_layout.xml
View file

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!--
<?xml version="1.0" encoding="utf-8"?>
<!--
ownCloud Android client application
Copyright (C) 2015 ownCloud Inc.
@ -49,7 +50,7 @@
/>
<TextView
<TextView
android:id="@+id/reason_cert_expired"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -108,14 +109,14 @@
android:layout_weight="1"
>
<LinearLayout
<LinearLayout
android:id="@+id/details_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="start"
android:orientation="vertical" >
<TextView
<TextView
android:id="@+id/null_cert"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -136,7 +137,7 @@
android:textAppearance="?android:attr/textAppearanceMedium"
/>
<TextView
<TextView
android:id="@+id/label_subject_CN"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -144,7 +145,7 @@
android:textAppearance="?android:attr/textAppearanceSmall"
/>
<TextView
<TextView
android:id="@+id/value_subject_CN"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -153,7 +154,7 @@
android:textAppearance="?android:attr/textAppearanceSmall"
/>
<TextView
<TextView
android:id="@+id/label_subject_O"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -161,7 +162,7 @@
android:textAppearance="?android:attr/textAppearanceSmall"
/>
<TextView
<TextView
android:id="@+id/value_subject_O"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -170,7 +171,7 @@
android:textAppearance="?android:attr/textAppearanceSmall"
/>
<TextView
<TextView
android:id="@+id/label_subject_OU"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -178,7 +179,7 @@
android:textAppearance="?android:attr/textAppearanceSmall"
/>
<TextView
<TextView
android:id="@+id/value_subject_OU"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -187,7 +188,7 @@
android:textAppearance="?android:attr/textAppearanceSmall"
/>
<TextView
<TextView
android:id="@+id/label_subject_ST"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -195,7 +196,7 @@
android:textAppearance="?android:attr/textAppearanceSmall"
/>
<TextView
<TextView
android:id="@+id/value_subject_ST"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -212,7 +213,7 @@
android:textAppearance="?android:attr/textAppearanceSmall"
/>
<TextView
<TextView
android:id="@+id/value_subject_C"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -221,7 +222,7 @@
android:textAppearance="?android:attr/textAppearanceSmall"
/>
<TextView
<TextView
android:id="@+id/label_subject_L"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -229,7 +230,7 @@
android:textAppearance="?android:attr/textAppearanceSmall"
/>
<TextView
<TextView
android:id="@+id/value_subject_L"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -239,7 +240,7 @@
/>
<TextView
<TextView
android:id="@+id/label_issuer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -248,7 +249,7 @@
android:textAppearance="?android:attr/textAppearanceMedium"
/>
<TextView
<TextView
android:id="@+id/label_issuer_CN"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -256,7 +257,7 @@
android:textAppearance="?android:attr/textAppearanceSmall"
/>
<TextView
<TextView
android:id="@+id/value_issuer_CN"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -265,7 +266,7 @@
android:textAppearance="?android:attr/textAppearanceSmall"
/>
<TextView
<TextView
android:id="@+id/label_issuer_O"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -273,7 +274,7 @@
android:textAppearance="?android:attr/textAppearanceSmall"
/>
<TextView
<TextView
android:id="@+id/value_issuer_O"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -282,7 +283,7 @@
android:textAppearance="?android:attr/textAppearanceSmall"
/>
<TextView
<TextView
android:id="@+id/label_issuer_OU"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -290,7 +291,7 @@
android:textAppearance="?android:attr/textAppearanceSmall"
/>
<TextView
<TextView
android:id="@+id/value_issuer_OU"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -299,7 +300,7 @@
android:textAppearance="?android:attr/textAppearanceSmall"
/>
<TextView
<TextView
android:id="@+id/label_issuer_ST"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -307,7 +308,7 @@
android:textAppearance="?android:attr/textAppearanceSmall"
/>
<TextView
<TextView
android:id="@+id/value_issuer_ST"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -324,7 +325,7 @@
android:textAppearance="?android:attr/textAppearanceSmall"
/>
<TextView
<TextView
android:id="@+id/value_issuer_C"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -333,7 +334,7 @@
android:textAppearance="?android:attr/textAppearanceSmall"
/>
<TextView
<TextView
android:id="@+id/label_issuer_L"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -341,7 +342,7 @@
android:textAppearance="?android:attr/textAppearanceSmall"
/>
<TextView
<TextView
android:id="@+id/value_issuer_L"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -350,7 +351,7 @@
android:textAppearance="?android:attr/textAppearanceSmall"
/>
<TextView
<TextView
android:id="@+id/label_validity"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -359,7 +360,7 @@
android:textAppearance="?android:attr/textAppearanceMedium"
/>
<TextView
<TextView
android:id="@+id/label_validity_from"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -367,7 +368,7 @@
android:textAppearance="?android:attr/textAppearanceSmall"
/>
<TextView
<TextView
android:id="@+id/value_validity_from"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -376,7 +377,7 @@
android:textAppearance="?android:attr/textAppearanceSmall"
/>
<TextView
<TextView
android:id="@+id/label_validity_to"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -384,7 +385,7 @@
android:textAppearance="?android:attr/textAppearanceSmall"
/>
<TextView
<TextView
android:id="@+id/value_validity_to"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -402,7 +403,7 @@
android:textAppearance="?android:attr/textAppearanceMedium"
/>
<TextView
<TextView
android:id="@+id/label_signature_algorithm"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -410,7 +411,7 @@
android:textAppearance="?android:attr/textAppearanceSmall"
/>
<TextView
<TextView
android:id="@+id/value_signature_algorithm"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -437,11 +438,11 @@
android:textAppearance="?android:attr/textAppearanceSmall"
/>
</LinearLayout>
</LinearLayout>
</ScrollView>
<TextView
<TextView
android:id="@+id/question"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -457,7 +458,7 @@
android:layout_height="wrap_content"
android:gravity="center" >
<androidx.appcompat.widget.AppCompatButton
<com.google.android.material.button.MaterialButton
android:id="@+id/cancel"
style="@style/Button.Borderless"
android:layout_width="@dimen/zero"
@ -465,7 +466,7 @@
android:layout_weight="1"
android:text="@string/common_no" />
<androidx.appcompat.widget.AppCompatButton
<com.google.android.material.button.MaterialButton
android:id="@+id/details_btn"
style="@style/Button.Borderless"
android:layout_width="@dimen/zero"
@ -473,7 +474,7 @@
android:layout_weight="2"
android:text="@string/ssl_validator_btn_details_see" />
<androidx.appcompat.widget.AppCompatButton
<com.google.android.material.button.MaterialButton
android:id="@+id/ok"
style="@style/Button.Borderless"
android:layout_width="@dimen/zero"

81
src/main/res/layout/ssl_validator_layout.xml
View file

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!--
<?xml version="1.0" encoding="utf-8"?>
<!--
ownCloud Android client application
Copyright (C) 2015 ownCloud Inc.
@ -92,14 +93,14 @@
android:layout_width="wrap_content"
android:layout_height="@dimen/scroll_view_height">
<LinearLayout
<LinearLayout
android:id="@+id/details_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="start"
android:orientation="vertical" >
<TextView
<TextView
android:id="@+id/label_subject"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -108,7 +109,7 @@
android:textAppearance="?android:attr/textAppearanceMedium"
/>
<TextView
<TextView
android:id="@+id/label_subject_CN"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -116,7 +117,7 @@
android:textAppearance="?android:attr/textAppearanceSmall"
/>
<TextView
<TextView
android:id="@+id/value_subject_CN"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -125,7 +126,7 @@
android:textAppearance="?android:attr/textAppearanceSmall"
/>
<TextView
<TextView
android:id="@+id/label_subject_O"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -133,7 +134,7 @@
android:textAppearance="?android:attr/textAppearanceSmall"
/>
<TextView
<TextView
android:id="@+id/value_subject_O"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -142,7 +143,7 @@
android:textAppearance="?android:attr/textAppearanceSmall"
/>
<TextView
<TextView
android:id="@+id/label_subject_OU"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -150,7 +151,7 @@
android:textAppearance="?android:attr/textAppearanceSmall"
/>
<TextView
<TextView
android:id="@+id/value_subject_OU"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -159,7 +160,7 @@
android:textAppearance="?android:attr/textAppearanceSmall"
/>
<TextView
<TextView
android:id="@+id/label_subject_ST"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -167,7 +168,7 @@
android:textAppearance="?android:attr/textAppearanceSmall"
/>
<TextView
<TextView
android:id="@+id/value_subject_ST"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -184,7 +185,7 @@
android:textAppearance="?android:attr/textAppearanceSmall"
/>
<TextView
<TextView
android:id="@+id/value_subject_C"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -193,7 +194,7 @@
android:textAppearance="?android:attr/textAppearanceSmall"
/>
<TextView
<TextView
android:id="@+id/label_subject_L"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -201,7 +202,7 @@
android:textAppearance="?android:attr/textAppearanceSmall"
/>
<TextView
<TextView
android:id="@+id/value_subject_L"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -211,7 +212,7 @@
/>
<TextView
<TextView
android:id="@+id/label_issuer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -220,7 +221,7 @@
android:textAppearance="?android:attr/textAppearanceMedium"
/>
<TextView
<TextView
android:id="@+id/label_issuer_CN"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -228,7 +229,7 @@
android:textAppearance="?android:attr/textAppearanceSmall"
/>
<TextView
<TextView
android:id="@+id/value_issuer_CN"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -237,7 +238,7 @@
android:textAppearance="?android:attr/textAppearanceSmall"
/>
<TextView
<TextView
android:id="@+id/label_issuer_O"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -245,7 +246,7 @@
android:textAppearance="?android:attr/textAppearanceSmall"
/>
<TextView
<TextView
android:id="@+id/value_issuer_O"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -254,7 +255,7 @@
android:textAppearance="?android:attr/textAppearanceSmall"
/>
<TextView
<TextView
android:id="@+id/label_issuer_OU"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -262,7 +263,7 @@
android:textAppearance="?android:attr/textAppearanceSmall"
/>
<TextView
<TextView
android:id="@+id/value_issuer_OU"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -271,7 +272,7 @@
android:textAppearance="?android:attr/textAppearanceSmall"
/>
<TextView
<TextView
android:id="@+id/label_issuer_ST"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -279,7 +280,7 @@
android:textAppearance="?android:attr/textAppearanceSmall"
/>
<TextView
<TextView
android:id="@+id/value_issuer_ST"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -296,7 +297,7 @@
android:textAppearance="?android:attr/textAppearanceSmall"
/>
<TextView
<TextView
android:id="@+id/value_issuer_C"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -305,7 +306,7 @@
android:textAppearance="?android:attr/textAppearanceSmall"
/>
<TextView
<TextView
android:id="@+id/label_issuer_L"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -313,7 +314,7 @@
android:textAppearance="?android:attr/textAppearanceSmall"
/>
<TextView
<TextView
android:id="@+id/value_issuer_L"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -322,7 +323,7 @@
android:textAppearance="?android:attr/textAppearanceSmall"
/>
<TextView
<TextView
android:id="@+id/label_validity"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -331,7 +332,7 @@
android:textAppearance="?android:attr/textAppearanceMedium"
/>
<TextView
<TextView
android:id="@+id/label_validity_from"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -339,7 +340,7 @@
android:textAppearance="?android:attr/textAppearanceSmall"
/>
<TextView
<TextView
android:id="@+id/value_validity_from"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -348,7 +349,7 @@
android:textAppearance="?android:attr/textAppearanceSmall"
/>
<TextView
<TextView
android:id="@+id/label_validity_to"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -356,7 +357,7 @@
android:textAppearance="?android:attr/textAppearanceSmall"
/>
<TextView
<TextView
android:id="@+id/value_validity_to"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -366,7 +367,7 @@
/>
<TextView
<TextView
android:id="@+id/label_signature"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -375,7 +376,7 @@
android:textAppearance="?android:attr/textAppearanceMedium"
/>
<TextView
<TextView
android:id="@+id/label_signature_algorithm"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -383,7 +384,7 @@
android:textAppearance="?android:attr/textAppearanceSmall"
/>
<TextView
<TextView
android:id="@+id/value_signature_algorithm"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -393,7 +394,7 @@
/>
<TextView
<TextView
android:id="@+id/value_signature"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -402,11 +403,11 @@
android:textAppearance="?android:attr/textAppearanceSmall"
/>
</LinearLayout>
</LinearLayout>
</ScrollView>
<TextView
<TextView
android:id="@+id/question"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -421,7 +422,7 @@
android:layout_height="wrap_content"
android:gravity="center" >
<androidx.appcompat.widget.AppCompatButton
<com.google.android.material.button.MaterialButton
android:id="@+id/cancel"
style="@style/Button.Borderless"
android:layout_width="@dimen/zero"
@ -429,7 +430,7 @@
android:layout_weight="1"
android:text="@string/common_no" />
<androidx.appcompat.widget.AppCompatButton
<com.google.android.material.button.MaterialButton
android:id="@+id/details_btn"
style="@style/Button.Borderless"
android:layout_width="@dimen/zero"
@ -437,7 +438,7 @@
android:layout_weight="2"
android:text="@string/ssl_validator_btn_details_see" />
<androidx.appcompat.widget.AppCompatButton
<com.google.android.material.button.MaterialButton
android:id="@+id/ok"
style="@style/Button.Borderless"
android:layout_width="@dimen/zero"

6
src/main/res/layout/synced_folders_settings_layout.xml
View file

@ -420,7 +420,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.appcompat.widget.AppCompatButton
<com.google.android.material.button.MaterialButton
android:id="@+id/delete"
style="@style/Button.Borderless.Destructive"
android:layout_width="wrap_content"
@ -435,14 +435,14 @@
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true">
<androidx.appcompat.widget.AppCompatButton
<com.google.android.material.button.MaterialButton
android:id="@+id/cancel"
style="@style/Button.Borderless"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/common_cancel"/>
<androidx.appcompat.widget.AppCompatButton
<com.google.android.material.button.MaterialButton
android:id="@+id/save"
style="@style/Button.Borderless"
android:layout_width="wrap_content"

9
src/main/res/layout/upload_files_layout.xml
View file

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!--
<?xml version="1.0" encoding="utf-8"?>
<!--
ownCloud Android client application
Copyright (C) 2015 ownCloud Inc.
@ -76,7 +77,7 @@
android:orientation="horizontal"
android:padding="@dimen/standard_padding">
<androidx.appcompat.widget.AppCompatButton
<com.google.android.material.button.MaterialButton
android:id="@+id/upload_files_btn_cancel"
android:theme="@style/Button"
android:layout_width="wrap_content"
@ -86,7 +87,7 @@
android:layout_marginRight="@dimen/standard_half_margin"
android:layout_marginEnd="@dimen/standard_half_margin"/>
<androidx.appcompat.widget.AppCompatButton
<com.google.android.material.button.MaterialButton
android:id="@+id/upload_files_btn_upload"
android:theme="@style/Button.Primary"
android:layout_width="wrap_content"
@ -94,6 +95,6 @@
android:layout_weight="1"
android:text="@string/uploader_btn_upload_text" />
</LinearLayout>
</LinearLayout>
</LinearLayout>

7
src/main/res/layout/uploader_layout.xml
View file

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!--
<?xml version="1.0" encoding="utf-8"?>
<!--
ownCloud Android client application
Copyright (C) 2012 Bartek Przybylski
@ -61,7 +62,7 @@
android:orientation="horizontal"
android:padding="@dimen/standard_padding">
<androidx.appcompat.widget.AppCompatButton
<com.google.android.material.button.MaterialButton
android:theme="@style/Button"
android:id="@+id/uploader_cancel"
style="@style/ownCloud.Button"
@ -73,7 +74,7 @@
android:layout_marginRight="@dimen/standard_half_margin"
android:layout_marginEnd="@dimen/standard_half_margin"/>
<androidx.appcompat.widget.AppCompatButton
<com.google.android.material.button.MaterialButton
android:id="@+id/uploader_choose_folder"
android:theme="@style/Button.Primary"
android:layout_width="fill_parent"

2
src/main/res/layout/whats_new_activity.xml
View file

@ -54,7 +54,7 @@
android:orientation="horizontal"
android:weightSum="3">
<androidx.appcompat.widget.AppCompatButton
<com.google.android.material.button.MaterialButton
android:id="@+id/skip"
style="@style/Button.Borderless.Login"
android:layout_width="0dp"

38
src/main/res/values/styles.xml
View file

@ -19,7 +19,7 @@
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<!-- General ownCloud app style -->
<style name="Theme.ownCloud" parent="Theme.AppCompat.Light.DarkActionBar">
<style name="Theme.ownCloud" parent="Theme.MaterialComponents.Light.DarkActionBar">
<item name="android:actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
<item name="actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
<item name="actionModeBackground">@color/action_mode_background</item>
@ -34,19 +34,19 @@
<item name="fontFamily">@font/nunito_regular</item>
</style>
<style name="FallbackThemingTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<style name="FallbackThemingTheme" parent="Theme.MaterialComponents.Light.DarkActionBar">
<item name="colorPrimary">#424242</item>
<item name="colorPrimaryDark">#212121</item>
<item name="colorAccent">#757575</item>
</style>
<style name="FallbackDatePickerDialogTheme" parent="Theme.AppCompat.Light.Dialog">
<style name="FallbackDatePickerDialogTheme" parent="Theme.MaterialComponents.Light.Dialog">
<item name="colorPrimary">#424242</item>
<item name="colorPrimaryDark">#212121</item>
<item name="colorAccent">#757575</item>
</style>
<style name="FallbackTheming.Dialog" parent="Theme.AppCompat.Light.Dialog.Alert">
<style name="FallbackTheming.Dialog" parent="Theme.MaterialComponents.Light.Dialog.Alert">
<item name="colorPrimary">#424242</item>
<item name="colorPrimaryDark">#212121</item>
<item name="colorAccent">#757575</item>
@ -56,7 +56,7 @@
</style>
<!-- seperate action bar style for activities without an action bar -->
<style name="Theme.ownCloud.Toolbar" parent="Theme.AppCompat.Light.NoActionBar">
<style name="Theme.ownCloud.Toolbar" parent="Theme.MaterialComponents.Light.NoActionBar">
<item name="windowNoTitle">true</item>
<item name="windowActionBar">false</item>
<item name="colorPrimary">@color/primary</item>
@ -82,13 +82,13 @@
<item name="android:textColorHint">@color/login_text_hint_color</item>
</style>
<style name="ownCloud.AlertDialog" parent="Theme.AppCompat.Light.Dialog.Alert">
<style name="ownCloud.AlertDialog" parent="Theme.MaterialComponents.Light.Dialog.Alert">
<item name="colorAccent">@color/color_accent</item>
<item name="android:textColorPrimary">@color/primary</item>
<item name="searchViewStyle">@style/ownCloud.SearchView</item>
</style>
<style name="ownCloud.Dialog" parent="Theme.AppCompat.Light.Dialog">
<style name="ownCloud.Dialog" parent="Theme.MaterialComponents.Light.Dialog">
<item name="colorAccent">@color/color_accent</item>
<item name="searchViewStyle">@style/ownCloud.SearchView</item>
</style>
@ -110,11 +110,11 @@
<!--<item name="suggestionRowLayout">...</item>-->
</style>
<style name="ownCloud.Button" parent="Widget.AppCompat.Button">
<style name="ownCloud.Button" parent="Widget.MaterialComponents.Button">
<item name="colorButtonNormal">@color/primary</item>
</style>
<style name="Button" parent="Base.Widget.AppCompat.Button">
<style name="Button" parent="Widget.MaterialComponents.Button">
<item name="colorButtonNormal">@color/secondary_button_background_color</item>
<item name="android:textColor">@color/secondary_button_text_color</item>
</style>
@ -130,15 +130,15 @@
<item name="android:textColor">@color/primary_dark</item>
</style>
<style name="Button.Borderless" parent="Base.Widget.AppCompat.Button.Borderless">
<style name="Button.Borderless" parent="Widget.MaterialComponents.Button.TextButton">
<item name="android:textColor">@drawable/borderless_btn</item>
</style>
<style name="Button.Borderless.Destructive" parent="Base.Widget.AppCompat.Button.Borderless">
<style name="Button.Borderless.Destructive" parent="Widget.MaterialComponents.Button.TextButton">
<item name="android:textColor">@color/highlight_textColor_Warning</item>
</style>
<style name="Button.Borderless.Login" parent="Base.Widget.AppCompat.Button.Borderless">
<style name="Button.Borderless.Login" parent="Widget.MaterialComponents.Button.TextButton">
<item name="android:textColor">@color/white</item>
</style>
@ -153,7 +153,7 @@
</style>
<!-- ACTION BAR STYLES -->
<style name="Theme.ownCloud.Overlay.ActionBar" parent="@style/Widget.AppCompat.ActionBar">
<style name="Theme.ownCloud.Overlay.ActionBar" parent="@style/Widget.MaterialComponents.Toolbar">
<item name="android:background">@color/color_transparent</item>
<item name="android:windowActionBarOverlay">true</item>
<!-- Support library compatibility -->
@ -173,14 +173,14 @@
<item name="android:indeterminateDrawable">@drawable/actionbar_progress_indeterminate_horizontal</item>
</style>
<style name="Theme.ownCloud.Fullscreen" parent="@style/Theme.AppCompat">
<style name="Theme.ownCloud.Fullscreen" parent="@style/Theme.MaterialComponents">
<item name="android:windowFullscreen">true</item>
<item name="colorAccent">@color/color_accent</item>
</style>
<style name="Theme.ownCloud.Widget.ActionBar"
parent="@style/Widget.AppCompat.Light.ActionBar.Solid.Inverse">
<style name="Theme.ownCloud.Widget.ActionBar"
parent="@style/Theme.MaterialComponents.Light.DarkActionBar">
<item name="android:background">@color/primary</item>
<item name="background">@color/primary</item>
<item name="android:textColor">#ffffff</item>
@ -191,7 +191,7 @@
</style>
<!-- Dialogs -->
<style name="Theme.ownCloud.Dialog" parent="@style/Theme.AppCompat.Light.Dialog.Alert">
<style name="Theme.ownCloud.Dialog" parent="@style/Theme.MaterialComponents.Light.Dialog.Alert">
<item name="windowNoTitle">false</item>
<item name="colorAccent">@color/color_accent</item>
<item name="buttonBarButtonStyle">@style/Theme.ownCloud.Dialog.ButtonBar.Button</item>
@ -203,7 +203,7 @@
<item name="colorAccent">@color/color_accent</item>
</style>
<style name="Theme.ownCloud.Dialog.NoButtonBarStyle" parent="@style/Theme.AppCompat.Light.Dialog.Alert">
<style name="Theme.ownCloud.Dialog.NoButtonBarStyle" parent="@style/Theme.MaterialComponents.Light.Dialog.Alert">
<item name="windowNoTitle">false</item>
<item name="colorAccent">@color/color_accent</item>
</style>
@ -226,7 +226,7 @@
<item name="android:minHeight">@null</item>
</style>
<style name="Theme.ownCloud.Dialog.ButtonBar.Button" parent="@style/Widget.AppCompat.Button.Borderless.Colored">
<style name="Theme.ownCloud.Dialog.ButtonBar.Button" parent="@style/Widget.MaterialComponents.Button.TextButton">
<!-- Setting the weight as follows should result in equally wide buttons filling the alert dialog width,
but instead they span further out of the dialog, breaking in multiple lines though -->
<item name="android:layout_width">0dp</item>