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

Edited greetings and course card layout in preparation for release 2.1.0

Browse Source
This commit is contained in:
Deniz Düzgören
2019-08-02 13:35:54 +02:00
parent a2721aabcd
commit 6ed3257ca1
5 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/denizd/substitutionplan/Main.kt
+5 -6
View File
@@ -215,12 +215,11 @@ class Main : AppCompatActivity(R.layout.app_bar_main) {
private fun getGreetingString(): String {
val gen = Random()
val greetingArray = when (Calendar.getInstance().get(Calendar.HOUR_OF_DAY)) {
in 5..10 -> resources.getStringArray(R.array.greetingsMorning)
in 11..17 -> resources.getStringArray(R.array.greetingsNoon)
else -> resources.getStringArray(R.array.greetingsEvening)
}
return String.format(greetingArray[gen.nextInt(7)], prefs.getString("username", ""))
return String.format(when (Calendar.getInstance().get(Calendar.HOUR_OF_DAY)) {
in 5..10 -> resources.getStringArray(R.array.greetingsMorning)[gen.nextInt(resources.getStringArray(R.array.greetingsMorning).size)]
in 11..17 -> resources.getStringArray(R.array.greetingsNoon)[gen.nextInt(resources.getStringArray(R.array.greetingsNoon).size)]
else -> resources.getStringArray(R.array.greetingsEvening)[gen.nextInt(resources.getStringArray(R.array.greetingsEvening).size)]
}, prefs.getString("username", ""))
}
private fun openInfoDialog() {
app/src/main/java/com/denizd/substitutionplan/SettingsFragment.kt
+1
View File
@@ -25,6 +25,7 @@ import com.google.android.material.bottomnavigation.BottomNavigationView
import com.google.android.material.button.MaterialButton
import com.google.android.material.textfield.TextInputEditText
import com.jaredrummler.android.device.DeviceName
import kotlin.collections.ArrayList
class SettingsFragment : Fragment(R.layout.content_settings), View.OnClickListener, CompoundButton.OnCheckedChangeListener, ColourAdapter.OnClickListener {