diff --git a/.idea/modules.xml b/.idea/modules.xml
index ba252c2..5074956 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,7 +3,9 @@
+
+
\ No newline at end of file
diff --git a/.idea/navEditor.xml b/.idea/navEditor.xml
new file mode 100644
index 0000000..b5f64af
--- /dev/null
+++ b/.idea/navEditor.xml
@@ -0,0 +1,31 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/render.experimental.xml b/.idea/render.experimental.xml
new file mode 100644
index 0000000..881b33d
--- /dev/null
+++ b/.idea/render.experimental.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 7780ded..d4d8e01 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -66,16 +66,18 @@ jacocoAndroidUnitTestReport {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
- implementation 'androidx.appcompat:appcompat:1.0.2'
+ implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+ implementation 'com.android.support:design:28.0.0'
// test implementation
+ implementation 'androidx.legacy:legacy-support-v4:1.0.0'
testImplementation 'junit:junit:4.12'
testImplementation 'org.robolectric:robolectric:4.3'
testImplementation 'org.powermock:powermock-api-mockito:1.4.12'
testImplementation 'org.powermock:powermock-module-junit4:1.6.2'
testImplementation 'org.mockito:mockito-core:2.28.2'
- testImplementation 'androidx.arch.core:core-testing:2.0.1'
+ testImplementation 'androidx.arch.core:core-testing:2.1.0'
androidTestImplementation 'androidx.test:runner:1.2.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
androidTestImplementation 'androidx.test:runner:1.2.0'
@@ -89,7 +91,7 @@ dependencies {
androidTestImplementation 'androidx.test.espresso:espresso-intents:3.2.0'
// Google Ads
- implementation 'com.google.android.gms:play-services-ads:18.1.1'
+ implementation 'com.google.android.gms:play-services-ads:18.2.0'
// OkHttp && logger
implementation 'com.squareup.okhttp3:okhttp:3.12.0'
@@ -106,9 +108,9 @@ dependencies {
kaptTest 'androidx.room:room-testing:2.1.0'
// Lifecycle components
- implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
+ implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0'
implementation 'android.arch.lifecycle:viewmodel:1.1.1'
- annotationProcessor 'androidx.lifecycle:lifecycle-compiler:2.0.0'
+ annotationProcessor 'androidx.lifecycle:lifecycle-compiler:2.1.0'
// Coroutines
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutine_version"
@@ -129,4 +131,6 @@ dependencies {
//ProgressBar
implementation 'com.wang.avi:library:2.1.3'
+ implementation 'androidx.navigation:navigation-fragment-ktx:2.1.0'
+ implementation 'androidx.navigation:navigation-ui-ktx:2.1.0'
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c305d4..820f394 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -39,6 +39,7 @@
+
\ No newline at end of file
diff --git a/app/src/main/java/com/seok/gitfordeveloper/views/LauncherActivity.kt b/app/src/main/java/com/seok/gitfordeveloper/views/LauncherActivity.kt
index a14a618..221f41c 100644
--- a/app/src/main/java/com/seok/gitfordeveloper/views/LauncherActivity.kt
+++ b/app/src/main/java/com/seok/gitfordeveloper/views/LauncherActivity.kt
@@ -24,6 +24,6 @@ class LauncherActivity : AppCompatActivity() {
startActivity(intent)
overridePendingTransition(R.anim.fade_in, R.anim.fade_out)
finish()
- }, 1500)
+ }, 200)
}
}
diff --git a/app/src/main/java/com/seok/gitfordeveloper/views/LoginActivity.kt b/app/src/main/java/com/seok/gitfordeveloper/views/LoginActivity.kt
index 0dde242..34ce70f 100644
--- a/app/src/main/java/com/seok/gitfordeveloper/views/LoginActivity.kt
+++ b/app/src/main/java/com/seok/gitfordeveloper/views/LoginActivity.kt
@@ -27,12 +27,15 @@ class LoginActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_login)
- init()
- checkForSignIn()
- login_img_login.setOnClickListener {
- val intent = Intent(Intent.ACTION_VIEW, Uri.parse(authToken.buildHttpUrl(BuildConfig.GITHUB_CLIENT_ID)))
- startActivityForResult(intent, HttpURLConnection.HTTP_OK)
- }
+ startActivity(Intent(this, Main2Activity::class.java))
+ overridePendingTransition(R.anim.fade_in, R.anim.fade_out)
+ finish()
+// init()
+// checkForSignIn()
+// login_img_login.setOnClickListener {
+// val intent = Intent(Intent.ACTION_VIEW, Uri.parse(authToken.buildHttpUrl(BuildConfig.GITHUB_CLIENT_ID)))
+// startActivityForResult(intent, HttpURLConnection.HTTP_OK)
+// }
}
private fun init() {
@@ -80,7 +83,7 @@ class LoginActivity : AppCompatActivity() {
}
private fun goToMainActivity() {
- startActivity(Intent(this, MainActivity::class.java))
+ startActivity(Intent(this, Main2Activity::class.java))
overridePendingTransition(R.anim.fade_in, R.anim.fade_out)
finish()
}
diff --git a/app/src/main/java/com/seok/gitfordeveloper/views/Main2Activity.kt b/app/src/main/java/com/seok/gitfordeveloper/views/Main2Activity.kt
new file mode 100644
index 0000000..14bce3e
--- /dev/null
+++ b/app/src/main/java/com/seok/gitfordeveloper/views/Main2Activity.kt
@@ -0,0 +1,13 @@
+package com.seok.gitfordeveloper.views
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import com.seok.gitfordeveloper.R
+
+class Main2Activity : AppCompatActivity() {
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ setContentView(R.layout.fragment_main)
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/seok/gitfordeveloper/views/MainActivity.kt b/app/src/main/java/com/seok/gitfordeveloper/views/MainActivity.kt
index 68f13bb..62edc74 100644
--- a/app/src/main/java/com/seok/gitfordeveloper/views/MainActivity.kt
+++ b/app/src/main/java/com/seok/gitfordeveloper/views/MainActivity.kt
@@ -4,6 +4,7 @@ import android.graphics.Color
import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import android.view.Gravity
+import android.view.MenuItem
import android.widget.LinearLayout
import android.widget.TextView
import androidx.lifecycle.Observer
@@ -11,12 +12,14 @@ import androidx.lifecycle.ViewModelProviders
import com.bumptech.glide.Glide
import com.google.android.gms.ads.AdRequest
import com.google.android.gms.ads.MobileAds
+import com.google.android.material.bottomnavigation.BottomNavigationView
import com.seok.gitfordeveloper.BuildConfig
import com.seok.gitfordeveloper.R
import com.seok.gitfordeveloper.database.Commits
import com.seok.gitfordeveloper.utils.*
import com.seok.gitfordeveloper.viewmodel.MainViewModel
import kotlinx.android.synthetic.main.activity_main.*
+import kotlinx.android.synthetic.main.activity_main2.*
import org.jetbrains.anko.*
class MainActivity : AppCompatActivity() {
@@ -30,10 +33,18 @@ class MainActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
- setContentView(R.layout.activity_main)
- init()
- checkForUserInfo()
- initViewModelFun()
+ setContentView(R.layout.activity_main2)
+ bottom_navigation.setOnNavigationItemSelectedListener {
+ when(it.itemId){
+ R.id.nav_menu_f -> longToast("1")
+ R.id.nav_menu_s -> longToast("2")
+ }
+ true
+ }
+
+// init()
+// checkForUserInfo()
+// initViewModelFun()
}
private fun init() {
diff --git a/app/src/main/java/com/seok/gitfordeveloper/views/MainFragment.kt b/app/src/main/java/com/seok/gitfordeveloper/views/MainFragment.kt
new file mode 100644
index 0000000..969848b
--- /dev/null
+++ b/app/src/main/java/com/seok/gitfordeveloper/views/MainFragment.kt
@@ -0,0 +1,23 @@
+package com.seok.gitfordeveloper.views
+
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+
+import com.seok.gitfordeveloper.R
+
+/**
+ * A simple [Fragment] subclass.
+ */
+class MainFragment : Fragment() {
+ override fun onCreateView(
+ inflater: LayoutInflater, container: ViewGroup?,
+ savedInstanceState: Bundle?
+ ): View? {
+ // Inflate the layout for this fragment
+ return inflater.inflate(R.layout.fragment_main, container, false)
+ }
+}
diff --git a/app/src/main/res/layout/activity_main2.xml b/app/src/main/res/layout/activity_main2.xml
new file mode 100644
index 0000000..599a1b9
--- /dev/null
+++ b/app/src/main/res/layout/activity_main2.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
new file mode 100644
index 0000000..fff873b
--- /dev/null
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/menu/bottom_navigation_menu.xml b/app/src/main/res/menu/bottom_navigation_menu.xml
new file mode 100644
index 0000000..47254b8
--- /dev/null
+++ b/app/src/main/res/menu/bottom_navigation_menu.xml
@@ -0,0 +1,12 @@
+
+
\ No newline at end of file
diff --git a/app/src/main/res/navigation/bottom_navigation.xml b/app/src/main/res/navigation/bottom_navigation.xml
new file mode 100644
index 0000000..e1e8046
--- /dev/null
+++ b/app/src/main/res/navigation/bottom_navigation.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 3632c39..7b64d22 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -13,5 +13,5 @@
#444444
-
+ #e4f9f5
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9f7e8df..e24d5b7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -7,6 +7,7 @@
로그인 토큰 발급을 실패하였습니다\n다시 시도 해주세요
Today contribution :
Max contribution :
+ Main
Empty token
@@ -26,4 +27,7 @@
ca-app-pub-2766237193476584~8461542866
ca-app-pub-2766237193476584/5575239666
ca-app-pub-3940256099942544/6300978111
+
+
+ Hello blank fragment