Skip to content
This repository was archived by the owner on Aug 3, 2022. It is now read-only.

Update SDk version, better RTL languages support #12

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update SDk version, better RTL languages support #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5fd8de1
Update SDK verison
FranciscoPombal Oct 9, 2016
e21dd75
improvements to some layout files
FranciscoPombal Oct 9, 2016
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
10 changes: 5 additions & 5 deletions 1-Base/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,19 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 23
buildToolsVersion "23.0.3"
compileSdkVersion 24
buildToolsVersion "24.0.3"

defaultConfig {
applicationId "com.example.android.materialdesigncodelab"
minSdkVersion 15
targetSdkVersion 23
targetSdkVersion 24
versionCode 1
versionName "1.0"
}
}

dependencies {
compile 'com.android.support:appcompat-v7:23.4.0'
compile 'com.android.support:design:23.4.0'
compile 'com.android.support:appcompat-v7:24.2.1'
compile 'com.android.support:design:24.2.1'
}
1 change: 1 addition & 0 deletions 1-Base/src/main/res/menu/menu_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2015 The Android Open Source Project
~
Expand Down
1 change: 1 addition & 0 deletions 1-Base/src/main/res/values-w820dp/dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2015 The Android Open Source Project
~
Expand Down
1 change: 1 addition & 0 deletions 1-Base/src/main/res/values/dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2015 The Android Open Source Project
~
Expand Down
1 change: 1 addition & 0 deletions 1-Base/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2015 The Android Open Source Project
~
Expand Down
3 changes: 2 additions & 1 deletion 1-Base/src/main/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2015 The Android Open Source Project
~
Expand All @@ -18,5 +19,5 @@
<style name="AppTheme.Base" parent="Theme.AppCompat.Light.DarkActionBar">
<!-- Customize your theme here. -->
</style>
<style name="AppTheme" parent="AppTheme.Base"></style>
<style name="AppTheme" parent="AppTheme.Base"/>
</resources>
10 changes: 5 additions & 5 deletions 2-Color/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,19 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 23
buildToolsVersion "23.0.3"
compileSdkVersion 24
buildToolsVersion "24.0.3"

defaultConfig {
applicationId "com.example.android.materialdesigncodelab"
minSdkVersion 15
targetSdkVersion 23
targetSdkVersion 24
versionCode 1
versionName "1.0"
}
}

dependencies {
compile 'com.android.support:appcompat-v7:23.4.0'
compile 'com.android.support:design:23.4.0'
compile 'com.android.support:appcompat-v7:24.2.1'
compile 'com.android.support:design:24.2.1'
}
1 change: 1 addition & 0 deletions 2-Color/src/main/res/menu/menu_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2015 The Android Open Source Project
~
Expand Down
1 change: 1 addition & 0 deletions 2-Color/src/main/res/values-w820dp/dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2015 The Android Open Source Project
~
Expand Down
1 change: 1 addition & 0 deletions 2-Color/src/main/res/values/dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2015 The Android Open Source Project
~
Expand Down
1 change: 1 addition & 0 deletions 2-Color/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2015 The Android Open Source Project
~
Expand Down
5 changes: 3 additions & 2 deletions 2-Color/src/main/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2015 The Android Open Source Project
~
Expand All @@ -24,5 +25,5 @@
<item name="colorAccent">#00B0FF</item>
<!-- Blue -->
</style>
<style name="AppTheme" parent="AppTheme.Base"></style>
</resources>
<style name="AppTheme" parent="AppTheme.Base"/>
</resources>
12 changes: 6 additions & 6 deletions 3-Layout/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,20 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 23
buildToolsVersion "23.0.3"
compileSdkVersion 24
buildToolsVersion "24.0.3"

defaultConfig {
applicationId "com.example.android.materialdesigncodelab"
minSdkVersion 15
targetSdkVersion 23
targetSdkVersion 24
versionCode 1
versionName "1.0"
}
}

dependencies {
compile 'com.android.support:appcompat-v7:23.4.0'
compile 'com.android.support:design:23.4.0'
compile 'com.android.support:recyclerview-v7:23.4.0'
compile 'com.android.support:appcompat-v7:24.2.1'
compile 'com.android.support:design:24.2.1'
compile 'com.android.support:recyclerview-v7:24.2.1'
}
1 change: 1 addition & 0 deletions 3-Layout/src/main/res/menu/menu_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2015 The Android Open Source Project
~
Expand Down
1 change: 1 addition & 0 deletions 3-Layout/src/main/res/values-w820dp/dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2015 The Android Open Source Project
~
Expand Down
1 change: 1 addition & 0 deletions 3-Layout/src/main/res/values/dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2015 The Android Open Source Project
~
Expand Down
1 change: 1 addition & 0 deletions 3-Layout/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2015 The Android Open Source Project
~
Expand Down
5 changes: 3 additions & 2 deletions 3-Layout/src/main/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2015 The Android Open Source Project
~
Expand All @@ -24,5 +25,5 @@
<item name="colorAccent">#00B0FF</item>
<!-- Blue -->
</style>
<style name="AppTheme" parent="AppTheme.Base"></style>
</resources>
<style name="AppTheme" parent="AppTheme.Base"/>
</resources>
14 changes: 7 additions & 7 deletions 4-RecyclerView/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,21 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 23
buildToolsVersion "23.0.3"
compileSdkVersion 24
buildToolsVersion "24.0.3"

