isoron
/
loop
mirror of https://github.com/iSoron/uhabits.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Increase target SDK to 29; update support library

Browse Source
pull/535/head
Alinson S. Xavier 6 years ago
parent 48d145626f
commit 83c1197dc1
14 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File

6
android/gradle.properties
Unescape View File

@ -2,12 +2,12 @@ VERSION_CODE = 35
VERSION_NAME = 1.7.8
MIN_SDK_VERSION = 19
TARGET_SDK_VERSION = 27
COMPILE_SDK_VERSION = 27
TARGET_SDK_VERSION = 29
COMPILE_SDK_VERSION = 29
DAGGER_VERSION = 2.25.2
KOTLIN_VERSION = 1.3.50
SUPPORT_LIBRARY_VERSION = 27.1.1
SUPPORT_LIBRARY_VERSION = 28.0.0
AUTO_FACTORY_VERSION = 1.0-beta6
BUILD_TOOLS_VERSION = 3.5.2

2
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberPickerFactory.kt
Unescape View File

@ -71,7 +71,7 @@ class NumberPickerFactory
}
.create()
dialog.window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE)
dialog.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE)
InterfaceUtils.setupEditorAction(picker) { _, actionId, _ ->
if (actionId == EditorInfo.IME_ACTION_DONE)

2
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/BarChart.java
Unescape View File

@ -433,7 +433,7 @@ public class BarChart extends ScrollableChart
primaryColor = Color.BLACK;
textColor = res.getColor(R.attr.mediumContrastTextColor);
gridColor = res.getColor(R.attr.lowContrastTextColor);
backgroundColor = res.getColor(R.attr.cardBackgroundColor);
backgroundColor = res.getColor(R.attr.cardBgColor);
}
private void initDateFormats()

2
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/RingView.java
Unescape View File

@ -242,7 +242,7 @@ public class RingView extends View
StyledResources res = new StyledResources(getContext());
if (backgroundColor == null)
backgroundColor = res.getColor(R.attr.cardBackgroundColor);
backgroundColor = res.getColor(R.attr.cardBgColor);
if (inactiveColor == null)
inactiveColor = res.getColor(R.attr.highContrastTextColor);

2
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/ScoreChart.java
Unescape View File

@ -405,7 +405,7 @@ public class ScoreChart extends ScrollableChart
primaryColor = Color.BLACK;
textColor = res.getColor(R.attr.mediumContrastTextColor);
gridColor = res.getColor(R.attr.lowContrastTextColor);
backgroundColor = res.getColor(R.attr.cardBackgroundColor);
backgroundColor = res.getColor(R.attr.cardBgColor);
}
private void initDateFormats()

2
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt
Unescape View File

@ -106,7 +106,7 @@ class ListHabitsScreen
if (data == null) return
if (resultCode != Activity.RESULT_OK) return
try {
val inStream = activity.contentResolver.openInputStream(data.data)
val inStream = activity.contentResolver.openInputStream(data.data!!)
val cacheDir = activity.externalCacheDir
val tempFile = File.createTempFile("import", "", cacheDir)
FileUtils.copy(inStream, tempFile)

2
android/uhabits-android/src/main/java/org/isoron/uhabits/notifications/RingtoneManager.kt
Unescape View File

@ -55,7 +55,7 @@ class RingtoneManager
var ringtoneUri: Uri? = null
val defaultRingtoneUri = Settings.System.DEFAULT_NOTIFICATION_URI
val prefRingtoneUri = prefs.getString("pref_ringtone_uri",
defaultRingtoneUri.toString())
defaultRingtoneUri.toString())!!
if (prefRingtoneUri.isNotEmpty())
ringtoneUri = Uri.parse(prefRingtoneUri)

2
android/uhabits-android/src/main/java/org/isoron/uhabits/preferences/SharedPreferencesStorage.kt
Unescape View File

