Skip to content

Commit

Permalink
Merge pull request #94 from TeamMyDaily/feature/92-keyword-view-struc…
Browse files Browse the repository at this point in the history
…ture

Feature/92 keyword view structure
  • Loading branch information
4z7l committed Mar 5, 2021
2 parents f9e0fe0 + 7ac1334 commit d240b93
Show file tree
Hide file tree
Showing 23 changed files with 376 additions and 476 deletions.
18 changes: 18 additions & 0 deletions app/release/output-metadata.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": 2,
"artifactType": {
"type": "APK",
"kind": "Directory"
},
"applicationId": "org.mydaily",
"variantName": "processReleaseResources",
"elements": [
{
"type": "SINGLE",
"filters": [],
"versionCode": 1,
"versionName": "1.0.0",
"outputFile": "app-release.apk"
}
]
}
37 changes: 15 additions & 22 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,11 @@
android:supportsRtl="true"
android:theme="@style/Theme.MyDaily"
android:usesCleartextTraffic="true">
<activity android:name=".ui.view.splash.service.ServiceExplainActivity"/>
<activity android:name=".ui.view.splash.SplashActivity"
<activity android:name=".ui.view.keyword.KeywordActivity"
android:exported="true"/>
<activity android:name=".ui.view.splash.service.ServiceExplainActivity" />
<activity
android:name=".ui.view.splash.SplashActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand All @@ -28,48 +31,38 @@
android:exported="true" />
<activity
android:name=".ui.view.goal.detail.GoalAddActivity"
android:windowSoftInputMode="adjustResize" />
android:windowSoftInputMode="adjustResize" />
<activity
android:name=".ui.view.keyword.KeywordAddActivity"
android:name=".ui.view.keyword.add.KeywordAddActivity"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.view.keyword.KeywordListActivity"
android:exported="true"
android:windowSoftInputMode="stateAlwaysHidden" />
<activity
android:name=".ui.view.keyword.popup.KeywordPopupActivity"
android:windowSoftInputMode="stateAlwaysHidden"
android:exported="true"/>
<activity android:name=".ui.view.keyword.KeywordSelectActivity"
android:exported="true"
android:windowSoftInputMode="stateAlwaysHidden"/>
android:windowSoftInputMode="stateAlwaysHidden" />
<activity
android:name=".ui.view.task.detail.TaskDetailActivity"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.view.user.SignInActivity"
android:windowSoftInputMode="adjustResize"
android:exported="true">
</activity>
android:exported="true"
android:windowSoftInputMode="adjustResize"></activity>
<activity
android:name=".ui.view.remind.detail.RemindDetailWriteActivity"
android:exported="true"
android:windowSoftInputMode="adjustResize"/>
android:windowSoftInputMode="adjustResize" />
<activity
android:name=".ui.view.goal.detail.GoalDetailActivity"
android:exported="true"
android:windowSoftInputMode="adjustResize"/>
android:windowSoftInputMode="adjustResize" />
<activity
android:name=".ui.view.user.SignUpActivity"
android:exported="true"
android:windowSoftInputMode="adjustResize"/>
android:windowSoftInputMode="adjustResize" />
<activity
android:name=".ui.view.user.SignUpTermsActivity"
android:exported="true" />
<activity android:name=".ui.view.MainActivity">
</activity>

<activity android:name=".ui.view.mypage.MyPageSettingActivity"/>
<activity android:name=".ui.view.MainActivity"></activity>
<activity android:name=".ui.view.mypage.MyPageSettingActivity" />
</application>

</manifest>
29 changes: 29 additions & 0 deletions app/src/main/java/org/mydaily/ui/view/keyword/KeywordActivity.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package org.mydaily.ui.view.keyword

import org.koin.androidx.viewmodel.ext.android.viewModel
import org.mydaily.R
import org.mydaily.databinding.ActivityKeywordBinding
import org.mydaily.ui.base.BaseActivity
import org.mydaily.ui.view.keyword.method.KeywordMethodFragment
import org.mydaily.ui.viewmodel.KeywordViewModel
import org.mydaily.util.extension.replace

class KeywordActivity : BaseActivity<ActivityKeywordBinding, KeywordViewModel>() {
override val layoutResourceId: Int
get() = R.layout.activity_keyword
override val viewModel: KeywordViewModel by viewModel()

private val selectFragment: KeywordMethodFragment by lazy { KeywordMethodFragment() }

override fun initView() {
replace(R.id.container_keyword, selectFragment)
}

override fun initBeforeBinding() {

}

override fun initAfterBinding() {

}
}
264 changes: 0 additions & 264 deletions app/src/main/java/org/mydaily/ui/view/keyword/KeywordListActivity.kt

This file was deleted.

Loading

0 comments on commit d240b93

Please sign in to comment.