Skip to content

Commit 9858cc7

Browse files
AndyScherzingerAndyScherzinger
committed
WiP
1 parent 396c8c4 commit 9858cc7

26 files changed

Lines changed: 158 additions & 154 deletions

‎src/main/java/com/owncloud/android/ui/activity/ParticipateActivity.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,11 @@
3030
import android.view.View;
3131
import android.widget.TextView;
3232

33+
import com.google.android.material.button.MaterialButton;
3334
import com.owncloud.android.R;
3435
import com.owncloud.android.utils.DisplayUtils;
3536
import com.owncloud.android.utils.ThemeUtils;
3637

37-
import androidx.appcompat.widget.AppCompatButton;
38-
3938
/**
4039
* Activity providing information about ways to participate in the app's development.
4140
*/
@@ -93,7 +92,7 @@ private void setupContent() {
9392
ThemeUtils.colorToHexString(ThemeUtils.primaryColor(this, true)),
9493
getString(R.string.contributing_link)))));
9594

96-
AppCompatButton reportButton = findViewById(R.id.participate_testing_report);
95+
MaterialButton reportButton = findViewById(R.id.participate_testing_report);
9796
reportButton.getBackground().setColorFilter(ThemeUtils.primaryAccentColor(this), PorterDuff.Mode.SRC_ATOP);
9897
reportButton.setOnClickListener(v -> DisplayUtils.startLinkIntent(this, R.string.report_issue_link));
9998
}

‎src/main/java/com/owncloud/android/ui/activity/UploadFilesActivity.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
import android.widget.Spinner;
4343
import android.widget.TextView;
4444

