Set minSdk to 19

pull/996/head
Alex Baker 6 years ago
parent fe37699bc2
commit be161f022d

@ -134,10 +134,6 @@ public class AndroidUtilities {
return (int) (dp * displayMetrics.density + 0.5f);
}
public static boolean preKitKat() {
return !atLeastKitKat();
}
public static boolean preLollipop() {
return !atLeastLollipop();
}
@ -146,10 +142,6 @@ public class AndroidUtilities {
return !atLeastOreo();
}
public static boolean atLeastKitKat() {
return Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT;
}
public static boolean atLeastLollipop() {
return Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP;
}

@ -4,7 +4,6 @@ import static android.content.ContentResolver.SCHEME_CONTENT;
import static android.provider.DocumentsContract.EXTRA_INITIAL_URI;
import static androidx.core.content.FileProvider.getUriForFile;
import static com.google.common.collect.Iterables.any;
import static com.todoroo.andlib.utility.AndroidUtilities.atLeastKitKat;
import static com.todoroo.andlib.utility.AndroidUtilities.atLeastLollipop;
import static com.todoroo.andlib.utility.AndroidUtilities.preLollipop;
import static com.todoroo.astrid.utility.Constants.FILE_PROVIDER_AUTHORITY;
@ -43,29 +42,21 @@ public class FileHelper {
public static final int MAX_FILENAME_LENGTH = 40;
public static Intent newFilePickerIntent(Activity activity, Uri initial, String... mimeTypes) {
if (atLeastKitKat()) {
Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
intent.putExtra("android.content.extra.SHOW_ADVANCED", true);
intent.putExtra("android.content.extra.FANCY", true);
intent.putExtra("android.content.extra.SHOW_FILESIZE", true);
intent.addCategory(Intent.CATEGORY_OPENABLE);
setInitialUri(activity, intent, initial);
if (mimeTypes.length == 1) {
intent.setType(mimeTypes[0]);
} else {
intent.setType("*/*");
if (mimeTypes.length > 1) {
intent.putExtra(Intent.EXTRA_MIME_TYPES, mimeTypes);
}
}
return intent;
Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
intent.putExtra("android.content.extra.SHOW_ADVANCED", true);
intent.putExtra("android.content.extra.FANCY", true);
intent.putExtra("android.content.extra.SHOW_FILESIZE", true);
intent.addCategory(Intent.CATEGORY_OPENABLE);
setInitialUri(activity, intent, initial);
if (mimeTypes.length == 1) {
intent.setType(mimeTypes[0]);
} else {
Intent intent = new Intent(activity, FileExplore.class);
if (initial != null) {
intent.putExtra(FileExplore.EXTRA_START_PATH, initial.getPath());
intent.setType("*/*");
if (mimeTypes.length > 1) {
intent.putExtra(Intent.EXTRA_MIME_TYPES, mimeTypes);
}
return intent;
}
return intent;
}
public static void newDirectoryPicker(Fragment fragment, int rc, @Nullable Uri initial) {

@ -1,7 +1,6 @@
package org.tasks.gtasks;
import static com.google.common.collect.Lists.transform;
import static com.todoroo.andlib.utility.AndroidUtilities.preKitKat;
import static org.tasks.date.DateTimeUtils.newDateTime;
import android.content.Context;
@ -165,10 +164,6 @@ public class GoogleTaskSynchronizer {
}
private void synchronize(GoogleTaskAccount account) throws IOException {
if (preKitKat()) {
account.setError(context.getString(R.string.requires_android_version, "4.4"));
return;
}
if (!permissionChecker.canAccessAccounts()
|| googleAccountManager.getAccount(account.getAccount()) == null) {
account.setError(context.getString(R.string.cannot_access_account));

@ -1,6 +1,5 @@
package org.tasks.jobs;
import static com.todoroo.andlib.utility.AndroidUtilities.atLeastKitKat;
import static com.todoroo.andlib.utility.AndroidUtilities.atLeastMarshmallow;
import static com.todoroo.andlib.utility.AndroidUtilities.atLeastOreo;
import static com.todoroo.andlib.utility.DateUtilities.now;
@ -203,10 +202,8 @@ public class WorkManager {
PendingIntent pendingIntent = getNotificationPendingIntent();
if (atLeastMarshmallow()) {
alarmManager.setExactAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, time, pendingIntent);
} else if (atLeastKitKat()) {
alarmManager.setExact(AlarmManager.RTC_WAKEUP, time, pendingIntent);
} else {
alarmManager.set(AlarmManager.RTC_WAKEUP, time, pendingIntent);
alarmManager.setExact(AlarmManager.RTC_WAKEUP, time, pendingIntent);
}
}
}

@ -5,7 +5,6 @@ import static androidx.preference.PreferenceManager.setDefaultValues;
import static com.google.common.collect.Iterables.filter;
import static com.google.common.collect.Iterables.transform;
import static com.google.common.collect.Sets.newHashSet;
import static com.todoroo.andlib.utility.AndroidUtilities.atLeastKitKat;
import static com.todoroo.andlib.utility.AndroidUtilities.atLeastLollipop;
import static java.util.Collections.emptySet;
@ -243,10 +242,6 @@ public class Preferences {
return getIntegerFromString(R.string.p_default_reminders_mode_key, 0);
}
public int getRowPadding() {
return getInt(R.string.p_rowPadding, 16);
}
public int getFontSize() {
return getInt(R.string.p_fontSize, 16);
}
@ -414,12 +409,10 @@ public class Preferences {
}
}
if (atLeastKitKat()) {
DocumentFile file =
DocumentFile.fromFile(context.getExternalFilesDir(null)).createDirectory(name);
if (file != null) {
return file.getUri();
}
DocumentFile documentFile =
DocumentFile.fromFile(context.getExternalFilesDir(null)).createDirectory(name);
if (documentFile != null) {
return documentFile.getUri();
}
File file = getDefaultFileLocation(name);
@ -445,11 +438,7 @@ public class Preferences {
cacheDir = context.getCacheDir();
}
if (atLeastKitKat()) {
return DocumentFile.fromFile(cacheDir).getUri();
} else {
return Uri.fromFile(cacheDir);
}
return DocumentFile.fromFile(cacheDir).getUri();
}
private boolean hasWritePermission(Context context, Uri uri) {

@ -1,6 +1,5 @@
package org.tasks.scheduling;
import static com.todoroo.andlib.utility.AndroidUtilities.atLeastKitKat;
import static com.todoroo.andlib.utility.AndroidUtilities.atLeastMarshmallow;
import android.annotation.SuppressLint;
@ -27,10 +26,8 @@ public class AlarmManager {
if (atLeastMarshmallow()) {
alarmManager.setExactAndAllowWhileIdle(
android.app.AlarmManager.RTC_WAKEUP, time, pendingIntent);
} else if (atLeastKitKat()) {
alarmManager.setExact(android.app.AlarmManager.RTC_WAKEUP, time, pendingIntent);
} else {
alarmManager.set(android.app.AlarmManager.RTC_WAKEUP, time, pendingIntent);
alarmManager.setExact(android.app.AlarmManager.RTC_WAKEUP, time, pendingIntent);
}
}
}

@ -1,7 +1,5 @@
package org.tasks.sync;
import static com.todoroo.andlib.utility.AndroidUtilities.atLeastKitKat;
import android.app.Activity;
import android.content.Intent;
import android.content.res.TypedArray;
@ -11,7 +9,6 @@ import android.view.ViewGroup;
import android.widget.ArrayAdapter;
import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
@ -64,18 +61,9 @@ public class AddAccountDialog {
(dialog, which) -> {
switch (which) {
case 0:
if (atLeastKitKat()) {
activity.startActivityForResult(
new Intent(activity, GtasksLoginActivity.class),
SynchronizationKt.REQUEST_GOOGLE_TASKS);
} else {
Toast.makeText(
activity,
activity.getString(R.string.requires_android_version, "4.4"),
Toast.LENGTH_SHORT)
.show();
return;
}
activity.startActivityForResult(
new Intent(activity, GtasksLoginActivity.class),
SynchronizationKt.REQUEST_GOOGLE_TASKS);
break;
case 1:
activity.startActivityForResult(

@ -1,6 +1,5 @@
package org.tasks.tasklist;
import static com.todoroo.andlib.utility.AndroidUtilities.atLeastKitKat;
import static com.todoroo.andlib.utility.AndroidUtilities.atLeastLollipop;
import static com.todoroo.andlib.utility.DateUtilities.getRelativeDateTime;
@ -121,13 +120,8 @@ public class ViewHolder extends RecyclerView.ViewHolder {
description.setEllipsize(null);
}
if (atLeastKitKat()) {
setTopPadding(rowPadding, nameView, completeBox);
setBottomPadding(rowPadding, completeBox);
} else {
MarginLayoutParams lp = (MarginLayoutParams) rowBody.getLayoutParams();
lp.setMargins(lp.leftMargin, rowPadding, lp.rightMargin, rowPadding);
}
setTopPadding(rowPadding, nameView, completeBox);
setBottomPadding(rowPadding, completeBox);
nameView.setTextSize(fontSize);
description.setTextSize(fontSize);
@ -220,16 +214,14 @@ public class ViewHolder extends RecyclerView.ViewHolder {
description.setOnClickListener(view -> onRowBodyClick());
description.setOnLongClickListener(view -> onRowBodyLongClick());
}
if (atLeastKitKat()) {
if (chipGroup.getVisibility() == View.VISIBLE) {
setBottomPadding(rowPadding, chipGroup);
setBottomPadding(0, description, nameView);
} else if (description.getVisibility() == View.VISIBLE) {
setBottomPadding(rowPadding, description);
setBottomPadding(0, nameView);
} else {
setBottomPadding(rowPadding, nameView);
}
if (chipGroup.getVisibility() == View.VISIBLE) {
setBottomPadding(rowPadding, chipGroup);
setBottomPadding(0, description, nameView);
} else if (description.getVisibility() == View.VISIBLE) {
setBottomPadding(rowPadding, description);
setBottomPadding(0, nameView);
} else {
setBottomPadding(rowPadding, nameView);
}
}

@ -549,7 +549,6 @@
<string name="upgrade_blurb_3">Wählen Sie unten einen beliebigen Abonnementpreis aus, um Ihre kostenlose Testversion zu starten. Sie können jederzeit kündigen</string>
<string name="upgrade_blurb_4">Ihre Unterstützung bedeutet mir sehr viel, danke!</string>
<string name="back">Zurück</string>
<string name="requires_android_version">Benötigt Android %s+</string>
<string name="chip_style">Stil der Marke</string>
<string name="chip_style_outlined">mit Kontur</string>
<string name="chip_style_filled">mit Füllung</string>

@ -554,7 +554,6 @@
<string name="upgrade_blurb_3">Elija cualquier precio de suscripción a continuación para iniciar su prueba gratuita. Puede cancelar en cualquier momento</string>
<string name="upgrade_blurb_4">Su apoyo significa mucho para mí, ¡gracias!</string>
<string name="back">Volver</string>
<string name="requires_android_version">Requiere Android %s+</string>
<string name="chip_style">Estilo de chip</string>
<string name="chip_style_outlined">Contorneado</string>
<string name="chip_style_filled">Lleno</string>

@ -556,7 +556,6 @@
<string name="upgrade_blurb_3">Hautatu azpiko harpidetza salneurri bat zure doako proba hasteko. Nahi duzunean eten dezakezu</string>
<string name="upgrade_blurb_4">Zure babesa asko da niretzat, eskerrik asko!</string>
<string name="back">Atzera</string>
<string name="requires_android_version">Android %s+ behar du</string>
<string name="chip_style">Txip estiloa</string>
<string name="chip_style_outlined">Ingerada</string>
<string name="chip_style_filled">Betea</string>

@ -550,7 +550,6 @@ est configuré correctement</string>
<string name="upgrade_blurb_3">Choisissez l\'un des prix d\'abonnement ci-dessous pour commencer votre essai gratuit. Vous pouvez annuler à tout moment</string>
<string name="upgrade_blurb_4">Votre soutien est très important pour moi, merci !</string>
<string name="back">Retour</string>
<string name="requires_android_version">Nécessite Android %s+</string>
<string name="chip_style">Style de puce</string>
<string name="chip_style_outlined">Entouré</string>
<string name="chip_style_filled">Rempli</string>

@ -552,7 +552,6 @@
<string name="upgrade_blurb_3">Az ingyenes próbaidőszak megkezdéséhez válassz a lenti előfizetési díjakból. Bármikor lemondhatod az előfizetést</string>
<string name="upgrade_blurb_4">A támogatásod sokat jelent nekem, köszönöm!</string>
<string name="back">Vissza</string>
<string name="requires_android_version">Android %s+ szükséges</string>
<string name="chip_style">Jelölő stílusa</string>
<string name="chip_style_outlined">Körvonal</string>
<string name="chip_style_filled">Tele</string>

@ -549,7 +549,6 @@
<string name="upgrade_blurb_3">Kies hierbeneden een abonnementsprijs om je gratis proefperiode te starten. Je kunt het altijd annuleren</string>
<string name="upgrade_blurb_4">Je steun betekent veel voor me, bedankt!</string>
<string name="back">Terug</string>
<string name="requires_android_version">Vereist Android %s+</string>
<string name="chip_style">Fiche-stijl</string>
<string name="chip_style_outlined">Omlijnd</string>
<string name="chip_style_filled">Gevuld</string>

@ -565,7 +565,6 @@
<string name="upgrade_blurb_3">Wybierz dowolną cenę subskrypcji poniżej, aby rozpocząć bezpłatny okres próbny. Możesz zrezygnować w każdej chwili</string>
<string name="upgrade_blurb_4">Twoje wsparcie wiele dla mnie znaczy, dziękuję!</string>
<string name="back">Wstecz</string>
<string name="requires_android_version">Wymaga Android %s+</string>
<string name="chip_style">Styl chipa</string>
<string name="chip_style_outlined">Obrysowany</string>
<string name="chip_style_filled">Wypełniony</string>

@ -571,7 +571,6 @@
<string name="upgrade_blurb_3">Выберите любую сумму подписки для того, чтобы начать Ваш бесплатный пробный период. Вы можете отказаться в любой момент</string>
<string name="upgrade_blurb_4">Ваша поддержка много значит для меня, спасибо!</string>
<string name="back">Назад</string>
<string name="requires_android_version">Требует Андроид %s+</string>
<string name="chip_style">Стиль индикаторов списков</string>
<string name="chip_style_outlined">Контурный</string>
<string name="chip_style_filled">Заполненный</string>

@ -554,7 +554,6 @@
<string name="upgrade_blurb_3">Ücretsiz denemenizi başlatmak için aşağıdan herhangi abonelik bedelini seçin. İstediğinizde iptal edebilirsiniz</string>
<string name="upgrade_blurb_4">Desteğiniz çok şey ifade ediyor, teşekkürler!</string>
<string name="back">Geri</string>
<string name="requires_android_version">Android %s+ gerektirir</string>
<string name="chip_style">Yonga biçimi</string>
<string name="chip_style_outlined">Dış çizgi</string>
<string name="chip_style_filled">Tok</string>

@ -545,7 +545,6 @@
<string name="upgrade_blurb_3">选择下方任意订阅价格即可开始免费试用。 你可以随时取消</string>
<string name="upgrade_blurb_4">您的支持对我很重要,谢谢!</string>
<string name="back">返回</string>
<string name="requires_android_version">需要安卓系统 %s+</string>
<string name="chip_style">Chip样式</string>
<string name="chip_style_outlined">描边</string>
<string name="chip_style_filled">填充</string>

@ -557,7 +557,6 @@ File %1$s contained %2$s.\n\n
<string name="upgrade_blurb_3">Choose any subscription price below to start your free trial. You may cancel at any time</string>
<string name="upgrade_blurb_4">Your support means a lot to me, thank you!</string>
<string name="back">Back</string>
<string name="requires_android_version">Requires Android %s+</string>
<string name="chip_style">Chip style</string>
<string name="chip_style_outlined">Outlined</string>
<string name="chip_style_filled">Filled</string>

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

Loading…
Cancel
Save