Skip to content

Commit e16cf30

Browse files
msnodevemsnodeve
committed
feature: Main UI 최적화 진행 중
1 parent 538f1b6 commit e16cf30

7 files changed

Lines changed: 291 additions & 42 deletions

File tree

‎app/release/output.json‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎app/src/main/java/com/seok/gfd/views/LauncherActivity.kt‎

Lines changed: 11 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,12 @@ package com.seok.gfd.views
22

33
import android.annotation.SuppressLint
44
import android.content.Intent
5-
import android.graphics.Color
65
import android.os.Bundle
76
import android.os.Handler
87
import android.view.WindowManager
9-
import android.widget.TextView
10-
import androidx.annotation.DimenRes
11-
import androidx.annotation.Dimension
128
import androidx.appcompat.app.AppCompatActivity
139
import com.seok.gfd.R
1410
import com.seok.gfd.utils.CommonUtils
15-
import com.ssomai.android.scalablelayout.ScalableLayout
16-
import kotlinx.android.synthetic.main.activity_launcher.*
17-
import org.jetbrains.anko.backgroundColor
1811

1912
class LauncherActivity : AppCompatActivity() {
2013

@@ -29,28 +22,23 @@ class LauncherActivity : AppCompatActivity() {
2922

3023
initSetUI()
3124

32-
val scalablelayout = ScalableLayout(this,commonUtils.getScreenWidth(), commonUtils.getScreenHeight())
33-
scalablelayout.backgroundColor = Color.LTGRAY
34-
val tv = TextView(this)
35-
tv.text = "testjfalskdflasjdlkfjaskldfjlksadjfklsajdflksjdlkfjaslkdfjlasdflasdjflkasdf"
36-
tv.backgroundColor = Color.YELLOW
37-
scalablelayout.addView(tv, 10f, 10f, commonUtils.getScreenWidth()/2, commonUtils.getScreenHeight())
38-
scalablelayout.setScale_TextSize(tv, commonUtils.getScreenHeight()/10)
25+
// val scalablelayout = ScalableLayout(this,commonUtils.getScreenWidth(), commonUtils.getScreenHeight())
26+
// scalablelayout.backgroundColor = Color.LTGRAY
27+
// val tv = TextView(this)
28+
// tv.text = "testjfalskdflasjdlkfjaskldfjlksadjfklsajdflksjdlkfjaslkdfjlasdflasdjflkasdf"
29+
// tv.backgroundColor = Color.YELLOW
30+
// scalablelayout.addView(tv, 10f, 10f, commonUtils.getScreenWidth()/2, commonUtils.getScreenHeight())
31+
// scalablelayout.setScale_TextSize(tv, commonUtils.getScreenHeight()/10)
32+
3933
// scalablelayout.setScale_TextSize(tv, 20f)
4034
// val imageVIew = ImageView(this)
4135
// imageVIew.setImageResource(R.drawable.gfd_logo)
4236
// scalablelayout.addView(imageVIew, 200f, 30f, 50f, 50f)
4337

44-
launcher_const_layout.addView(scalablelayout)
45-
// scale_layout.backgroundColor = Color.LTGRAY
46-
// val tv = TextView(this)
47-
// tv.text = "test"
48-
// tv.textSize = 20f
49-
// tv.backgroundColor = Color.YELLOW
50-
// scale_layout.addView(tv)
38+
// launcher_const_layout.addView(scalablelayout)
5139

5240

53-
// startLoading()
41+
startLoading()
5442
}
5543

5644
private fun startLoading(){
@@ -59,7 +47,7 @@ class LauncherActivity : AppCompatActivity() {
5947
startActivity(intent)
6048
overridePendingTransition(R.anim.fade_in, R.anim.fade_out)
6149
finish()
62-
}, 2000)
50+
}, 100)
6351
}
6452

