karolina/avh-plan-android
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

App is now fully converted to Kotlin

Browse Source
This commit is contained in:
Deniz Düzgören
2019-05-26 18:40:02 +02:00
parent 44269a7def
commit abc3309acd
46 changed files with 266 additions and 3170 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/denizd/substitutionplan/Main.kt
+18 -10
View File
@@ -144,11 +144,10 @@ class Main : AppCompatActivity(R.layout.activity_main) {
if (info.manufacturer.contains("Huawei") ||
info.manufacturer.contains("Honor") ||
info.manufacturer.contains("Xiaomi")) {
val alertDialog: AlertDialog.Builder = if (prefs.getInt("themeInt", 0) == 1) {
AlertDialog.Builder(context, R.style.AlertDialogCustomDark)
} else {
AlertDialog.Builder(context, R.style.AlertDialogCustomLight)
} // TODO dialogue theming
val alertDialog = when (prefs.getInt("themeInt", 0)) {
1 -> AlertDialog.Builder(context, R.style.AlertDialogCustomDark)
else -> AlertDialog.Builder(context, R.style.AlertDialogCustomLight)
}
val dialogView = LayoutInflater.from(context).inflate(R.layout.secret_dialog, null)
val title = dialogView.findViewById<TextView>(R.id.textviewtitle)
title.text = getString(R.string.chinaTitle)
@@ -242,27 +241,28 @@ class Main : AppCompatActivity(R.layout.activity_main) {
} else {
getString(R.string.personalplan)
}
lateinit var fragment: Fragment
if (prefs.getBoolean("defaultPersonalised", false)) {
loadFragment(FragmentPersonal())
fragment = mPlanFragment(true)
bottomNav.selectedItemId = R.id.personal
toolbarTxt.text = userPlan
} else {
loadFragment(FragmentPlan())
fragment = mPlanFragment(false)
bottomNav.selectedItemId = R.id.plan
toolbarTxt.text = getString(R.string.app_name)
}
loadFragment(fragment)
bottomNav.setOnNavigationItemSelectedListener { item: MenuItem ->
var fragmentLoading = true
lateinit var fragment: Fragment
when (item.itemId) {
R.id.plan -> {
fragment = PlanFragment(false)
fragment = mPlanFragment(false)
toolbarTxt.text = getString(R.string.app_name)
}
R.id.personal -> {
fragment = PlanFragment(true)
fragment = mPlanFragment(true)
toolbarTxt.text = userPlan
}
R.id.menu -> {
@@ -320,6 +320,14 @@ class Main : AppCompatActivity(R.layout.activity_main) {
}
}
private fun mPlanFragment(ispersonal: Boolean): PlanFragment {
val f = PlanFragment()
val bdl = Bundle(1)
bdl.putBoolean("ispersonal", ispersonal)
f.arguments = bdl
return f
}
private fun loadFragment(fragment: Fragment): Boolean {
supportFragmentManager.beginTransaction().replace(R.id.fragment_container, fragment).commit()
return true