defaultConfig {
applicationId "com.example.android.materialdesigncodelab"
minSdkVersion 15
targetSdkVersion 23
targetSdkVersion 24
versionCode 1
versionName "1.0"
}
}

dependencies {
compile 'com.android.support:appcompat-v7:23.4.0'
compile 'com.android.support:design:23.4.0'
compile 'com.android.support:cardview-v7:23.4.0'
compile 'com.android.support:recyclerview-v7:23.4.0'
compile 'com.android.support:appcompat-v7:24.2.1'
compile 'com.android.support:design:24.2.1'
compile 'com.android.support:cardview-v7:24.2.1'
compile 'com.android.support:recyclerview-v7:24.2.1'
}
9 changes: 5 additions & 4 deletions 4-RecyclerView/src/main/res/layout/item_card.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,9 @@
android:id="@+id/card_title"
android:layout_width="match_parent"
android:layout_height="@dimen/card_title_height"
android:layout_alignBottom="@+id/card_image"
android:layout_alignBottom="@id/card_image"
android:layout_marginLeft="@dimen/md_keylines"
android:layout_marginStart="@dimen/md_keylines"
tools:text="@string/item_title"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="@color/white" />
Expand All @@ -51,22 +52,22 @@
android:id="@+id/card_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/card_image"
android:layout_below="@id/card_image"
android:layout_marginLeft="@dimen/md_keylines"
android:layout_marginTop="@dimen/md_keylines"
android:layout_marginBottom="@dimen/md_keylines"
android:layout_marginRight="@dimen/md_keylines"
tools:text="@string/item_desc"
android:ellipsize="end"
android:singleLine="true"
android:maxLines="1"
android:textColor="@color/dark_grey"
android:textSize="@dimen/article_subheading" />

<Button
android:id="@+id/action_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/card_text"
android:layout_below="@id/card_text"
style="?android:attr/borderlessButtonStyle"
android:textColor="?attr/colorPrimary"
android:text="Action" />
Expand Down
12 changes: 8 additions & 4 deletions 4-RecyclerView/src/main/res/layout/item_list.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/md_keylines"
android:layout_toRightOf="@+id/list_avatar"
android:layout_marginStart="@dimen/md_keylines"
android:layout_toRightOf="@id/list_avatar"
android:layout_toEndOf="@id/list_avatar"
tools:text="@string/item_title"
android:textAppearance="?attr/textAppearanceListItem"
android:textSize="@dimen/article_subheading" />
Expand All @@ -42,12 +44,14 @@
android:id="@+id/list_desc"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/list_title"
android:layout_below="@id/list_title"
android:layout_marginLeft="@dimen/md_keylines"
android:layout_toRightOf="@+id/list_avatar"
android:layout_marginStart="@dimen/md_keylines"
android:layout_toRightOf="@id/list_avatar"
android:layout_toEndOf="@id/list_avatar"
android:textColor="@color/medium_grey"
android:ellipsize="end"
android:singleLine="true"
android:maxLines="1"
tools:text="@string/item_desc"
android:textAppearance="?attr/textAppearanceListItem"
android:textSize="@dimen/list_body" />
Expand Down
1 change: 1 addition & 0 deletions 4-RecyclerView/src/main/res/menu/menu_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2015 The Android Open Source Project
~
Expand Down
1 change: 1 addition & 0 deletions 4-RecyclerView/src/main/res/values-w820dp/dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2015 The Android Open Source Project
~
Expand Down
1 change: 1 addition & 0 deletions 4-RecyclerView/src/main/res/values/dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2015 The Android Open Source Project
~
Expand Down
1 change: 1 addition & 0 deletions 4-RecyclerView/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2015 The Android Open Source Project
~
Expand Down
5 changes: 3 additions & 2 deletions 4-RecyclerView/src/main/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2015 The Android Open Source Project
~
Expand All @@ -24,5 +25,5 @@
<item name="colorAccent">#00B0FF</item>
<!-- Blue -->
</style>
<style name="AppTheme" parent="AppTheme.Base"></style>
</resources>
<style name="AppTheme" parent="AppTheme.Base"/>
</resources>
14 changes: 7 additions & 7 deletions 5-VectorAssets/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,22 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 23
buildToolsVersion "23.0.3"
compileSdkVersion 24
buildToolsVersion "24.0.3"

defaultConfig {
applicationId "com.example.android.materialdesigncodelab"
minSdkVersion 15
targetSdkVersion 23
targetSdkVersion 24
versionCode 1
versionName "1.0"
vectorDrawables.useSupportLibrary = true
}
}

dependencies {
compile 'com.android.support:appcompat-v7:23.4.0'
compile 'com.android.support:design:23.4.0'
compile 'com.android.support:cardview-v7:23.4.0'
compile 'com.android.support:recyclerview-v7:23.4.0'
compile 'com.android.support:appcompat-v7:24.2.1'
compile 'com.android.support:design:24.2.1'
compile 'com.android.support:cardview-v7:24.2.1'
compile 'com.android.support:recyclerview-v7:24.2.1'
}
1 change: 1 addition & 0 deletions 5-VectorAssets/src/main/res/drawable/ic_add.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
Expand Down
1 change: 1 addition & 0 deletions 5-VectorAssets/src/main/res/drawable/ic_favorite.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
Expand Down
1 change: 1 addition & 0 deletions 5-VectorAssets/src/main/res/drawable/ic_menu.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
Expand Down
1 change: 1 addition & 0 deletions 5-VectorAssets/src/main/res/drawable/ic_share.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
Expand Down
Loading