fix #128
This commit is contained in:
parent
5792a47133
commit
2b27456498
|
@ -261,7 +261,7 @@ class ActAccountSetting
|
||||||
|
|
||||||
Styler.fixHorizontalPadding(root)
|
Styler.fixHorizontalPadding(root)
|
||||||
|
|
||||||
ActAppSetting.setSwitchColor(this, pref, root)
|
App1.setSwitchColor(this, pref, root)
|
||||||
|
|
||||||
tvInstance = findViewById(R.id.tvInstance)
|
tvInstance = findViewById(R.id.tvInstance)
|
||||||
tvUser = findViewById(R.id.tvUser)
|
tvUser = findViewById(R.id.tvUser)
|
||||||
|
|
|
@ -1071,7 +1071,7 @@ class TootStatus(parser : TootParser, src : JsonObject) : TimelineItem() {
|
||||||
}
|
}
|
||||||
|
|
||||||
// 年の部分が現在と同じなら省略する
|
// 年の部分が現在と同じなら省略する
|
||||||
val dateNow = format.format(Date(t))
|
val dateNow = format.format(Date())
|
||||||
val delm = dateNow.indexOf('-')
|
val delm = dateNow.indexOf('-')
|
||||||
if(delm!=-1 && dateNow.substring(0,delm+1) == dateTarget.substring(0,delm+1)){
|
if(delm!=-1 && dateNow.substring(0,delm+1) == dateTarget.substring(0,delm+1)){
|
||||||
dateTarget = dateTarget.substring(delm+1)
|
dateTarget = dateTarget.substring(delm+1)
|
||||||
|
|
Loading…
Reference in New Issue