Skip to content

Commit 6f628b3

Browse files
Merge pull request #16 from hathibelagal-dev/15-number-tiles-covered-by-title-bar-in-140
15 number tiles covered by title bar in 140
2 parents 8083720 + 058a976 commit 6f628b3

6 files changed

Lines changed: 21 additions & 7 deletions

File tree

.idea/deploymentTargetSelector.xml

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ android {
1010
applicationId = "io.github.hathibelagal.eidetic"
1111
minSdk = 26
1212
targetSdk = 35
13-
versionCode = 8
14-
versionName = "1.4.0"
13+
versionCode = 9
14+
versionName = "1.4.1"
1515

1616
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
1717
}

app/src/main/java/io/github/hathibelagal/eidetic/MainActivity.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,10 @@ private void createButtons() {
133133
gridParams.width = 0;
134134
gridParams.rowSpec = GridLayout.spec(i, 1f);
135135
gridParams.columnSpec = GridLayout.spec(j, 1f);
136+
gridParams.setMargins(4, 0, 4, 0);
136137

137138
b.setLayoutParams(gridParams);
139+
b.setPadding(0, 0, 0, 0);
138140
b.setOnTouchListener(MainActivity.this);
139141
buttons.add(b);
140142
grid.addView(b);

app/src/main/res/drawable/number_button_ready.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@
55
<item>
66
<shape android:shape="rectangle">
77
<corners android:radius="16dp"/>
8+
<stroke android:width="2dp"/>
89
<gradient
910
android:startColor="#20000000"
1011
android:endColor="#00000000"
1112
android:angle="270"/>
1213
</shape>
1314
</item>
14-
<item android:bottom="4dp">
15+
<item>
1516
<shape android:shape="rectangle">
1617
<gradient
1718
android:startColor="#5AA1E6"
@@ -37,7 +38,7 @@
3738
android:angle="270"/>
3839
</shape>
3940
</item>
40-
<item android:bottom="2dp">
41+
<item>
4142
<shape android:shape="rectangle">
4243
<gradient
4344
android:startColor="#F5A623"

app/src/main/res/layout/activity_main.xml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,17 @@
77
android:orientation="vertical"
88
android:background="@drawable/game_background"
99
android:id="@+id/grid_container"
10-
android:padding="16dp">
10+
android:fitsSystemWindows="true"
11+
>
1112

1213
<GridLayout
1314
android:layout_width="match_parent"
14-
android:layout_height="match_parent"
15+
android:layout_height="0dp"
16+
android:layout_weight="1"
1517
android:id="@+id/grid"
1618
android:rowCount="6"
1719
android:columnCount="3"
18-
android:useDefaultMargins="true"
20+
android:useDefaultMargins="false"
1921
android:alpha="0.8"
2022
/>
2123

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Fixes for API level 35

0 commit comments

Comments
 (0)