6553
private fun initSetUI(){

‎app/src/main/java/com/seok/gfd/views/Main2Fragment.kt‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
package com.seok.gfd.views
2+
3+
4+
import android.os.Bundle
5+
import android.view.LayoutInflater
6+
import android.view.View
7+
import android.view.ViewGroup
8+
import androidx.fragment.app.Fragment
9+
import com.seok.gfd.R
10+
import com.seok.gfd.utils.CommonUtils
11+
import kotlinx.android.synthetic.main.fragment_main2.*
12+
13+
class Main2Fragment : Fragment() {
14+
lateinit var commonUtils: CommonUtils
15+
16+
override fun onCreateView(
17+
inflater: LayoutInflater,
18+
container: ViewGroup?,
19+
savedInstanceState: Bundle?
20+
): View? {
21+
return inflater.inflate(R.layout.fragment_main2, container, false)
22+
}
23+
24+
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
25+
super.onViewCreated(view, savedInstanceState)
26+
init()
27+
initSetUI()
28+
}
29+
30+
private fun init() {
31+
commonUtils = CommonUtils.instance
32+
}
33+
34+
private fun initSetUI(){
35+
main_top_scalable_layout.scaleWidth = commonUtils.getScreenWidth()
36+
main_top_scalable_layout.scaleHeight = commonUtils.getScreenHeight()
37+
}
38+
}

‎app/src/main/java/com/seok/gfd/views/MainActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import kotlinx.android.synthetic.main.activity_main.*
1111
class MainActivity : AppCompatActivity() {
1212
private val fragmentManager = supportFragmentManager
1313

14-
private val mainFragment = MainFragment()
14+
private val mainFragment = Main2Fragment()
1515
private val rankFragment = RankFragment()
1616
private val optionFragment = OptionFragment()
1717

‎app/src/main/res/layout/activity_main.xml‎

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<LinearLayout
3-
xmlns:android="http://schemas.android.com/apk/res/android"
2+
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
43
xmlns:app="http://schemas.android.com/apk/res-auto"
5-
android:orientation="vertical"
64
android:layout_width="match_parent"
75
android:layout_height="match_parent">
86

@@ -11,18 +9,10 @@
119
android:name="androidx.navigation.fragment.NavHostFragment"
1210
android:layout_width="match_parent"
1311
android:layout_height="0dp"
14-
android:layout_weight="1"/>
15-
<!-- Main content -->
16-
17-
<com.google.android.gms.ads.AdView
18-
android:id="@+id/adView"
19-
android:layout_width="match_parent"
20-
android:layout_height="wrap_content"
21-
app:adSize="BANNER"
22-
app:adUnitId="@string/banner_ad_unit_id"
23-
app:layout_constraintBottom_toBottomOf="parent"
12+
app:layout_constraintBottom_toTopOf="@+id/bottom_navigation"
2413
app:layout_constraintEnd_toEndOf="parent"
25-
app:layout_constraintStart_toStartOf="parent" />
14+
app:layout_constraintStart_toStartOf="parent"
15+
app:layout_constraintTop_toTopOf="parent" />
2616

2717
<com.google.android.material.bottomnavigation.BottomNavigationView
2818
android:id="@+id/bottom_navigation"
@@ -33,8 +23,22 @@
3323
app:itemIconTint="@color/userRankPos"
3424
app:itemTextColor="@color/userRankPos"
3525
app:labelVisibilityMode="selected"
36-
app:menu="@menu/bottom_navigation_menu" >
26+
app:layout_constraintBottom_toBottomOf="parent"
27+
app:layout_constraintEnd_toEndOf="parent"
28+
app:layout_constraintStart_toStartOf="parent"
29+
app:menu="@menu/bottom_navigation_menu">
3730

3831
</com.google.android.material.bottomnavigation.BottomNavigationView>
3932

40-
</LinearLayout>
33+
<com.google.android.gms.ads.AdView
34+
android:id="@+id/adView"
35+
android:layout_width="match_parent"
36+
android:layout_height="wrap_content"
37+
app:adSize="BANNER"
38+
app:adUnitId="@string/banner_ad_unit_id"
39+
app:layout_constraintBottom_toTopOf="@+id/bottom_navigation"
40+
app:layout_constraintEnd_toEndOf="parent"
41+
app:layout_constraintStart_toStartOf="parent" />
42+
43+
44+
</androidx.constraintlayout.widget.ConstraintLayout>

‎app/src/main/res/layout/fragment_main.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@
2727
android:id="@+id/img_mv_user_profile"
2828
android:layout_width="160dp"
2929
android:layout_height="160dp"
30-
app:srcCompat="@drawable/gfd_launcher" />
30+
app:srcCompat="@drawable/gfd_launcher"
31+
tools:visibility="visible" />
3132
</LinearLayout>
3233

3334
<TextView

0 commit comments

Comments
 (0)