From 845b0717493786a6ee206bb63fa49bbbfd76ebbd Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Fri, 27 Mar 2020 13:19:58 -0500 Subject: [PATCH] Set minSdk to 17 --- .../andlib/utility/AndroidUtilities.java | 4 --- .../org/tasks/dialogs/AlertDialogBuilder.java | 8 ++--- .../main/java/org/tasks/jobs/SyncWork.java | 3 +- .../main/java/org/tasks/locale/Locale.java | 5 +-- .../preferences/fragments/LookAndFeel.kt | 3 -- .../java/org/tasks/themes/DrawableUtil.java | 18 ++--------- .../tasks/ui/SingleCheckedArrayAdapter.java | 7 +--- .../tasks/widget/ScrollableViewsFactory.java | 11 ++----- .../java/org/tasks/widget/TasksWidget.java | 5 +-- .../main/res/layout-w820dp/week_buttons.xml | 4 +-- .../main/res/layout/aac_record_activity.xml | 8 ++--- .../res/layout/activity_location_picker.xml | 10 ------ app/src/main/res/layout/activity_purchase.xml | 8 ++--- .../layout/astrid_calendar_reminder_view.xml | 32 ++++++++----------- .../res/layout/control_set_clear_button.xml | 1 - .../main/res/layout/control_set_deadline.xml | 1 - .../main/res/layout/control_set_priority.xml | 4 --- .../main/res/layout/control_set_reminders.xml | 5 --- .../main/res/layout/control_set_repeat.xml | 20 +++--------- .../res/layout/control_set_repeat_display.xml | 2 -- .../main/res/layout/control_set_subtasks.xml | 2 -- .../main/res/layout/control_set_template.xml | 4 --- .../main/res/layout/control_set_timers.xml | 4 +-- .../res/layout/control_set_timers_dialog.xml | 16 ++++------ .../res/layout/custom_filter_activity.xml | 3 -- app/src/main/res/layout/custom_filter_row.xml | 17 ++-------- .../main/res/layout/dialog_purchase_cell.xml | 4 +-- .../main/res/layout/dialog_radius_seekbar.xml | 12 ++----- .../editable_subtask_adapter_row_body.xml | 14 ++------ app/src/main/res/layout/file_row.xml | 2 -- .../main/res/layout/filter_adapter_row.xml | 12 +------ .../res/layout/filter_adapter_subheader.xml | 6 ---- .../main/res/layout/fragment_comment_bar.xml | 5 --- .../main/res/layout/fragment_task_edit.xml | 2 -- app/src/main/res/layout/frequency_item.xml | 2 -- .../main/res/layout/list_settings_color.xml | 2 -- .../main/res/layout/list_settings_icon.xml | 1 - app/src/main/res/layout/location_details.xml | 11 +------ app/src/main/res/layout/location_row.xml | 5 --- .../res/layout/preference_draggable_row.xml | 2 -- app/src/main/res/layout/row_attribution.xml | 4 --- .../res/layout/row_attribution_header.xml | 4 --- app/src/main/res/layout/row_place.xml | 14 -------- app/src/main/res/layout/row_place_footer.xml | 4 +-- app/src/main/res/layout/row_tag_picker.xml | 5 --- app/src/main/res/layout/scrollable_widget.xml | 10 ------ .../res/layout/simple_list_item_2_themed.xml | 5 --- .../simple_list_item_single_checkmark.xml | 2 -- .../layout/simple_list_item_single_choice.xml | 4 --- .../layout/simple_spinner_dropdown_item.xml | 4 --- .../res/layout/subtask_adapter_row_body.xml | 12 ++----- .../main/res/layout/task_adapter_row_body.xml | 16 +--------- app/src/main/res/layout/widget_row.xml | 8 +---- app/src/main/res/values-w820dp/styles.xml | 6 ++-- app/src/main/res/values/styles.xml | 10 +++--- buildSrc/src/main/kotlin/Versions.kt | 2 +- 56 files changed, 68 insertions(+), 327 deletions(-) diff --git a/app/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java b/app/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java index 6602e4813..861db96cb 100644 --- a/app/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java +++ b/app/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java @@ -146,10 +146,6 @@ public class AndroidUtilities { return !atLeastOreo(); } - public static boolean atLeastJellybeanMR1() { - return Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1; - } - public static boolean atLeastKitKat() { return Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT; } diff --git a/app/src/main/java/org/tasks/dialogs/AlertDialogBuilder.java b/app/src/main/java/org/tasks/dialogs/AlertDialogBuilder.java index bea4521d4..129c3b96e 100644 --- a/app/src/main/java/org/tasks/dialogs/AlertDialogBuilder.java +++ b/app/src/main/java/org/tasks/dialogs/AlertDialogBuilder.java @@ -1,7 +1,5 @@ package org.tasks.dialogs; -import static com.todoroo.andlib.utility.AndroidUtilities.atLeastJellybeanMR1; - import android.content.Context; import android.content.DialogInterface; import android.view.View; @@ -90,10 +88,8 @@ public class AlertDialogBuilder { } private String[] addDirectionality(String[] strings) { - if (atLeastJellybeanMR1()) { - for (int i = 0; i < strings.length; i++) { - strings[i] = withDirectionality(strings[i]); - } + for (int i = 0; i < strings.length; i++) { + strings[i] = withDirectionality(strings[i]); } return strings; } diff --git a/app/src/main/java/org/tasks/jobs/SyncWork.java b/app/src/main/java/org/tasks/jobs/SyncWork.java index 1365f6e21..eb93b9873 100644 --- a/app/src/main/java/org/tasks/jobs/SyncWork.java +++ b/app/src/main/java/org/tasks/jobs/SyncWork.java @@ -1,6 +1,5 @@ package org.tasks.jobs; -import static com.todoroo.andlib.utility.AndroidUtilities.atLeastJellybeanMR1; import static java.util.concurrent.Executors.newFixedThreadPool; import android.content.Context; @@ -67,7 +66,7 @@ public class SyncWork extends InjectingWorker { } private void sync() throws InterruptedException { - int numThreads = atLeastJellybeanMR1() ? Runtime.getRuntime().availableProcessors() : 2; + int numThreads = Runtime.getRuntime().availableProcessors(); ExecutorService executor = newFixedThreadPool(numThreads); for (CaldavAccount account : caldavDao.getAccounts()) { diff --git a/app/src/main/java/org/tasks/locale/Locale.java b/app/src/main/java/org/tasks/locale/Locale.java index 49e0c765b..f66bd3670 100644 --- a/app/src/main/java/org/tasks/locale/Locale.java +++ b/app/src/main/java/org/tasks/locale/Locale.java @@ -1,7 +1,5 @@ package org.tasks.locale; -import static com.todoroo.andlib.utility.AndroidUtilities.atLeastJellybeanMR1; - import android.annotation.SuppressLint; import android.annotation.TargetApi; import android.app.Dialog; @@ -52,8 +50,7 @@ public class Locale implements Serializable { appDirectionality == View.LAYOUT_DIRECTION_RTL ? RIGHT_TO_LEFT_MARK : LEFT_TO_RIGHT_MARK; int deviceDirectionality = TextUtilsCompat.getLayoutDirectionFromLocale(deviceLocale); hasUserOverrides = - !(deviceLocale.equals(appLocale) && appDirectionality == deviceDirectionality) - && atLeastJellybeanMR1(); + !(deviceLocale.equals(appLocale) && appDirectionality == deviceDirectionality); } public static Locale getInstance(Context context) { diff --git a/app/src/main/java/org/tasks/preferences/fragments/LookAndFeel.kt b/app/src/main/java/org/tasks/preferences/fragments/LookAndFeel.kt index d890a9cac..e798705b7 100644 --- a/app/src/main/java/org/tasks/preferences/fragments/LookAndFeel.kt +++ b/app/src/main/java/org/tasks/preferences/fragments/LookAndFeel.kt @@ -13,7 +13,6 @@ import androidx.annotation.StringRes import androidx.preference.ListPreference import androidx.preference.Preference import com.google.common.base.Strings -import com.todoroo.andlib.utility.AndroidUtilities.atLeastJellybeanMR1 import com.todoroo.andlib.utility.AndroidUtilities.atLeastLollipop import com.todoroo.astrid.api.Filter import org.tasks.BuildConfig @@ -151,8 +150,6 @@ class LookAndFeel : InjectingPreferenceFragment(), Preference.OnPreferenceChange requires(R.string.task_list_options, atLeastLollipop(), R.string.p_show_subtasks) - requires(R.string.settings_localization, atLeastJellybeanMR1(), R.string.p_language) - @Suppress("ConstantConditionIf") if (BuildConfig.FLAVOR != "googleplay") { removeGroup(R.string.TEA_control_location) diff --git a/app/src/main/java/org/tasks/themes/DrawableUtil.java b/app/src/main/java/org/tasks/themes/DrawableUtil.java index be1a71b5a..1794038dd 100644 --- a/app/src/main/java/org/tasks/themes/DrawableUtil.java +++ b/app/src/main/java/org/tasks/themes/DrawableUtil.java @@ -1,7 +1,5 @@ package org.tasks.themes; -import static com.todoroo.andlib.utility.AndroidUtilities.atLeastJellybeanMR1; - import android.content.Context; import android.graphics.drawable.Drawable; import android.graphics.drawable.LayerDrawable; @@ -18,26 +16,16 @@ public class DrawableUtil { public static void setLeftDrawable(Context context, TextView tv, @DrawableRes int resId) { Drawable wrapped = getWrapped(context, resId); - if (atLeastJellybeanMR1()) { - tv.setCompoundDrawablesRelativeWithIntrinsicBounds(wrapped, null, null, null); - } else { - tv.setCompoundDrawablesWithIntrinsicBounds(wrapped, null, null, null); - } + tv.setCompoundDrawablesRelativeWithIntrinsicBounds(wrapped, null, null, null); } public static void setRightDrawable(Context context, TextView tv, @DrawableRes int resId) { Drawable wrapped = getWrapped(context, resId); - if (atLeastJellybeanMR1()) { - tv.setCompoundDrawablesRelativeWithIntrinsicBounds(null, null, wrapped, null); - } else { - tv.setCompoundDrawablesWithIntrinsicBounds(null, null, wrapped, null); - } + tv.setCompoundDrawablesRelativeWithIntrinsicBounds(null, null, wrapped, null); } public static Drawable getLeftDrawable(TextView tv) { - return atLeastJellybeanMR1() - ? tv.getCompoundDrawablesRelative()[0] - : tv.getCompoundDrawables()[0]; + return tv.getCompoundDrawablesRelative()[0]; } public static Drawable wrap(@NotNull Drawable icon) { diff --git a/app/src/main/java/org/tasks/ui/SingleCheckedArrayAdapter.java b/app/src/main/java/org/tasks/ui/SingleCheckedArrayAdapter.java index d98b719aa..3e367d3c4 100644 --- a/app/src/main/java/org/tasks/ui/SingleCheckedArrayAdapter.java +++ b/app/src/main/java/org/tasks/ui/SingleCheckedArrayAdapter.java @@ -1,6 +1,5 @@ package org.tasks.ui; -import static com.todoroo.andlib.utility.AndroidUtilities.atLeastJellybeanMR1; import static com.todoroo.andlib.utility.AndroidUtilities.preLollipop; import android.content.Context; @@ -67,11 +66,7 @@ public class SingleCheckedArrayAdapter extends ArrayAdapter { wrapped.setAlpha(0); } DrawableCompat.setTint(wrapped, color); - if (atLeastJellybeanMR1()) { - view.setCompoundDrawablesRelativeWithIntrinsicBounds(wrapped, null, null, null); - } else { - view.setCompoundDrawablesWithIntrinsicBounds(wrapped, null, null, null); - } + view.setCompoundDrawablesRelativeWithIntrinsicBounds(wrapped, null, null, null); } return view; } diff --git a/app/src/main/java/org/tasks/widget/ScrollableViewsFactory.java b/app/src/main/java/org/tasks/widget/ScrollableViewsFactory.java index dc882d96a..1d760599d 100644 --- a/app/src/main/java/org/tasks/widget/ScrollableViewsFactory.java +++ b/app/src/main/java/org/tasks/widget/ScrollableViewsFactory.java @@ -1,7 +1,6 @@ package org.tasks.widget; import static androidx.core.content.ContextCompat.getColor; -import static com.todoroo.andlib.utility.AndroidUtilities.atLeastJellybeanMR1; import android.appwidget.AppWidgetManager; import android.content.Context; @@ -179,10 +178,8 @@ class ScrollableViewsFactory implements RemoteViewsService.RemoteViewsFactory { row.setViewVisibility(R.id.widget_complete_box, View.GONE); } - if (atLeastJellybeanMR1()) { - row.setInt( - R.id.widget_row, "setLayoutDirection", Locale.getInstance(context).getDirectionality()); - } + row.setInt( + R.id.widget_row, "setLayoutDirection", Locale.getInstance(context).getDirectionality()); row.setViewPadding( R.id.widget_row, widgetPadding + taskContainer.getIndent() * indentPadding, @@ -207,9 +204,7 @@ class ScrollableViewsFactory implements RemoteViewsService.RemoteViewsFactory { AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(context); RemoteViews rv = new RemoteViews(context.getPackageName(), R.layout.scrollable_widget); rv.setTextViewText(R.id.widget_title, filter.listingTitle); - if (atLeastJellybeanMR1()) { - rv.setInt(R.id.widget, "setLayoutDirection", Locale.getInstance(context).getDirectionality()); - } + rv.setInt(R.id.widget, "setLayoutDirection", Locale.getInstance(context).getDirectionality()); appWidgetManager.partiallyUpdateAppWidget(widgetId, rv); List queries = TaskListQuery.getQuery( diff --git a/app/src/main/java/org/tasks/widget/TasksWidget.java b/app/src/main/java/org/tasks/widget/TasksWidget.java index 76314e0da..bd57c6b40 100644 --- a/app/src/main/java/org/tasks/widget/TasksWidget.java +++ b/app/src/main/java/org/tasks/widget/TasksWidget.java @@ -3,7 +3,6 @@ package org.tasks.widget; import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK; import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP; import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK; -import static com.todoroo.andlib.utility.AndroidUtilities.atLeastJellybeanMR1; import android.app.PendingIntent; import android.appwidget.AppWidgetManager; @@ -75,9 +74,7 @@ public class TasksWidget extends InjectingAppWidgetProvider { rvIntent.setData(Uri.parse(rvIntent.toUri(Intent.URI_INTENT_SCHEME))); ThemeColor color = new ThemeColor(context, widgetPreferences.getColor()); RemoteViews remoteViews = new RemoteViews(context.getPackageName(), R.layout.scrollable_widget); - if (atLeastJellybeanMR1()) { - remoteViews.setInt(R.id.widget, "setLayoutDirection", locale.getDirectionality()); - } + remoteViews.setInt(R.id.widget, "setLayoutDirection", locale.getDirectionality()); if (widgetPreferences.showHeader()) { remoteViews.setViewVisibility(R.id.widget_header, View.VISIBLE); remoteViews.setViewVisibility( diff --git a/app/src/main/res/layout-w820dp/week_buttons.xml b/app/src/main/res/layout-w820dp/week_buttons.xml index 96050fcf6..e59cf1fa2 100644 --- a/app/src/main/res/layout-w820dp/week_buttons.xml +++ b/app/src/main/res/layout-w820dp/week_buttons.xml @@ -19,8 +19,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:layout_marginLeft="20dp" - android:layout_marginRight="20dp" + android:layout_marginStart="20dp" + android:layout_marginEnd="20dp" android:gravity="center_horizontal" android:orientation="horizontal"> diff --git a/app/src/main/res/layout/aac_record_activity.xml b/app/src/main/res/layout/aac_record_activity.xml index 4e18a79ce..281928054 100644 --- a/app/src/main/res/layout/aac_record_activity.xml +++ b/app/src/main/res/layout/aac_record_activity.xml @@ -7,8 +7,8 @@ + android:paddingEnd="@dimen/keyline_content_inset"> + android:paddingEnd="@dimen/keyline_content_inset" /> @@ -17,10 +17,8 @@ android:layout_height="wrap_content" android:layout_marginTop="5dip" android:layout_marginBottom="15dip" - android:layout_marginStart="10dp" - android:layout_marginEnd="5dp" - android:layout_marginLeft="10dip" - android:layout_marginRight="5dip" + android:layout_marginStart="10dip" + android:layout_marginEnd="5dip" android:orientation="horizontal"> @@ -88,8 +83,8 @@ android:layout_width="fill_parent" android:layout_height="35dip" android:layout_marginBottom="10dip" - android:layout_marginLeft="10dip" - android:layout_marginRight="10dip" + android:layout_marginStart="10dip" + android:layout_marginEnd="10dip" android:gravity="center" android:text="@string/new_tag" android:textColor="@android:color/white" @@ -100,8 +95,8 @@ android:layout_width="fill_parent" android:layout_height="35dip" android:layout_marginBottom="10dip" - android:layout_marginLeft="10dip" - android:layout_marginRight="10dip" + android:layout_marginStart="10dip" + android:layout_marginEnd="10dip" android:background="#707070" android:gravity="center" android:text="@string/CRA_postpone" @@ -112,8 +107,8 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="10dip" - android:layout_marginLeft="10dip" - android:layout_marginRight="10dip"> + android:layout_marginStart="10dip" + android:layout_marginEnd="10dip"> diff --git a/app/src/main/res/layout/control_set_priority.xml b/app/src/main/res/layout/control_set_priority.xml index 1f822ec42..74c5dc2da 100644 --- a/app/src/main/res/layout/control_set_priority.xml +++ b/app/src/main/res/layout/control_set_priority.xml @@ -12,8 +12,6 @@ android:layout_height="wrap_content" android:paddingStart="0dp" android:paddingEnd="@dimen/keyline_second" - android:paddingLeft="0dp" - android:paddingRight="@dimen/keyline_second" android:gravity="start|center_vertical" android:text="@string/TEA_importance_label"/> @@ -23,8 +21,6 @@ android:layout_gravity="end" android:paddingStart="@dimen/keyline_second" android:paddingEnd="0dp" - android:paddingLeft="@dimen/keyline_second" - android:paddingRight="0dp" android:gravity="end" android:orientation="horizontal"> diff --git a/app/src/main/res/layout/control_set_reminders.xml b/app/src/main/res/layout/control_set_reminders.xml index daa386a6b..5b8459258 100644 --- a/app/src/main/res/layout/control_set_reminders.xml +++ b/app/src/main/res/layout/control_set_reminders.xml @@ -23,21 +23,16 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" - android:layout_alignParentRight="true" android:paddingStart="0dp" android:paddingEnd="10dp" - android:paddingLeft="0dp" - android:paddingRight="10dp" android:background="@null" android:gravity="end"/> diff --git a/app/src/main/res/layout/control_set_repeat.xml b/app/src/main/res/layout/control_set_repeat.xml index fd9faeb21..291b23c52 100644 --- a/app/src/main/res/layout/control_set_repeat.xml +++ b/app/src/main/res/layout/control_set_repeat.xml @@ -29,8 +29,6 @@ android:layout_gravity="center_horizontal" android:paddingStart="@dimen/keyline_first" android:paddingEnd="@dimen/keyline_first" - android:paddingLeft="@dimen/keyline_first" - android:paddingRight="@dimen/keyline_first" app:backgroundTint="?attr/colorOnSecondary"/> @@ -47,8 +45,6 @@ android:layout_height="wrap_content" android:paddingStart="@dimen/keyline_first" android:paddingEnd="0dp" - android:paddingLeft="@dimen/keyline_first" - android:paddingRight="0dp" android:text="@string/repeat_every" android:textAppearance="@style/TextAppearance"/> @@ -56,8 +52,8 @@ android:id="@+id/intervalValue" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:paddingLeft="4dp" - android:paddingRight="4dp" + android:paddingStart="4dp" + android:paddingEnd="4dp" android:ems="3" android:focusable="true" android:focusableInTouchMode="true" @@ -75,8 +71,6 @@ android:layout_height="wrap_content" android:paddingStart="0dp" android:paddingEnd="@dimen/keyline_first" - android:paddingLeft="0dp" - android:paddingRight="@dimen/keyline_first" android:textAppearance="@style/TextAppearance"/> @@ -89,8 +83,6 @@ android:layout_height="wrap_content" android:paddingStart="@dimen/keyline_first" android:paddingEnd="@dimen/keyline_first" - android:paddingLeft="@dimen/keyline_first" - android:paddingRight="@dimen/keyline_first" android:orientation="vertical" android:visibility="gone"> @@ -124,16 +116,14 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/keyline_first" android:layout_marginEnd="0dp" - android:layout_marginLeft="@dimen/keyline_first" - android:layout_marginRight="0dp" android:layout_gravity="center"/> diff --git a/app/src/main/res/layout/control_set_repeat_display.xml b/app/src/main/res/layout/control_set_repeat_display.xml index 5afc3f82b..38c8dd5f2 100644 --- a/app/src/main/res/layout/control_set_repeat_display.xml +++ b/app/src/main/res/layout/control_set_repeat_display.xml @@ -32,8 +32,6 @@ android:layout_height="wrap_content" android:paddingStart="0dp" android:paddingEnd="5dp" - android:paddingLeft="0dp" - android:paddingRight="5dp" android:text="@string/repeats_from" android:textAppearance="@style/TextAppearance"/> diff --git a/app/src/main/res/layout/control_set_subtasks.xml b/app/src/main/res/layout/control_set_subtasks.xml index f301a631a..448d5c422 100644 --- a/app/src/main/res/layout/control_set_subtasks.xml +++ b/app/src/main/res/layout/control_set_subtasks.xml @@ -35,9 +35,7 @@ android:gravity="start" android:hint="@string/TEA_add_subtask" android:paddingStart="0dp" - android:paddingLeft="0dp" android:paddingEnd="@dimen/keyline_second" - android:paddingRight="@dimen/keyline_second" android:textAlignment="viewStart" /> diff --git a/app/src/main/res/layout/control_set_template.xml b/app/src/main/res/layout/control_set_template.xml index 78e2eaee4..c5b4ecb19 100644 --- a/app/src/main/res/layout/control_set_template.xml +++ b/app/src/main/res/layout/control_set_template.xml @@ -8,8 +8,6 @@ android:paddingBottom="@dimen/task_edit_drawable_padding_top_bottom" android:paddingStart="0dp" android:paddingEnd="@dimen/keyline_first" - android:paddingLeft="0dp" - android:paddingRight="@dimen/keyline_first" android:orientation="horizontal"> @@ -43,8 +41,8 @@ @@ -61,8 +59,6 @@ android:layout_weight="1" android:paddingStart="10dp" android:paddingEnd="0dp" - android:paddingLeft="10dip" - android:paddingRight="0dp" android:gravity="end"/> diff --git a/app/src/main/res/layout/custom_filter_activity.xml b/app/src/main/res/layout/custom_filter_activity.xml index 3ebfac649..66116c93c 100644 --- a/app/src/main/res/layout/custom_filter_activity.xml +++ b/app/src/main/res/layout/custom_filter_activity.xml @@ -58,8 +58,6 @@ android:layout_height="wrap_content" android:paddingStart="5dp" android:paddingEnd="0dp" - android:paddingLeft="5dip" - android:paddingRight="0dp" android:gravity="center" android:text="@string/CFA_help"/> @@ -78,7 +76,6 @@ android:layout_height="wrap_content" android:layout_weight="1" android:layout_marginEnd="3dp" - android:layout_marginRight="3dip" android:paddingTop="10dip" android:paddingBottom="10dip" android:text="@string/CFA_button_add"/> diff --git a/app/src/main/res/layout/custom_filter_row.xml b/app/src/main/res/layout/custom_filter_row.xml index 4c562a03f..9ba8913d7 100644 --- a/app/src/main/res/layout/custom_filter_row.xml +++ b/app/src/main/res/layout/custom_filter_row.xml @@ -9,8 +9,6 @@ android:layout_height="55dip" android:paddingStart="4dip" android:paddingEnd="6dip" - android:paddingLeft="4dip" - android:paddingRight="6dip" android:background="?attr/selectableItemBackground" android:orientation="horizontal"> @@ -19,17 +17,14 @@ android:layout_width="wrap_content" android:layout_height="fill_parent" android:layout_alignParentEnd="true" - android:layout_alignParentRight="true" - android:paddingLeft="5dip" - android:paddingRight="5dip" + android:paddingStart="5dp" + android:paddingEnd="5dp" android:gravity="center_vertical|end"/> @@ -41,8 +36,6 @@ android:layout_height="fill_parent" android:paddingStart="5dp" android:paddingEnd="5dp" - android:paddingLeft="5dip" - android:paddingRight="5dip" android:scaleType="center"/> @@ -52,8 +45,6 @@ android:layout_height="fill_parent" android:paddingStart="5dp" android:paddingEnd="5dp" - android:paddingLeft="5dip" - android:paddingRight="5dip" android:visibility="gone"/> @@ -62,10 +53,8 @@ style="@style/TextAppearance" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:paddingStart="5dip" + android:paddingStart="5dp" android:paddingEnd="5dp" - android:paddingLeft="5dip" - android:paddingRight="5dp" android:gravity="start|center_vertical" android:textAlignment="viewStart" android:textSize="18sp"/> diff --git a/app/src/main/res/layout/dialog_purchase_cell.xml b/app/src/main/res/layout/dialog_purchase_cell.xml index 8d81d52a7..bdde7ceba 100644 --- a/app/src/main/res/layout/dialog_purchase_cell.xml +++ b/app/src/main/res/layout/dialog_purchase_cell.xml @@ -4,8 +4,8 @@ xmlns:tools="http://schemas.android.com/tools" style="@style/TextButton" android:id="@+id/price" - android:paddingLeft="0dp" - android:paddingRight="0dp" + android:paddingStart="0dp" + android:paddingEnd="0dp" android:layout_width="@dimen/icon_picker_size" android:layout_height="@dimen/icon_picker_size" android:textSize="18sp" diff --git a/app/src/main/res/layout/dialog_radius_seekbar.xml b/app/src/main/res/layout/dialog_radius_seekbar.xml index 5897c18bc..87c3acf15 100644 --- a/app/src/main/res/layout/dialog_radius_seekbar.xml +++ b/app/src/main/res/layout/dialog_radius_seekbar.xml @@ -10,8 +10,6 @@ android:layout_height="wrap_content" android:paddingStart="@dimen/keyline_first" android:paddingEnd="@dimen/keyline_first" - android:paddingLeft="@dimen/keyline_first" - android:paddingRight="@dimen/keyline_first" android:gravity="center" android:minHeight="?attr/listPreferredItemHeight" app:sl_discreteMode="true" @@ -22,26 +20,20 @@ android:id="@+id/min" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentLeft="true" android:layout_alignParentStart="true" android:layout_below="@id/slider" android:paddingTop="5dp" android:paddingStart="@dimen/keyline_first" - android:paddingEnd="@dimen/keyline_first" - android:paddingLeft="@dimen/keyline_first" - android:paddingRight="@dimen/keyline_first"/> + android:paddingEnd="@dimen/keyline_first"/> + android:paddingEnd="@dimen/keyline_first"/> diff --git a/app/src/main/res/layout/editable_subtask_adapter_row_body.xml b/app/src/main/res/layout/editable_subtask_adapter_row_body.xml index 2edbbf11c..99e77dee4 100644 --- a/app/src/main/res/layout/editable_subtask_adapter_row_body.xml +++ b/app/src/main/res/layout/editable_subtask_adapter_row_body.xml @@ -10,26 +10,20 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentStart="true" - android:layout_alignParentLeft="true" android:paddingStart="0dp" - android:paddingLeft="0dp" - android:paddingEnd="@dimen/keyline_first" - android:paddingRight="@dimen/keyline_first" /> + android:paddingEnd="@dimen/keyline_first" /> + android:layout_alignParentEnd="true" /> - \ No newline at end of file diff --git a/app/src/main/res/layout/file_row.xml b/app/src/main/res/layout/file_row.xml index 29bc615b3..5fc408ed0 100644 --- a/app/src/main/res/layout/file_row.xml +++ b/app/src/main/res/layout/file_row.xml @@ -16,10 +16,8 @@ style="@android:style/TextAppearance" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentLeft="true" android:layout_alignParentStart="true" android:layout_gravity="start" - android:layout_toLeftOf="@id/clear" android:layout_toStartOf="@id/clear" android:gravity="start" android:textDirection="locale" diff --git a/app/src/main/res/layout/filter_adapter_row.xml b/app/src/main/res/layout/filter_adapter_row.xml index 575a9f963..c5a0b8b66 100644 --- a/app/src/main/res/layout/filter_adapter_row.xml +++ b/app/src/main/res/layout/filter_adapter_row.xml @@ -9,21 +9,16 @@ android:paddingTop="12dp" android:paddingBottom="12dp" android:paddingStart="@dimen/keyline_first" - android:paddingEnd="0dp" - android:paddingLeft="@dimen/keyline_first" - android:paddingRight="0dp"> + android:paddingEnd="0dp"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_comment_bar.xml b/app/src/main/res/layout/fragment_comment_bar.xml index 613c3e012..1790d0517 100644 --- a/app/src/main/res/layout/fragment_comment_bar.xml +++ b/app/src/main/res/layout/fragment_comment_bar.xml @@ -6,8 +6,6 @@ android:layout_height="wrap_content" android:paddingStart="@dimen/keyline_first" android:paddingEnd="@dimen/keyline_first" - android:paddingLeft="@dimen/keyline_first" - android:paddingRight="@dimen/keyline_first" android:gravity="center_vertical" android:minHeight="50dp" android:orientation="horizontal"> @@ -30,8 +28,6 @@ android:layout_gravity="center_vertical" android:paddingStart="@dimen/keyline_second" android:paddingEnd="0dp" - android:paddingLeft="@dimen/keyline_second" - android:paddingRight="0dp" android:background="@null" android:freezesText="true" android:gravity="start" @@ -52,7 +48,6 @@ android:layout_height="39dip" android:layout_weight="1" android:layout_marginStart="3dp" - android:layout_marginLeft="3dip" android:scaleType="center" android:src="@drawable/ic_outline_add_24px" android:tint="?attr/colorOnPrimary" diff --git a/app/src/main/res/layout/fragment_task_edit.xml b/app/src/main/res/layout/fragment_task_edit.xml index 4babb4140..42e555c48 100644 --- a/app/src/main/res/layout/fragment_task_edit.xml +++ b/app/src/main/res/layout/fragment_task_edit.xml @@ -30,9 +30,7 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:paddingTop="?attr/actionBarSize" - android:paddingLeft="@dimen/keyline_first" android:paddingStart="@dimen/keyline_first" - android:paddingRight="@dimen/keyline_first" android:paddingEnd="@dimen/keyline_first" android:paddingBottom="@dimen/keyline_second" android:layout_gravity="top" diff --git a/app/src/main/res/layout/frequency_item.xml b/app/src/main/res/layout/frequency_item.xml index 3b4022b29..316f54161 100644 --- a/app/src/main/res/layout/frequency_item.xml +++ b/app/src/main/res/layout/frequency_item.xml @@ -8,8 +8,6 @@ android:paddingBottom="12dp" android:paddingStart="0dp" android:paddingEnd="0dp" - android:paddingLeft="0dp" - android:paddingRight="0dp" android:ellipsize="end" android:singleLine="true" android:textAlignment="viewStart" diff --git a/app/src/main/res/layout/list_settings_color.xml b/app/src/main/res/layout/list_settings_color.xml index 7dfce094c..e4bc58072 100644 --- a/app/src/main/res/layout/list_settings_color.xml +++ b/app/src/main/res/layout/list_settings_color.xml @@ -11,9 +11,7 @@ android:id="@+id/color" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_alignParentLeft="true" android:layout_alignParentStart="true" - android:layout_toLeftOf="@id/clear" android:layout_toStartOf="@id/clear" android:contentDescription="@string/color" android:drawablePadding="@dimen/keyline_second" diff --git a/app/src/main/res/layout/list_settings_icon.xml b/app/src/main/res/layout/list_settings_icon.xml index f20688398..5830c9e37 100644 --- a/app/src/main/res/layout/list_settings_icon.xml +++ b/app/src/main/res/layout/list_settings_icon.xml @@ -8,7 +8,6 @@ android:id="@+id/icon" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_alignParentLeft="true" android:layout_alignParentStart="true" android:contentDescription="@string/icon" android:drawablePadding="@dimen/keyline_second" diff --git a/app/src/main/res/layout/location_details.xml b/app/src/main/res/layout/location_details.xml index f1876d46b..78b071fbe 100644 --- a/app/src/main/res/layout/location_details.xml +++ b/app/src/main/res/layout/location_details.xml @@ -15,8 +15,6 @@ android:layout_height="?android:attr/listPreferredItemHeightSmall" android:paddingStart="@dimen/keyline_second" android:paddingEnd="@dimen/keyline_first" - android:paddingLeft="@dimen/keyline_second" - android:paddingRight="@dimen/keyline_first" android:gravity="center_vertical" android:text="@string/location_remind_arrival" android:textAppearance="?attr/textAppearanceListItemSmall"/> @@ -26,8 +24,6 @@ android:layout_height="?android:attr/listPreferredItemHeightSmall" android:paddingStart="@dimen/keyline_second" android:paddingEnd="@dimen/keyline_first" - android:paddingLeft="@dimen/keyline_second" - android:paddingRight="@dimen/keyline_first" android:gravity="center_vertical" android:text="@string/location_remind_departure" android:textAppearance="?attr/textAppearanceListItemSmall"/> @@ -37,16 +33,13 @@ android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeightSmall" android:paddingStart="@dimen/keyline_second" - android:paddingEnd="@dimen/keyline_first" - android:paddingLeft="@dimen/keyline_second" - android:paddingRight="@dimen/keyline_first"> + android:paddingEnd="@dimen/keyline_first"> diff --git a/app/src/main/res/layout/row_attribution.xml b/app/src/main/res/layout/row_attribution.xml index fc73d79a5..96b36de58 100644 --- a/app/src/main/res/layout/row_attribution.xml +++ b/app/src/main/res/layout/row_attribution.xml @@ -25,8 +25,6 @@ android:layout_height="wrap_content" android:paddingStart="@dimen/keyline_first" android:paddingEnd="@dimen/keyline_first" - android:paddingLeft="@dimen/keyline_first" - android:paddingRight="@dimen/keyline_first" android:gravity="center_vertical" android:ellipsize="end" android:maxLines="1" @@ -36,9 +34,7 @@ android:id="@+id/libraries" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingLeft="@dimen/keyline_first" android:paddingStart="@dimen/keyline_first" - android:paddingRight="@dimen/keyline_first" android:paddingEnd="@dimen/keyline_first" android:textColor="?android:textColorSecondary" android:textSize="@dimen/sku_details_row_text_size"/> diff --git a/app/src/main/res/layout/row_attribution_header.xml b/app/src/main/res/layout/row_attribution_header.xml index c1511b8f3..cb67c05a8 100644 --- a/app/src/main/res/layout/row_attribution_header.xml +++ b/app/src/main/res/layout/row_attribution_header.xml @@ -8,13 +8,9 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/keyline_first" android:layout_marginBottom="@dimen/keyline_first" - android:layout_marginLeft="@dimen/card_view_margin" android:layout_marginStart="@dimen/card_view_margin" android:layout_marginEnd="@dimen/card_view_margin" - android:layout_marginRight="@dimen/card_view_margin" - android:paddingLeft="@dimen/keyline_first" android:paddingStart="@dimen/keyline_first" - android:paddingRight="@dimen/keyline_first" android:paddingEnd="@dimen/keyline_first" android:gravity="start|center_vertical" android:textColor="?attr/colorAccent" diff --git a/app/src/main/res/layout/row_place.xml b/app/src/main/res/layout/row_place.xml index f9f0e7829..63b2b2e39 100644 --- a/app/src/main/res/layout/row_place.xml +++ b/app/src/main/res/layout/row_place.xml @@ -12,12 +12,9 @@ android:id="@+id/place_icon" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentLeft="true" android:layout_alignParentStart="true" android:paddingStart="@dimen/keyline_first" android:paddingEnd="@dimen/keyline_second" - android:paddingLeft="@dimen/keyline_first" - android:paddingRight="@dimen/keyline_second" android:src="@drawable/ic_outline_place_24px" android:tint="@color/icon_tint"/> @@ -27,11 +24,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" - android:layout_alignParentRight="true" android:paddingStart="@dimen/keyline_first" android:paddingEnd="@dimen/keyline_first" - android:paddingLeft="@dimen/keyline_first" - android:paddingRight="@dimen/keyline_first" android:src="@drawable/ic_outline_edit_24px" android:tint="@color/icon_tint" /> @@ -40,13 +34,9 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_toEndOf="@id/place_icon" - android:layout_toLeftOf="@id/location_settings" - android:layout_toRightOf="@id/place_icon" android:layout_toStartOf="@id/location_settings" android:paddingStart="0dp" android:paddingEnd="@dimen/keyline_first" - android:paddingLeft="0dp" - android:paddingRight="@dimen/keyline_first" android:ellipsize="end" android:gravity="start|top" android:maxLines="2" @@ -59,13 +49,9 @@ android:layout_height="wrap_content" android:layout_below="@+id/name" android:layout_toEndOf="@id/place_icon" - android:layout_toLeftOf="@id/location_settings" - android:layout_toRightOf="@id/place_icon" android:layout_toStartOf="@id/location_settings" android:paddingStart="0dp" android:paddingEnd="@dimen/keyline_first" - android:paddingLeft="0dp" - android:paddingRight="@dimen/keyline_first" android:ellipsize="end" android:maxLines="2" android:visibility="gone" diff --git a/app/src/main/res/layout/row_place_footer.xml b/app/src/main/res/layout/row_place_footer.xml index a9ca376e3..8579bbe09 100644 --- a/app/src/main/res/layout/row_place_footer.xml +++ b/app/src/main/res/layout/row_place_footer.xml @@ -8,7 +8,7 @@ android:id="@+id/divider" style="@style/task_edit_row_divider"/> - diff --git a/app/src/main/res/layout/row_tag_picker.xml b/app/src/main/res/layout/row_tag_picker.xml index 9568ad4e6..7e24c37a0 100644 --- a/app/src/main/res/layout/row_tag_picker.xml +++ b/app/src/main/res/layout/row_tag_picker.xml @@ -12,7 +12,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" - android:layout_alignParentRight="true" android:clickable="true" android:focusable="true" android:layout_centerVertical="true" @@ -23,15 +22,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentStart="true" - android:layout_alignParentLeft="true" android:layout_toStartOf="@id/checkbox" - android:layout_toLeftOf="@id/checkbox" android:drawablePadding="@dimen/keyline_second" android:textColor="@color/text_primary" android:layout_centerVertical="true" android:paddingStart="@dimen/keyline_first" - android:paddingLeft="@dimen/keyline_first" android:paddingEnd="@dimen/keyline_first" - android:paddingRight="@dimen/keyline_first" android:textSize="@dimen/task_edit_text_size" /> diff --git a/app/src/main/res/layout/scrollable_widget.xml b/app/src/main/res/layout/scrollable_widget.xml index b98e13fd1..030a1d72d 100644 --- a/app/src/main/res/layout/scrollable_widget.xml +++ b/app/src/main/res/layout/scrollable_widget.xml @@ -26,12 +26,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" - android:layout_alignParentRight="true" android:layout_centerVertical="true" android:paddingStart="@dimen/widget_padding" android:paddingEnd="@dimen/widget_padding" - android:paddingLeft="@dimen/widget_padding" - android:paddingRight="@dimen/widget_padding" android:background="@android:color/transparent" android:scaleType="fitCenter" android:src="@drawable/ic_outline_add_24px" @@ -42,12 +39,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:layout_toLeftOf="@id/widget_button" android:layout_toStartOf="@id/widget_button" android:paddingStart="@dimen/widget_padding" android:paddingEnd="0dp" - android:paddingLeft="@dimen/widget_padding" - android:paddingRight="0dp" android:background="@android:color/transparent" android:scaleType="fitCenter" android:src="@drawable/ic_outline_settings_24px" @@ -57,15 +51,11 @@ android:id="@+id/widget_title" android:layout_width="wrap_content" android:layout_height="match_parent" - android:layout_alignParentLeft="true" android:layout_alignParentStart="true" android:layout_centerVertical="true" - android:layout_toLeftOf="@id/widget_reconfigure" android:layout_toStartOf="@id/widget_reconfigure" android:paddingStart="@dimen/widget_padding" android:paddingEnd="0dp" - android:paddingLeft="@dimen/widget_padding" - android:paddingRight="0dp" android:ellipsize="end" android:gravity="start|center_vertical" android:maxLines="2" diff --git a/app/src/main/res/layout/simple_list_item_2_themed.xml b/app/src/main/res/layout/simple_list_item_2_themed.xml index 4df175ef1..fcf93b735 100644 --- a/app/src/main/res/layout/simple_list_item_2_themed.xml +++ b/app/src/main/res/layout/simple_list_item_2_themed.xml @@ -6,10 +6,8 @@ android:minHeight="?attr/listPreferredItemHeight" android:mode="twoLine" android:paddingStart="@dimen/keyline_first" - android:paddingLeft="@dimen/keyline_first" android:paddingTop="@dimen/list_item_spacing" android:paddingEnd="@dimen/keyline_first" - android:paddingRight="@dimen/keyline_first" android:paddingBottom="@dimen/list_item_spacing"> diff --git a/app/src/main/res/layout/subtask_adapter_row_body.xml b/app/src/main/res/layout/subtask_adapter_row_body.xml index 23359ca55..f909e972f 100644 --- a/app/src/main/res/layout/subtask_adapter_row_body.xml +++ b/app/src/main/res/layout/subtask_adapter_row_body.xml @@ -10,35 +10,27 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentStart="true" - android:layout_alignParentLeft="true" android:paddingStart="0dp" - android:paddingLeft="0dp" - android:paddingEnd="@dimen/keyline_first" - android:paddingRight="@dimen/keyline_first" /> + android:paddingEnd="@dimen/keyline_first" /> + android:layout_alignParentEnd="true" /> diff --git a/app/src/main/res/layout/task_adapter_row_body.xml b/app/src/main/res/layout/task_adapter_row_body.xml index bc6454a59..e8a5acdce 100644 --- a/app/src/main/res/layout/task_adapter_row_body.xml +++ b/app/src/main/res/layout/task_adapter_row_body.xml @@ -13,12 +13,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentTop="true" - android:layout_alignParentLeft="true" android:layout_alignParentStart="true" android:paddingStart="@dimen/keyline_first" - android:paddingEnd="@dimen/keyline_second" - android:paddingLeft="@dimen/keyline_first" - android:paddingRight="@dimen/keyline_second"/> + android:paddingEnd="@dimen/keyline_second"/> @@ -40,13 +34,9 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_toEndOf="@id/completeBox" - android:layout_toLeftOf="@id/due_date" - android:layout_toRightOf="@id/completeBox" android:layout_toStartOf="@id/due_date" android:paddingStart="0dp" android:paddingEnd="@dimen/keyline_first" - android:paddingLeft="0dp" - android:paddingRight="@dimen/keyline_first" android:ellipsize="end" android:gravity="start|top" android:maxLines="1" @@ -65,8 +55,6 @@ android:layout_marginTop="@dimen/task_list_item_spacing" android:paddingStart="@dimen/keyline_content_inset" android:paddingEnd="@dimen/keyline_first" - android:paddingLeft="@dimen/keyline_content_inset" - android:paddingRight="@dimen/keyline_first" android:ellipsize="end" android:gravity="start" android:maxLines="2" @@ -83,8 +71,6 @@ android:layout_marginTop="@dimen/task_list_item_spacing" android:layout_marginStart="@dimen/keyline_content_inset" android:layout_marginEnd="@dimen/keyline_first" - android:layout_marginLeft="@dimen/keyline_content_inset" - android:layout_marginRight="@dimen/keyline_first" android:visibility="gone" app:chipSpacingHorizontal="@dimen/chip_spacing" app:chipSpacingVertical="@dimen/chip_spacing"/> diff --git a/app/src/main/res/layout/widget_row.xml b/app/src/main/res/layout/widget_row.xml index d4f38b0c6..03dcbbdf0 100644 --- a/app/src/main/res/layout/widget_row.xml +++ b/app/src/main/res/layout/widget_row.xml @@ -9,31 +9,25 @@ android:layout_height="wrap_content" android:paddingStart="@dimen/widget_padding" android:paddingEnd="@dimen/widget_padding" - android:paddingLeft="@dimen/widget_padding" - android:paddingRight="@dimen/widget_padding" android:clickable="false"> + android:paddingEnd="@dimen/widget_padding"/> diff --git a/app/src/main/res/values-w820dp/styles.xml b/app/src/main/res/values-w820dp/styles.xml index 06691d199..4dc3add9f 100644 --- a/app/src/main/res/values-w820dp/styles.xml +++ b/app/src/main/res/values-w820dp/styles.xml @@ -4,9 +4,7 @@ \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 5731d45a4..34cde5c2e 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -3,8 +3,8 @@