feat: Change order of calendar and history"

References: #474
pull/475/head
Christoph Hennemann 7 years ago
parent 178061475e
commit eefadb2f06

@ -108,7 +108,7 @@ dependencies {
implementation "org.apmem.tools:layouts:1.10" implementation "org.apmem.tools:layouts:1.10"
implementation "com.google.code.gson:gson:2.7" implementation "com.google.code.gson:gson:2.7"
implementation "com.google.code.findbugs:jsr305:3.0.2" implementation "com.google.code.findbugs:jsr305:3.0.2"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$KOTLIN_VERSION" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$KOTLIN_VERSION"
compileOnly "javax.annotation:jsr250-api:1.0" compileOnly "javax.annotation:jsr250-api:1.0"
compileOnly "com.google.auto.factory:auto-factory:1.0-beta3" compileOnly "com.google.auto.factory:auto-factory:1.0-beta3"

@ -52,17 +52,17 @@
style="@style/Card" style="@style/Card"
android:gravity="center"/> android:gravity="center"/>
<org.isoron.uhabits.activities.habits.show.views.BarCard
android:id="@+id/barCard"
style="@style/Card"
android:gravity="center"/>
<org.isoron.uhabits.activities.habits.show.views.HistoryCard <org.isoron.uhabits.activities.habits.show.views.HistoryCard
android:id="@+id/historyCard" android:id="@+id/historyCard"
style="@style/Card" style="@style/Card"
android:gravity="center" android:gravity="center"
android:paddingBottom="0dp"/> android:paddingBottom="0dp"/>
<org.isoron.uhabits.activities.habits.show.views.BarCard
android:id="@+id/barCard"
style="@style/Card"
android:gravity="center"/>
<org.isoron.uhabits.activities.habits.show.views.StreakCard <org.isoron.uhabits.activities.habits.show.views.StreakCard
android:id="@+id/streakCard" android:id="@+id/streakCard"
style="@style/Card"/> style="@style/Card"/>

Loading…
Cancel
Save