chore: 개발 환경 세팅 준비

msnodeve · msnodeve · commit d927f9650732 · 2020-12-22T21:17:11.000+09:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -45,6 +45,7 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
+    //noinspection GradleDependency
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,27 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
         package="com.seok.gfd">
 
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
             android:allowBackup="true"
-            android:fullBackupContent="@xml/backup_descriptor"
             android:icon="@drawable/gfd_app_logo"
             android:label="@string/app_name"
-            android:networkSecurityConfig="@xml/network_security_config"
-            android:supportsRtl="true"
-            android:theme="@style/AppTheme"
-            tools:ignore="GoogleAppIndexingWarning">
-        <activity android:name=".views.GuestMain"></activity>
+            android:theme="@style/AppLightTheme">
+        <activity android:name=".views.SearchActivity"></activity>
+        <activity android:name=".views.LauncherActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity android:name=".views.MainActivity" />
+        <activity android:name=".v1.views.GuestMain" />
 
         <meta-data
                 android:name="com.google.android.gms.ads.APPLICATION_ID"
                 android:value="@string/admob_app_id" />
 
         <activity
-                android:name=".views.LoginActivity"
+                android:name=".v1.views.LoginActivity"
                 android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -32,14 +36,7 @@
                 <data android:scheme="gfd" />
             </intent-filter>
         </activity>
-        <activity android:name=".views.LauncherActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity android:name=".views.MainActivity" />
+        <activity android:name=".v1.views.Main2Activity" />
     </application>
 
 </manifest>
diff --git a/app/src/main/java/com/seok/gfd/v1/views/GuestMain.kt b/app/src/main/java/com/seok/gfd/v1/views/GuestMain.kt
@@ -1,4 +1,4 @@
-package com.seok.gfd.views
+package com.seok.gfd.v1.views
 
 import android.os.Bundle
 import android.view.View
diff --git a/app/src/main/java/com/seok/gfd/v1/views/LoginActivity.kt b/app/src/main/java/com/seok/gfd/v1/views/LoginActivity.kt
@@ -1,4 +1,4 @@
-package com.seok.gfd.views
+package com.seok.gfd.v1.views
 
 
 import android.content.Intent
@@ -9,7 +9,6 @@ import android.view.View
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProviders
-import com.seok.gfd.BuildConfig
 import com.seok.gfd.R
 import com.seok.gfd.utils.SharedPreference
 import com.seok.gfd.viewmodel.UserViewModel
@@ -73,7 +72,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)
     }
 
diff --git a/app/src/main/java/com/seok/gfd/v1/views/Main3Fragment.kt b/app/src/main/java/com/seok/gfd/v1/views/Main3Fragment.kt
@@ -1,4 +1,4 @@
-package com.seok.gfd.views
+package com.seok.gfd.v1.views
 
 
 import android.annotation.SuppressLint
diff --git a/app/src/main/java/com/seok/gfd/v1/views/MainFragment.kt b/app/src/main/java/com/seok/gfd/v1/views/MainFragment.kt
@@ -1,4 +1,4 @@
-package com.seok.gfd.views
+package com.seok.gfd.v1.views
 
 
 import android.os.Bundle
