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

Change layout, add onscreen keyboard

Browse Source
This commit is contained in:
Fabian Zobrist
2020-08-14 19:10:43 +02:00
parent 7bc9961a65
commit 6cda0a9d5e
4 changed files with 239 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,22 +6,18 @@
android:layout_height="match_parent" android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"> app:layout_behavior="@string/appbar_scrolling_view_behavior">
<TableLayout <LinearLayout
android:id="@+id/Names"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="0dp"
app:layout_constraintDimensionRatio="w,1:1" android:orientation="horizontal"
tools:layout_editor_absoluteX="1dp" app:layout_constraintTop_toTopOf="parent">
tools:layout_editor_absoluteY="-1dp">
<TableRow
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView <TextView
android:id="@+id/nameTeamA" android:id="@+id/nameTeamA"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0.5" android:layout_weight="1"
android:text="@string/team_a" android:text="@string/team_a"
android:textAppearance="@style/TextAppearance.AppCompat.Display1" /> android:textAppearance="@style/TextAppearance.AppCompat.Display1" />
@@ -29,38 +25,53 @@
android:id="@+id/nameTeamB" android:id="@+id/nameTeamB"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0.5" android:layout_weight="1"
android:text="@string/team_b" android:text="@string/team_b"
android:textAppearance="@style/TextAppearance.AppCompat.Display1" /> android:textAppearance="@style/TextAppearance.AppCompat.Display1" />
</TableRow>
<TableRow </LinearLayout>
<ScrollView
android:id="@+id/scrollView2"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="0dp"
app:layout_constraintBottom_toTopOf="@+id/Score"
app:layout_constraintTop_toBottomOf="@+id/Names">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:id="@+id/historyA"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="123" />
<TextView <TextView
android:id="@+id/historyB" android:id="@+id/historyB"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0.5" /> android:layout_weight="1"
android:text="123" />
<TextView </LinearLayout>
android:id="@+id/historyA" </ScrollView>
<LinearLayout
android:id="@+id/Score"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="0dp"
android:layout_weight="0.5" /> android:orientation="horizontal"
app:layout_constraintBottom_toTopOf="@+id/Input">
</TableRow>
<TableRow
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView <TextView
android:id="@+id/scoreA" android:id="@+id/scoreA"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0.5" android:layout_weight="1"
android:textAppearance="@style/TextAppearance.AppCompat.Body1" android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textSize="18sp" /> android:textSize="18sp" />
@@ -68,14 +79,18 @@
android:id="@+id/scoreB" android:id="@+id/scoreB"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0.5" android:layout_weight="1"
android:textAppearance="@style/TextAppearance.AppCompat.Body1" android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textSize="18sp" /> android:textSize="18sp" />
</TableRow>
<TableRow </LinearLayout>
<LinearLayout
android:id="@+id/Input"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="0dp"
android:orientation="horizontal"
app:layout_constraintBottom_toTopOf="@+id/ButtonRow1">
<EditText <EditText
android:id="@+id/inputTeamA" android:id="@+id/inputTeamA"
@@ -96,40 +111,151 @@
android:hint="0" android:hint="0"
android:importantForAutofill="no" android:importantForAutofill="no"
android:inputType="numberSigned" /> android:inputType="numberSigned" />
</TableRow> </LinearLayout>
<TableRow <LinearLayout
android:id="@+id/ButtonRow1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="0dp"
android:orientation="horizontal"
app:layout_constraintBottom_toTopOf="@+id/ButtonRow2">
<Button
android:id="@+id/button1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="1" />
<Button
android:id="@+id/button2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="2" />
<Button
android:id="@+id/button3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="3" />
<Button <Button
android:id="@+id/add100" android:id="@+id/add100"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0.5" android:layout_weight="1"
android:text="+100" /> android:text="+100" />
</LinearLayout>
<LinearLayout
android:id="@+id/ButtonRow2"
android:layout_width="match_parent"
android:layout_height="0dp"
android:orientation="horizontal"
app:layout_constraintBottom_toTopOf="@+id/ButtonRow3">
<Button
android:id="@+id/button4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="4" />
<Button
android:id="@+id/button5"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="5" />
<Button
android:id="@+id/button6"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="6" />
<Button <Button
android:id="@+id/sub100" android:id="@+id/sub100"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0.5" android:layout_weight="1"
android:text="-100" /> android:text="-100" />
</LinearLayout>
</TableRow> <LinearLayout
android:id="@+id/ButtonRow3"
android:layout_width="match_parent"
android:layout_height="0dp"
android:orientation="horizontal"
app:layout_constraintBottom_toTopOf="@+id/ButtonRow4">
<TableRow <Button
android:layout_width="88dp" android:id="@+id/button7"
android:layout_height="match_parent"> android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="7" />
<Button
android:id="@+id/button8"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="8" />
<Button
android:id="@+id/button9"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="9" />
<Button
android:id="@+id/back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="d-" />
</LinearLayout>
<LinearLayout
android:id="@+id/ButtonRow4"
android:layout_width="match_parent"
android:layout_height="0dp"
android:orientation="horizontal"
android:visibility="visible"
app:layout_constraintBottom_toBottomOf="parent"
tools:layout_editor_absoluteX="1dp">
<Button
android:id="@+id/dummy1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1.0"
android:visibility="invisible" />
<Button
android:id="@+id/button0"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1.0"
android:text="Button" />
<Button
android:id="@+id/dummy2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1.0"
android:visibility="invisible" />
<Button <Button
android:id="@+id/add" android:id="@+id/add"
android:layout_width="120dp" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1.0" android:layout_weight="1.0"
android:text="@string/add" /> android:text="@string/add" />
</TableRow> </LinearLayout>
</TableLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

7
app/src/main/res/values-de/strings.xml Normal file
View File

@@ -0,0 +1,7 @@
<?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>
</resources>

7
app/src/main/res/values-gsw-rCH/strings.xml Normal file
View File

@@ -0,0 +1,7 @@
<?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>
</resources>

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

@@ -1,5 +1,5 @@
<resources> <resources>
<string name="app_name">Tichu Counter</string> <string name="app_name" translatable="false">Tichu Counter</string>
<!-- Strings used for fragments for navigation --> <!-- Strings used for fragments for navigation -->
<string name="team_a">Team A</string> <string name="team_a">Team A</string>