From 88801f69614c97476409ee9369fdf4febd9975ba Mon Sep 17 00:00:00 2001 From: Gregor Santner Date: Sat, 9 Apr 2016 13:53:06 +0200 Subject: [PATCH] Android Studio 2.0; bump libs; gradle version --- .travis.yml | 2 +- app/build.gradle | 6 ++--- .../activity/MainActivity.java | 25 +++++++++--------- .../activity/ShareActivity.java | 2 +- .../activity/ShareActivity2.java | 2 +- .../listener/SoftKeyboardStateWatcher.java | 13 +++++---- .../task/ProfileFetchTask.java | 2 +- .../ui/ContextMenuWebView.java | 15 +++++------ .../res/drawable/fab_label_background.xml | 9 +++---- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.jar | Bin 53637 -> 53636 bytes gradle/wrapper/gradle-wrapper.properties | 4 +-- 12 files changed, 40 insertions(+), 42 deletions(-) diff --git a/.travis.yml b/.travis.yml index 212e8f85..241a133b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ android: - platform-tools - tools - android-23 - - build-tools-23.0.2 + - build-tools-23.0.3 - extra-google-m2repository - extra-android-m2repository diff --git a/app/build.gradle b/app/build.gradle index 6f08d04a..3c659bc1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 23 - buildToolsVersion "23.0.2" + buildToolsVersion "23.0.3" useLibrary 'org.apache.http.legacy' defaultConfig { @@ -23,8 +23,8 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) testCompile 'junit:junit:4.12' - compile 'com.android.support:appcompat-v7:23.2.1' - compile 'com.android.support:design:23.2.1' + compile 'com.android.support:appcompat-v7:23.3.0' + compile 'com.android.support:design:23.3.0' compile 'com.getbase:floatingactionbutton:1.9.1' compile 'com.jakewharton:butterknife:7.0.1' } diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java index 7c5be503..0b3945d8 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java @@ -231,11 +231,11 @@ public class MainActivity extends AppCompatActivity String cookies = cookieManager.getCookie(url); Log.d(App.TAG, "All the cookies in a string:" + cookies); - if(cookies != null) { + if (cookies != null) { cookieManager.setCookie(url, cookies); - cookieManager.setCookie("https://"+appSettings.getPodDomain(),cookies); - for(String c:cookies.split(";")){ - Log.d(App.TAG, "Cookie: " + c.split("=")[0]+ " Value:"+c.split("=")[1]); + cookieManager.setCookie("https://" + appSettings.getPodDomain(), cookies); + for (String c : cookies.split(";")) { + Log.d(App.TAG, "Cookie: " + c.split("=")[0] + " Value:" + c.split("=")[1]); } //new ProfileFetchTask(app).execute(); } @@ -972,8 +972,7 @@ public class MainActivity extends AppCompatActivity } break; - case R.id.nav_settings_view: - { + case R.id.nav_settings_view: { final CharSequence[] options = {getString(R.string.settings_font), getString(R.string.settings_view), appSettings.isLoadImages() ? getString(R.string.settings_images_switch_off) : getString(R.string.settings_images_switch_on)}; @@ -982,12 +981,15 @@ public class MainActivity extends AppCompatActivity .setItems(options, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int item) { - switch(item) { - case 0: alertFormElements(); + switch (item) { + case 0: + alertFormElements(); break; - case 1: webView.loadUrl("https://" + podDomain + "/mobile/toggle"); + case 1: + webView.loadUrl("https://" + podDomain + "/mobile/toggle"); break; - case 2: webSettings.setLoadsImagesAutomatically(!appSettings.isLoadImages()); + case 2: + webSettings.setLoadsImagesAutomatically(!appSettings.isLoadImages()); appSettings.setLoadImages(!appSettings.isLoadImages()); webView.loadUrl(webView.getUrl()); break; @@ -1107,8 +1109,7 @@ public class MainActivity extends AppCompatActivity case REQUEST_CODE_ASK_PERMISSIONS_SAVE_IMAGE: if (grantResults.length == 1 && grantResults[0] == PackageManager.PERMISSION_GRANTED) { Toast.makeText(this, R.string.permission_granted_try_again, Toast.LENGTH_SHORT).show(); - } - else { + } else { Toast.makeText(this, R.string.permission_denied, Toast.LENGTH_SHORT).show(); } return; diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/ShareActivity.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/ShareActivity.java index 1a72ab5a..3b42a725 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/activity/ShareActivity.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/ShareActivity.java @@ -51,8 +51,8 @@ import java.util.Date; public class ShareActivity extends MainActivity { - private WebView webView; private static final String TAG = "Diaspora Share"; + private WebView webView; private String podDomain; private ValueCallback mFilePathCallback; private String mCameraPhotoPath; diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/ShareActivity2.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/ShareActivity2.java index e466e9de..1d69ea04 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/activity/ShareActivity2.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/ShareActivity2.java @@ -51,8 +51,8 @@ import java.util.Date; public class ShareActivity2 extends MainActivity { - private WebView webView; private static final String TAG = "Diaspora Share"; + private WebView webView; private String podDomain; private ValueCallback mFilePathCallback; private String mCameraPhotoPath; diff --git a/app/src/main/java/com/github/dfa/diaspora_android/listener/SoftKeyboardStateWatcher.java b/app/src/main/java/com/github/dfa/diaspora_android/listener/SoftKeyboardStateWatcher.java index 2fa16e3c..8d3c119d 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/listener/SoftKeyboardStateWatcher.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/listener/SoftKeyboardStateWatcher.java @@ -14,17 +14,10 @@ import java.util.List; public class SoftKeyboardStateWatcher implements ViewTreeObserver.OnGlobalLayoutListener { - public interface SoftKeyboardStateListener { - void onSoftKeyboardOpened(int keyboardHeightInPx); - - void onSoftKeyboardClosed(); - } - private final List listeners = new LinkedList<>(); private final View activityRootView; private int lastSoftKeyboardHeightInPx; private boolean isSoftKeyboardOpened; - public SoftKeyboardStateWatcher(View activityRootView) { this(activityRootView, false); } @@ -93,4 +86,10 @@ public class SoftKeyboardStateWatcher implements ViewTreeObserver.OnGlobalLayout } } } + + public interface SoftKeyboardStateListener { + void onSoftKeyboardOpened(int keyboardHeightInPx); + + void onSoftKeyboardClosed(); + } } diff --git a/app/src/main/java/com/github/dfa/diaspora_android/task/ProfileFetchTask.java b/app/src/main/java/com/github/dfa/diaspora_android/task/ProfileFetchTask.java index 5d607e69..2668c4be 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/task/ProfileFetchTask.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/task/ProfileFetchTask.java @@ -65,7 +65,7 @@ public class ProfileFetchTask extends AsyncTask { if (extractedProfileData != null) { WebUserProfile profile = new WebUserProfile(app); profile.parseJson(extractedProfileData); - Log.d(App.TAG, "Extracted new_messages (service):"+profile.getUnreadMessagesCount()); + Log.d(App.TAG, "Extracted new_messages (service):" + profile.getUnreadMessagesCount()); } return null; diff --git a/app/src/main/java/com/github/dfa/diaspora_android/ui/ContextMenuWebView.java b/app/src/main/java/com/github/dfa/diaspora_android/ui/ContextMenuWebView.java index d9083064..16291ad5 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/ui/ContextMenuWebView.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/ui/ContextMenuWebView.java @@ -57,7 +57,7 @@ public class ContextMenuWebView extends WebView { public boolean onMenuItemClick(MenuItem item) { HitTestResult result = getHitTestResult(); String url = result.getExtra(); - switch(item.getItemId()) { + switch (item.getItemId()) { //Save image to external memory case ID_SAVE_IMAGE: { boolean writeToStoragePermitted = true; @@ -83,7 +83,7 @@ public class ContextMenuWebView extends WebView { MainActivity.REQUEST_CODE_ASK_PERMISSIONS_SAVE_IMAGE); } } - if(writeToStoragePermitted) { + if (writeToStoragePermitted) { if (url != null) { Uri source = Uri.parse(url); DownloadManager.Request request = new DownloadManager.Request(source); @@ -96,10 +96,10 @@ public class ContextMenuWebView extends WebView { } } } - break; + break; case ID_EXTERNAL_BROWSER: - if(url != null) { + if (url != null) { Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url)); context.startActivity(intent); } @@ -107,7 +107,7 @@ public class ContextMenuWebView extends WebView { //Copy url to clipboard case ID_COPY_LINK: - if(url != null) { + if (url != null) { ClipboardManager clipboard = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE); clipboard.setPrimaryClip(ClipData.newPlainText("text", url)); Toast.makeText(context, R.string.toast_link_address_copied, Toast.LENGTH_SHORT).show(); @@ -116,7 +116,7 @@ public class ContextMenuWebView extends WebView { //Try to share link to other apps case ID_SHARE_LINK: - if(url != null) { + if (url != null) { Intent sendIntent = new Intent(); sendIntent.setAction(Intent.ACTION_SEND); sendIntent.putExtra(Intent.EXTRA_TEXT, url); @@ -137,8 +137,7 @@ public class ContextMenuWebView extends WebView { menu.setHeaderTitle(result.getExtra()); menu.add(0, ID_SAVE_IMAGE, 0, context.getString(R.string.context_menu_save_image)).setOnMenuItemClickListener(handler); menu.add(0, ID_EXTERNAL_BROWSER, 0, context.getString(R.string.context_menu_open_external_browser)).setOnMenuItemClickListener(handler); - } - else if (result.getType() == HitTestResult.ANCHOR_TYPE || + } else if (result.getType() == HitTestResult.ANCHOR_TYPE || result.getType() == HitTestResult.SRC_ANCHOR_TYPE) { // Menu options for a hyperlink. menu.setHeaderTitle(result.getExtra()); diff --git a/app/src/main/res/drawable/fab_label_background.xml b/app/src/main/res/drawable/fab_label_background.xml index 83f55c97..58fc6933 100644 --- a/app/src/main/res/drawable/fab_label_background.xml +++ b/app/src/main/res/drawable/fab_label_background.xml @@ -1,11 +1,10 @@ - + - + android:top="4dp" /> + \ No newline at end of file diff --git a/build.gradle b/build.gradle index e0b366a7..168f129d 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.5.0' + classpath 'com.android.tools.build:gradle:2.0.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 05ef575b0cd0173fc735f2857ce4bd594ce4f6bd..13372aef5e24af05341d49695ee84e5f9b594659 100644 GIT binary patch delta 1915 zcmZWp3rtg27(Tr%g+V)>*5Oroilt5{MV$^`3?}1IR^*{Ur+_d!WoV`YHzrWTU>FAF zh|y>=kq#EeEYQLRf+_MW6iQ`=88e3lP!}{pR5nNE&i${IRc~_h{pY*?_rK0L_h=Qj zsER98M00ue2-(>oNkhd+p`VaI#7M=N%^MIxi6=M4ySYjvcT4V{Avt#hJ^k+kR@vuIp}i zC|R>=Ufe#X;+Bx_{yD8wSMN?(*|`7PX5Mt|@_pj!@a#{Whj{_{{N(B7$)a`F&$~a; zncu6KOdArv@0G7EJfkW8yW{B7ocWr(C3P;-zg`;dRN>${^`YJIPkcD#U*+-lPCUuq z7^HKYU-Ynk?1Qt7F5;b|4^|I(%N!DVsA3knQRH zhHvh$4KU9Oo^!yMDZIftn@Y?qQ&svSn}t(;<+$Ldkm7_MpJ!Kcz%E*DB^ z($^h0Lm_mDZz-jqkB@1SNIR;z$cm0Oe8OfJ*M_oc|6hh!X0|zj^@(rATo+~@pWQx; zHj!C`lh*^`ShE*)*Sm$jdDLWzH;>x5)dAyBZroSb5NGLESl>ge(XV9AJHDq61axm- z1-Q9=Js@t61srSN2bgqC4p@C{D~BBA{zG8+TXtE?677V_v&#-aX+$W;k=#C#MYZ$psP>1)|hU9V^gw6^P^0PP))TuJDIfh9O$r zN-J3ro*H~Pe-lmRG{Cs(8XRBs7iJbs{7FXj4avCHN;;y2%12B~AuVT!=FoW2&_^(q z<@1z delta 1838 zcmZWpdrVVT7(cz`Q65DLqJ}XU z9KpfZA`x1%7A{oS z(vw_%l9X#^jS!EAZ2aYwd@-LuOo2}96^0O!S8hrXemI#wmCr$ohA;i(m1=h`14bW! zrxFIRFK3uR4WBBYfG9D$55z9>Mj$joo`VH2tL$#EjD#5z2XYRSsWwxsg-B#W41nePuJks=cDqn#U5?0gea zClmdXC4os2$%Vjxi-Ex@d0+DFIMyz8`HsSSnN8y3!rxWS-m1~Yaq)dczGL-RwPH+l z+obdf;`j5hl2v`guPgrg6ZidBayulpQM+g31j;?nE5oHNR8)=AcAHR_7^U~Js+@nG zJX~#cvB+SQ-VW}bZHtyhsq1-EjDSwW6b* z>q~d|s$b+z=0*yCbXgy=%JZn#wE3CV7KO)WiF9U4z&>$}(X3&gSo3T4w%ix#V{v&w zKTNAWh>+E3l*3D`4gcX&R+lRU)gTJ5PePzFj@X ztqYpT8#xzRQy=f`ck}s;#17f)|1OzSig%~I!zHLur5&M|1rAU=0AhK@91t2&)&q87 zlZ`oW)Q}_M!J?y3#D&GZ-632%rg0v7IzOs1N2r#MIVFxbufj$nD>`KkM$-pgu==OP zgOLOqa{q$VnBa>_IToFvT(xjd$6_4Rwnd z9DQ?|%jQyfc9K0hcz!z@Z&VY`+W1`RXPKE+IR$~ETX@exxd?SxAru0ED|*ba?SP}^ zr?wcbJ(HU*%y%@J%t93Ti4aa0aK|oMVfdTFwnqNuu$hh+hZ1rZ9wOeQU2Xaj@fmF} zGx2y#`!1kM`x?OH_Kkp5?J~fT_AdZauOiTz3a6&z|3pO zfLE?b0j;jHc8cpMu)lmg70_PCx=q)83VVYt{>aJlWP}ZF^<&cG^ zdVO(Hr-z7%_opZS?-&k3QZg$6X53U?0u5*c;`EQ*6nw7V(wo3+5fsv-1i%6nwSXN|< zTXn3oKIh{;HOWjxhH34*j$pI$FRV1ifYeB&4tuKvg)8eetM0>6A^ zDd?psotoTC=)$e+A=LiUBt8Fys#>(?3ce=|`Pt(2UY6p?-dDZsqp7dXLqpD+SuQznns#5lT*^dJ=T^z7xBKH){nX5}3mKM-iKQ_FDw0jC(TDgXcg diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f23df6e4..122a0dca 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Oct 21 11:34:03 PDT 2015 +#Mon Dec 28 10:00:20 PST 2015 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip