Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Master Backmerge #30

Merged
merged 4 commits into from
Jul 23, 2021
Merged

Master Backmerge #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ea2cd6b
Merge pull request #28 from furkanaskin/dev
nuhkoca Jul 19, 2021
28aad32
Fix typo
nuhkoca Jul 19, 2021
98ed090
Rename job
nuhkoca Jul 19, 2021
a4c30d4
Fix release workflow
nuhkoca Jul 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@ name: Release

on:
push:
branches:
- master
tags:
- 'v*.*.*'

jobs:
build:
release:
name: Release
runs-on: ubuntu-latest

steps:
Expand All @@ -32,16 +33,11 @@ jobs:
key: ${{ runner.os }}-gradle-${{ hashFiles('checksum.txt') }}

- name: Assemble Debug App
uses: ./gradlew clean assembleDebug

- name: Get Release Date
id: release-date-generator
run: echo "::set-output name=release-date::$(date +%F)"
run: ./gradlew clean assembleDebug

- name: Release a new version
uses: softprops/action-gh-release@v1
with:
files: app/build/outputs/apk/debug/*.apk
name: Release ${{ steps.release-date-generator.outputs.release-date }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8 changes: 4 additions & 4 deletions app/src/main/res/layout/fragment_weather_detail.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
type="com.faskn.app.weatherapp.ui.weather_detail.WeatherDetailViewModel" />
</data>


<RelativeLayout
android:id="@+id/rootView"
android:layout_width="match_parent"
Expand All @@ -29,15 +28,16 @@
android:id="@+id/fabClose"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:backgroundTint="@android:color/transparent"
android:elevation="8dp"
android:padding="0dp"
android:scaleType="fitXY"
android:src="@drawable/ic_close"
app:borderWidth="0dp"
app:layout_anchor="@id/cardView"
app:layout_anchorGravity="center_horizontal|top"
app:useCompatPadding="true" />
app:srcCompat="@drawable/ic_close"
app:tint="@null"
app:useCompatPadding="true"
tools:ignore="ContentDescription" />

<com.google.android.material.card.MaterialCardView
android:id="@+id/cardView"
Expand Down