Skip to content

Commit 69d0242

Browse files
committed
Giphy integration
// FREEBIE
1 parent 8e9e384 commit 69d0242

File tree

58 files changed

+1644
-15
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+1644
-15
lines changed

AndroidManifest.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,11 @@
266266
android:windowSoftInputMode="stateHidden"
267267
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
268268

269+
<activity android:name=".giph.ui.GiphyActivity"
270+
android:theme="@style/TextSecure.LightNoActionBar"
271+
android:windowSoftInputMode="stateHidden"
272+
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
273+
269274
<activity android:name=".PassphraseChangeActivity"
270275
android:label="@string/AndroidManifest__change_passphrase"
271276
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>

build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,8 @@ android {
172172

173173
buildConfigField "long", "BUILD_TIMESTAMP", getLastCommitTimestamp() + "L"
174174
buildConfigField "String", "TEXTSECURE_URL", "\"https://textsecure-service.whispersystems.org\""
175+
buildConfigField "String", "GIPHY_PROXY_HOST", "\"giphy-proxy-production.whispersystems.org\""
176+
buildConfigField "int", "GIPHY_PROXY_PORT", "80"
175177
buildConfigField "String", "USER_AGENT", "\"OWA\""
176178
buildConfigField "String", "REDPHONE_MASTER_URL", "\"https://redphone-master.whispersystems.org\""
177179
buildConfigField "String", "REDPHONE_RELAY_HOST", "\"relay.whispersystems.org\""

proguard-appcompat-v7.pro

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,7 @@
77
-keep public class * extends android.support.v4.view.ActionProvider {
88
public <init>(android.content.Context);
99
}
10+
11+
-keepattributes *Annotation*
12+
-keep public class * extends android.support.design.widget.CoordinatorLayout.Behavior { *; }
13+
-keep public class * extends android.support.design.widget.ViewOffsetBehavior { *; }
130 Bytes
Loading
243 Bytes
Loading
105 Bytes
Loading

res/drawable-hdpi/poweredby_giphy.png

4.03 KB
Loading
94 Bytes
Loading
196 Bytes
Loading
82 Bytes
Loading

0 commit comments

Comments
 (0)