Set minSdk to 17

pull/996/head
Alex Baker 6 years ago
parent 6acf1fba32
commit 845b071749

@ -146,10 +146,6 @@ public class AndroidUtilities {
return !atLeastOreo(); return !atLeastOreo();
} }
public static boolean atLeastJellybeanMR1() {
return Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1;
}
public static boolean atLeastKitKat() { public static boolean atLeastKitKat() {
return Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT; return Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT;
} }

@ -1,7 +1,5 @@
package org.tasks.dialogs; package org.tasks.dialogs;
import static com.todoroo.andlib.utility.AndroidUtilities.atLeastJellybeanMR1;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.view.View; import android.view.View;
@ -90,11 +88,9 @@ public class AlertDialogBuilder {
} }
private String[] addDirectionality(String[] strings) { private String[] addDirectionality(String[] strings) {
if (atLeastJellybeanMR1()) {
for (int i = 0; i < strings.length; i++) { for (int i = 0; i < strings.length; i++) {
strings[i] = withDirectionality(strings[i]); strings[i] = withDirectionality(strings[i]);
} }
}
return strings; return strings;
} }

@ -1,6 +1,5 @@
package org.tasks.jobs; package org.tasks.jobs;
import static com.todoroo.andlib.utility.AndroidUtilities.atLeastJellybeanMR1;
import static java.util.concurrent.Executors.newFixedThreadPool; import static java.util.concurrent.Executors.newFixedThreadPool;
import android.content.Context; import android.content.Context;
@ -67,7 +66,7 @@ public class SyncWork extends InjectingWorker {
} }
private void sync() throws InterruptedException { private void sync() throws InterruptedException {
int numThreads = atLeastJellybeanMR1() ? Runtime.getRuntime().availableProcessors() : 2; int numThreads = Runtime.getRuntime().availableProcessors();
ExecutorService executor = newFixedThreadPool(numThreads); ExecutorService executor = newFixedThreadPool(numThreads);
for (CaldavAccount account : caldavDao.getAccounts()) { for (CaldavAccount account : caldavDao.getAccounts()) {

@ -1,7 +1,5 @@
package org.tasks.locale; package org.tasks.locale;
import static com.todoroo.andlib.utility.AndroidUtilities.atLeastJellybeanMR1;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.annotation.TargetApi; import android.annotation.TargetApi;
import android.app.Dialog; 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; appDirectionality == View.LAYOUT_DIRECTION_RTL ? RIGHT_TO_LEFT_MARK : LEFT_TO_RIGHT_MARK;
int deviceDirectionality = TextUtilsCompat.getLayoutDirectionFromLocale(deviceLocale); int deviceDirectionality = TextUtilsCompat.getLayoutDirectionFromLocale(deviceLocale);
hasUserOverrides = hasUserOverrides =
!(deviceLocale.equals(appLocale) && appDirectionality == deviceDirectionality) !(deviceLocale.equals(appLocale) && appDirectionality == deviceDirectionality);
&& atLeastJellybeanMR1();
} }
public static Locale getInstance(Context context) { public static Locale getInstance(Context context) {

@ -13,7 +13,6 @@ import androidx.annotation.StringRes
import androidx.preference.ListPreference import androidx.preference.ListPreference
import androidx.preference.Preference import androidx.preference.Preference
import com.google.common.base.Strings import com.google.common.base.Strings
import com.todoroo.andlib.utility.AndroidUtilities.atLeastJellybeanMR1
import com.todoroo.andlib.utility.AndroidUtilities.atLeastLollipop import com.todoroo.andlib.utility.AndroidUtilities.atLeastLollipop
import com.todoroo.astrid.api.Filter import com.todoroo.astrid.api.Filter
import org.tasks.BuildConfig 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.task_list_options, atLeastLollipop(), R.string.p_show_subtasks)
requires(R.string.settings_localization, atLeastJellybeanMR1(), R.string.p_language)
@Suppress("ConstantConditionIf") @Suppress("ConstantConditionIf")
if (BuildConfig.FLAVOR != "googleplay") { if (BuildConfig.FLAVOR != "googleplay") {
removeGroup(R.string.TEA_control_location) removeGroup(R.string.TEA_control_location)

@ -1,7 +1,5 @@
package org.tasks.themes; package org.tasks.themes;
import static com.todoroo.andlib.utility.AndroidUtilities.atLeastJellybeanMR1;
import android.content.Context; import android.content.Context;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.graphics.drawable.LayerDrawable; import android.graphics.drawable.LayerDrawable;
@ -18,26 +16,16 @@ public class DrawableUtil {
public static void setLeftDrawable(Context context, TextView tv, @DrawableRes int resId) { public static void setLeftDrawable(Context context, TextView tv, @DrawableRes int resId) {
Drawable wrapped = getWrapped(context, resId); Drawable wrapped = getWrapped(context, resId);
if (atLeastJellybeanMR1()) {
tv.setCompoundDrawablesRelativeWithIntrinsicBounds(wrapped, null, null, null); tv.setCompoundDrawablesRelativeWithIntrinsicBounds(wrapped, null, null, null);
} else {
tv.setCompoundDrawablesWithIntrinsicBounds(wrapped, null, null, null);
}
} }
public static void setRightDrawable(Context context, TextView tv, @DrawableRes int resId) { public static void setRightDrawable(Context context, TextView tv, @DrawableRes int resId) {
Drawable wrapped = getWrapped(context, resId); Drawable wrapped = getWrapped(context, resId);
if (atLeastJellybeanMR1()) {
tv.setCompoundDrawablesRelativeWithIntrinsicBounds(null, null, wrapped, null); tv.setCompoundDrawablesRelativeWithIntrinsicBounds(null, null, wrapped, null);
} else {
tv.setCompoundDrawablesWithIntrinsicBounds(null, null, wrapped, null);
}
} }
public static Drawable getLeftDrawable(TextView tv) { public static Drawable getLeftDrawable(TextView tv) {
return atLeastJellybeanMR1() return tv.getCompoundDrawablesRelative()[0];
? tv.getCompoundDrawablesRelative()[0]
: tv.getCompoundDrawables()[0];
} }
public static Drawable wrap(@NotNull Drawable icon) { public static Drawable wrap(@NotNull Drawable icon) {

@ -1,6 +1,5 @@
package org.tasks.ui; package org.tasks.ui;
import static com.todoroo.andlib.utility.AndroidUtilities.atLeastJellybeanMR1;
import static com.todoroo.andlib.utility.AndroidUtilities.preLollipop; import static com.todoroo.andlib.utility.AndroidUtilities.preLollipop;
import android.content.Context; import android.content.Context;
@ -67,11 +66,7 @@ public class SingleCheckedArrayAdapter extends ArrayAdapter<String> {
wrapped.setAlpha(0); wrapped.setAlpha(0);
} }
DrawableCompat.setTint(wrapped, color); DrawableCompat.setTint(wrapped, color);
if (atLeastJellybeanMR1()) {
view.setCompoundDrawablesRelativeWithIntrinsicBounds(wrapped, null, null, null); view.setCompoundDrawablesRelativeWithIntrinsicBounds(wrapped, null, null, null);
} else {
view.setCompoundDrawablesWithIntrinsicBounds(wrapped, null, null, null);
}
} }
return view; return view;
} }

@ -1,7 +1,6 @@
package org.tasks.widget; package org.tasks.widget;
import static androidx.core.content.ContextCompat.getColor; import static androidx.core.content.ContextCompat.getColor;
import static com.todoroo.andlib.utility.AndroidUtilities.atLeastJellybeanMR1;
import android.appwidget.AppWidgetManager; import android.appwidget.AppWidgetManager;
import android.content.Context; import android.content.Context;
@ -179,10 +178,8 @@ class ScrollableViewsFactory implements RemoteViewsService.RemoteViewsFactory {
row.setViewVisibility(R.id.widget_complete_box, View.GONE); row.setViewVisibility(R.id.widget_complete_box, View.GONE);
} }
if (atLeastJellybeanMR1()) {
row.setInt( row.setInt(
R.id.widget_row, "setLayoutDirection", Locale.getInstance(context).getDirectionality()); R.id.widget_row, "setLayoutDirection", Locale.getInstance(context).getDirectionality());
}
row.setViewPadding( row.setViewPadding(
R.id.widget_row, R.id.widget_row,
widgetPadding + taskContainer.getIndent() * indentPadding, widgetPadding + taskContainer.getIndent() * indentPadding,
@ -207,9 +204,7 @@ class ScrollableViewsFactory implements RemoteViewsService.RemoteViewsFactory {
AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(context); AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(context);
RemoteViews rv = new RemoteViews(context.getPackageName(), R.layout.scrollable_widget); RemoteViews rv = new RemoteViews(context.getPackageName(), R.layout.scrollable_widget);
rv.setTextViewText(R.id.widget_title, filter.listingTitle); 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); appWidgetManager.partiallyUpdateAppWidget(widgetId, rv);
List<String> queries = List<String> queries =
TaskListQuery.getQuery( TaskListQuery.getQuery(

@ -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_TASK;
import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP; import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP;
import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK; import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
import static com.todoroo.andlib.utility.AndroidUtilities.atLeastJellybeanMR1;
import android.app.PendingIntent; import android.app.PendingIntent;
import android.appwidget.AppWidgetManager; import android.appwidget.AppWidgetManager;
@ -75,9 +74,7 @@ public class TasksWidget extends InjectingAppWidgetProvider {
rvIntent.setData(Uri.parse(rvIntent.toUri(Intent.URI_INTENT_SCHEME))); rvIntent.setData(Uri.parse(rvIntent.toUri(Intent.URI_INTENT_SCHEME)));
ThemeColor color = new ThemeColor(context, widgetPreferences.getColor()); ThemeColor color = new ThemeColor(context, widgetPreferences.getColor());
RemoteViews remoteViews = new RemoteViews(context.getPackageName(), R.layout.scrollable_widget); 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()) { if (widgetPreferences.showHeader()) {
remoteViews.setViewVisibility(R.id.widget_header, View.VISIBLE); remoteViews.setViewVisibility(R.id.widget_header, View.VISIBLE);
remoteViews.setViewVisibility( remoteViews.setViewVisibility(

@ -19,8 +19,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginLeft="20dp" android:layout_marginStart="20dp"
android:layout_marginRight="20dp" android:layout_marginEnd="20dp"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:orientation="horizontal"> android:orientation="horizontal">

@ -7,8 +7,8 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="10dip" android:layout_marginStart="10dip"
android:layout_marginRight="10dip" android:layout_marginEnd="10dip"
android:orientation="vertical"> android:orientation="vertical">
<Chronometer <Chronometer
@ -24,8 +24,8 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="35dip" android:layout_height="35dip"
android:layout_marginBottom="10dip" android:layout_marginBottom="10dip"
android:layout_marginLeft="10dip" android:layout_marginStart="10dip"
android:layout_marginRight="10dip" android:layout_marginEnd="10dip"
android:background="@color/overdue" android:background="@color/overdue"
android:gravity="center" android:gravity="center"
android:text="@string/audio_stop_recording" android:text="@string/audio_stop_recording"

@ -70,7 +70,6 @@
android:layout_margin="@dimen/task_list_fab_margin" android:layout_margin="@dimen/task_list_fab_margin"
android:layout_marginBottom="@dimen/keyline_first" android:layout_marginBottom="@dimen/keyline_first"
android:layout_marginEnd="@dimen/keyline_first" android:layout_marginEnd="@dimen/keyline_first"
android:layout_marginRight="@dimen/keyline_first"
android:layout_gravity="end|bottom" android:layout_gravity="end|bottom"
android:padding="0dp" android:padding="0dp"
android:src="@drawable/ic_outline_gps_fixed_24px" android:src="@drawable/ic_outline_gps_fixed_24px"
@ -106,8 +105,6 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/keyline_first" android:layout_marginStart="@dimen/keyline_first"
android:layout_marginLeft="@dimen/keyline_first"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:paddingTop="@dimen/keyline_first" android:paddingTop="@dimen/keyline_first"
android:paddingBottom="@dimen/keyline_first" android:paddingBottom="@dimen/keyline_first"
@ -121,9 +118,7 @@
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_marginEnd="@dimen/keyline_first" android:layout_marginEnd="@dimen/keyline_first"
android:layout_marginRight="@dimen/keyline_first"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:paddingTop="@dimen/keyline_first" android:paddingTop="@dimen/keyline_first"
android:paddingBottom="@dimen/keyline_first" android:paddingBottom="@dimen/keyline_first"
android:indeterminate="true" android:indeterminate="true"
@ -133,10 +128,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/keyline_second" android:layout_marginStart="@dimen/keyline_second"
android:layout_marginLeft="@dimen/keyline_second"
android:layout_toEndOf="@id/place_icon" android:layout_toEndOf="@id/place_icon"
android:layout_toLeftOf="@id/loading_indicator"
android:layout_toRightOf="@id/place_icon"
android:layout_toStartOf="@id/loading_indicator" android:layout_toStartOf="@id/loading_indicator"
android:paddingTop="@dimen/keyline_first" android:paddingTop="@dimen/keyline_first"
android:paddingBottom="@dimen/keyline_first" android:paddingBottom="@dimen/keyline_first"
@ -151,7 +143,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/keyline_first" android:layout_marginStart="@dimen/keyline_first"
android:layout_marginLeft="@dimen/keyline_first"
android:layout_below="@id/place_icon" android:layout_below="@id/place_icon"
android:paddingTop="8dp" android:paddingTop="8dp"
android:paddingBottom="8dp" android:paddingBottom="8dp"
@ -202,7 +193,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="64dp" android:layout_marginStart="64dp"
android:layout_marginLeft="64dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:gravity="start" android:gravity="start"
android:text="@android:string/search_go" android:text="@android:string/search_go"

@ -73,10 +73,8 @@
android:visibility="gone" android:visibility="gone"
app:checkedButton="@id/button_monthly" app:checkedButton="@id/button_monthly"
app:singleSelection="true" app:singleSelection="true"
android:paddingLeft="@dimen/keyline_content_inset"
android:paddingStart="@dimen/keyline_content_inset" android:paddingStart="@dimen/keyline_content_inset"
android:paddingEnd="@dimen/keyline_content_inset" android:paddingEnd="@dimen/keyline_content_inset">
android:paddingRight="@dimen/keyline_content_inset">
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/button_monthly" android:id="@+id/button_monthly"
@ -99,10 +97,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:paddingLeft="@dimen/keyline_content_inset"
android:paddingStart="@dimen/keyline_content_inset" android:paddingStart="@dimen/keyline_content_inset"
android:paddingEnd="@dimen/keyline_content_inset" android:paddingEnd="@dimen/keyline_content_inset" />
android:paddingRight="@dimen/keyline_content_inset" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/subscribe" android:id="@+id/subscribe"

@ -7,8 +7,8 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="10dip" android:layout_marginStart="10dip"
android:layout_marginRight="10dip" android:layout_marginEnd="10dip"
android:background="@drawable/reminder_dialog_background" android:background="@drawable/reminder_dialog_background"
android:orientation="vertical"> android:orientation="vertical">
@ -17,10 +17,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="5dip" android:layout_marginTop="5dip"
android:layout_marginBottom="15dip" android:layout_marginBottom="15dip"
android:layout_marginStart="10dp" android:layout_marginStart="10dip"
android:layout_marginEnd="5dp" android:layout_marginEnd="5dip"
android:layout_marginLeft="10dip"
android:layout_marginRight="5dip"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
@ -49,10 +47,8 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="10dip" android:layout_marginBottom="10dip"
android:layout_marginStart="2dp" android:layout_marginStart="2dip"
android:layout_marginEnd="5dp" android:layout_marginEnd="5dip"
android:layout_marginLeft="2dip"
android:layout_marginRight="5dip"
android:gravity="bottom" android:gravity="bottom"
android:orientation="horizontal"> android:orientation="horizontal">
<ImageView <ImageView
@ -67,8 +63,7 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="5dip" android:layout_marginBottom="5dip"
android:layout_marginEnd="5dp" android:layout_marginEnd="5dip"
android:layout_marginRight="5dip"
android:background="@drawable/speech_bubble_reminder" android:background="@drawable/speech_bubble_reminder"
android:gravity="center_vertical" android:gravity="center_vertical"
android:minHeight="60dip"> android:minHeight="60dip">
@ -88,8 +83,8 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="35dip" android:layout_height="35dip"
android:layout_marginBottom="10dip" android:layout_marginBottom="10dip"
android:layout_marginLeft="10dip" android:layout_marginStart="10dip"
android:layout_marginRight="10dip" android:layout_marginEnd="10dip"
android:gravity="center" android:gravity="center"
android:text="@string/new_tag" android:text="@string/new_tag"
android:textColor="@android:color/white" android:textColor="@android:color/white"
@ -100,8 +95,8 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="35dip" android:layout_height="35dip"
android:layout_marginBottom="10dip" android:layout_marginBottom="10dip"
android:layout_marginLeft="10dip" android:layout_marginStart="10dip"
android:layout_marginRight="10dip" android:layout_marginEnd="10dip"
android:background="#707070" android:background="#707070"
android:gravity="center" android:gravity="center"
android:text="@string/CRA_postpone" android:text="@string/CRA_postpone"
@ -112,8 +107,8 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="10dip" android:layout_marginBottom="10dip"
android:layout_marginLeft="10dip" android:layout_marginStart="10dip"
android:layout_marginRight="10dip"> android:layout_marginEnd="10dip">
<TextView <TextView
android:id="@+id/ignore" android:id="@+id/ignore"
@ -130,7 +125,6 @@
android:layout_width="35dip" android:layout_width="35dip"
android:layout_height="35dip" android:layout_height="35dip"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:padding="4dip" android:padding="4dip"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:scaleType="fitCenter" android:scaleType="fitCenter"

@ -5,7 +5,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_gravity="top|center" android:layout_gravity="top|center"
android:alpha="@dimen/alpha_secondary" android:alpha="@dimen/alpha_secondary"
android:background="?attr/selectableItemBackgroundBorderless" android:background="?attr/selectableItemBackgroundBorderless"

@ -23,7 +23,6 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="15dp" android:layout_marginStart="15dp"
android:layout_marginLeft="15dp"
android:background="@null"/> android:background="@null"/>
</LinearLayout> </LinearLayout>

@ -12,8 +12,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="0dp" android:paddingStart="0dp"
android:paddingEnd="@dimen/keyline_second" android:paddingEnd="@dimen/keyline_second"
android:paddingLeft="0dp"
android:paddingRight="@dimen/keyline_second"
android:gravity="start|center_vertical" android:gravity="start|center_vertical"
android:text="@string/TEA_importance_label"/> android:text="@string/TEA_importance_label"/>
@ -23,8 +21,6 @@
android:layout_gravity="end" android:layout_gravity="end"
android:paddingStart="@dimen/keyline_second" android:paddingStart="@dimen/keyline_second"
android:paddingEnd="0dp" android:paddingEnd="0dp"
android:paddingLeft="@dimen/keyline_second"
android:paddingRight="0dp"
android:gravity="end" android:gravity="end"
android:orientation="horizontal"> android:orientation="horizontal">

@ -23,21 +23,16 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:paddingStart="0dp" android:paddingStart="0dp"
android:paddingEnd="10dp" android:paddingEnd="10dp"
android:paddingLeft="0dp"
android:paddingRight="10dp"
android:background="@null" android:background="@null"
android:gravity="end"/> android:gravity="end"/>
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_gravity="start" android:layout_gravity="start"
android:layout_toLeftOf="@id/reminder_alarm"
android:layout_toStartOf="@id/reminder_alarm" android:layout_toStartOf="@id/reminder_alarm"
android:gravity="start" android:gravity="start"
android:orientation="horizontal"> android:orientation="horizontal">

@ -29,8 +29,6 @@
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:paddingStart="@dimen/keyline_first" android:paddingStart="@dimen/keyline_first"
android:paddingEnd="@dimen/keyline_first" android:paddingEnd="@dimen/keyline_first"
android:paddingLeft="@dimen/keyline_first"
android:paddingRight="@dimen/keyline_first"
app:backgroundTint="?attr/colorOnSecondary"/> app:backgroundTint="?attr/colorOnSecondary"/>
</FrameLayout> </FrameLayout>
@ -47,8 +45,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="@dimen/keyline_first" android:paddingStart="@dimen/keyline_first"
android:paddingEnd="0dp" android:paddingEnd="0dp"
android:paddingLeft="@dimen/keyline_first"
android:paddingRight="0dp"
android:text="@string/repeat_every" android:text="@string/repeat_every"
android:textAppearance="@style/TextAppearance"/> android:textAppearance="@style/TextAppearance"/>
@ -56,8 +52,8 @@
android:id="@+id/intervalValue" android:id="@+id/intervalValue"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="4dp" android:paddingStart="4dp"
android:paddingRight="4dp" android:paddingEnd="4dp"
android:ems="3" android:ems="3"
android:focusable="true" android:focusable="true"
android:focusableInTouchMode="true" android:focusableInTouchMode="true"
@ -75,8 +71,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="0dp" android:paddingStart="0dp"
android:paddingEnd="@dimen/keyline_first" android:paddingEnd="@dimen/keyline_first"
android:paddingLeft="0dp"
android:paddingRight="@dimen/keyline_first"
android:textAppearance="@style/TextAppearance"/> android:textAppearance="@style/TextAppearance"/>
</LinearLayout> </LinearLayout>
@ -89,8 +83,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="@dimen/keyline_first" android:paddingStart="@dimen/keyline_first"
android:paddingEnd="@dimen/keyline_first" android:paddingEnd="@dimen/keyline_first"
android:paddingLeft="@dimen/keyline_first"
android:paddingRight="@dimen/keyline_first"
android:orientation="vertical" android:orientation="vertical"
android:visibility="gone"> android:visibility="gone">
@ -124,16 +116,14 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/keyline_first" android:layout_marginStart="@dimen/keyline_first"
android:layout_marginEnd="0dp" android:layout_marginEnd="0dp"
android:layout_marginLeft="@dimen/keyline_first"
android:layout_marginRight="0dp"
android:layout_gravity="center"/> android:layout_gravity="center"/>
<EditText <EditText
android:id="@+id/repeatTimesValue" android:id="@+id/repeatTimesValue"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="4dp" android:paddingStart="4dp"
android:paddingRight="4dp" android:paddingEnd="4dp"
android:ems="3" android:ems="3"
android:focusable="true" android:focusable="true"
android:focusableInTouchMode="true" android:focusableInTouchMode="true"
@ -152,8 +142,6 @@
android:layout_gravity="center" android:layout_gravity="center"
android:paddingStart="0dp" android:paddingStart="0dp"
android:paddingEnd="@dimen/keyline_first" android:paddingEnd="@dimen/keyline_first"
android:paddingLeft="0dp"
android:paddingRight="@dimen/keyline_first"
android:textAppearance="@style/TextAppearance"/> android:textAppearance="@style/TextAppearance"/>
</LinearLayout> </LinearLayout>

@ -32,8 +32,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="0dp" android:paddingStart="0dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:paddingLeft="0dp"
android:paddingRight="5dp"
android:text="@string/repeats_from" android:text="@string/repeats_from"
android:textAppearance="@style/TextAppearance"/> android:textAppearance="@style/TextAppearance"/>

@ -35,9 +35,7 @@
android:gravity="start" android:gravity="start"
android:hint="@string/TEA_add_subtask" android:hint="@string/TEA_add_subtask"
android:paddingStart="0dp" android:paddingStart="0dp"
android:paddingLeft="0dp"
android:paddingEnd="@dimen/keyline_second" android:paddingEnd="@dimen/keyline_second"
android:paddingRight="@dimen/keyline_second"
android:textAlignment="viewStart" /> android:textAlignment="viewStart" />
</RelativeLayout> </RelativeLayout>

@ -8,8 +8,6 @@
android:paddingBottom="@dimen/task_edit_drawable_padding_top_bottom" android:paddingBottom="@dimen/task_edit_drawable_padding_top_bottom"
android:paddingStart="0dp" android:paddingStart="0dp"
android:paddingEnd="@dimen/keyline_first" android:paddingEnd="@dimen/keyline_first"
android:paddingLeft="0dp"
android:paddingRight="@dimen/keyline_first"
android:orientation="horizontal"> android:orientation="horizontal">
<ImageView <ImageView
@ -19,8 +17,6 @@
android:layout_gravity="top" android:layout_gravity="top"
android:paddingStart="@dimen/keyline_first" android:paddingStart="@dimen/keyline_first"
android:paddingEnd="@dimen/keyline_second" android:paddingEnd="@dimen/keyline_second"
android:paddingLeft="@dimen/keyline_first"
android:paddingRight="@dimen/keyline_second"
android:alpha="@dimen/alpha_secondary" android:alpha="@dimen/alpha_secondary"
android:scaleType="center" android:scaleType="center"
android:tint="@color/icon_tint" android:tint="@color/icon_tint"

@ -38,8 +38,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:paddingLeft="5dip" android:paddingStart="5dip"
android:paddingRight="5dip" android:paddingEnd="5dip"
android:alpha="@dimen/alpha_secondary" android:alpha="@dimen/alpha_secondary"
android:gravity="center_vertical|center_horizontal" android:gravity="center_vertical|center_horizontal"
android:scaleType="centerInside" android:scaleType="centerInside"

@ -8,16 +8,16 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:paddingLeft="5dip" android:paddingStart="5dip"
android:paddingRight="5dip" android:paddingEnd="5dip"
android:orientation="vertical"> android:orientation="vertical">
<!-- estimated time --> <!-- estimated time -->
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="50dip" android:layout_height="50dip"
android:layout_marginLeft="10dip" android:layout_marginStart="10dip"
android:layout_marginRight="10dip" android:layout_marginEnd="10dip"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
@ -32,8 +32,6 @@
android:layout_weight="1" android:layout_weight="1"
android:paddingStart="10dp" android:paddingStart="10dp"
android:paddingEnd="0dp" android:paddingEnd="0dp"
android:paddingLeft="10dip"
android:paddingRight="0dp"
android:gravity="end"/> android:gravity="end"/>
</LinearLayout> </LinearLayout>
@ -43,8 +41,8 @@
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="50dip" android:layout_height="50dip"
android:layout_marginLeft="10dip" android:layout_marginStart="10dip"
android:layout_marginRight="10dip" android:layout_marginEnd="10dip"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
@ -61,8 +59,6 @@
android:layout_weight="1" android:layout_weight="1"
android:paddingStart="10dp" android:paddingStart="10dp"
android:paddingEnd="0dp" android:paddingEnd="0dp"
android:paddingLeft="10dip"
android:paddingRight="0dp"
android:gravity="end"/> android:gravity="end"/>
</LinearLayout> </LinearLayout>

@ -58,8 +58,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="0dp" android:paddingEnd="0dp"
android:paddingLeft="5dip"
android:paddingRight="0dp"
android:gravity="center" android:gravity="center"
android:text="@string/CFA_help"/> android:text="@string/CFA_help"/>
@ -78,7 +76,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:layout_marginEnd="3dp" android:layout_marginEnd="3dp"
android:layout_marginRight="3dip"
android:paddingTop="10dip" android:paddingTop="10dip"
android:paddingBottom="10dip" android:paddingBottom="10dip"
android:text="@string/CFA_button_add"/> android:text="@string/CFA_button_add"/>

@ -9,8 +9,6 @@
android:layout_height="55dip" android:layout_height="55dip"
android:paddingStart="4dip" android:paddingStart="4dip"
android:paddingEnd="6dip" android:paddingEnd="6dip"
android:paddingLeft="4dip"
android:paddingRight="6dip"
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:orientation="horizontal"> android:orientation="horizontal">
@ -19,17 +17,14 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_alignParentRight="true" android:paddingStart="5dp"
android:paddingLeft="5dip" android:paddingEnd="5dp"
android:paddingRight="5dip"
android:gravity="center_vertical|end"/> android:gravity="center_vertical|end"/>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_toLeftOf="@id/filter_count"
android:layout_toStartOf="@id/filter_count" android:layout_toStartOf="@id/filter_count"
android:gravity="center_vertical|start" android:gravity="center_vertical|start"
android:orientation="horizontal"> android:orientation="horizontal">
@ -41,8 +36,6 @@
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:paddingLeft="5dip"
android:paddingRight="5dip"
android:scaleType="center"/> android:scaleType="center"/>
<!-- filter icon --> <!-- filter icon -->
@ -52,8 +45,6 @@
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:paddingLeft="5dip"
android:paddingRight="5dip"
android:visibility="gone"/> android:visibility="gone"/>
<!-- filter text --> <!-- filter text -->
@ -62,10 +53,8 @@
style="@style/TextAppearance" style="@style/TextAppearance"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:paddingStart="5dip" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:paddingLeft="5dip"
android:paddingRight="5dp"
android:gravity="start|center_vertical" android:gravity="start|center_vertical"
android:textAlignment="viewStart" android:textAlignment="viewStart"
android:textSize="18sp"/> android:textSize="18sp"/>

@ -4,8 +4,8 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
style="@style/TextButton" style="@style/TextButton"
android:id="@+id/price" android:id="@+id/price"
android:paddingLeft="0dp" android:paddingStart="0dp"
android:paddingRight="0dp" android:paddingEnd="0dp"
android:layout_width="@dimen/icon_picker_size" android:layout_width="@dimen/icon_picker_size"
android:layout_height="@dimen/icon_picker_size" android:layout_height="@dimen/icon_picker_size"
android:textSize="18sp" android:textSize="18sp"

@ -10,8 +10,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="@dimen/keyline_first" android:paddingStart="@dimen/keyline_first"
android:paddingEnd="@dimen/keyline_first" android:paddingEnd="@dimen/keyline_first"
android:paddingLeft="@dimen/keyline_first"
android:paddingRight="@dimen/keyline_first"
android:gravity="center" android:gravity="center"
android:minHeight="?attr/listPreferredItemHeight" android:minHeight="?attr/listPreferredItemHeight"
app:sl_discreteMode="true" app:sl_discreteMode="true"
@ -22,26 +20,20 @@
android:id="@+id/min" android:id="@+id/min"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_below="@id/slider" android:layout_below="@id/slider"
android:paddingTop="5dp" android:paddingTop="5dp"
android:paddingStart="@dimen/keyline_first" android:paddingStart="@dimen/keyline_first"
android:paddingEnd="@dimen/keyline_first" android:paddingEnd="@dimen/keyline_first"/>
android:paddingLeft="@dimen/keyline_first"
android:paddingRight="@dimen/keyline_first"/>
<TextView <TextView
android:id="@+id/max" android:id="@+id/max"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_below="@id/slider" android:layout_below="@id/slider"
android:paddingTop="5dp" android:paddingTop="5dp"
android:paddingStart="@dimen/keyline_first" android:paddingStart="@dimen/keyline_first"
android:paddingEnd="@dimen/keyline_first" android:paddingEnd="@dimen/keyline_first"/>
android:paddingLeft="@dimen/keyline_first"
android:paddingRight="@dimen/keyline_first"/>
</RelativeLayout> </RelativeLayout>

@ -10,26 +10,20 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
android:paddingStart="0dp" android:paddingStart="0dp"
android:paddingLeft="0dp" android:paddingEnd="@dimen/keyline_first" />
android:paddingEnd="@dimen/keyline_first"
android:paddingRight="@dimen/keyline_first" />
<include <include
layout="@layout/control_set_clear_button" layout="@layout/control_set_clear_button"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true" />
android:layout_alignParentRight="true" />
<EditText <EditText
android:id="@+id/title" android:id="@+id/title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_toRightOf="@id/completeBox"
android:layout_toEndOf="@id/completeBox" android:layout_toEndOf="@id/completeBox"
android:layout_toLeftOf="@id/clear"
android:layout_toStartOf="@id/clear" android:layout_toStartOf="@id/clear"
android:background="@null" android:background="@null"
android:focusable="true" android:focusable="true"
@ -37,15 +31,11 @@
android:hint="@string/enter_title_hint" android:hint="@string/enter_title_hint"
android:imeOptions="flagNoExtractUi" android:imeOptions="flagNoExtractUi"
android:inputType="textCapSentences" android:inputType="textCapSentences"
android:paddingStart="0dp" android:paddingStart="0dp"
android:paddingLeft="0dp"
android:paddingEnd="@dimen/keyline_first" android:paddingEnd="@dimen/keyline_first"
android:paddingRight="@dimen/keyline_first"
android:singleLine="false" android:singleLine="false"
android:textAlignment="viewStart" android:textAlignment="viewStart"
android:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorPrimary"
android:textSize="@dimen/task_edit_text_size" /> android:textSize="@dimen/task_edit_text_size" />
</RelativeLayout> </RelativeLayout>

@ -16,10 +16,8 @@
style="@android:style/TextAppearance" style="@android:style/TextAppearance"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_gravity="start" android:layout_gravity="start"
android:layout_toLeftOf="@id/clear"
android:layout_toStartOf="@id/clear" android:layout_toStartOf="@id/clear"
android:gravity="start" android:gravity="start"
android:textDirection="locale" android:textDirection="locale"

@ -9,21 +9,16 @@
android:paddingTop="12dp" android:paddingTop="12dp"
android:paddingBottom="12dp" android:paddingBottom="12dp"
android:paddingStart="@dimen/keyline_first" android:paddingStart="@dimen/keyline_first"
android:paddingEnd="0dp" android:paddingEnd="0dp">
android:paddingLeft="@dimen/keyline_first"
android:paddingRight="0dp">
<TextView <TextView
android:id="@+id/size" android:id="@+id/size"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:paddingStart="0dp" android:paddingStart="0dp"
android:paddingEnd="@dimen/keyline_first" android:paddingEnd="@dimen/keyline_first"
android:paddingLeft="0dp"
android:paddingRight="@dimen/keyline_first"
android:fontFamily="@string/font_fontFamily_medium" android:fontFamily="@string/font_fontFamily_medium"
android:gravity="end" android:gravity="end"
android:minEms="3" android:minEms="3"
@ -34,7 +29,6 @@
android:id="@+id/icon" android:id="@+id/icon"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:alpha="@dimen/alpha_secondary" android:alpha="@dimen/alpha_secondary"
@ -46,13 +40,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_toEndOf="@id/icon" android:layout_toEndOf="@id/icon"
android:layout_toLeftOf="@id/size"
android:layout_toRightOf="@id/icon"
android:layout_toStartOf="@id/size" android:layout_toStartOf="@id/size"
android:paddingStart="@dimen/keyline_second" android:paddingStart="@dimen/keyline_second"
android:paddingEnd="@dimen/keyline_first" android:paddingEnd="@dimen/keyline_first"
android:paddingLeft="@dimen/keyline_second"
android:paddingRight="@dimen/keyline_first"
android:checkMark="@drawable/checkmark" android:checkMark="@drawable/checkmark"
android:checkMarkTint="?colorAccent" android:checkMarkTint="?colorAccent"
android:checked="false" android:checked="false"

@ -20,15 +20,12 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_alignBottom="@id/text" android:layout_alignBottom="@id/text"
android:layout_below="@id/divider" android:layout_below="@id/divider"
android:paddingTop="8dp" android:paddingTop="8dp"
android:paddingBottom="8dp" android:paddingBottom="8dp"
android:paddingStart="0dp" android:paddingStart="0dp"
android:paddingEnd="@dimen/keyline_first" android:paddingEnd="@dimen/keyline_first"
android:paddingLeft="0dp"
android:paddingRight="@dimen/keyline_first"
android:alpha="@dimen/alpha_secondary" android:alpha="@dimen/alpha_secondary"
android:clickable="true" android:clickable="true"
android:focusable="true" android:focusable="true"
@ -44,7 +41,6 @@
android:ellipsize="end" android:ellipsize="end"
android:textColor="@color/text_secondary" android:textColor="@color/text_secondary"
android:fontFamily="@string/font_fontFamily_medium" android:fontFamily="@string/font_fontFamily_medium"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_below="@id/divider" android:layout_below="@id/divider"
android:paddingTop="16dp" android:paddingTop="16dp"
@ -55,9 +51,7 @@
android:textAlignment="viewStart" android:textAlignment="viewStart"
android:textSize="14sp" android:textSize="14sp"
android:paddingStart="@dimen/keyline_first" android:paddingStart="@dimen/keyline_first"
android:paddingLeft="@dimen/keyline_first"
android:paddingEnd="@dimen/keyline_first" android:paddingEnd="@dimen/keyline_first"
android:paddingRight="@dimen/keyline_first"
tools:ignore="UnusedAttribute" /> tools:ignore="UnusedAttribute" />
</RelativeLayout> </RelativeLayout>

@ -6,8 +6,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="@dimen/keyline_first" android:paddingStart="@dimen/keyline_first"
android:paddingEnd="@dimen/keyline_first" android:paddingEnd="@dimen/keyline_first"
android:paddingLeft="@dimen/keyline_first"
android:paddingRight="@dimen/keyline_first"
android:gravity="center_vertical" android:gravity="center_vertical"
android:minHeight="50dp" android:minHeight="50dp"
android:orientation="horizontal"> android:orientation="horizontal">
@ -30,8 +28,6 @@
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:paddingStart="@dimen/keyline_second" android:paddingStart="@dimen/keyline_second"
android:paddingEnd="0dp" android:paddingEnd="0dp"
android:paddingLeft="@dimen/keyline_second"
android:paddingRight="0dp"
android:background="@null" android:background="@null"
android:freezesText="true" android:freezesText="true"
android:gravity="start" android:gravity="start"
@ -52,7 +48,6 @@
android:layout_height="39dip" android:layout_height="39dip"
android:layout_weight="1" android:layout_weight="1"
android:layout_marginStart="3dp" android:layout_marginStart="3dp"
android:layout_marginLeft="3dip"
android:scaleType="center" android:scaleType="center"
android:src="@drawable/ic_outline_add_24px" android:src="@drawable/ic_outline_add_24px"
android:tint="?attr/colorOnPrimary" android:tint="?attr/colorOnPrimary"

@ -30,9 +30,7 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="?attr/actionBarSize" android:paddingTop="?attr/actionBarSize"
android:paddingLeft="@dimen/keyline_first"
android:paddingStart="@dimen/keyline_first" android:paddingStart="@dimen/keyline_first"
android:paddingRight="@dimen/keyline_first"
android:paddingEnd="@dimen/keyline_first" android:paddingEnd="@dimen/keyline_first"
android:paddingBottom="@dimen/keyline_second" android:paddingBottom="@dimen/keyline_second"
android:layout_gravity="top" android:layout_gravity="top"

@ -8,8 +8,6 @@
android:paddingBottom="12dp" android:paddingBottom="12dp"
android:paddingStart="0dp" android:paddingStart="0dp"
android:paddingEnd="0dp" android:paddingEnd="0dp"
android:paddingLeft="0dp"
android:paddingRight="0dp"
android:ellipsize="end" android:ellipsize="end"
android:singleLine="true" android:singleLine="true"
android:textAlignment="viewStart" android:textAlignment="viewStart"

@ -11,9 +11,7 @@
android:id="@+id/color" android:id="@+id/color"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_toLeftOf="@id/clear"
android:layout_toStartOf="@id/clear" android:layout_toStartOf="@id/clear"
android:contentDescription="@string/color" android:contentDescription="@string/color"
android:drawablePadding="@dimen/keyline_second" android:drawablePadding="@dimen/keyline_second"

@ -8,7 +8,6 @@
android:id="@+id/icon" android:id="@+id/icon"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:contentDescription="@string/icon" android:contentDescription="@string/icon"
android:drawablePadding="@dimen/keyline_second" android:drawablePadding="@dimen/keyline_second"

@ -15,8 +15,6 @@
android:layout_height="?android:attr/listPreferredItemHeightSmall" android:layout_height="?android:attr/listPreferredItemHeightSmall"
android:paddingStart="@dimen/keyline_second" android:paddingStart="@dimen/keyline_second"
android:paddingEnd="@dimen/keyline_first" android:paddingEnd="@dimen/keyline_first"
android:paddingLeft="@dimen/keyline_second"
android:paddingRight="@dimen/keyline_first"
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="@string/location_remind_arrival" android:text="@string/location_remind_arrival"
android:textAppearance="?attr/textAppearanceListItemSmall"/> android:textAppearance="?attr/textAppearanceListItemSmall"/>
@ -26,8 +24,6 @@
android:layout_height="?android:attr/listPreferredItemHeightSmall" android:layout_height="?android:attr/listPreferredItemHeightSmall"
android:paddingStart="@dimen/keyline_second" android:paddingStart="@dimen/keyline_second"
android:paddingEnd="@dimen/keyline_first" android:paddingEnd="@dimen/keyline_first"
android:paddingLeft="@dimen/keyline_second"
android:paddingRight="@dimen/keyline_first"
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="@string/location_remind_departure" android:text="@string/location_remind_departure"
android:textAppearance="?attr/textAppearanceListItemSmall"/> android:textAppearance="?attr/textAppearanceListItemSmall"/>
@ -37,16 +33,13 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeightSmall" android:layout_height="?android:attr/listPreferredItemHeightSmall"
android:paddingStart="@dimen/keyline_second" android:paddingStart="@dimen/keyline_second"
android:paddingEnd="@dimen/keyline_first" android:paddingEnd="@dimen/keyline_first">
android:paddingLeft="@dimen/keyline_second"
android:paddingRight="@dimen/keyline_first">
<TextView <TextView
android:id="@+id/location_radius_value" android:id="@+id/location_radius_value"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="?android:attr/listPreferredItemHeightSmall" android:layout_height="?android:attr/listPreferredItemHeightSmall"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="250" android:text="250"
android:textAppearance="?attr/textAppearanceListItem" android:textAppearance="?attr/textAppearanceListItem"
@ -55,9 +48,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="?android:attr/listPreferredItemHeightSmall" android:layout_height="?android:attr/listPreferredItemHeightSmall"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_toLeftOf="@id/location_radius_value"
android:layout_toStartOf="@id/location_radius_value" android:layout_toStartOf="@id/location_radius_value"
android:ellipsize="end" android:ellipsize="end"
android:gravity="center_vertical" android:gravity="center_vertical"

@ -9,7 +9,6 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_gravity="top|center" android:layout_gravity="top|center"
android:alpha="@dimen/alpha_secondary" android:alpha="@dimen/alpha_secondary"
android:background="?attr/selectableItemBackgroundBorderless" android:background="?attr/selectableItemBackgroundBorderless"
@ -24,9 +23,7 @@
style="@style/TaskEditTextPrimary" style="@style/TaskEditTextPrimary"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_toLeftOf="@id/geofence_options"
android:layout_toStartOf="@id/geofence_options" android:layout_toStartOf="@id/geofence_options"
android:clickable="true" android:clickable="true"
android:focusable="true" android:focusable="true"
@ -39,10 +36,8 @@
style="@style/TaskEditTextPrimary" style="@style/TaskEditTextPrimary"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_below="@id/location_name" android:layout_below="@id/location_name"
android:layout_toLeftOf="@id/geofence_options"
android:layout_toStartOf="@id/geofence_options" android:layout_toStartOf="@id/geofence_options"
android:clickable="true" android:clickable="true"
android:ellipsize="end" android:ellipsize="end"

@ -15,8 +15,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/keyline_first" android:layout_marginStart="@dimen/keyline_first"
android:layout_marginEnd="@dimen/keyline_first" android:layout_marginEnd="@dimen/keyline_first"
android:layout_marginLeft="@dimen/keyline_first"
android:layout_marginRight="@dimen/keyline_first"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:textAppearance="?android:attr/textAppearanceMedium"/> android:textAppearance="?android:attr/textAppearanceMedium"/>

@ -25,8 +25,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="@dimen/keyline_first" android:paddingStart="@dimen/keyline_first"
android:paddingEnd="@dimen/keyline_first" android:paddingEnd="@dimen/keyline_first"
android:paddingLeft="@dimen/keyline_first"
android:paddingRight="@dimen/keyline_first"
android:gravity="center_vertical" android:gravity="center_vertical"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1" android:maxLines="1"
@ -36,9 +34,7 @@
android:id="@+id/libraries" android:id="@+id/libraries"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="@dimen/keyline_first"
android:paddingStart="@dimen/keyline_first" android:paddingStart="@dimen/keyline_first"
android:paddingRight="@dimen/keyline_first"
android:paddingEnd="@dimen/keyline_first" android:paddingEnd="@dimen/keyline_first"
android:textColor="?android:textColorSecondary" android:textColor="?android:textColorSecondary"
android:textSize="@dimen/sku_details_row_text_size"/> android:textSize="@dimen/sku_details_row_text_size"/>

@ -8,13 +8,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/keyline_first" android:layout_marginTop="@dimen/keyline_first"
android:layout_marginBottom="@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_marginStart="@dimen/card_view_margin"
android:layout_marginEnd="@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:paddingStart="@dimen/keyline_first"
android:paddingRight="@dimen/keyline_first"
android:paddingEnd="@dimen/keyline_first" android:paddingEnd="@dimen/keyline_first"
android:gravity="start|center_vertical" android:gravity="start|center_vertical"
android:textColor="?attr/colorAccent" android:textColor="?attr/colorAccent"

@ -12,12 +12,9 @@
android:id="@+id/place_icon" android:id="@+id/place_icon"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:paddingStart="@dimen/keyline_first" android:paddingStart="@dimen/keyline_first"
android:paddingEnd="@dimen/keyline_second" android:paddingEnd="@dimen/keyline_second"
android:paddingLeft="@dimen/keyline_first"
android:paddingRight="@dimen/keyline_second"
android:src="@drawable/ic_outline_place_24px" android:src="@drawable/ic_outline_place_24px"
android:tint="@color/icon_tint"/> android:tint="@color/icon_tint"/>
@ -27,11 +24,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:paddingStart="@dimen/keyline_first" android:paddingStart="@dimen/keyline_first"
android:paddingEnd="@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:src="@drawable/ic_outline_edit_24px"
android:tint="@color/icon_tint" /> android:tint="@color/icon_tint" />
@ -40,13 +34,9 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_toEndOf="@id/place_icon" 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:layout_toStartOf="@id/location_settings"
android:paddingStart="0dp" android:paddingStart="0dp"
android:paddingEnd="@dimen/keyline_first" android:paddingEnd="@dimen/keyline_first"
android:paddingLeft="0dp"
android:paddingRight="@dimen/keyline_first"
android:ellipsize="end" android:ellipsize="end"
android:gravity="start|top" android:gravity="start|top"
android:maxLines="2" android:maxLines="2"
@ -59,13 +49,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/name" android:layout_below="@+id/name"
android:layout_toEndOf="@id/place_icon" 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:layout_toStartOf="@id/location_settings"
android:paddingStart="0dp" android:paddingStart="0dp"
android:paddingEnd="@dimen/keyline_first" android:paddingEnd="@dimen/keyline_first"
android:paddingLeft="0dp"
android:paddingRight="@dimen/keyline_first"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="2" android:maxLines="2"
android:visibility="gone" android:visibility="gone"

@ -8,7 +8,7 @@
android:id="@+id/divider" android:id="@+id/divider"
style="@style/task_edit_row_divider"/> style="@style/task_edit_row_divider"/>
<ImageView xmlns:android="http://schemas.android.com/apk/res/android" <ImageView
android:id="@+id/place_attribution" android:id="@+id/place_attribution"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -16,8 +16,6 @@
android:paddingBottom="@dimen/keyline_first" android:paddingBottom="@dimen/keyline_first"
android:paddingStart="@dimen/keyline_content_inset" android:paddingStart="@dimen/keyline_content_inset"
android:paddingEnd="@dimen/keyline_second" android:paddingEnd="@dimen/keyline_second"
android:paddingLeft="@dimen/keyline_content_inset"
android:paddingRight="@dimen/keyline_second"
android:src="@drawable/mapbox_logo_icon"/> android:src="@drawable/mapbox_logo_icon"/>
</LinearLayout> </LinearLayout>

@ -12,7 +12,6 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:clickable="true" android:clickable="true"
android:focusable="true" android:focusable="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
@ -23,15 +22,11 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
android:layout_toStartOf="@id/checkbox" android:layout_toStartOf="@id/checkbox"
android:layout_toLeftOf="@id/checkbox"
android:drawablePadding="@dimen/keyline_second" android:drawablePadding="@dimen/keyline_second"
android:textColor="@color/text_primary" android:textColor="@color/text_primary"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:paddingStart="@dimen/keyline_first" android:paddingStart="@dimen/keyline_first"
android:paddingLeft="@dimen/keyline_first"
android:paddingEnd="@dimen/keyline_first" android:paddingEnd="@dimen/keyline_first"
android:paddingRight="@dimen/keyline_first"
android:textSize="@dimen/task_edit_text_size" /> android:textSize="@dimen/task_edit_text_size" />
</RelativeLayout> </RelativeLayout>

@ -26,12 +26,9 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:paddingStart="@dimen/widget_padding" android:paddingStart="@dimen/widget_padding"
android:paddingEnd="@dimen/widget_padding" android:paddingEnd="@dimen/widget_padding"
android:paddingLeft="@dimen/widget_padding"
android:paddingRight="@dimen/widget_padding"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:src="@drawable/ic_outline_add_24px" android:src="@drawable/ic_outline_add_24px"
@ -42,12 +39,9 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_toLeftOf="@id/widget_button"
android:layout_toStartOf="@id/widget_button" android:layout_toStartOf="@id/widget_button"
android:paddingStart="@dimen/widget_padding" android:paddingStart="@dimen/widget_padding"
android:paddingEnd="0dp" android:paddingEnd="0dp"
android:paddingLeft="@dimen/widget_padding"
android:paddingRight="0dp"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:src="@drawable/ic_outline_settings_24px" android:src="@drawable/ic_outline_settings_24px"
@ -57,15 +51,11 @@
android:id="@+id/widget_title" android:id="@+id/widget_title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_toLeftOf="@id/widget_reconfigure"
android:layout_toStartOf="@id/widget_reconfigure" android:layout_toStartOf="@id/widget_reconfigure"
android:paddingStart="@dimen/widget_padding" android:paddingStart="@dimen/widget_padding"
android:paddingEnd="0dp" android:paddingEnd="0dp"
android:paddingLeft="@dimen/widget_padding"
android:paddingRight="0dp"
android:ellipsize="end" android:ellipsize="end"
android:gravity="start|center_vertical" android:gravity="start|center_vertical"
android:maxLines="2" android:maxLines="2"

@ -6,10 +6,8 @@
android:minHeight="?attr/listPreferredItemHeight" android:minHeight="?attr/listPreferredItemHeight"
android:mode="twoLine" android:mode="twoLine"
android:paddingStart="@dimen/keyline_first" android:paddingStart="@dimen/keyline_first"
android:paddingLeft="@dimen/keyline_first"
android:paddingTop="@dimen/list_item_spacing" android:paddingTop="@dimen/list_item_spacing"
android:paddingEnd="@dimen/keyline_first" android:paddingEnd="@dimen/keyline_first"
android:paddingRight="@dimen/keyline_first"
android:paddingBottom="@dimen/list_item_spacing"> android:paddingBottom="@dimen/list_item_spacing">
<ImageView <ImageView
@ -17,9 +15,7 @@
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
android:layout_marginEnd="@dimen/keyline_first" android:layout_marginEnd="@dimen/keyline_first"
android:layout_marginRight="@dimen/keyline_first"
android:tint="@null" /> android:tint="@null" />
<TextView <TextView
@ -28,7 +24,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_toEndOf="@id/image_view" android:layout_toEndOf="@id/image_view"
android:layout_toRightOf="@id/image_view"
android:textAppearance="?attr/textAppearanceListItem" /> android:textAppearance="?attr/textAppearanceListItem" />
<TextView <TextView

@ -19,8 +19,6 @@
android:layout_height="?android:attr/listPreferredItemHeightSmall" android:layout_height="?android:attr/listPreferredItemHeightSmall"
android:paddingStart="@dimen/keyline_first" android:paddingStart="@dimen/keyline_first"
android:paddingEnd="@dimen/keyline_first" android:paddingEnd="@dimen/keyline_first"
android:paddingLeft="@dimen/keyline_first"
android:paddingRight="@dimen/keyline_first"
android:checkMark="@drawable/checkmark" android:checkMark="@drawable/checkmark"
android:checkMarkTint="?colorAccent" android:checkMarkTint="?colorAccent"
android:checked="false" android:checked="false"

@ -19,12 +19,8 @@
android:layout_height="?android:attr/listPreferredItemHeightSmall" android:layout_height="?android:attr/listPreferredItemHeightSmall"
android:paddingStart="@dimen/keyline_first" android:paddingStart="@dimen/keyline_first"
android:paddingEnd="@dimen/keyline_first" android:paddingEnd="@dimen/keyline_first"
android:paddingLeft="@dimen/keyline_first"
android:paddingRight="@dimen/keyline_first"
android:checkMark="@null" android:checkMark="@null"
android:drawableLeft="?android:attr/listChoiceIndicatorSingle"
android:drawableStart="?android:attr/listChoiceIndicatorSingle" android:drawableStart="?android:attr/listChoiceIndicatorSingle"
android:drawableRight="@null"
android:drawableEnd="@null" android:drawableEnd="@null"
android:checked="false" android:checked="false"
android:drawablePadding="@dimen/keyline_second" android:drawablePadding="@dimen/keyline_second"

@ -36,13 +36,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignBaseline="@id/text1" android:layout_alignBaseline="@id/text1"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_toEndOf="@id/text1" android:layout_toEndOf="@id/text1"
android:layout_toRightOf="@id/text1"
android:paddingStart="8dp" android:paddingStart="8dp"
android:paddingEnd="8dp" android:paddingEnd="8dp"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:gravity="center_vertical|end" android:gravity="center_vertical|end"
android:textSize="12sp"/> android:textSize="12sp"/>

@ -10,35 +10,27 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
android:paddingStart="0dp" android:paddingStart="0dp"
android:paddingLeft="0dp" android:paddingEnd="@dimen/keyline_first" />
android:paddingEnd="@dimen/keyline_first"
android:paddingRight="@dimen/keyline_first" />
<com.google.android.material.chip.ChipGroup <com.google.android.material.chip.ChipGroup
android:id="@+id/chip_group" android:id="@+id/chip_group"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true" />
android:layout_alignParentRight="true" />
<TextView <TextView
android:id="@+id/title" android:id="@+id/title"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_toStartOf="@id/chip_group" android:layout_toStartOf="@id/chip_group"
android:layout_toLeftOf="@id/chip_group"
android:layout_toEndOf="@id/completeBox" android:layout_toEndOf="@id/completeBox"
android:layout_toRightOf="@id/completeBox"
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:clickable="true" android:clickable="true"
android:focusable="true" android:focusable="true"
android:gravity="start|top" android:gravity="start|top"
android:paddingStart="0dp" android:paddingStart="0dp"
android:paddingLeft="0dp"
android:paddingEnd="@dimen/keyline_first" android:paddingEnd="@dimen/keyline_first"
android:paddingRight="@dimen/keyline_first"
android:textAlignment="viewStart" android:textAlignment="viewStart"
android:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorPrimary"
android:textSize="@dimen/task_edit_text_size" /> android:textSize="@dimen/task_edit_text_size" />

@ -13,12 +13,9 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:paddingStart="@dimen/keyline_first" android:paddingStart="@dimen/keyline_first"
android:paddingEnd="@dimen/keyline_second" android:paddingEnd="@dimen/keyline_second"/>
android:paddingLeft="@dimen/keyline_first"
android:paddingRight="@dimen/keyline_second"/>
<TextView <TextView
android:id="@+id/due_date" android:id="@+id/due_date"
@ -26,11 +23,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignBaseline="@id/title" android:layout_alignBaseline="@id/title"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:paddingStart="0dp" android:paddingStart="0dp"
android:paddingEnd="@dimen/keyline_first" android:paddingEnd="@dimen/keyline_first"
android:paddingLeft="0dp"
android:paddingRight="@dimen/keyline_first"
android:ellipsize="end" android:ellipsize="end"
android:singleLine="true" android:singleLine="true"
android:textSize="14sp"/> android:textSize="14sp"/>
@ -40,13 +34,9 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_toEndOf="@id/completeBox" android:layout_toEndOf="@id/completeBox"
android:layout_toLeftOf="@id/due_date"
android:layout_toRightOf="@id/completeBox"
android:layout_toStartOf="@id/due_date" android:layout_toStartOf="@id/due_date"
android:paddingStart="0dp" android:paddingStart="0dp"
android:paddingEnd="@dimen/keyline_first" android:paddingEnd="@dimen/keyline_first"
android:paddingLeft="0dp"
android:paddingRight="@dimen/keyline_first"
android:ellipsize="end" android:ellipsize="end"
android:gravity="start|top" android:gravity="start|top"
android:maxLines="1" android:maxLines="1"
@ -65,8 +55,6 @@
android:layout_marginTop="@dimen/task_list_item_spacing" android:layout_marginTop="@dimen/task_list_item_spacing"
android:paddingStart="@dimen/keyline_content_inset" android:paddingStart="@dimen/keyline_content_inset"
android:paddingEnd="@dimen/keyline_first" android:paddingEnd="@dimen/keyline_first"
android:paddingLeft="@dimen/keyline_content_inset"
android:paddingRight="@dimen/keyline_first"
android:ellipsize="end" android:ellipsize="end"
android:gravity="start" android:gravity="start"
android:maxLines="2" android:maxLines="2"
@ -83,8 +71,6 @@
android:layout_marginTop="@dimen/task_list_item_spacing" android:layout_marginTop="@dimen/task_list_item_spacing"
android:layout_marginStart="@dimen/keyline_content_inset" android:layout_marginStart="@dimen/keyline_content_inset"
android:layout_marginEnd="@dimen/keyline_first" android:layout_marginEnd="@dimen/keyline_first"
android:layout_marginLeft="@dimen/keyline_content_inset"
android:layout_marginRight="@dimen/keyline_first"
android:visibility="gone" android:visibility="gone"
app:chipSpacingHorizontal="@dimen/chip_spacing" app:chipSpacingHorizontal="@dimen/chip_spacing"
app:chipSpacingVertical="@dimen/chip_spacing"/> app:chipSpacingVertical="@dimen/chip_spacing"/>

@ -9,31 +9,25 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="@dimen/widget_padding" android:paddingStart="@dimen/widget_padding"
android:paddingEnd="@dimen/widget_padding" android:paddingEnd="@dimen/widget_padding"
android:paddingLeft="@dimen/widget_padding"
android:paddingRight="@dimen/widget_padding"
android:clickable="false"> android:clickable="false">
<ImageView <ImageView
android:id="@+id/widget_complete_box" android:id="@+id/widget_complete_box"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_gravity="center" android:layout_gravity="center"
android:paddingTop="3dp" android:paddingTop="3dp"
android:paddingBottom="3dp" android:paddingBottom="3dp"
android:paddingStart="0dp" android:paddingStart="0dp"
android:paddingEnd="@dimen/widget_padding" android:paddingEnd="@dimen/widget_padding"/>
android:paddingLeft="0dp"
android:paddingRight="@dimen/widget_padding"/>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_toEndOf="@id/widget_complete_box" android:layout_toEndOf="@id/widget_complete_box"
android:layout_toRightOf="@id/widget_complete_box"
android:paddingTop="3dp" android:paddingTop="3dp"
android:paddingBottom="3dp" android:paddingBottom="3dp"
android:orientation="vertical"> android:orientation="vertical">

@ -4,9 +4,7 @@
<style name="task_list_container"> <style name="task_list_container">
<item name="android:elevation" tools:ignore="NewApi">@dimen/elevation_refresh_indicator</item> <item name="android:elevation" tools:ignore="NewApi">@dimen/elevation_refresh_indicator</item>
<item name="android:clipToPadding">false</item> <item name="android:clipToPadding">false</item>
<item name="android:paddingLeft">0dp</item> <item name="android:paddingStart">0dp</item>
<item name="android:paddingStart" tools:ignore="NewApi">0dp</item> <item name="android:paddingEnd">@dimen/elevation_padding</item>
<item name="android:paddingRight">@dimen/elevation_padding</item>
<item name="android:paddingEnd" tools:ignore="NewApi">@dimen/elevation_padding</item>
</style> </style>
</resources> </resources>

@ -3,8 +3,8 @@
<style name="popup_overlay" parent="ThemeOverlay.MaterialComponents.Light"/> <style name="popup_overlay" parent="ThemeOverlay.MaterialComponents.Light"/>
<style name="SpinnerNoPadding" parent="Widget.AppCompat.TextView.SpinnerItem"> <style name="SpinnerNoPadding" parent="Widget.AppCompat.TextView.SpinnerItem">
<item name="android:paddingLeft">0dp</item> <item name="android:paddingStart">0dp</item>
<item name="android:paddingRight">0dp</item> <item name="android:paddingEnd">0dp</item>
</style> </style>
<style name="TranslucentDialog" parent="DayNightDialog"> <style name="TranslucentDialog" parent="DayNightDialog">
@ -132,10 +132,8 @@
<item name="android:layout_marginTop">0dp</item> <item name="android:layout_marginTop">0dp</item>
<item name="android:layout_marginBottom">0dp</item> <item name="android:layout_marginBottom">0dp</item>
<item name="android:layout_width">match_parent</item> <item name="android:layout_width">match_parent</item>
<item name="android:layout_marginRight">@dimen/card_view_margin</item> <item name="android:layout_marginEnd">@dimen/card_view_margin</item>
<item name="android:layout_marginEnd" tools:ignore="NewApi">@dimen/card_view_margin</item> <item name="android:layout_marginStart">@dimen/card_view_margin</item>
<item name="android:layout_marginLeft">@dimen/card_view_margin</item>
<item name="android:layout_marginStart" tools:ignore="NewApi">@dimen/card_view_margin</item>
<item name="cardCornerRadius">@dimen/card_view_card_corner_radius</item> <item name="cardCornerRadius">@dimen/card_view_card_corner_radius</item>
<item name="cardElevation">@dimen/card_view_card_elevation</item> <item name="cardElevation">@dimen/card_view_card_elevation</item>
<item name="cardPreventCornerOverlap">false</item> <item name="cardPreventCornerOverlap">false</item>

@ -1,7 +1,7 @@
object Versions { object Versions {
const val kotlin = "1.3.70" const val kotlin = "1.3.70"
const val targetSdk = 29 const val targetSdk = 29
const val minSdk = 16 const val minSdk = 17
const val dagger = "2.26" const val dagger = "2.26"
const val butterknife = "10.2.1" const val butterknife = "10.2.1"
const val work = "2.3.4" const val work = "2.3.4"

Loading…
Cancel
Save