sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-05-23 06:07:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #808 from caipivara/fix/missing-ids-on-some-layouts

Browse source 
Fix missing + on id definition for some layouts
This commit is contained in:
Phillip Thelen 2017-10-23 13:35:16 +02:00 committed by GitHub
commit 3bd8201440
11 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.travis.yml
View file

@ -32,10 +32,10 @@ android:
- tools
# The BuildTools version used by your project
- build-tools-25.0.3
- build-tools-26.0.1
# The SDK version used to compile your project
- android-25
- android-26
# Additional components
- extra-google-google_play_services

5
Habitica/build.gradle
View file

@ -138,8 +138,8 @@ dependencies {
}
android {
compileSdkVersion 26
buildToolsVersion "26.0.1"
compileSdkVersion sdk_version
buildToolsVersion build_tools_version
defaultConfig {
applicationId "com.habitrpg.android.habitica"
@ -181,6 +181,7 @@ android {
productFlavors {
dev {
minSdkVersion 21
buildConfigField "String", "STAGING_KEY", "\"1dcf9ed3-3b14-45b3-9e7e-acdfff68a368\""
}
prod {

4
Habitica/res/layout/dialog_purchase_content_gear.xml
View file

@ -15,7 +15,7 @@
android:layout_width="@dimen/shopitem_image_size"
android:layout_height="@dimen/shopitem_image_size" />
<TextView
android:id="@id/titleTextView"
android:id="@+id/titleTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/Headline"
@ -24,7 +24,7 @@
android:layout_marginTop="14dp"
android:layout_marginBottom="4dp"/>
<TextView
android:id="@id/notesTextView"
android:id="@+id/notesTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/Body2"

4
Habitica/res/layout/dialog_purchase_content_item.xml
View file

@ -15,7 +15,7 @@
android:layout_width="@dimen/shopitem_image_size"
android:layout_height="@dimen/shopitem_image_size" />
<TextView
android:id="@id/titleTextView"
android:id="@+id/titleTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/Headline"
@ -24,7 +24,7 @@
android:layout_marginTop="14dp"
android:layout_marginBottom="4dp"/>
<TextView
android:id="@id/notesTextView"
android:id="@+id/notesTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/Body2"

4
Habitica/res/layout/dialog_purchase_content_quest.xml
View file

@ -15,7 +15,7 @@
android:layout_width="@dimen/shopitem_image_size"
android:layout_height="@dimen/shopitem_image_size" />
<TextView
android:id="@id/titleTextView"
android:id="@+id/titleTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/Headline"
@ -24,7 +24,7 @@
android:layout_marginTop="14dp"
android:layout_marginBottom="4dp"/>
<TextView
android:id="@id/notesTextView"
android:id="@+id/notesTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/Body2"

2
Habitica/res/layout/dialog_yesterdaily_task.xml
View file

@ -47,7 +47,7 @@
android:background="@color/gray_500"
android:visibility="gone"/>
<LinearLayout
android:id="@id/checklistView"
android:id="@+id/checklistView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"/>

6
Habitica/res/layout/item_item.xml
View file

@ -7,7 +7,7 @@
style="@style/RowWrapper"
android:clickable="true">
<com.facebook.drawee.view.SimpleDraweeView
android:id="@id/imageView"
android:id="@+id/imageView"
android:layout_width="@dimen/gear_image_size"
android:layout_height="@dimen/gear_image_size"
bind:actualImageScaleType="fitCenter"
@ -18,13 +18,13 @@
android:orientation="vertical"
android:layout_gravity="center_vertical">
<TextView
android:id="@id/titleTextView"
android:id="@+id/titleTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:text="Title"
style="@style/RowTitle"/>
<TextView
android:id="@id/ownedTextView"
android:id="@+id/ownedTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:text="Value"

2
Habitica/res/layout/reward_item_card.xml
View file

@ -71,7 +71,7 @@
android:layout_height="22dp"
android:paddingBottom="8dp"/>
<TextView
android:id="@id/priceLabel"
android:id="@+id/priceLabel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/yellow_10"

2
Habitica/res/layout/value_bar.xml
View file

@ -19,7 +19,7 @@
android:contentDescription="Bar Icon"
android:visibility="gone"/>
<LinearLayout
android:id="@id/bar_full"
android:id="@+id/bar_full"
android:layout_toRightOf="@id/ic_header"
android:layout_toEndOf="@id/ic_header"
android:layout_width="match_parent"

3
build.gradle
View file

@ -2,6 +2,9 @@
buildscript {
ext.kotlin_version = '1.1.51'
ext.build_tools_version = '26.0.1'
ext.sdk_version = 26
repositories {
jcenter()
maven { url "https://plugins.gradle.org/m2/" }

5
seeds-sdk/build.gradle
View file

@ -28,9 +28,8 @@ repositories {
}
android {
compileSdkVersion 25
buildToolsVersion "25.0.3"
compileSdkVersion sdk_version
buildToolsVersion build_tools_version
defaultConfig {
minSdkVersion 14