zobrist/TichuCounter
1
0
Fork 0
Code Issues 3 Pull Requests Actions Projects Releases 9 Wiki Activity

Use new classes

Browse Source
This commit is contained in:
Fabian Zobrist
2020-08-19 19:10:34 +02:00
parent e8044a7c70
commit 2c07e433e0
8 changed files with 202 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/src/main/res/drawable/checkmark.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.1 KiB

88
app/src/main/res/layout/content_main.xml
View File

@@ -33,19 +33,49 @@
</LinearLayout>
<LinearLayout
android:id="@+id/Score"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintTop_toBottomOf="@+id/Names">
<TextView
android:id="@+id/scoreA"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="0"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textSize="18sp" />
<TextView
android:id="@+id/scoreB"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="0"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textSize="18sp" />
</LinearLayout>
<View
android:id="@+id/divider5"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="?android:attr/listDivider"
app:layout_constraintBottom_toBottomOf="@+id/scrollView2" />
app:layout_constraintBottom_toBottomOf="@+id/scrolViewHistory" />
<ScrollView
android:id="@+id/scrollView2"
android:id="@+id/scrolViewHistory"
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintBottom_toTopOf="@+id/Score"
app:layout_constraintTop_toBottomOf="@+id/Names">
android:layout_marginTop="16dp"
app:layout_constraintBottom_toTopOf="@+id/Input"
app:layout_constraintTop_toBottomOf="@+id/Score">
<LinearLayout
android:layout_width="match_parent"
@@ -69,33 +99,6 @@
</LinearLayout>
</ScrollView>
<LinearLayout
android:id="@+id/Score"
android:layout_width="match_parent"
android:layout_height="0dp"
android:orientation="horizontal"
app:layout_constraintBottom_toTopOf="@+id/Input">
<TextView
android:id="@+id/scoreA"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textSize="18sp" />
<TextView
android:id="@+id/scoreB"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textSize="18sp" />
</LinearLayout>
<View
android:id="@+id/divider6"
android:layout_width="match_parent"
@@ -116,10 +119,10 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:ems="10"
android:gravity="center"
android:hint="0"
android:importantForAutofill="no"
android:inputType="numberSigned"
android:gravity="center"/>
android:inputType="numberSigned" />
<EditText
android:id="@+id/inputTeamB"
@@ -127,10 +130,10 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:ems="10"
android:gravity="center"
android:hint="0"
android:importantForAutofill="no"
android:inputType="numberSigned"
android:gravity="center"/>
android:inputType="numberSigned" />
</LinearLayout>
<LinearLayout
@@ -255,10 +258,12 @@
app:layout_constraintBottom_toBottomOf="parent"
tools:layout_editor_absoluteX="1dp">
<Space
<Button
android:id="@+id/buttonInv"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1.0" />
android:layout_weight="1.0"
android:text="+/-" />
<Button
android:id="@+id/button0"
@@ -272,11 +277,12 @@
android:layout_height="wrap_content"
android:layout_weight="1.0" />
<Button
android:id="@+id/add"
<ImageButton
android:id="@+id/submit"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1.0"
android:text="@string/add" />
android:scaleType="fitCenter"
app:srcCompat="@drawable/checkmark" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

4
app/src/main/res/menu/menu_main.xml
View File

@@ -8,4 +8,8 @@
android:orderInCategory="100"
android:title="@string/clear"
app:showAsAction="never" />
<item
android:id="@+id/action_undo"
android:icon="@android:drawable/ic_menu_revert"
android:title="@string/undo" />
</menu>

6
app/src/main/res/values-de/strings.xml
View File

@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="team_a">Team A</string>
<string name="team_b">Team B</string>
<string name="clear">Löschen</string>
<string name="add">Hinzufügen</string>
<string name="clear">Neues Spiel Starten</string>
<string name="undo">Letzte Runde Löschen</string>
</resources>

6
app/src/main/res/values-gsw-rCH/strings.xml
View File

@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="clear">Lösche</string>
<string name="team_a">Team A</string>
<string name="team_b">Team B</string>
<string name="add">Drzuetue</string>
<string name="clear">Neus Spil Starte</string>
<string name="undo">Letschti Rundi Lösche</string>
</resources>

8
app/src/main/res/values/strings.xml
View File

@@ -2,8 +2,8 @@
<string name="app_name" translatable="false">Tichu Counter</string>
<!-- Strings used for fragments for navigation -->
<string name="team_a">Team A</string>
<string name="team_b">Team B</string>
<string name="add">Add</string>
<string name="clear">Clear</string>
<string name="team_a" translatable="false">Team A</string>
<string name="team_b" translatable="false">Team B</string>
<string name="clear">Start New Game</string>
<string name="undo">Undo Last Round</string>
</resources>