s416084/find-my-tutor-android
1
0
Fork 0
Code Issues Pull Requests Releases 9 Wiki Activity

Add prompt with battery exclusion #157

Merged
s416204 merged 6 commits from batteryExclusion into develop 2019-01-12 19:27:16 +01:00
Conversation 0 Commits 6 Files Changed 14 +8 -1
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 282f74f5e0 - Show all commits

7
app/src/main/res/layout/content_tutor_tab_layout.xml
View File

@ -154,6 +154,8 @@
app:backgroundTint="@color/colorPrimary" app:backgroundTint="@color/colorPrimary"
android:layout_alignBaseline="@+id/dutyTitle" android:layout_alignBaseline="@+id/dutyTitle"
android:layout_toEndOf="@+id/dutyTitle" android:layout_toEndOf="@+id/dutyTitle"
android:stateListAnimator="@null"
android:text="@string/addDuty" /> android:text="@string/addDuty" />
<android.support.design.widget.TextInputLayout <android.support.design.widget.TextInputLayout
@ -192,6 +194,7 @@
android:layout_alignEnd="@+id/userEmailLayout" android:layout_alignEnd="@+id/userEmailLayout"
android:textColor="@color/white" android:textColor="@color/white"
app:backgroundTint="@color/colorPrimary" app:backgroundTint="@color/colorPrimary"
android:stateListAnimator="@null"
android:text="@string/scrap_tutor_tab" /> android:text="@string/scrap_tutor_tab" />
<android.support.v7.widget.AppCompatButton <android.support.v7.widget.AppCompatButton
@ -199,11 +202,13 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="30dp" android:layout_marginStart="30dp"
android:layout_marginEnd="-25dp" android:layout_marginEnd="-20dp"
android:layout_below="@+id/userNoteLayout" android:layout_below="@+id/userNoteLayout"
android:layout_alignEnd="@+id/dutyHourView" android:layout_alignEnd="@+id/dutyHourView"
android:textColor="@color/white" android:textColor="@color/white"
app:backgroundTint="@color/colorPrimary" app:backgroundTint="@color/colorPrimary"
android:stateListAnimator="@null"
android:text="@string/saveButton" /> android:text="@string/saveButton" />
</RelativeLayout> </RelativeLayout>

2
app/src/main/res/layout/preference_button_widget.xml
View File

@ -16,6 +16,8 @@
android:textColor="@color/white" android:textColor="@color/white"
app:backgroundTint="@color/top_user_modal" app:backgroundTint="@color/top_user_modal"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:stateListAnimator="@null"
/> />