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

Adapted PlanFragment into a superclass inherited by GeneralPlanFragment and PersonalPlanFragment, changed text layout attribute for dialogues

Browse Source
This commit is contained in:
Deniz Düzgören
2019-07-22 19:10:25 +02:00
parent d3d727d2ae
commit 0576ca0d1a
14 changed files with 112 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/layout/app_bar_main.xml
+3 -1
View File
@@ -21,7 +21,9 @@
app:popupTheme="@style/AppThemeLight.PopupOverlay"
app:titleTextColor="@color/accent"
app:contentInsetStart="0dp"
app:layout_scrollFlags="scroll|enterAlwaysCollapsed">
app:layout_scrollFlags="scroll|enterAlwaysCollapsed"
app:layout_collapseMode="pin"
android:layout_gravity="bottom">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
app/src/main/res/layout/dating_dialog.xml
+2 -1
View File
@@ -15,7 +15,8 @@
android:textSize="22sp"
android:layout_gravity="center_horizontal"
android:textColor="@color/datingPink"
android:text="@string/dating"/>
android:text="@string/dating"
android:textAlignment="center"/>
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
app/src/main/res/layout/diagnostics_dialog.xml
+2 -1
View File
@@ -14,7 +14,8 @@
android:layout_marginTop="16dp"
android:textSize="22sp"
android:layout_gravity="center_horizontal"
android:textColor="@color/textcolor"/>
android:textColor="@color/textcolor"
android:textAlignment="center"/>
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
app/src/main/res/layout/edittext_dialog.xml
+2 -1
View File
@@ -14,7 +14,8 @@
android:layout_marginTop="16dp"
android:textSize="22sp"
android:layout_gravity="center_horizontal"
android:textColor="@color/textcolor"/>
android:textColor="@color/textcolor"
android:textAlignment="center"/>
<androidx.core.widget.NestedScrollView
android:layout_width="wrap_content"
app/src/main/res/layout/empty_dialog.xml
+2 -1
View File
@@ -12,7 +12,8 @@
android:layout_marginTop="16dp"
android:textSize="22sp"
android:layout_gravity="center_horizontal"
android:textColor="@color/textcolor"/>
android:textColor="@color/textcolor"
android:textAlignment="center"/>
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
app/src/main/res/layout/secret_dialog.xml
+2 -1
View File
@@ -12,7 +12,8 @@
android:layout_marginTop="16dp"
android:textSize="22sp"
android:layout_gravity="center_horizontal"
android:textColor="@color/textcolor"/>
android:textColor="@color/textcolor"
android:textAlignment="center"/>
<androidx.core.widget.NestedScrollView
android:layout_width="wrap_content"
app/src/main/res/layout/simple_dialog.xml
+2 -1
View File
@@ -12,7 +12,8 @@
android:layout_marginTop="16dp"
android:textSize="22sp"
android:layout_gravity="center_horizontal"
android:textColor="@color/textcolor"/>
android:textColor="@color/textcolor"
android:textAlignment="center"/>
<androidx.core.widget.NestedScrollView
android:layout_width="wrap_content"
app/src/main/res/values/strings.xml
-6
View File
@@ -123,18 +123,12 @@
<string name="courseWat">WAT</string>
<string name="courseFor">Special Education</string>
<string name="courseWp">WP &amp; "Methodenstunde"</string>
<string name="clearall">Clear all</string>
<string name="allcolourscleared">Colours for all courses have been cleared</string>
<string name="chromecompatible">No Chrome-compatible browser found</string>
<string name="noyoutube">YouTube app not found</string>
<string name="showinfo">Show info tab in navigation bar</string>
<string name="swipeindependent">Independent of swipe gesture</string>
<string name="lastupdatedK">"Last updated: "</string>
<string name="darkmode2">Enables night mode</string>
</resources>