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

Version 2.0.2 - card background now customisable, tablet layout changed

Browse Source
This commit is contained in:
Deniz Düzgören
2019-06-02 17:57:57 +02:00
parent abc3309acd
commit d4cef4f25d
23 changed files with 379 additions and 450 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/layout/bg_colour_picker.xml
+125
View File
@@ -0,0 +1,125 @@
<?xml version="1.0" encoding="utf-8"?>
<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:paddingBottom="8dp">
<TableRow
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.google.android.material.button.MaterialButton
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
android:id="@+id/def"
android:layout_margin="8dp"
android:layout_weight="1"
app:strokeColor="@color/bggrey"
app:strokeWidth="2dp"
app:cornerRadius="16dp"/>
<com.google.android.material.button.MaterialButton
style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
android:id="@+id/red"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/bgred"
app:cornerRadius="16dp"/>
<com.google.android.material.button.MaterialButton
style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
android:id="@+id/orange"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/bgorange"
app:cornerRadius="16dp"/>
<com.google.android.material.button.MaterialButton
style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
android:id="@+id/yellow"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/bgyellow"
app:cornerRadius="16dp"/>
</TableRow>
<TableRow
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.google.android.material.button.MaterialButton
style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
android:id="@+id/green"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/bggreen"
app:cornerRadius="16dp"/>
<com.google.android.material.button.MaterialButton
style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
android:id="@+id/teal"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/bgteal"
app:cornerRadius="16dp"/>
<com.google.android.material.button.MaterialButton
style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
android:id="@+id/cyan"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/bgcyan"
app:cornerRadius="16dp"/>
<com.google.android.material.button.MaterialButton
style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
android:id="@+id/blue"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/bgblue"
app:cornerRadius="16dp"/>
</TableRow>
<TableRow
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.google.android.material.button.MaterialButton
style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
android:id="@+id/purple"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/bgpurple"
app:cornerRadius="16dp"/>
<com.google.android.material.button.MaterialButton
style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
android:id="@+id/pink"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/bgpink"
app:cornerRadius="16dp"/>
<com.google.android.material.button.MaterialButton
style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
android:id="@+id/brown"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/bgbrown"
app:cornerRadius="16dp"/>
<com.google.android.material.button.MaterialButton
style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
android:id="@+id/grey"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/bggrey"
app:cornerRadius="16dp"/>
</TableRow>
</TableLayout>
app/src/main/res/layout/colour_picker.xml
-196
View File
@@ -1,196 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:paddingBottom="8dp">
<TableRow
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.google.android.material.button.MaterialButton
android:id="@+id/colourRed"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/red"
app:cornerRadius="16dp"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/colourPink"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/pink"
app:cornerRadius="16dp"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/colourPurple"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/purple"
app:cornerRadius="16dp"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/colourDeepPurple"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/deeppurple"
app:cornerRadius="16dp"/>
</TableRow>
<TableRow
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.google.android.material.button.MaterialButton
android:id="@+id/colourLavender"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/lavender"
app:cornerRadius="16dp"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/colourIndigo"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/indigo"
app:cornerRadius="16dp"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/colourBlue"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/blue"
app:cornerRadius="16dp"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/colourLightBlue"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/lightblue"
app:cornerRadius="16dp"/>
</TableRow>
<TableRow
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.google.android.material.button.MaterialButton
android:id="@+id/colourTeal"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/teal"
app:cornerRadius="16dp"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/colourGreen"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/green"
app:cornerRadius="16dp"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/colourYellow"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/yellow"
app:cornerRadius="16dp"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/colourOrange"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/orange"
app:cornerRadius="16dp"/>
</TableRow>
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/neoncolours"
android:textColor="@color/textcolor"
android:layout_marginStart="8dp"/>
<TableRow
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.google.android.material.button.MaterialButton
android:id="@+id/colourNeonRed"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/neonred"
app:cornerRadius="16dp"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/colourNeonPink"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/neonpink"
app:cornerRadius="16dp"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/colourNeonPurple"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/neonpurple"
app:cornerRadius="16dp"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/colourNeonDeepPurple"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/neondeeppurple"
app:cornerRadius="16dp"/>
</TableRow>
<TableRow
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.google.android.material.button.MaterialButton
android:id="@+id/colourNeonBlue"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/neonblue"
app:cornerRadius="16dp"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/colourNeonGreen"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/neongreen"
app:cornerRadius="16dp"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/colourNeonYellow"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/neonyellow"
app:cornerRadius="16dp"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/colourNeonOrange"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/neonorange"
app:cornerRadius="16dp"/>
</TableRow>
<com.google.android.material.button.MaterialButton
android:id="@+id/colourNone"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
android:layout_margin="8dp"
android:text="@string/clearcolour"
android:textColor="@color/textcolor"
app:strokeColor="@color/textcolor"
app:strokeWidth="2dp"/>
</TableLayout>
app/src/main/res/layout/content_settings.xml
+1 -1
View File
@@ -655,9 +655,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:text=""
android:textColor="@color/hintcolor"
android:textSize="12sp"
android:fontFeatureSettings="tnum"
app:layout_constraintStart_toStartOf="@+id/txtVersion"
app:layout_constraintTop_toBottomOf="@+id/txtVersion"
app:layout_constraintBottom_toBottomOf="parent"/>
app/src/main/res/layout/course_card.xml
+6 -3
View File
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<com.google.android.material.card.MaterialCardView
android:id="@+id/planCard"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:backgroundTint="@color/lightbackground"
app:cardBackgroundColor="@color/lightbackground"
app:cardCornerRadius="8dp"
android:clickable="true"
android:focusable="true"
@@ -69,11 +70,13 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginBottom="16dp"
android:textAlignment="textEnd"
android:textColor="@color/textcolor"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/time"
app:layout_constraintStart_toStartOf="@+id/time"
app:layout_constraintTop_toBottomOf="@+id/time"
android:textColor="@color/textcolor" />
app:layout_constraintTop_toBottomOf="@+id/time" />
<TextView
android:id="@+id/additional"
app/src/main/res/values-night/colors.xml
+12 -1
View File
@@ -1,10 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="background">#121212</color>
<!-- <color name="lightbackground">#1E1E1E</color>-->
<color name="lightbackground">#222222</color>
<color name="accent">#64b5f6</color>
<color name="textcolor">#e0e0e0</color>
<color name="hintcolor">#9e9e9e</color>
<color name="lighthintcolor">#313131</color>
<color name="bgred">#5B2B2A</color>
<color name="bgorange">#604A1D</color>
<color name="bgyellow">#635C1F</color>
<color name="bggreen">#355823</color>
<color name="bgteal">#19504B</color>
<color name="bgcyan">#2F555D</color>
<color name="bgblue">#1F3B5E</color>
<color name="bgpurple">#42295D</color>
<color name="bgpink">#5A2345</color>
<color name="bgbrown">#442F1B</color>
<color name="bggrey">#3C3F43</color>
</resources>
app/src/main/res/values-sw600dp/attr.xml
+4
View File
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<bool name="isTablet">true</bool>
</resources>
app/src/main/res/values/attr.xml
+4
View File
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<bool name="isTablet">false</bool>
</resources>
app/src/main/res/values/attrs.xml
-18
View File
@@ -1,18 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<declare-styleable name="ds">
<attr name="colorPrimary" format="color"/>
<attr name="colorPrimaryDark" format="color"/>
<attr name="colorAccent" format="color"/>
<attr name="colorBackground" format="color"/>
<attr name="colorBackgroundCard" format="color"/>
<attr name="colorText" format="color"/>
<attr name="colorHint" format="color"/>
<attr name="colorHintDark" format="color"/>
<attr name="colorHintLight" format="color"/>
<attr name="referenceTextColor" format="reference"/>
<attr name="colorChip" format="color"/>
</declare-styleable>
</resources>
app/src/main/res/values/colors.xml
+11 -22
View File
@@ -10,29 +10,18 @@
<color name="datingPink">#d81b60</color>
<color name="red">#e53935</color>
<color name="pink">#E91E63</color>
<color name="purple">#9C27B0</color>
<color name="deeppurple">#673AB7</color>
<color name="lavender">#AB47BC</color>
<color name="indigo">#3F51B5</color>
<color name="blue">#1976D2</color>
<color name="lightblue">#2196F3</color>
<color name="teal">#009688</color>
<color name="green">#43A047</color>
<color name="yellow">#FDD835</color>
<color name="orange">#F4511E</color>
<color name="neonred">#ff1744</color>
<color name="neonpink">#F50057</color>
<color name="neonpurple">#D500F9</color>
<color name="neondeeppurple">#651FFF</color>
<color name="neonblue">#2979FF</color>
<color name="neongreen">#00E676</color>
<color name="neonyellow">#FFEA00</color>
<color name="neonorange">#FF3D00</color>
<color name="bgred">#F28B82</color>
<color name="bgorange">#FBBC04</color>
<color name="bgyellow">#FFF475</color>
<color name="bggreen">#CCFF90</color>
<color name="bgteal">#A7FFEB</color>
<color name="bgcyan">#CBF0F8</color>
<color name="bgblue">#AECBFA</color>
<color name="bgpurple">#D7AEFB</color>
<color name="bgpink">#FDCFE8</color>
<color name="bgbrown">#E6C9A8</color>
<color name="bggrey">#BDBDBD</color>
<color name="mtrl_textinput_default_box_stroke_color" tools:override="true">#757575</color>
</resources>
app/src/main/res/values/styles.xml
+4 -4
View File
@@ -25,14 +25,14 @@
<item name="android:colorEdgeEffect">@color/accent</item>
</style>
<style name="AlertDialogCustomLight" parent="Theme.AppCompat.Light.Dialog.Alert">
<style name="AlertDialogCustomLight" parent="Theme.MaterialComponents.Light.Dialog.Alert">
<item name="android:background">#eeeeee</item>
<item name="android:textColorPrimary">#212121</item>
</style>
<style name="AlertDialogCustomDark" parent="Theme.AppCompat.Light.Dialog.Alert">
<item name="android:background">#121212</item>
<item name="android:textColorPrimary">#e0e0e0</item>
<style name="AlertDialog" parent="Theme.MaterialComponents.Light.Dialog.Alert">
<item name="android:background">@color/lightbackground</item>
<item name="android:textColorPrimary">@color/textcolor</item>
</style>
<style name="AppThemeLight.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar">