Skip to content

Commit

Permalink
Merge branch 'hotfix/1.7.9'
Browse files Browse the repository at this point in the history
  • Loading branch information
iSoron committed Apr 21, 2018
2 parents bf3964a + 0864f83 commit ce27773
Show file tree
Hide file tree
Showing 77 changed files with 4,783 additions and 520 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

### 1.7.8 (April 21, 2018)

* Add support for adaptive icons (Oreo)
* Add support for notification channels (Oreo)
* Update translations

### 1.7.7 (September 30, 2017)

* Fix bug that caused reminders to show repeatedly on DST changes
Expand Down
17 changes: 8 additions & 9 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ apply plugin: 'jacoco'
apply plugin: 'com.github.triplet.play'

android {
compileSdkVersion 25
buildToolsVersion "25.0.2"
compileSdkVersion 27
buildToolsVersion "27.0.3"

// signingConfigs {
// release {
Expand All @@ -27,7 +27,7 @@ android {
defaultConfig {
applicationId "org.isoron.uhabits"
minSdkVersion 15
targetSdkVersion 25
targetSdkVersion 27

buildConfigField "Integer", "databaseVersion", "15"
buildConfigField "String", "databaseFilename", "\"uhabits.db\""
Expand Down Expand Up @@ -73,7 +73,7 @@ dependencies {

androidTestApt 'com.google.dagger:dagger-compiler:2.2'

androidTestCompile 'com.android.support:support-annotations:25.3.0'
androidTestCompile 'com.android.support:support-annotations:27.1.1'
androidTestCompile 'com.android.support.test:rules:0.5'
androidTestCompile 'com.android.support.test:runner:0.5'
androidTestCompile 'com.google.auto.factory:auto-factory:1.0-beta3'
Expand All @@ -84,16 +84,15 @@ dependencies {
apt 'com.google.dagger:dagger-compiler:2.2'
apt 'com.jakewharton:butterknife-compiler:8.0.1'

compile 'com.android.support:appcompat-v7:25.3.0'
compile 'com.android.support:design:25.3.0'
compile 'com.android.support:preference-v14:25.3.0'
compile 'com.android.support:support-v4:25.3.0'
compile 'com.android.support:appcompat-v7:27.1.1'
compile 'com.android.support:design:27.1.1'
compile 'com.android.support:preference-v14:27.1.1'
compile 'com.android.support:support-v4:27.1.1'
compile 'com.getpebble:pebblekit:3.0.0'
compile 'com.github.paolorotolo:appintro:3.4.0'
compile 'com.google.auto.factory:auto-factory:1.0-beta3'
compile 'com.google.dagger:dagger:2.2'
compile 'com.jakewharton:butterknife:8.0.1'
compile 'com.michaelpardo:activeandroid:3.1.0-SNAPSHOT'
compile 'com.opencsv:opencsv:3.7'
compile 'org.apmem.tools:layouts:1.10@aar'
compile 'org.jetbrains:annotations-java5:15.0'
Expand Down

This file was deleted.

4 changes: 2 additions & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
<manifest
package="org.isoron.uhabits"
xmlns:android="http://schemas.android.com/apk/res/android"
android:versionCode="35"
android:versionName="1.7.8">
android:versionCode="36"
android:versionName="1.7.9">

<uses-permission android:name="android.permission.VIBRATE"/>

Expand Down
Binary file modified app/src/main/ic_launcher-web.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
86 changes: 86 additions & 0 deletions app/src/main/java/com/activeandroid/ActiveAndroid.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
package com.activeandroid;

/*
* Copyright (C) 2010 Michael Pardo
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

import android.content.Context;
import android.database.sqlite.SQLiteDatabase;

import com.activeandroid.util.Log;

public final class ActiveAndroid {
//////////////////////////////////////////////////////////////////////////////////////
// PUBLIC METHODS
//////////////////////////////////////////////////////////////////////////////////////

public static void initialize(Context context) {
initialize(new Configuration.Builder(context).create());
}

public static void initialize(Configuration configuration) {
initialize(configuration, false);
}

public static void initialize(Context context, boolean loggingEnabled) {
initialize(new Configuration.Builder(context).create(), loggingEnabled);
}

public static void initialize(Configuration configuration, boolean loggingEnabled) {
// Set logging enabled first
setLoggingEnabled(loggingEnabled);
Cache.initialize(configuration);
}

public static void clearCache() {
Cache.clear();
}

public static void dispose() {
Cache.dispose();
}

public static void setLoggingEnabled(boolean enabled) {
Log.setEnabled(enabled);
}

public static SQLiteDatabase getDatabase() {
return Cache.openDatabase();
}

public static void beginTransaction() {
Cache.openDatabase().beginTransaction();
}

public static void endTransaction() {
Cache.openDatabase().endTransaction();
}

public static void setTransactionSuccessful() {
Cache.openDatabase().setTransactionSuccessful();
}

public static boolean inTransaction() {
return Cache.openDatabase().inTransaction();
}

public static void execSQL(String sql) {
Cache.openDatabase().execSQL(sql);
}

public static void execSQL(String sql, Object[] bindArgs) {
Cache.openDatabase().execSQL(sql, bindArgs);
}
}
Loading

0 comments on commit ce27773

Please sign in to comment.