Swiched the Naming and Cleard stuff up

This commit is contained in:
Erik Foris 2020-10-05 14:46:29 +02:00
parent d7f59301e2
commit 9d7a4dc3ce
6 changed files with 10 additions and 18 deletions

View File

@ -3,18 +3,9 @@
<JetCodeStyleSettings> <JetCodeStyleSettings>
<option name="PACKAGES_TO_USE_STAR_IMPORTS"> <option name="PACKAGES_TO_USE_STAR_IMPORTS">
<value> <value>
<package name="java.util" alias="false" withSubpackages="false" /> <package name="java.util" withSubpackages="false" static="false" />
<package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" /> <package name="kotlinx.android.synthetic" withSubpackages="true" static="false" />
<package name="io.ktor" alias="false" withSubpackages="true" /> <package name="io.ktor" withSubpackages="true" static="false" />
</value>
</option>
<option name="PACKAGES_IMPORT_LAYOUT">
<value>
<package name="" alias="false" withSubpackages="true" />
<package name="java" alias="false" withSubpackages="true" />
<package name="javax" alias="false" withSubpackages="true" />
<package name="kotlin" alias="false" withSubpackages="true" />
<package name="" alias="true" withSubpackages="true" />
</value> </value>
</option> </option>
</JetCodeStyleSettings> </JetCodeStyleSettings>

View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="GradleMigrationSettings" migrationVersion="1" />
<component name="GradleSettings"> <component name="GradleSettings">
<option name="linkedExternalProjectsSettings"> <option name="linkedExternalProjectsSettings">
<GradleProjectSettings> <GradleProjectSettings>

View File

@ -10,7 +10,7 @@ public class DashboardViewModel extends ViewModel {
public DashboardViewModel() { public DashboardViewModel() {
mText = new MutableLiveData<>(); mText = new MutableLiveData<>();
mText.setValue("This is dashboard fragment"); mText.setValue("This is the Üben segment");
} }
public LiveData<String> getText() { public LiveData<String> getText() {

View File

@ -10,7 +10,7 @@ public class HomeViewModel extends ViewModel {
public HomeViewModel() { public HomeViewModel() {
mText = new MutableLiveData<>(); mText = new MutableLiveData<>();
mText.setValue("This is home fragment"); mText.setValue("This is The Dasbord");
} }
public LiveData<String> getText() { public LiveData<String> getText() {

View File

@ -10,7 +10,7 @@ public class NotificationsViewModel extends ViewModel {
public NotificationsViewModel() { public NotificationsViewModel() {
mText = new MutableLiveData<>(); mText = new MutableLiveData<>();
mText.setValue("This is notifications fragment"); mText.setValue("This is the abfragen fragment");
} }
public LiveData<String> getText() { public LiveData<String> getText() {

View File

@ -1,6 +1,6 @@
<resources> <resources>
<string name="app_name">Vokabel-Trainer</string> <string name="app_name">Vokabel-Trainer</string>
<string name="title_home">Einfügen</string> <string name="title_home">Dashbord</string>
<string name="title_dashboard">Üben</string> <string name="title_dashboard">Abfragen</string>
<string name="title_notifications">Abfragen</string> <string name="title_notifications">Einfügen</string>
</resources> </resources>