@@ -63,7 +63,9 @@ class MainFragment : Fragment() {
             val fragmentPagerItems = FragmentPagerItems.with(activity)
             for (element in it.years!!) {
                 val commitResponseDto = getYearContributionData(element.year, it)
-                fragmentPagerItems.add(element.year + "(" + element.total + ")", MainSub::class.java, MainSub.arguments(commitResponseDto))
+                fragmentPagerItems.add(element.year + "(" + element.total + ")", MainSub::class.java,
+                    MainSub.arguments(commitResponseDto)
+                )
             }
             val adapter = FragmentPagerItemAdapter(
                 activity?.supportFragmentManager,
diff --git a/app/src/main/java/com/seok/gfd/v1/views/MainSub.kt b/app/src/main/java/com/seok/gfd/v1/views/MainSub.kt
@@ -1,4 +1,4 @@
-package com.seok.gfd.views
+package com.seok.gfd.v1.views
 
 import android.graphics.Color
 import android.os.Bundle
@@ -8,7 +8,6 @@ import android.view.ViewGroup
 import android.widget.LinearLayout
 import android.widget.TextView
 import android.widget.Toast
-import androidx.core.content.res.ResourcesCompat
 import androidx.fragment.app.Fragment
 import com.ogaclejapan.smarttablayout.utils.v4.Bundler
 import com.seok.gfd.R
diff --git a/app/src/main/java/com/seok/gfd/v1/views/OptionFragment.kt b/app/src/main/java/com/seok/gfd/v1/views/OptionFragment.kt
@@ -1,4 +1,4 @@
-package com.seok.gfd.views
+package com.seok.gfd.v1.views
 
 import android.os.Bundle
 import android.view.LayoutInflater
diff --git a/app/src/main/java/com/seok/gfd/v1/views/RankFragment.kt b/app/src/main/java/com/seok/gfd/v1/views/RankFragment.kt
@@ -1,4 +1,4 @@
-package com.seok.gfd.views
+package com.seok.gfd.v1.views
 
 
 import android.annotation.SuppressLint
diff --git a/app/src/main/java/com/seok/gfd/views/LauncherActivity.kt b/app/src/main/java/com/seok/gfd/views/LauncherActivity.kt
@@ -12,14 +12,14 @@ class LauncherActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_launcher)
 
-//        startLoading()
+        startLoading()
     }
 
     private fun startLoading(){
         Handler().postDelayed({
-            val intent = Intent(this, LoginActivity::class.java)
+            val intent = Intent(this, MainActivity::class.java)
             startActivity(intent)
             finish()
-        }, 5500)
+        }, 1000)
     }
 }
diff --git a/app/src/main/java/com/seok/gfd/views/MainActivity.kt b/app/src/main/java/com/seok/gfd/views/MainActivity.kt
@@ -1,52 +1,12 @@
 package com.seok.gfd.views
 
-import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import androidx.fragment.app.Fragment
-import com.google.android.gms.ads.AdRequest
-import com.google.android.gms.ads.MobileAds
+import android.os.Bundle
 import com.seok.gfd.R
-import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : AppCompatActivity() {
-    private val fragmentManager = supportFragmentManager
-
-    private val mainFragment = MainFragment()
-//    private val rankFragment = RankFragment()
-    private val optionFragment = OptionFragment()
-
-    private var activeFragment : Fragment = mainFragment
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
-
-        fragmentManager.beginTransaction().add(R.id.host_fragment, mainFragment, "1").commit()
-//        fragmentManager.beginTransaction().add(R.id.host_fragment, rankFragment, "2").hide(rankFragment).commit()
-        fragmentManager.beginTransaction().add(R.id.host_fragment, optionFragment, "3").hide(optionFragment).commit()
-        bottom_navigation.setOnNavigationItemSelectedListener {
-            when(it.itemId){
-                R.id.nav_menu_m -> {
-                    fragmentManager.beginTransaction().hide(activeFragment).show(mainFragment).commit()
-                    activeFragment = mainFragment
-                }
-//                R.id.nav_menu_r -> {
-//                    fragmentManager.beginTransaction().hide(activeFragment).show(rankFragment).commit()
-//                    activeFragment = rankFragment
-//                }
-                R.id.nav_menu_o -> {
-                    fragmentManager.beginTransaction().hide(activeFragment).show(optionFragment).commit()
-                    activeFragment = optionFragment
-                }
-            }
-            true
-        }
-
-        MobileAds.initialize(
-            this.application,
-            getString(R.string.admob_app_id)
-        )
-        val adRequest = AdRequest.Builder().build()
-        github_login_ads_view.loadAd(adRequest)
     }
 }
diff --git a/app/src/main/res/layout/activity_guest_main.xml b/app/src/main/res/layout/activity_guest_main.xml
@@ -5,7 +5,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="#FFFFFF"
-        tools:context=".views.GuestMain"
+        tools:context=".v1.views.GuestMain"
         tools:ignore="MissingConstraints">
 
     <com.ssomai.android.scalablelayout.ScalableLayout
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
@@ -4,7 +4,7 @@
         xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        tools:context=".views.LoginActivity" android:orientation="vertical">
