Skip to content

Commit

Permalink
no message
Browse files Browse the repository at this point in the history
  • Loading branch information
@mym0404
mym0404 committed Jan 2, 2020
1 parent d533d32 commit 0cece75
Show file tree
Hide file tree
Showing 5 changed files with 78 additions and 58 deletions.
125 changes: 71 additions & 54 deletions app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,23 @@
xmlns:tools="http://schemas.android.com/tools"
package="com.fundito.fundito">

<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />

<application
tools:ignore="LockedOrientationActivity"
android:usesCleartextTraffic="true"
android:name=".application.MainApplication"
android:allowBackup="true"
android:icon="@mipmap/sample_image"
android:label="@string/app_name"
android:roundIcon="@mipmap/sample_image_round"
android:supportsRtl="true"
android:theme="@style/AppTheme"
android:usesCleartextTraffic="true"
tools:ignore="LockedOrientationActivity"
tools:targetApi="m">

<!-- FACEBOOK-->
<!-- FACEBOOK-->
<meta-data
android:name="com.facebook.sdk.ApplicationId"
android:value="@string/facebook_app_id" />
Expand All @@ -40,20 +40,17 @@
</intent-filter>
</activity>

<provider android:authorities="com.facebook.app.FacebookContentProvider458706525080336"
<provider
android:name="com.facebook.FacebookContentProvider"
android:exported="true"/>
<!--ENDFACEBOOK-->



android:authorities="com.facebook.app.FacebookContentProvider458706525080336"
android:exported="true" />
<!--ENDFACEBOOK-->



<activity android:name=".presentation.splash.SplashActivity"
android:screenOrientation="portrait"
<activity
android:name=".presentation.splash.SplashActivity"
android:configChanges="screenLayout|orientation|fontScale|locale|screenSize"
>
android:screenOrientation="portrait">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<action android:name="android.intent.action.MAIN" />
Expand All @@ -62,66 +59,86 @@
</intent-filter>
</activity>

<activity android:name=".presentation.login.LoginNicknameActivity"
android:exported="true" />
<activity android:name=".presentation.login.CardRegisterActivity"
android:screenOrientation="portrait"
android:exported="true"
<activity
android:name=".presentation.login.LoginNicknameActivity"
android:exported="true" />
<activity
android:name=".presentation.login.CardRegisterActivity"
android:configChanges="screenLayout|orientation|fontScale|locale|screenSize"
/>

<activity android:name=".presentation.login.LoginActivity"
android:screenOrientation="portrait"
android:exported="true"
android:screenOrientation="portrait" />

<activity
android:name=".presentation.login.LoginActivity"
android:configChanges="screenLayout|orientation|fontScale|locale|screenSize"
/>
android:exported="true"
android:screenOrientation="portrait" />


<activity android:name=".presentation.main.MainActivity"
android:screenOrientation="portrait"
android:exported="true"
<activity
android:name=".presentation.main.MainActivity"
android:configChanges="screenLayout|orientation|fontScale|locale|screenSize"
/>
<activity android:name=".presentation.store.StoreDetailActivity"
android:screenOrientation="portrait"
android:exported="true"
android:screenOrientation="portrait" />
<activity
android:name=".presentation.store.StoreDetailActivity"
android:configChanges="screenLayout|orientation|fontScale|locale|screenSize"
/>
<activity android:name=".presentation.store.StoreCheerActivity"
android:screenOrientation="portrait"
android:exported="true"
android:screenOrientation="portrait" />
<activity
android:name=".presentation.store.StoreCheerActivity"
android:configChanges="screenLayout|orientation|fontScale|locale|screenSize"
android:exported="true"
android:screenOrientation="portrait"