45+
import com.google.android.material.button.MaterialButton;
4546
import com.owncloud.android.R;
4647
import com.owncloud.android.db.PreferenceManager;
4748
import com.owncloud.android.lib.common.utils.Log_OC;
@@ -62,7 +63,6 @@
6263
import androidx.annotation.NonNull;
6364
import androidx.annotation.Nullable;
6465
import androidx.appcompat.app.ActionBar;
65-
import androidx.appcompat.widget.AppCompatButton;
6666
import androidx.appcompat.widget.AppCompatSpinner;
6767
import androidx.appcompat.widget.SearchView;
6868
import androidx.core.view.MenuItemCompat;
@@ -160,7 +160,7 @@ public void onCreate(Bundle savedInstanceState) {
160160

161161
if (mLocalFolderPickerMode) {
162162
findViewById(R.id.upload_options).setVisibility(View.GONE);
163-
((AppCompatButton) findViewById(R.id.upload_files_btn_upload))
163+
((MaterialButton) findViewById(R.id.upload_files_btn_upload))
164164
.setText(R.string.uploader_btn_alternative_text);
165165
}
166166

@@ -169,7 +169,7 @@ public void onCreate(Bundle savedInstanceState) {
169169
// Set input controllers
170170
findViewById(R.id.upload_files_btn_cancel).setOnClickListener(this);
171171

172-
mUploadBtn = (AppCompatButton) findViewById(R.id.upload_files_btn_upload);
172+
mUploadBtn = (MaterialButton) findViewById(R.id.upload_files_btn_upload);
173173
mUploadBtn.getBackground().setColorFilter(ThemeUtils.primaryAccentColor(this), PorterDuff.Mode.SRC_ATOP);
174174
mUploadBtn.setOnClickListener(this);
175175

‎src/main/java/com/owncloud/android/ui/dialog/SortingOrderDialogFragment.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@
3030
import android.widget.ImageButton;
3131
import android.widget.TextView;
3232

33+
import com.google.android.material.button.MaterialButton;
3334
import com.owncloud.android.R;
3435
import com.owncloud.android.lib.common.utils.Log_OC;
3536
import com.owncloud.android.utils.FileSortOrder;
3637
import com.owncloud.android.utils.ThemeUtils;
3738

3839
import androidx.annotation.NonNull;
39-
import androidx.appcompat.widget.AppCompatButton;
4040
import androidx.fragment.app.DialogFragment;
4141

4242
/**
@@ -51,7 +51,7 @@ public class SortingOrderDialogFragment extends DialogFragment {
5151

5252
private View mView;
5353
private View[] mTaggedViews;
54-
private AppCompatButton mCancel;
54+
private MaterialButton mCancel;
5555
private String mCurrentSortOrderName;
5656

5757
public static SortingOrderDialogFragment newInstance(FileSortOrder sortOrder) {

‎src/main/java/com/owncloud/android/ui/dialog/SyncedFolderPreferencesDialogFragment.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import android.view.ViewGroup;
3535
import android.widget.TextView;
3636

37+
import com.google.android.material.button.MaterialButton;
3738
import com.owncloud.android.R;
3839
import com.owncloud.android.datamodel.MediaFolderType;
3940
import com.owncloud.android.datamodel.SyncedFolderDisplayItem;
@@ -49,7 +50,6 @@
4950
import androidx.annotation.NonNull;
5051
import androidx.annotation.Nullable;
5152
import androidx.appcompat.app.AlertDialog;
52-
import androidx.appcompat.widget.AppCompatButton;
5353
import androidx.appcompat.widget.AppCompatCheckBox;
5454
import androidx.appcompat.widget.SwitchCompat;
5555
import androidx.fragment.app.DialogFragment;
@@ -78,8 +78,8 @@ public class SyncedFolderPreferencesDialogFragment extends DialogFragment {
7878
private TextView mRemoteFolderSummary;
7979

8080
private SyncedFolderParcelable mSyncedFolder;
81-
private AppCompatButton mCancel;
82-
private AppCompatButton mSave;
81+
private MaterialButton mCancel;
82+
private MaterialButton mSave;
8383
private boolean behaviourDialogShown;
8484
private AlertDialog behaviourDialog;
8585

‎src/main/java/com/owncloud/android/ui/fragment/ShareFileFragment.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import android.widget.ScrollView;
4040
import android.widget.TextView;
4141

42+
import com.google.android.material.button.MaterialButton;
4243
import com.google.android.material.snackbar.Snackbar;
4344
import com.owncloud.android.R;
4445
import com.owncloud.android.datamodel.OCFile;
@@ -60,7 +61,6 @@
6061
import java.util.List;
6162

6263
import androidx.annotation.NonNull;
63-
import androidx.appcompat.widget.AppCompatButton;
6464
import androidx.appcompat.widget.SwitchCompat;
6565
import androidx.fragment.app.Fragment;
6666

@@ -717,7 +717,7 @@ private void updatePublicShareSection() {
717717
}
718718

719719
// GetLink button
720-
AppCompatButton getLinkButton = getGetLinkButton();
720+
MaterialButton getLinkButton = getGetLinkButton();
721721
getLinkButton.getBackground().setColorFilter(ThemeUtils.primaryAccentColor(getContext()),
722722
PorterDuff.Mode.SRC_ATOP);
723723
getLinkButton.setVisibility(View.VISIBLE);
@@ -873,8 +873,8 @@ private View getHideFileListingPermissionSection() {
873873
return getView().findViewById(R.id.shareViaLinkHideFileListingPermissionSection);
874874
}
875875

876-
private AppCompatButton getGetLinkButton() {
877-
return (AppCompatButton) getView().findViewById(R.id.shareViaLinkGetLinkButton);
876+
private MaterialButton getGetLinkButton() {
877+
return (MaterialButton) getView().findViewById(R.id.shareViaLinkGetLinkButton);
878878
}
879879

880880
/**

‎src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactsBackupFragment.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939

4040
import com.evernote.android.job.JobRequest;
4141
import com.evernote.android.job.util.support.PersistableBundleCompat;
42+
import com.google.android.material.button.MaterialButton;
4243
import com.google.android.material.snackbar.Snackbar;
4344
import com.owncloud.android.R;
4445
import com.owncloud.android.datamodel.ArbitraryDataProvider;
@@ -63,7 +64,6 @@
6364
import androidx.annotation.NonNull;
6465
import androidx.annotation.Nullable;
6566
import androidx.appcompat.app.ActionBar;
66-
import androidx.appcompat.widget.AppCompatButton;
6767
import androidx.appcompat.widget.SwitchCompat;
6868
import androidx.fragment.app.Fragment;
6969
import butterknife.BindView;
@@ -81,13 +81,13 @@ public class ContactsBackupFragment extends FileFragment implements DatePickerDi
8181
public SwitchCompat backupSwitch;
8282

8383
@BindView(R.id.contacts_datepicker)
84-
public AppCompatButton contactsDatePickerBtn;
84+
public MaterialButton contactsDatePickerBtn;
8585

8686
@BindView(R.id.contacts_last_backup_timestamp)
8787
public TextView lastBackup;
8888

8989
@BindView(R.id.contacts_backup_now)
90-
public AppCompatButton backupNow;
90+
public MaterialButton backupNow;
9191

9292
private Date selectedDate;
9393
private boolean calendarPickerOpen;
@@ -183,7 +183,7 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
183183
contactsDatePickerBtn.getBackground().setColorFilter(accentColor, PorterDuff.Mode.SRC_ATOP);
184184
contactsDatePickerBtn.setTextColor(fontColor);
185185

186-
AppCompatButton chooseDate = view.findViewById(R.id.contacts_datepicker);
186+
MaterialButton chooseDate = view.findViewById(R.id.contacts_datepicker);
187187
chooseDate.getBackground().setColorFilter(accentColor, PorterDuff.Mode.SRC_ATOP);
188188
chooseDate.setTextColor(ThemeUtils.fontColor(getContext()));
189189

‎src/main/res/layout-land/account_setup.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
android:orientation="vertical"
5959
android:padding="@dimen/standard_half_padding" >
6060

61-
<androidx.appcompat.widget.AppCompatButton
61+
<com.google.android.material.button.MaterialButton
6262
android:id="@+id/centeredRefreshButton"
6363
style="@style/ownCloud.Button"
6464
android:layout_width="wrap_content"
@@ -281,7 +281,7 @@
281281
android:orientation="vertical"
282282
android:paddingTop="@dimen/standard_half_padding">
283283

284-
<androidx.appcompat.widget.AppCompatButton
284+
<com.google.android.material.button.MaterialButton
285285
android:id="@+id/buttonOK"
286286
android:theme="@style/Button.Login"
287287
style="@style/Button.Login"

‎src/main/res/layout/account_setup.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
android:orientation="vertical"
5151
android:padding="@dimen/standard_half_padding">
5252

53-
<androidx.appcompat.widget.AppCompatButton
53+
<com.google.android.material.button.MaterialButton
5454
android:id="@+id/centeredRefreshButton"
5555
style="@style/ownCloud.Button"
5656
android:layout_width="wrap_content"
@@ -262,7 +262,7 @@
262262
android:textColor="@color/login_text_color"
263263
android:contentDescription="@string/auth_unauthorized"/>
264264

265-
<androidx.appcompat.widget.AppCompatButton
265+
<com.google.android.material.button.MaterialButton
266266
android:id="@+id/buttonOK"
267267
android:theme="@style/Button.Login"
268268
style="@style/Button.Login"

‎src/main/res/layout/activity_manage_space.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
android:text="@string/manage_space_description"
3232
/>
3333

34-
<androidx.appcompat.widget.AppCompatButton
34+
<com.google.android.material.button.MaterialButton
3535
android:layout_width="match_parent"
3636
android:layout_height="wrap_content"
3737
android:text="@string/manage_space_clear_data"

‎src/main/res/layout/activity_sso_grant_permission.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
app:layout_constraintTop_toTopOf="parent"
4848
tools:text="Grant Nextcloud News access to your Nextcloud account incrediblyLong_username_with_123456789_number@Nextcloud_dummy.com?" />
4949

50-
<androidx.appcompat.widget.AppCompatButton
50+
<com.google.android.material.button.MaterialButton
5151
android:id="@+id/btnGrant"
5252
style="@style/Button.Borderless"
5353
android:layout_width="wrap_content"
@@ -56,7 +56,7 @@
5656
app:layout_constraintBottom_toBottomOf="parent"
5757
app:layout_constraintEnd_toEndOf="parent" />
5858

59-
<androidx.appcompat.widget.AppCompatButton
59+
<com.google.android.material.button.MaterialButton
6060
android:id="@+id/btnDecline"
6161
style="@style/Button.Borderless"
6262
android:layout_width="wrap_content"

0 commit comments

Comments
 (0)