Skip to content

Commit 0fcf64f

Browse files
author
Suneet Srivastava
committed
Merge branch 'development' of https://github.com/fossasia/phimpme-android into pintrest
2 parents c230a19 + 7c4f5cf commit 0fcf64f

23 files changed

+952
-525
lines changed

app/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,8 @@ dependencies {
163163
//exoplayer
164164
implementation 'com.google.android.exoplayer:exoplayer:r1.5.7'
165165

166+
implementation "androidx.lifecycle:lifecycle-extensions:$rootProject.lifecycleVersion"
167+
166168
//utils
167169
implementation 'com.github.deano2390:MaterialShowcaseView:1.2.0@aar'
168170
implementation "com.jakewharton:butterknife:$rootProject.butterknifeVersion"

app/src/main/AndroidManifest.xml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,11 @@
5555
android:largeHeap="true"
5656
android:supportsRtl="true"
5757
android:theme="@style/AppTheme">
58+
<activity android:name=".share.pinterest.PinterestShareActivity"></activity>
5859

59-
<uses-library android:name="org.apache.http.legacy" android:required="false"/>
60+
<uses-library
61+
android:name="org.apache.http.legacy"
62+
android:required="false" />
6063

6164
<activity
6265
android:name=".share.twitter.LoginActivity"
@@ -279,7 +282,7 @@
279282
android:name=".gallery.activities.AboutActivity"
280283
android:configChanges="orientation|screenSize"
281284
android:label="@string/about"
282-
android:theme="@style/Theme.AppCompat.NoActionBar"></activity>
285+
android:theme="@style/Theme.AppCompat.NoActionBar" />
283286
<activity
284287
android:name=".gallery.activities.ExcludedAlbumsActivity"
285288
android:label="@string/excluded_albums"

app/src/main/java/org/fossasia/phimpme/MyApplication.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
import android.os.StrictMode;
66
import android.util.Log;
77
import androidx.multidex.MultiDex;
8+
9+
import com.android.volley.VolleyLog;
810
import com.squareup.leakcanary.LeakCanary;
911
import com.squareup.leakcanary.RefWatcher;
1012
import com.twitter.sdk.android.core.DefaultLogger;
@@ -54,7 +56,7 @@ public void onCreate() {
5456
.debug(true)
5557
.build();
5658
Twitter.initialize(config);
57-
59+
VolleyLog.DEBUG = true;
5860
/** Realm initialization */
5961
Realm.init(this);
6062
RealmConfiguration realmConfiguration =

0 commit comments

Comments
 (0)