Skip to content

Commit

Permalink
Auto-update
Browse files Browse the repository at this point in the history
  • Loading branch information
@google-automerger
google-automerger committed Oct 11, 2017
1 parent cf1c76c commit 50e31ad
Show file tree
Hide file tree
Showing 9 changed files with 42 additions and 46 deletions.
2 changes: 1 addition & 1 deletion .google/packaging.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
---
status: PUBLISHED
technologies: [Android]
categories: [UI, Android O Preview]
categories: [UI]
languages: [Java]
solutions: [Mobile]
github: android-DownloadableFonts
Expand Down
12 changes: 2 additions & 10 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,22 +63,14 @@ first attempt.
</application>
```

Note that the sample uses Google Play Services as a font provider, which requires pre-released
version of Google Play Services.
You can sign up for the beta program so that the beta version of Google Play Services is
downloaded to your device. https://developers.google.com/android/guides/beta-program
If you have Google Play Services whose version number is equal or above 11.x.x, that means you
have the compatible version installed. (You can confirm by navigating to
Settings -> Apps -> Google Play Services)

[1]: https://developer.android.com/reference/android/support/v4/provider/FontRequest.html
[2]: https://developer.android.com/reference/android/support/v4/provider/FontsContractCompat.html

Pre-requisites
--------------

- Android SDK 25
- Android Build Tools v25.0.3
- Android SDK 26
- Android Build Tools v26.0.1
- Android Support Repository

Screenshots
Expand Down
17 changes: 9 additions & 8 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
apply plugin: 'com.android.application'

ext {
supportLibVersion = '26.0.1'
}

android {
compileSdkVersion 26
buildToolsVersion "26.0.0 rc2"
buildToolsVersion "26.0.1"

defaultConfig {
applicationId "com.example.android.downloadablefonts"
// Once API level 26 SDK is launched, lower the minSdkVersion.
// At this moment, an app targeting the preview version of the SDK only runs on the
// preview device.
minSdkVersion 26
minSdkVersion 14
targetSdkVersion 26
}

Expand All @@ -21,8 +22,8 @@ android {
}

dependencies {
compile 'com.android.support:appcompat-v7:26.0.0-beta1'
compile 'com.android.support:design:26.0.0-beta1'
compile 'com.android.support:cardview-v7:26.0.0-beta1'
compile "com.android.support:appcompat-v7:$supportLibVersion"
compile "com.android.support:design:$supportLibVersion"
compile "com.android.support:cardview-v7:$supportLibVersion"
}
}
7 changes: 6 additions & 1 deletion app/src/main/res/layout/bottom_sheet_font_query.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@

<android.support.design.widget.TextInputLayout
android:id="@+id/auto_complete_family_name_input"
android:layout_width="240dp"
android:layout_width="0dp"
android:layout_weight="4"
android:layout_height="wrap_content">

<AutoCompleteTextView
Expand All @@ -66,6 +67,7 @@

<Button
android:id="@+id/button_request"
android:layout_weight="1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/request" />
Expand Down Expand Up @@ -108,6 +110,7 @@
android:layout_height="wrap_content"
android:layout_width="80dp"
android:layout_marginStart="@dimen/margin_small"
android:layout_marginLeft="@dimen/margin_small"
android:textSize="16sp"
android:gravity="end" />
</LinearLayout>
Expand Down Expand Up @@ -149,6 +152,7 @@
android:layout_height="wrap_content"
android:layout_width="80dp"
android:layout_marginStart="@dimen/margin_small"
android:layout_marginLeft="@dimen/margin_small"
android:textSize="16sp"
android:gravity="end" />
</LinearLayout>
Expand Down Expand Up @@ -190,6 +194,7 @@
android:layout_height="wrap_content"
android:layout_width="80dp"
android:layout_marginStart="@dimen/margin_small"
android:layout_marginLeft="@dimen/margin_small"
android:textSize="16sp"
android:gravity="end" />
</LinearLayout>
Expand Down
10 changes: 3 additions & 7 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,17 @@
buildscript {
repositories {
jcenter()
maven {
url 'https://maven.google.com'
}
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.0-alpha1'
classpath 'com.android.tools.build:gradle:3.0.0-alpha9'
}
}

allprojects {
repositories {
jcenter()
maven {
url 'https://maven.google.com'
}
google()
}
}

Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed May 10 17:45:17 JST 2017
#Wed Aug 09 11:54:51 JST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-4.0-20170406000015+0000-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-rc-1-all.zip
17 changes: 9 additions & 8 deletions kotlinApp/app/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'

ext {
supportLibVersion = '26.0.1'
}

android {
compileSdkVersion 26
buildToolsVersion "26.0.0 rc2"
buildToolsVersion "26.0.1"

defaultConfig {
applicationId "com.example.android.downloadablefonts"
// Once API level 26 SDK is launched, lower the minSdkVersion.
// At this moment, an app targeting the preview version of the SDK only runs on the
// preview device.
minSdkVersion 26
minSdkVersion 14
targetSdkVersion 26
}

Expand All @@ -22,9 +23,9 @@ android {
}

dependencies {
compile 'com.android.support:appcompat-v7:26.0.0-beta1'
compile 'com.android.support:design:26.0.0-beta1'
compile 'com.android.support:cardview-v7:26.0.0-beta1'
compile "com.android.support:appcompat-v7:$supportLibVersion"
compile "com.android.support:design:$supportLibVersion"
compile "com.android.support:cardview-v7:$supportLibVersion"
}
}

Expand Down
7 changes: 6 additions & 1 deletion kotlinApp/app/src/main/res/layout/bottom_sheet_font_query.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@

<android.support.design.widget.TextInputLayout
android:id="@+id/auto_complete_family_name_input"
android:layout_width="240dp"
android:layout_width="0dp"
android:layout_weight="4"
android:layout_height="wrap_content">

<AutoCompleteTextView
Expand All @@ -66,6 +67,7 @@

<Button
android:id="@+id/button_request"
android:layout_weight="1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/request" />
Expand Down Expand Up @@ -108,6 +110,7 @@
android:layout_height="wrap_content"
android:layout_width="80dp"
android:layout_marginStart="@dimen/margin_small"
android:layout_marginLeft="@dimen/margin_small"
android:textSize="16sp"
android:gravity="end" />
</LinearLayout>
Expand Down Expand Up @@ -149,6 +152,7 @@
android:layout_height="wrap_content"
android:layout_width="80dp"
android:layout_marginStart="@dimen/margin_small"
android:layout_marginLeft="@dimen/margin_small"
android:textSize="16sp"
android:gravity="end" />
</LinearLayout>
Expand Down Expand Up @@ -190,6 +194,7 @@
android:layout_height="wrap_content"
android:layout_width="80dp"
android:layout_marginStart="@dimen/margin_small"
android:layout_marginLeft="@dimen/margin_small"
android:textSize="16sp"
android:gravity="end" />
</LinearLayout>
Expand Down
12 changes: 4 additions & 8 deletions kotlinApp/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,20 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext.kotlin_version = '1.1.2-4'
ext.kotlin_version = '1.1.3-2'
repositories {
jcenter()
maven {
url 'https://maven.google.com'
}
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.0-alpha1'
classpath 'com.android.tools.build:gradle:3.0.0-alpha9'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}

allprojects {
repositories {
jcenter()
maven {
url 'https://maven.google.com'
}
google()
}
}

0 comments on commit 50e31ad

Please sign in to comment.