/>
<activity android:name=".presentation.charge.ChargeActivity"
android:screenOrientation="portrait"
<activity
android:name=".presentation.charge.ChargeActivity"
android:configChanges="screenLayout|orientation|fontScale|locale|screenSize"
/>
<activity android:name=".presentation.main.feed.FeedFriendDetailActivity"
android:screenOrientation="portrait"
android:exported="true"
android:screenOrientation="portrait" />
<activity
android:name=".presentation.main.feed.FeedFriendDetailActivity"
android:configChanges="screenLayout|orientation|fontScale|locale|screenSize"
/>
<activity android:name=".presentation.search.SearchActivity"
android:exported="true"
android:screenOrientation="portrait"
android:screenOrientation="portrait" />
<activity
android:name=".presentation.search.SearchActivity"
android:configChanges="screenLayout|orientation|fontScale|locale|screenSize"
/>
<activity android:name=".presentation.noti.NotiActivity"
android:exported="true"
android:screenOrientation="portrait"
android:screenOrientation="portrait" />
<activity
android:name=".presentation.noti.NotiActivity"
android:configChanges="screenLayout|orientation|fontScale|locale|screenSize"
/>
<activity android:name=".presentation.funding.FundingActivity"
android:exported="true"
android:screenOrientation="portrait"
android:screenOrientation="portrait" />
<activity
android:name=".presentation.funding.FundingActivity"
android:configChanges="screenLayout|orientation|fontScale|locale|screenSize"
/>
<activity android:name=".presentation.login.LoginPasswordActivity"
android:exported="true"
android:screenOrientation="portrait"
android:screenOrientation="portrait" />
<activity
android:name=".presentation.login.LoginPasswordActivity"
android:configChanges="screenLayout|orientation|fontScale|locale|screenSize"
/>
android:exported="true"
android:screenOrientation="portrait" />
<service
android:name=".service.FCMService"
android:exported="false">
<intent-filter>
<action android:name="com.google.firebase.MESSAGING_EVENT" />
</intent-filter>
</service>

<!-- Set custom default icon. This is used when no icon is set for incoming notification messages.
See README(https://goo.gl/l4GJaQ) for more. -->
<meta-data
android:name="com.google.firebase.messaging.default_notification_icon"
android:resource="@drawable/fundito_app_logo" />
<!-- Set color used with incoming notification messages. This is used when no color is set for the incoming
notification message. See README(https://goo.gl/6BKBk7) for more. -->
<meta-data
android:name="com.google.firebase.messaging.default_notification_color"
android:resource="@color/colorAccent" />
</application>

</manifest>
4 changes: 3 additions & 1 deletion app/src/main/java/com/fundito/fundito/common/util/NotificationUtil.kt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.fundito.fundito.common.util

import android.app.Notification
import android.app.NotificationChannel
import android.app.NotificationManager
import android.content.Context
Expand Down Expand Up @@ -39,7 +40,8 @@ class NotificationUtil @Inject constructor(private val context: Context) {
fun showNotification(message: String) {
val noti = NotificationCompat.Builder(context, NOTI_CHANNEL_ID)
.setContentTitle("펀디토")
.setContentText("하이하이")
.setContentText("message")
.setPriority(Notification.PRIORITY_MAX)
.build()

nm.notify(NOTI_ID,noti)
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/com/fundito/fundito/presentation/store/StoreCheerActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ class StoreCheerActivity : AppCompatActivity() {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_store_cheer)

shopName.text = storeName

shareDialog = ShareDialog(this)
shareDialog.registerCallback(callbackManager,object : FacebookCallback<Sharer.Result> {
override fun onSuccess(result: Sharer.Result?) {
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/java/com/fundito/fundito/service/FCMService.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ class FCMService : FirebaseMessagingService() {
override fun onNewToken(p0: String) {
super.onNewToken(p0)

Timber.e(p0)

/**
* If signinned, Update FCM Token
*/
Expand All @@ -38,6 +36,7 @@ class FCMService : FirebaseMessagingService() {
}

override fun onMessageReceived(p0: RemoteMessage) {
Timber.e(p0.toString())
notiUtil.showNotification("하이")
}
}
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_store_cheer.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
android:layout_marginLeft="32dp"
android:layout_marginTop="84dp"
android:lineSpacingExtra="0sp"
android:text="유나네 감자탕"
tools:text="유나네 감자탕"
android:textColor="@color/black"
android:textSize="32sp"
android:textStyle="bold"
Expand Down

0 comments on commit 0cece75

Please sign in to comment.