Seil0/ProjectLaogai
1
0
Fork 0
Code Issues 4 Pull Requests Releases 13 Wiki Activity

release 0.5.0 #35

Manually merged
Seil0 merged 38 commits from develop into master 2019-09-30 21:28:54 +02:00
Conversation 0 Commits 38 Files Changed 59 +2393 -710
59 changed files with 2393 additions and 710 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit aa69d2242f - Show all commits

3
app/src/main/java/org/mosad/seil0/projectlaogai/fragments/SettingsFragment.kt
View File

@ -24,7 +24,6 @@ package org.mosad.seil0.projectlaogai.fragments
import android.content.Context import android.content.Context
import android.os.Bundle import android.os.Bundle
import android.renderscript.Sampler
import android.util.TypedValue import android.util.TypedValue
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
@ -132,7 +131,6 @@ class SettingsFragment : Fragment() {
linLayoutCourse.setOnClickListener { linLayoutCourse.setOnClickListener {
selectCourse(context!!) selectCourse(context!!)
txtView_Course.text = cCourse.courseName // update txtView
} }
linLayoutAbout.setOnClickListener { linLayoutAbout.setOnClickListener {
@ -263,6 +261,7 @@ class SettingsFragment : Fragment() {
uiThread { uiThread {
dialog.dismiss() dialog.dismiss()
txtView_Course.text = cCourse.courseName // update txtView
} }
} }

32
app/src/main/res/layouts/activities/layout/linearlayout_meal.xml
View File

@ -1,23 +1,35 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:id="@+id/linLayout_Meal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:id="@+id/linLayout_Meal" android:padding="7dp"> android:layout_height="match_parent"
android:orientation="vertical"
android:paddingLeft="7dp"
android:paddingTop="2dp"
android:paddingRight="7dp"
android:paddingBottom="2dp">
<TextView <TextView
android:id="@+id/txtView_MealHeading"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="2dp"
android:text="@string/meal" android:text="@string/meal"
android:layout_width="match_parent" android:textAlignment="center"
android:layout_height="wrap_content" android:id="@+id/txtView_MealHeading" android:textSize="18sp" android:textSize="18sp"
android:textAlignment="center" android:paddingBottom="5dp" android:textStyle="bold" />
android:textStyle="bold"/>
<TextView <TextView
android:id="@+id/txtView_Meal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:id="@+id/txtView_Meal" android:textSize="15sp" android:layout_height="wrap_content"
android:textAlignment="center"/> android:textAlignment="center"
android:textSize="15sp" />
<View <View
android:id="@+id/divider_meal" android:id="@+id/divider_meal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:background="?dividerColor" android:layout_marginTop="3dp"
/> android:background="?dividerColor" />
</LinearLayout> </LinearLayout>