@ -55,7 +55,7 @@ class SharedPreferencesStorage
sharedPrefs.getLong(key, defValue)
override fun getString(key: String, defValue: String): String =
sharedPrefs.getString(key, defValue)
sharedPrefs.getString(key, defValue)!!
override fun onAttached(preferences: Preferences) {
this.preferences = preferences

4
android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetView.java
Unescape View File

@ -85,7 +85,7 @@ public class CheckmarkWidgetView extends HabitWidgetView
case Checkmark.CHECKED_IMPLICITLY:
text = getResources().getString(R.string.fa_check);
bgColor = res.getColor(R.attr.cardBackgroundColor);
bgColor = res.getColor(R.attr.cardBgColor);
fgColor = res.getColor(R.attr.mediumContrastTextColor);
setShadowAlpha(0x00);
@ -96,7 +96,7 @@ public class CheckmarkWidgetView extends HabitWidgetView
case Checkmark.UNCHECKED:
default:
text = getResources().getString(R.string.fa_times);
bgColor = res.getColor(R.attr.cardBackgroundColor);
bgColor = res.getColor(R.attr.cardBgColor);
fgColor = res.getColor(R.attr.mediumContrastTextColor);
setShadowAlpha(0x00);

2
android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/HabitWidgetView.java
Unescape View File

@ -97,7 +97,7 @@ public abstract class HabitWidgetView extends FrameLayout
backgroundPaint = innerDrawable.getPaint();
backgroundPaint.setShadowLayer(shadowRadius, shadowOffset, shadowOffset,
shadowColor);
backgroundPaint.setColor(res.getColor(R.attr.cardBackgroundColor));
backgroundPaint.setColor(res.getColor(R.attr.cardBgColor));
backgroundPaint.setAlpha(backgroundAlpha);
frame = (ViewGroup) findViewById(R.id.frame);

2
android/uhabits-android/src/main/res/drawable-v21/ripple.xml
Unescape View File

@ -20,5 +20,5 @@
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?android:colorControlHighlight">
<item android:drawable="?attr/cardBackgroundColor" />
<item android:drawable="?attr/cardBgColor" />
</ripple>

2
android/uhabits-android/src/main/res/values-v21/styles.xml
Unescape View File

@ -20,7 +20,7 @@
<resources>
<style name="Card" parent="CardCommon">
<item name="android:elevation">1dp</item>
<item name="android:background">?attr/cardBackgroundColor</item>
<item name="android:background">?attr/cardBgColor</item>
</style>
<style name="About.Item.Clickable" parent="About.Item">

2
android/uhabits-android/src/main/res/values/attrs.xml
Unescape View File

@ -20,7 +20,7 @@
<resources>
<attr name="windowBackgroundColor" format="reference"/>
<attr name="cardBackgroundColor" format="reference"/>
<attr name="cardBgColor" format="reference"/>
<attr name="headerBackgroundColor" format="reference"/>
<attr name="highlightedBackgroundColor" format="reference"/>
<attr name="useHabitColorAsPrimary" format="boolean"/>

8
android/uhabits-android/src/main/res/values/styles.xml
Unescape View File

@ -33,7 +33,7 @@
<item name="colorPrimary">@color/blue_grey_800</item>
<item name="colorPrimaryDark">@color/blue_grey_900</item>
<item name="colorAccent">?aboutScreenColor</item>
<item name="cardBackgroundColor">@color/grey_50</item>
<item name="cardBgColor">@color/grey_50</item>
<item name="windowBackgroundColor">@color/grey_200</item>
<item name="headerBackgroundColor">@color/grey_200</item>
<item name="highlightedBackgroundColor">@color/grey_100</item>
@ -88,7 +88,7 @@
<item name="colorPrimary">@color/grey_950</item>
<item name="colorPrimaryDark">@color/black</item>
<item name="colorAccent">?aboutScreenColor</item>
<item name="cardBackgroundColor">@color/grey_850</item>
<item name="cardBgColor">@color/grey_850</item>
<item name="windowBackgroundColor">@color/grey_900</item>
<item name="headerBackgroundColor">@color/grey_900</item>
<item name="highlightedBackgroundColor">@color/grey_800</item>
@ -132,7 +132,7 @@
<item name="colorPrimary">@color/black</item>
<item name="colorPrimaryDark">@color/black</item>
<item name="cardBackgroundColor">@color/black</item>
<item name="cardBgColor">@color/black</item>
<item name="windowBackgroundColor">@color/black</item>
<item name="headerBackgroundColor">@color/black</item>
<item name="highlightedBackgroundColor">@color/black</item>
@ -142,7 +142,7 @@
</style>
<style name="TransparentWidgetTheme" parent="AppBaseThemeDark">
<item name="cardBackgroundColor">@color/grey_850</item>
<item name="cardBgColor">@color/grey_850</item>
<item name="highContrastTextColor">@color/white</item>
<item name="mediumContrastTextColor">@color/white_aa</item>

Write Preview
Loading…
Cancel
Save