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

Added a colour picker with absolute masses of bad code, version 1.2.6 (unreleased)

Browse Source
This commit is contained in:
Deniz Düzgören
2019-05-04 16:20:14 +02:00
parent d5b5803ba2
commit adc3f8957d
18 changed files with 1071 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/layout/bottom_sheet.xml
+2 -1
View File
@@ -13,7 +13,8 @@
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:scrollbars="vertical">
<LinearLayout
android:id="@+id/bottom_sheet_linear"
app/src/main/res/layout/colour_picker.xml
+173
View File
@@ -0,0 +1,173 @@
<?xml version="1.0" encoding="utf-8"?>
<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
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"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/colourPink"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/pink"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/colourPurple"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/purple"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/colourDeepPurple"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/deeppurple"/>
</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"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/colourIndigo"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/indigo"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/colourBlue"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/blue"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/colourLightBlue"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/lightblue"/>
</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"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/colourGreen"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/green"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/colourYellow"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/yellow"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/colourOrange"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/orange"/>
</TableRow>
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/neoncolours"
android:textColor="?attr/colorText"
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"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/colourNeonPink"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/neonpink"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/colourNeonPurple"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/neonpurple"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/colourNeonDeepPurple"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/neondeeppurple"/>
</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"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/colourNeonGreen"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/neongreen"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/colourNeonYellow"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/neonyellow"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/colourNeonOrange"
android:layout_margin="8dp"
android:layout_weight="1"
android:backgroundTint="@color/neonorange"/>
</TableRow>
<com.google.android.material.button.MaterialButton
android:id="@+id/colourNone"
android:layout_margin="8dp"
android:backgroundTint="?attr/colorText"
android:text="@string/clearcolour"
android:textColor="?attr/colorBackground"/>
</TableLayout>
app/src/main/res/layout/content_settings.xml
+47 -4
View File
@@ -129,6 +129,43 @@
app:layout_constraintStart_toStartOf="@+id/txtDark"
app:layout_constraintTop_toTopOf="@+id/txtDark" />
<TextView
android:id="@+id/txtCustomiseColours1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/customisecolor1"
android:textColor="?attr/colorText"
android:textSize="14sp"
app:layout_constraintStart_toStartOf="@+id/txtRestart"
app:layout_constraintTop_toBottomOf="@+id/txtRestart" />
<TextView
android:id="@+id/txtCustomiseColours2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/customisecolor2"
android:textColor="?attr/colorHint"
android:textSize="12sp"
app:layout_constraintStart_toStartOf="@+id/txtCustomiseColours1"
app:layout_constraintTop_toBottomOf="@+id/txtCustomiseColours1" />
<LinearLayout
android:id="@+id/btnCustomiseColours"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="0dp"
android:layout_marginBottom="16dp"
android:clickable="true"
android:focusable="true"
style="@style/SelectableItemBackground"
android:orientation="vertical"
app:layout_constraintBottom_toTopOf="@+id/txtFilter"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/txtRestart" />
<TextView
android:id="@+id/txtFilter"
android:layout_width="wrap_content"
@@ -138,7 +175,7 @@
android:text="@string/filter"
android:textColor="?attr/colorAccent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/switchDark" />
app:layout_constraintTop_toBottomOf="@+id/txtCustomiseColours2" />
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/txtLayoutClasses"
@@ -404,6 +441,7 @@
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:clickable="true"
android:focusable="true"
style="@style/SelectableItemBackground"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="@+id/txtWeb"
@@ -440,6 +478,7 @@
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:clickable="true"
android:focusable="true"
style="@style/SelectableItemBackground"
android:orientation="vertical"
app:layout_constraintBottom_toTopOf="@+id/txtTerms"
@@ -473,9 +512,10 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:layout_marginEnd="0dp"
android:layout_marginBottom="8dp"
android:clickable="true"
android:focusable="true"
style="@style/SelectableItemBackground"
android:orientation="vertical"
app:layout_constraintBottom_toTopOf="@+id/txtPrivacyP"
@@ -509,9 +549,10 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:layout_marginEnd="0dp"
android:layout_marginBottom="8dp"
android:clickable="true"
android:focusable="true"
style="@style/SelectableItemBackground"
android:orientation="vertical"
app:layout_constraintBottom_toTopOf="@+id/txtVersion"
@@ -545,9 +586,10 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:layout_marginEnd="0dp"
android:layout_marginBottom="56dp"
android:clickable="true"
android:focusable="true"
style="@style/SelectableItemBackground"
android:orientation="vertical"
app:layout_constraintBottom_toTopOf="@+id/btnHiddenENP"
@@ -575,6 +617,7 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:clickable="true"
android:focusable="false"
style="@style/SelectableItemBackground"
android:backgroundTint="@android:color/transparent"
app:layout_constraintBottom_toBottomOf="@+id/txtMeee"
app/src/main/res/layout/course_card.xml
+13 -7
View File
@@ -6,11 +6,16 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:backgroundTint="?attr/colorBackgroundCard"
app:strokeColor="?attr/colorAccent"
app:strokeWidth="0dp"
app:cardCornerRadius="0dp"
app:cardUseCompatPadding="true"
android:clickable="true">
app:cardCornerRadius="4dp"
android:clickable="true"
android:focusable="true"
android:layout_marginStart="4dp"
android:layout_marginEnd="4dp"
android:layout_marginTop="1dp"
android:layout_marginBottom="1dp"
app:cardElevation="1dp">
<!--app:cardUseCompatPadding="true"-->
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
@@ -94,11 +99,12 @@
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:tint="?attr/colorText"
app:layout_constraintBottom_toTopOf="@+id/room"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/group"
tools:srcCompat="@tools:sample/avatars" />
android:tint="?attr/colorText"/>
<!--tools:srcCompat="@tools:sample/avatars"-->
</androidx.constraintlayout.widget.ConstraintLayout>
app/src/main/res/layout/empty_dialog.xml
+25
View File
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="8dp">
<LinearLayout
android:id="@+id/empty_linearlayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="0dp"
android:paddingEnd="0dp"
android:paddingBottom="0dp"
android:paddingTop="8dp"
android:orientation="vertical">
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</LinearLayout>
app/src/main/res/layout/forever_alone_button.xml
+18
View File
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.google.android.material.button.MaterialButton
android:id="@+id/buttonclearallcolours"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:backgroundTint="?attr/colorText"
android:textColor="?attr/colorBackground"
android:text="@string/clearall"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"/>
</LinearLayout>
app/src/main/res/layout/just_a_card.xml
+24 -29
View File
@@ -1,37 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<com.google.android.material.card.MaterialCardView android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:paddingLeft="0dp"
android:paddingRight="0dp">
android:backgroundTint="?attr/colorBackgroundCard"
app:cardCornerRadius="4dp"
android:clickable="true"
android:focusable="true"
android:layout_marginStart="4dp"
android:layout_marginEnd="4dp"
android:layout_marginTop="1dp"
android:layout_marginBottom="1dp"
app:cardElevation="1dp"
xmlns:android="http://schemas.android.com/apk/res/android">
<com.google.android.material.card.MaterialCardView
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:backgroundTint="?attr/colorBackgroundCard"
app:strokeColor="?attr/colorAccent"
app:strokeWidth="0dp"
app:cardCornerRadius="0dp"
app:cardUseCompatPadding="true"
android:clickable="true">
android:layout_height="wrap_content">
<LinearLayout
<TextView
android:id="@+id/cardInfoText"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:textColor="?attr/colorText"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"/>
<TextView
android:id="@+id/cardInfoText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="?attr/colorText"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"/>
</LinearLayout>
</LinearLayout>
</com.google.android.material.card.MaterialCardView>
</LinearLayout>
</com.google.android.material.card.MaterialCardView>
app/src/main/res/layout/list_item.xml
+24
View File
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal" android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clickable="true"
android:focusable="true"
style="@style/SelectableItemBackground"
android:id="@+id/item_layout">
<ImageView
android:id="@+id/item_image"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_margin="16dp"
android:tint="?attr/colorText"/>
<TextView
android:id="@+id/item_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="?attr/colorText"
android:layout_gravity="center_vertical"/>
</LinearLayout>
app/src/main/res/values-de/strings.xml
+32
View File
@@ -92,4 +92,36 @@
<string name="orbuy">Oder kauf dir ein gutes Smartphone</string>
<string name="chinaTitle">Informationen bezüglich deines Gerätes</string>
<string name="searchonline">Suche online</string>
<string name="customisecolor1">Benutzerdefinierte Farben</string>
<string name="customisecolor2">Farben für jedes Fach einstellen</string>
<string name="courseDeu">Deutsch (+ DAZ)</string>
<string name="courseMat">Mathematik</string>
<string name="courseEng">Englisch (+ ENA)</string>
<string name="courseSpo">Sport</string>
<string name="coursePol">Politik</string>
<string name="courseDar">Darstellendes Spiel</string>
<string name="coursePhy">Physik</string>
<string name="courseBio">Biologie &amp; Naturwissenschaften</string>
<string name="courseChe">Chemie</string>
<string name="coursePhi">Philosophie</string>
<string name="courseLat">Latein</string>
<string name="courseSpa">Spanisch</string>
<string name="courseFra">Französisch</string>
<string name="courseInf">Informatik</string>
<string name="courseGes">Geschichte</string>
<string name="courseRel">Religion</string>
<string name="courseGeg">Geographie &amp; WUK</string>
<string name="courseKun">Kunst</string>
<string name="courseMus">Musik</string>
<string name="courseTue">Türkisch</string>
<string name="courseChi">Chinesisch</string>
<string name="courseGll">GLL</string>
<string name="courseWat">WAT</string>
<string name="courseFor">Förderunterricht</string>
<string name="courseWp">WP &amp; Methodenstunde</string>
<string name="neoncolours">Neonfarben</string>
<string name="clearall">Alle löschen</string>
<string name="allcolourscleared">Farben für alle Kurse wurden gelöscht</string>
<string name="clearcolour">Farbe löschen</string>
<string name="finish">Fertigstellen</string>
</resources>
app/src/main/res/values/colors.xml
+23
View File
@@ -19,4 +19,27 @@
<color name="slighttransparency">#42000000</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>
</resources>
app/src/main/res/values/strings.xml
+37
View File
@@ -105,6 +105,43 @@
<string name="searchonline">Search online</string>
<string name="customisecolor1">Customise colours</string>
<string name="customisecolor2">Customise every subject individually</string>
<string name="courseDeu">German (+ as a second language)</string>
<string name="courseMat">Mathematics</string>
<string name="courseEng">English (+ for beginners)</string>
<string name="courseSpo">Physical Education</string>
<string name="coursePol">Politics</string>
<string name="courseDar">Theatre</string>
<string name="coursePhy">Physics</string>
<string name="courseBio">Biology &amp; Natural Sciences</string>
<string name="courseChe">Chemistry</string>
<string name="coursePhi">Philosophy</string>
<string name="courseLat">Latin</string>
<string name="courseSpa">Spanish</string>
<string name="courseFra">French</string>
<string name="courseInf">Computer Science</string>
<string name="courseGes">History</string>
<string name="courseRel">Religion</string>
<string name="courseGeg">Geography &amp; WUK</string>
<string name="courseKun">Arts</string>
<string name="courseMus">Music</string>
<string name="courseTue">Turkish</string>
<string name="courseChi">Chinese</string>
<string name="courseGll">GLL</string>
<string name="courseWat">WAT</string>
<string name="courseFor">Special Education</string>
<string name="courseWp">WP &amp; "Methodenstunde"</string>
<string name="neoncolours">Neon colours</string>
<string name="clearall">Clear all</string>
<string name="clearcolour">Clear colour</string>
<string name="allcolourscleared">Colours for all courses have been cleared</string>
<string name="finish">Finish</string>
<!--<string name="avhblue">AvH-Blue</string>-->
<!--<string name="rosered">AvH-Blue</string>-->
<!--<string name="sunsetorange">AvH-Blue</string>-->