Material design update

.dockerignore

@@ -0,0 +1,10 @@
+.git
+.idea
+.gradle
+.settings
+
+local.properties
+
+**build/**
+
+**/*.zip

.gitignore

@@ -62,3 +62,11 @@ fastlane/Preview.html
 fastlane/screenshots
 fastlane/test_output
 fastlane/readme.md
+
+# VS Code
+**/.project
+**/.settings/
+**/.classpath
+
+# Exclude local configurations
+**/dropbox.xml.idea

Dockerfile

@@ -0,0 +1,31 @@
+# docker build -t android-build .
+
+FROM openjdk:8
+
+ENV SDK_URL="https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip" \
+    ANDROID_HOME="/usr/local/android-sdk" \
+    ANDROID_VERSION=26 \
+    ANDROID_BUILD_TOOLS_VERSION=26.0.2
+
+WORKDIR /usr/src/app
+
+RUN mkdir "$ANDROID_HOME" .android \
+    && cd "$ANDROID_HOME" \
+    && curl -o sdk.zip $SDK_URL \
+    && unzip sdk.zip \
+    && rm sdk.zip \
+    && yes | $ANDROID_HOME/tools/bin/sdkmanager --licenses
+
+ENV PATH ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/tools/bin:${ANDROID_HOME}/platform-tools
+
+RUN sdkmanager --update
+RUN sdkmanager "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" \
+    "platforms;android-${ANDROID_VERSION}" \
+    "platform-tools"
+
+COPY gradlew build.gradle ./
+COPY gradle/ ./gradle/
+
+RUN ./gradlew
+
+COPY . .

app/build.gradle

@@ -2,29 +2,38 @@ apply plugin: 'com.android.application'
 
 android {
 
-    compileSdkVersion 26
-    buildToolsVersion "27.0.3"
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'
 
     defaultConfig {
 
         applicationId 'com.todotxt.todotxttouch'
-        minSdkVersion 14
-        targetSdkVersion 17
+        minSdkVersion 21
+        targetSdkVersion 28
         versionCode 35
         versionName "release35"
+
+        multiDexEnabled true
+
     }
 
+    lintOptions {
+        checkReleaseBuilds true
+        // Or, if you prefer, you can continue to check for errors in release builds,
+        // but continue the build even when errors are found:
+        abortOnError false
+    }
 
     buildTypes {
 
         debug {
-            resValue "string", "dropbox_consumer_key", "123"
-            resValue "string", "dropbox_consumer_secret", "456"
+//            resValue "string", "dropbox_consumer_key", "db-"
+//            resValue "string", "dropbox_consumer_secret", ""
         }
 
         release {
-            minifyEnabled true // Enables code shrinking for the release build type.
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            // minifyEnabled true // Enables code shrinking for the release build type.
+            // proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
     flavorDimensions "free"
@@ -63,17 +72,22 @@ android {
 
 
 dependencies {
-    compile 'com.android.support:support-compat:26.1.0'
-    compile 'org.apache.james:apache-mime4j-james-utils:0.8.1'
-    compile 'org.apache.httpcomponents:httpmime:4.5.5'
-    compile 'com.github.cliftonlabs:json-simple:3.0.2'
-    compile 'com.googlecode.libphonenumber:libphonenumber:8.9.0'
-    compile 'oauth.signpost:signpost-commonshttp4:1.2.1.2'
-    compile 'oauth.signpost:signpost-core:1.2.1.2'
-    compile 'com.actionbarsherlock:actionbarsherlock:4.4.0@aar'
-    compile 'com.android.support:support-v4:26.1.0'
-    compile 'com.dropbox.core:dropbox-core-sdk:3.0.6'
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile 'junit:junit:4.12'
-    testCompile 'org.mockito:mockito-core:2.15.0'
-}
+    implementation 'com.android.support:support-compat:28.0.0'
+    implementation 'com.android.support:preference-v7:28.0.0'
+    implementation 'com.android.support:preference-v14:28.0.0'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.2'
+    implementation 'org.apache.james:apache-mime4j-james-utils:0.8.1'
+    implementation 'org.apache.httpcomponents:httpmime:4.5.5'
+    implementation 'com.github.cliftonlabs:json-simple:3.0.2'
+    implementation 'com.googlecode.libphonenumber:libphonenumber:8.9.0'
+    implementation 'oauth.signpost:signpost-commonshttp4:1.2.1.2'
+    implementation 'oauth.signpost:signpost-core:1.2.1.2'
+    implementation 'com.android.support:support-v4:28.0.0'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.android.support:design:28.0.0'
+    implementation 'com.dropbox.core:dropbox-core-sdk:3.0.6'
+    // implementation 'net.sf.proguard:proguard-gradle:6.0.3'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    testImplementation 'junit:junit:4.12'
+    testImplementation 'org.mockito:mockito-core:2.15.0'
+}

app/src/main/AndroidManifest.xml

@@ -28,10 +28,6 @@ You should have received a copy of the GNU General Public License along with Tod
     android:versionCode="56"
     android:versionName="2.2">
 
-    <uses-sdk
-        android:minSdkVersion="8"
-        android:targetSdkVersion="17" />
-
     <uses-permission android:name="android.permission.INTERNET" />
 
     <supports-screens
@@ -47,11 +43,11 @@ You should have received a copy of the GNU General Public License along with Tod
     <application
         android:name=".TodoApplication"
         android:allowBackup="true"
-        android:icon="@drawable/todotxt_touch_icon"
+        android:icon="@drawable/adaptive_icon"
         android:label="@string/app_label"
-        android:theme="@style/Theme.TodoTxt">
+        android:theme="@style/TodoTxtTouchLight">
         <activity
-            android:name="com.dropbox.client2.android.AuthActivity"
+            android:name="com.dropbox.core.android.AuthActivity"
             android:configChanges="orientation|keyboard"
             android:launchMode="singleTask">
             <intent-filter>
@@ -75,7 +71,8 @@ You should have received a copy of the GNU General Public License along with Tod
         </activity>
         <activity
             android:name=".Preferences"
-            android:label="@string/set_preferences" />
+            android:label="@string/set_preferences"
+            android:parentActivityName=".TodoTxtTouch"/>
         <activity
             android:name=".AddTask"
             android:label="@string/addtask"
@@ -112,7 +109,9 @@ You should have received a copy of the GNU General Public License along with Tod
         <activity
             android:name=".HelpActivity"
             android:theme="@android:style/Theme.Translucent.NoTitleBar" />
-        <activity android:name=".TodoTxtTouch">
+        <activity
+            android:name=".TodoTxtTouch"
+            android:theme="@style/TodoTxtTouchLight.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
             </intent-filter>
@@ -123,21 +122,6 @@ You should have received a copy of the GNU General Public License along with Tod
         </activity>
 
         <!-- Task list widget -->
-        <receiver
-            android:name=".TodoWidgetProvider"
-            android:enabled="@bool/below_api_14"
-            android:label="@string/app_label">
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="com.todotxt.todotxttouch.APPWIDGET_UPDATE" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.appwidget.provider"
-                android:resource="@xml/todo_widget_provider" />
-        </receiver>
         <receiver android:name=".PeriodicSyncStarter">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />