From dd5c7b3fb89eabb68cea6f8a0d2569bf011f9c46 Mon Sep 17 00:00:00 2001 From: Jannik Seiler Date: Mon, 10 Aug 2020 14:51:40 +0200 Subject: [PATCH] fix some lint warnings * remove unused resources --- app/build.gradle | 2 +- .../fragments/SettingsFragment.kt | 4 +- app/src/main/res/drawable/ic_menu_send.xml | 9 - app/src/main/res/drawable/ic_menu_share.xml | 9 - .../fragments/layout/fragment_settings.xml | 544 +++++++++--------- app/src/main/res/values-de-rDE/strings.xml | 1 - app/src/main/res/values/strings.xml | 1 - app/src/main/res/values/styles.xml | 4 - 8 files changed, 291 insertions(+), 283 deletions(-) delete mode 100644 app/src/main/res/drawable/ic_menu_send.xml delete mode 100644 app/src/main/res/drawable/ic_menu_share.xml diff --git a/app/build.gradle b/app/build.gradle index e733065..e04555b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,7 +11,7 @@ android { minSdkVersion 23 targetSdkVersion 29 versionCode 15 - versionName "0.5.90" + versionName "0.5.91" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" resValue "string", "build_time", buildTime() setProperty("archivesBaseName", "projectlaogai-$versionName") diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/SettingsFragment.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/SettingsFragment.kt index 1240695..536aeb9 100644 --- a/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/SettingsFragment.kt +++ b/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/SettingsFragment.kt @@ -29,8 +29,8 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.LinearLayout -import android.widget.Switch import android.widget.TextView +import androidx.appcompat.widget.SwitchCompat import androidx.fragment.app.Fragment import com.afollestad.aesthetic.Aesthetic import com.afollestad.materialdialogs.MaterialDialog @@ -72,7 +72,7 @@ class SettingsFragment : Fragment() { private lateinit var linLayoutTheme: LinearLayout private lateinit var linLayoutPrimaryColor: LinearLayout private lateinit var linLayoutAccentColor: LinearLayout - private lateinit var switchBuffet: Switch + private lateinit var switchBuffet: SwitchCompat private lateinit var txtViewCourse: TextView private var selectedTheme = DataTypes.Theme.Light diff --git a/app/src/main/res/drawable/ic_menu_send.xml b/app/src/main/res/drawable/ic_menu_send.xml deleted file mode 100644 index 9745066..0000000 --- a/app/src/main/res/drawable/ic_menu_send.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_menu_share.xml b/app/src/main/res/drawable/ic_menu_share.xml deleted file mode 100644 index b3e39e2..0000000 --- a/app/src/main/res/drawable/ic_menu_share.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/layouts/fragments/layout/fragment_settings.xml b/app/src/main/res/layouts/fragments/layout/fragment_settings.xml index bcbf90c..121b034 100644 --- a/app/src/main/res/layouts/fragments/layout/fragment_settings.xml +++ b/app/src/main/res/layouts/fragments/layout/fragment_settings.xml @@ -1,313 +1,345 @@ + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="?themePrimary" + tools:context=".fragments.SettingsFragment"> + + - + + - + + - + android:orientation="vertical"> + + android:id="@+id/txtView_Info" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="7dp" + android:fontFamily="sans-serif" + android:text="@string/info" + android:textColor="?colorAccent" + android:textSize="18sp" + android:textStyle="bold" + android:typeface="sans" /> + - - - - - - - - - - + android:id="@+id/linLayout_User" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:padding="7dp"> + android:id="@+id/txtView_User" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/sample_user" + android:textSize="16sp" + android:textStyle="bold" /> + android:id="@+id/txtView_UserDesc" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/user" /> + + android:id="@+id/divider2" + android:layout_width="match_parent" + android:layout_height="1dp" + android:background="?dividerColor" /> + + + + android:layout_height="wrap_content" + android:text="@string/sample_course" + android:textSize="16sp" + android:textStyle="bold" /> + - + android:id="@+id/txtView_CourseDesc" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/course_desc" /> + + android:id="@+id/divider" + android:layout_width="match_parent" + android:layout_height="1dp" + android:background="?dividerColor" /> + + android:id="@+id/linLayout_ManageLessons" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="7dp" + android:orientation="vertical"> + + android:id="@+id/txtView_ManageLessons" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/manage_lessons" + android:textSize="16sp" + android:textStyle="bold" /> + + + + + + + + + + + + + + + + + + + + - + + - - - - - - + android:layout_margin="7dp" + android:paddingTop="3dp" + android:text="@string/settings" + android:textColor="?colorAccent" + android:textSize="18sp" + android:textStyle="bold" + android:typeface="sans" /> + + + + + + + + + + + + + + + + + + - - - - - - - - - + android:gravity="end" + android:orientation="vertical"> + android:id="@+id/view_PrimaryColor" + android:layout_width="40dp" + android:layout_height="40dp" + android:background="?colorPrimary" /> + + android:id="@+id/divider4" + android:layout_width="match_parent" + android:layout_height="1dp" + android:background="?dividerColor" /> + + + - + android:orientation="vertical"> + - - - - + android:text="@string/accent_color" + android:textSize="16sp" + android:textStyle="bold" /> + + - - - + android:layout_margin="7dp" + android:gravity="end" + android:orientation="vertical"> + + + + + + + + diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml index fffc8c8..cf9d30d 100644 --- a/app/src/main/res/values-de-rDE/strings.xml +++ b/app/src/main/res/values-de-rDE/strings.xml @@ -63,7 +63,6 @@ löschen abbrechen auswählen - schließen Mensa-Guthaben aktuell: %1$s\n letzte Abbuchung: %1$s diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 14b61c1..1280910 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -68,7 +68,6 @@ delete @android:string/cancel select - close Mensa credit current: %1$s\n last: %1$s diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 8981642..2bff09b 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -47,10 +47,6 @@ @color/textPrimaryDark -