+        tools:context=".v1.views.LoginActivity" android:orientation="vertical">
 
     <com.wang.avi.AVLoadingIndicatorView
             android:id="@+id/login_progress_bar"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -1,44 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        tools:context=".views.MainActivity">
 
-    <fragment
-            android:id="@+id/host_fragment"
-            android:name="androidx.navigation.fragment.NavHostFragment"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            app:layout_constraintBottom_toTopOf="@+id/bottom_navigation"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
 
     <com.google.android.material.bottomnavigation.BottomNavigationView
             android:id="@+id/bottom_navigation"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            android:background="@color/thCommit"
-            app:itemIconTint="@color/userRankPos"
-            app:itemTextColor="@color/userRankPos"
-            app:labelVisibilityMode="selected"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:menu="@menu/bottom_navigation_menu">
-
-    </com.google.android.material.bottomnavigation.BottomNavigationView>
-
-    <com.google.android.gms.ads.AdView
-            android:id="@+id/github_login_ads_view"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:adSize="BANNER"
-            app:adUnitId="@string/banner_ad_unit_id"
-            app:layout_constraintBottom_toTopOf="@+id/bottom_navigation"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
-
+            app:menu="@menu/bottom_navigation_menu"
+            tools:visibility="gone" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
@@ -4,7 +4,7 @@
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        tools:context=".views.Main3Fragment">
+        tools:context=".v1.views.Main3Fragment">
 
 
     <com.ssomai.android.scalablelayout.ScalableLayout
diff --git a/app/src/main/res/layout/fragment_main3.xml b/app/src/main/res/layout/fragment_main3.xml
@@ -4,7 +4,7 @@
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        tools:context=".views.Main3Fragment">
+        tools:context=".v1.views.Main3Fragment">
 
     <!-- TODO: Update blank fragment layout -->
     <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/layout/fragment_main_sub.xml b/app/src/main/res/layout/fragment_main_sub.xml
@@ -4,7 +4,7 @@
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        tools:context=".views.MainSub">
+        tools:context=".v1.views.MainSub">
 
 
     <ScrollView
diff --git a/app/src/main/res/layout/fragment_option.xml b/app/src/main/res/layout/fragment_option.xml
@@ -4,7 +4,7 @@
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        tools:context=".views.OptionFragment">
+        tools:context=".v1.views.OptionFragment">
 
     <!-- TODO: Update blank fragment layout -->
 
diff --git a/app/src/main/res/layout/fragment_rank.xml b/app/src/main/res/layout/fragment_rank.xml
@@ -4,7 +4,7 @@
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        tools:context=".views.RankFragment">
+        tools:context=".v1.views.RankFragment">
 
     <LinearLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -1,11 +1,15 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <!-- Customize your theme here. -->
+    <style name="AppLightTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
     </style>
 
+    <style name="AppDarkTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
 </resources>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.seok.gfd.views`
	`1`	`+package com.seok.gfd.v1.views`
`2`	`2`
`3`	`3`	`import android.os.Bundle`
`4`	`4`	`import android.view.View`
Original file line number	Diff line number	Diff line change
`@@ -12,14 +12,14 @@ class LauncherActivity : AppCompatActivity() {`
`12`	`12`	`super.onCreate(savedInstanceState)`
`13`	`13`	`setContentView(R.layout.activity_launcher)`
`14`	`14`
`15`		`-// startLoading()`
	`15`	`+ startLoading()`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`private fun startLoading(){`
`19`	`19`	`Handler().postDelayed({`
`20`		`- val intent = Intent(this, LoginActivity::class.java)`
	`20`	`+ val intent = Intent(this, MainActivity::class.java)`
`21`	`21`	`startActivity(intent)`
`22`	`22`	`finish()`
`23`		`- }, 5500)`
	`23`	`+ }, 1000)`
`24`	`24`	`}`
`25`	`25`	`}`