From 1b0f1892c70e68aad69138aebf4d08796b7357ea Mon Sep 17 00:00:00 2001 From: Mehdi Baha Date: Tue, 7 Jul 2015 19:23:16 +0000 Subject: [PATCH] Fixe FragmentNewsfeed layout, and disable Sync for safety --- app/build.gradle | 3 ++- app/proguard-rules.pro | 13 +++++++++++++ .../insa/burnd/view/MainActivity/MainActivity.java | 4 ++-- app/src/main/res/layout/fragment_newsfeed.xml | 2 +- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c4aaeb4..e4de3a4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,7 +5,7 @@ android { buildToolsVersion "21.1.2" lintOptions { - abortOnError false + disable 'InvalidPackage' } defaultConfig { @@ -52,4 +52,5 @@ dependencies { compile 'com.mcxiaoke.volley:library:1.0.1' // Volley Library (handles all network request) compile 'com.github.paolorotolo:appintro:2.0.0' compile 'co.trikita:log:1.1.1' + compile 'com.jakewharton:butterknife:7.0.1' } \ No newline at end of file diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index e215254..462654c 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -9,6 +9,19 @@ # Add any project specific keep options here: +# Butterknife rules as advised by official website +-keep class butterknife.** { *; } +-dontwarn butterknife.internal.** +-keep class **$$ViewBinder { *; } + +-keepclasseswithmembernames class * { + @butterknife.* ; +} + +-keepclasseswithmembernames class * { + @butterknife.* ; +} + # If your project uses WebView with JS, uncomment the following # and specify the fully qualified class name to the JavaScript interface # class: diff --git a/app/src/main/java/com/insa/burnd/view/MainActivity/MainActivity.java b/app/src/main/java/com/insa/burnd/view/MainActivity/MainActivity.java index 34ba2dc..000b345 100644 --- a/app/src/main/java/com/insa/burnd/view/MainActivity/MainActivity.java +++ b/app/src/main/java/com/insa/burnd/view/MainActivity/MainActivity.java @@ -53,7 +53,7 @@ public void onCreate(Bundle savedInstanceState) { initToolbar(); initTabs(); - setupSyncadapter(); + //setupSyncadapter(); } private void initToolbar(){ @@ -127,7 +127,7 @@ private void setupSyncadapter() { mAccount, AUTHORITY, b, - 60*10); // every 10 minutes, cause : battery leaks + 60); } Log.d("Sync Complete"); } diff --git a/app/src/main/res/layout/fragment_newsfeed.xml b/app/src/main/res/layout/fragment_newsfeed.xml index 5be9ea1..57b4447 100644 --- a/app/src/main/res/layout/fragment_newsfeed.xml +++ b/app/src/main/res/layout/fragment_newsfeed.xml @@ -8,7 +8,7 @@ + android:layout_height="match_parent">