Set app_name in build.gradle (#830)

This commit is contained in:
Mikołaj Pich 2020-05-24 19:36:40 +02:00 committed by GitHub
parent cec1068f2e
commit 7fa14e5077
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 18 additions and 27 deletions

View File

@ -20,6 +20,7 @@ android {
versionCode 59 versionCode 59
versionName "0.18.0" versionName "0.18.0"
multiDexEnabled true multiDexEnabled true
resValue "string", "app_name", "Wulkanowy"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true vectorDrawables.useSupportLibrary = true
manifestPlaceholders = [ manifestPlaceholders = [
@ -56,6 +57,7 @@ android {
signingConfig signingConfigs.release signingConfig signingConfigs.release
} }
debug { debug {
resValue "string", "app_name", "Wulkanowy DEV " + defaultConfig.versionCode
applicationIdSuffix ".dev" applicationIdSuffix ".dev"
versionNameSuffix "-dev" versionNameSuffix "-dev"
testCoverageEnabled = project.hasProperty('coverage') testCoverageEnabled = project.hasProperty('coverage')

View File

@ -1,3 +0,0 @@
<resources>
<string name="app_name">Wulkanowy DEV</string>
</resources>

View File

@ -153,8 +153,8 @@
android:background="?selectableItemBackgroundBorderless" android:background="?selectableItemBackgroundBorderless"
android:fontFamily="sans-serif" android:fontFamily="sans-serif"
android:gravity="center" android:gravity="center"
android:text="@string/app_name" android:textSize="16sp"
android:textSize="16sp" /> tools:text="@tools:sample/date/ddmmyy" />
<ImageButton <ImageButton
android:id="@+id/attendanceNextButton" android:id="@+id/attendanceNextButton"

View File

@ -138,8 +138,8 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:fontFamily="sans-serif" android:fontFamily="sans-serif"
android:gravity="center" android:gravity="center"
android:text="@string/app_name" android:textSize="16sp"
android:textSize="16sp" /> tools:text="@tools:sample/date/ddmmyy" />
<ImageButton <ImageButton
android:id="@+id/examNextButton" android:id="@+id/examNextButton"

View File

@ -138,8 +138,8 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:fontFamily="sans-serif" android:fontFamily="sans-serif"
android:gravity="center" android:gravity="center"
android:text="@string/app_name" android:textSize="16sp"
android:textSize="16sp" /> tools:text="@tools:sample/date/ddmmyy" />
<ImageButton <ImageButton
android:id="@+id/homeworkNextButton" android:id="@+id/homeworkNextButton"

View File

@ -139,8 +139,8 @@
android:background="?selectableItemBackgroundBorderless" android:background="?selectableItemBackgroundBorderless"
android:fontFamily="sans-serif" android:fontFamily="sans-serif"
android:gravity="center" android:gravity="center"
android:text="@string/app_name" android:textSize="16sp"
android:textSize="16sp" /> tools:text="@tools:sample/date/ddmmyy" />
<ImageButton <ImageButton
android:id="@+id/timetableNextButton" android:id="@+id/timetableNextButton"

View File

@ -115,8 +115,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="48dp" android:layout_height="48dp"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:orientation="horizontal"
android:gravity="center" android:gravity="center"
android:orientation="horizontal"
tools:ignore="UnusedAttribute"> tools:ignore="UnusedAttribute">
<ImageButton <ImageButton
@ -125,24 +125,24 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:background="?attr/selectableItemBackgroundBorderless" android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/all_prev"
android:paddingLeft="12dp" android:paddingLeft="12dp"
android:paddingTop="8dp" android:paddingTop="8dp"
android:paddingRight="12dp" android:paddingRight="12dp"
android:paddingBottom="8dp" android:paddingBottom="8dp"
android:scaleType="fitStart" android:scaleType="fitStart"
android:tint="?colorPrimary" android:tint="?colorPrimary"
app:srcCompat="@drawable/ic_chevron_left" app:srcCompat="@drawable/ic_chevron_left" />
android:contentDescription="@string/all_prev"/>
<TextView <TextView
android:id="@+id/completedLessonsNavDate" android:id="@+id/completedLessonsNavDate"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:fontFamily="sans-serif"
android:background="?selectableItemBackgroundBorderless" android:background="?selectableItemBackgroundBorderless"
android:fontFamily="sans-serif"
android:gravity="center" android:gravity="center"
android:text="@string/app_name" android:textSize="16sp"
android:textSize="16sp" /> tools:text="@tools:sample/date/ddmmyy" />
<ImageButton <ImageButton
android:id="@+id/completedLessonsNextButton" android:id="@+id/completedLessonsNextButton"
@ -150,13 +150,13 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:background="?attr/selectableItemBackgroundBorderless" android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/all_next"
android:paddingLeft="12dp" android:paddingLeft="12dp"
android:paddingTop="8dp" android:paddingTop="8dp"
android:paddingRight="12dp" android:paddingRight="12dp"
android:paddingBottom="8dp" android:paddingBottom="8dp"
android:scaleType="fitEnd" android:scaleType="fitEnd"
android:tint="?colorPrimary" android:tint="?colorPrimary"
app:srcCompat="@drawable/ic_chevron_right" app:srcCompat="@drawable/ic_chevron_right" />
android:contentDescription="@string/all_next" />
</io.github.wulkanowy.ui.widgets.MaterialLinearLayout> </io.github.wulkanowy.ui.widgets.MaterialLinearLayout>
</FrameLayout> </FrameLayout>

View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="app_name">Wulkanowy</string>
<!--Activity/Fragment title--> <!--Activity/Fragment title-->
<string name="login_title">Anmelden</string> <string name="login_title">Anmelden</string>
<string name="main_title">Wulkanowy</string> <string name="main_title">Wulkanowy</string>

View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="app_name">Wulkanowy</string>
<!--Activity/Fragment title--> <!--Activity/Fragment title-->
<string name="login_title">Logowanie</string> <string name="login_title">Logowanie</string>
<string name="main_title">Wulkanowy</string> <string name="main_title">Wulkanowy</string>

View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="app_name">Wulkanowy</string>
<!--Activity/Fragment title--> <!--Activity/Fragment title-->
<string name="login_title">Авторизация</string> <string name="login_title">Авторизация</string>
<string name="main_title">Wulkanowy</string> <string name="main_title">Wulkanowy</string>

View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="app_name">Wulkanowy</string>
<!--Activity/Fragment title--> <!--Activity/Fragment title-->
<string name="login_title">Авторизація</string> <string name="login_title">Авторизація</string>
<string name="main_title">Wulkanowy</string> <string name="main_title">Wulkanowy</string>

View File

@ -1,9 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="app_name">Wulkanowy</string>
<!--Activity/Fragment title--> <!--Activity/Fragment title-->
<string name="login_title">Login</string> <string name="login_title">Login</string>
<string name="main_title">Wulkanowy</string> <string name="main_title">Wulkanowy</string>