diff options
author | Trevor Johns <trevorjohns@google.com> | 2017-05-17 04:20:13 -0700 |
---|---|---|
committer | Trevor Johns <trevorjohns@google.com> | 2017-05-17 12:02:04 -0700 |
commit | 6dab48e131e0d6ea3b8c8e695924f645028a0746 (patch) | |
tree | 6ebb3f94855b10ba928f5970874cf4c5fc824419 | |
parent | 530ea000cd1192b757f7445a7492f03928ce6f1c (diff) | |
download | android-6dab48e131e0d6ea3b8c8e695924f645028a0746.tar.gz |
DownloadableFonts: Make kotlinApp module self-contained
Update directory structure for DownloadableFonts's Kotlin
subproject so that it can run independently.
Test: ./gradlew assembleDebug
Change-Id: I22e859db56309eb3fcf5c8deef693124b4261b93
-rw-r--r-- | ui/fonts/DownloadableFonts/build.gradle | 2 | ||||
-rw-r--r-- | ui/fonts/DownloadableFonts/kotlinApp/.google/packaging.yaml | 20 | ||||
-rw-r--r-- | ui/fonts/DownloadableFonts/kotlinApp/README.md | 124 | ||||
-rw-r--r-- | ui/fonts/DownloadableFonts/kotlinApp/app/build.gradle | 37 | ||||
-rw-r--r-- | ui/fonts/DownloadableFonts/kotlinApp/app/src/main/AndroidManifest.xml (renamed from ui/fonts/DownloadableFonts/kotlinApp/src/main/AndroidManifest.xml) | 0 | ||||
-rw-r--r-- | ui/fonts/DownloadableFonts/kotlinApp/app/src/main/kotlin/com/example/android/downloadablefonts/Constants.kt (renamed from ui/fonts/DownloadableFonts/kotlinApp/src/main/kotlin/com/example/android/downloadablefonts/Constants.kt) | 0 | ||||
-rw-r--r-- | ui/fonts/DownloadableFonts/kotlinApp/app/src/main/kotlin/com/example/android/downloadablefonts/MainActivity.kt (renamed from ui/fonts/DownloadableFonts/kotlinApp/src/main/kotlin/com/example/android/downloadablefonts/MainActivity.kt) | 0 | ||||
-rw-r--r-- | ui/fonts/DownloadableFonts/kotlinApp/app/src/main/kotlin/com/example/android/downloadablefonts/QueryBuilder.kt (renamed from ui/fonts/DownloadableFonts/kotlinApp/src/main/kotlin/com/example/android/downloadablefonts/QueryBuilder.kt) | 0 | ||||
-rw-r--r-- | ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/font/lobster_two.xml (renamed from ui/fonts/DownloadableFonts/kotlinApp/src/main/res/font/lobster_two.xml) | 0 | ||||
-rw-r--r-- | ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/layout/activity_main.xml (renamed from ui/fonts/DownloadableFonts/kotlinApp/src/main/res/layout/activity_main.xml) | 0 | ||||
-rw-r--r-- | ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/layout/bottom_sheet_font_query.xml (renamed from ui/fonts/DownloadableFonts/kotlinApp/src/main/res/layout/bottom_sheet_font_query.xml) | 0 | ||||
-rwxr-xr-x | ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/mipmap-hdpi/ic_launcher.png (renamed from ui/fonts/DownloadableFonts/kotlinApp/src/main/res/mipmap-hdpi/ic_launcher.png) | bin | 2833 -> 2833 bytes | |||
-rw-r--r-- | ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/mipmap-hdpi/ic_launcher_round.png (renamed from ui/fonts/DownloadableFonts/kotlinApp/src/main/res/mipmap-hdpi/ic_launcher_round.png) | bin | 5236 -> 5236 bytes | |||
-rwxr-xr-x | ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/mipmap-mdpi/ic_launcher.png (renamed from ui/fonts/DownloadableFonts/kotlinApp/src/main/res/mipmap-mdpi/ic_launcher.png) | bin | 1868 -> 1868 bytes | |||
-rw-r--r-- | ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/mipmap-mdpi/ic_launcher_round.png (renamed from ui/fonts/DownloadableFonts/kotlinApp/src/main/res/mipmap-mdpi/ic_launcher_round.png) | bin | 3642 -> 3642 bytes | |||
-rwxr-xr-x | ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/mipmap-xhdpi/ic_launcher.png (renamed from ui/fonts/DownloadableFonts/kotlinApp/src/main/res/mipmap-xhdpi/ic_launcher.png) | bin | 3707 -> 3707 bytes | |||
-rw-r--r-- | ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png (renamed from ui/fonts/DownloadableFonts/kotlinApp/src/main/res/mipmap-xhdpi/ic_launcher_round.png) | bin | 6726 -> 6726 bytes | |||
-rwxr-xr-x | ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/mipmap-xxhdpi/ic_launcher.png (renamed from ui/fonts/DownloadableFonts/kotlinApp/src/main/res/mipmap-xxhdpi/ic_launcher.png) | bin | 5966 -> 5966 bytes | |||
-rw-r--r-- | ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png (renamed from ui/fonts/DownloadableFonts/kotlinApp/src/main/res/mipmap-xxhdpi/ic_launcher_round.png) | bin | 10479 -> 10479 bytes | |||
-rwxr-xr-x | ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png (renamed from ui/fonts/DownloadableFonts/kotlinApp/src/main/res/mipmap-xxxhdpi/ic_launcher.png) | bin | 8610 -> 8610 bytes | |||
-rw-r--r-- | ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png (renamed from ui/fonts/DownloadableFonts/kotlinApp/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png) | bin | 13724 -> 13724 bytes | |||
-rw-r--r-- | ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/values/colors.xml (renamed from ui/fonts/DownloadableFonts/kotlinApp/src/main/res/values/colors.xml) | 0 | ||||
-rw-r--r-- | ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/values/dimens.xml (renamed from ui/fonts/DownloadableFonts/kotlinApp/src/main/res/values/dimens.xml) | 0 | ||||
-rw-r--r-- | ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/values/family_names.xml (renamed from ui/fonts/DownloadableFonts/kotlinApp/src/main/res/values/family_names.xml) | 0 | ||||
-rw-r--r-- | ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/values/font_certs.xml (renamed from ui/fonts/DownloadableFonts/kotlinApp/src/main/res/values/font_certs.xml) | 0 | ||||
-rw-r--r-- | ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/values/preloaded_fonts.xml (renamed from ui/fonts/DownloadableFonts/kotlinApp/src/main/res/values/preloaded_fonts.xml) | 0 | ||||
-rw-r--r-- | ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/values/strings.xml (renamed from ui/fonts/DownloadableFonts/kotlinApp/src/main/res/values/strings.xml) | 0 | ||||
-rw-r--r-- | ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/values/styles.xml (renamed from ui/fonts/DownloadableFonts/kotlinApp/src/main/res/values/styles.xml) | 0 | ||||
-rw-r--r-- | ui/fonts/DownloadableFonts/kotlinApp/build.gradle | 41 | ||||
-rw-r--r-- | ui/fonts/DownloadableFonts/kotlinApp/gradle/wrapper/gradle-wrapper.jar | bin | 0 -> 53636 bytes | |||
-rw-r--r-- | ui/fonts/DownloadableFonts/kotlinApp/gradle/wrapper/gradle-wrapper.properties | 6 | ||||
-rwxr-xr-x | ui/fonts/DownloadableFonts/kotlinApp/gradlew | 160 | ||||
-rw-r--r-- | ui/fonts/DownloadableFonts/kotlinApp/gradlew.bat | 90 | ||||
-rw-r--r-- | ui/fonts/DownloadableFonts/kotlinApp/screenshots/icon-web.png | bin | 0 -> 95112 bytes | |||
-rw-r--r-- | ui/fonts/DownloadableFonts/kotlinApp/screenshots/screenshot-1.png | bin | 0 -> 100906 bytes | |||
-rw-r--r-- | ui/fonts/DownloadableFonts/kotlinApp/screenshots/screenshot-2.png | bin | 0 -> 98294 bytes | |||
-rw-r--r-- | ui/fonts/DownloadableFonts/kotlinApp/screenshots/screenshot-3.png | bin | 0 -> 95112 bytes | |||
-rw-r--r-- | ui/fonts/DownloadableFonts/kotlinApp/settings.gradle | 1 | ||||
-rw-r--r-- | ui/fonts/DownloadableFonts/settings.gradle | 2 |
39 files changed, 450 insertions, 33 deletions
diff --git a/ui/fonts/DownloadableFonts/build.gradle b/ui/fonts/DownloadableFonts/build.gradle index c6dfeeae..329bce1b 100644 --- a/ui/fonts/DownloadableFonts/build.gradle +++ b/ui/fonts/DownloadableFonts/build.gradle @@ -1,12 +1,10 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.1.2-3' repositories { jcenter() } dependencies { classpath 'com.android.tools.build:gradle:2.4.0-alpha6' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/ui/fonts/DownloadableFonts/kotlinApp/.google/packaging.yaml b/ui/fonts/DownloadableFonts/kotlinApp/.google/packaging.yaml new file mode 100644 index 00000000..d1e9f375 --- /dev/null +++ b/ui/fonts/DownloadableFonts/kotlinApp/.google/packaging.yaml @@ -0,0 +1,20 @@ + +# GOOGLE SAMPLE PACKAGING DATA +# +# This file is used by Google as part of our samples packaging process. +# End users may safely ignore this file. It has no relevance to other systems. +--- +status: DRAFTED +technologies: [Android] +categories: [UI, Android O Preview] +languages: [Kotlin] +solutions: [Mobile] +github: android-DownloadableFonts +level: INTERMEDIATE +icon: screenshots/icon-web.png +apiRefs: + - android:android.provider.FontRequest + - android:android.support.v4.provider.FontRequest + - android:android.provider.FontsContractCompat + - android:android.support.v4.provider.FontsContractCompat +license: apache2 diff --git a/ui/fonts/DownloadableFonts/kotlinApp/README.md b/ui/fonts/DownloadableFonts/kotlinApp/README.md new file mode 100644 index 00000000..d3dd8223 --- /dev/null +++ b/ui/fonts/DownloadableFonts/kotlinApp/README.md @@ -0,0 +1,124 @@ +Android DownloadableFonts Sample (Kotlin) +=================================== + +This sample demonstrates how to use the Downloadable Fonts feature introduced in Android O. +Downloadable Fonts is a feature that allows apps to request a certain font from a provider +instead of bundling it or downloading it themselves. This means, there is no need to bundle the +font as an asset. + +Introduction +------------ + +There are two ways of requesting a font to download. +To request a font to download from Java code, you need to create a [FontRequest][1] class first like +this: +```java +FontRequest request = new FontRequest( + "com.google.android.gms.fonts", // ProviderAuthority + "com.google.android.gms", // ProviderPackage + query, // Query + R.array.com_google_android_gms_fonts_certs); // Certificates +``` +The parameters `ProviderAuthority`, `ProviderPackage` are given by a font provider, in the case +above uses Google Play Services as a font provider. +The third parameter is a query string about the requested font. The syntax of the query is defined +by the font provider. + +Then pass the request instance to the `requestFont` method in the [FontsContractCompat][2]. +```java +FontsContractCompat.requestFont(context, request, callback, handler); +``` +The downloaded font or an error code if the request failed will be passed to the callback. +The example above assumes you are using the classes from the support library. There are +corresponding classes in the framework, but the feature is available back to API level 14 if you +use the support library. + +You can declare a downloaded font in an XML file and let the system download it for you and use it +in layouts. +```xml +<font-family xmlns:app="http://schemas.android.com/apk/res-auto" + app:fontProviderAuthority="com.google.android.gms.fonts" + app:fontProviderPackage="com.google.android.gms" + app:fontProviderQuery="Lobster Two" + app:fontProviderCerts="@array/com_google_android_gms_fonts_certs"> +</font-family> +``` +By defining the requested font in an XML file and putting the `preloaded_fonts` array and the +meta-data tag in the AndroidManifest, you can avoid the delay until the font is downloaded by the +first attempt. +```xml +<resources> + <array name="preloaded_fonts" translatable="false"> + <item>@font/lobster_two</item> + </array> +</resources> +``` + +```xml +<application > + ... + <meta-data android:name="preloaded_fonts" android:resource="@array/preloaded_fonts" /> + ... +</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 Support Repository + +Screenshots +------------- + +<img src="screenshots/screenshot-1.png" height="400" alt="Screenshot"/> + +Getting Started +--------------- + +This sample uses the Gradle build system. To build this project, use the +"gradlew build" command or use "Import Project" in Android Studio. + +Support +------- + +- Google+ Community: https://plus.google.com/communities/105153134372062985968 +- Stack Overflow: http://stackoverflow.com/questions/tagged/android + +If you've found an error in this sample, please file an issue: +https://github.com/googlesamples/android-DownloadableFonts + +Patches are encouraged, and may be submitted by forking this project and +submitting a pull request through GitHub. Please see CONTRIBUTING.md for more details. + +License +------- + +Copyright 2017 The Android Open Source Project, Inc. + +Licensed to the Apache Software Foundation (ASF) under one or more contributor +license agreements. See the NOTICE file distributed with this work for +additional information regarding copyright ownership. The ASF licenses this +file to you under the Apache License, Version 2.0 (the "License"); you may not +use this file except in compliance with the License. You may obtain a copy of +the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +License for the specific language governing permissions and limitations under +the License. diff --git a/ui/fonts/DownloadableFonts/kotlinApp/app/build.gradle b/ui/fonts/DownloadableFonts/kotlinApp/app/build.gradle new file mode 100644 index 00000000..1d94fb0d --- /dev/null +++ b/ui/fonts/DownloadableFonts/kotlinApp/app/build.gradle @@ -0,0 +1,37 @@ +apply plugin: 'com.android.application' +apply plugin: 'kotlin-android' + +android { + compileSdkVersion 'android-O' + buildToolsVersion "26.0.0 rc2" + + 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 'O' + targetSdkVersion 'O' + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' + } + } + + 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' + } +} + +repositories { + mavenCentral() +} +dependencies { + compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" +} + diff --git a/ui/fonts/DownloadableFonts/kotlinApp/src/main/AndroidManifest.xml b/ui/fonts/DownloadableFonts/kotlinApp/app/src/main/AndroidManifest.xml index 68ed0a2f..68ed0a2f 100644 --- a/ui/fonts/DownloadableFonts/kotlinApp/src/main/AndroidManifest.xml +++ b/ui/fonts/DownloadableFonts/kotlinApp/app/src/main/AndroidManifest.xml diff --git a/ui/fonts/DownloadableFonts/kotlinApp/src/main/kotlin/com/example/android/downloadablefonts/Constants.kt b/ui/fonts/DownloadableFonts/kotlinApp/app/src/main/kotlin/com/example/android/downloadablefonts/Constants.kt index 9ff2e93c..9ff2e93c 100644 --- a/ui/fonts/DownloadableFonts/kotlinApp/src/main/kotlin/com/example/android/downloadablefonts/Constants.kt +++ b/ui/fonts/DownloadableFonts/kotlinApp/app/src/main/kotlin/com/example/android/downloadablefonts/Constants.kt diff --git a/ui/fonts/DownloadableFonts/kotlinApp/src/main/kotlin/com/example/android/downloadablefonts/MainActivity.kt b/ui/fonts/DownloadableFonts/kotlinApp/app/src/main/kotlin/com/example/android/downloadablefonts/MainActivity.kt index aaad24f9..aaad24f9 100644 --- a/ui/fonts/DownloadableFonts/kotlinApp/src/main/kotlin/com/example/android/downloadablefonts/MainActivity.kt +++ b/ui/fonts/DownloadableFonts/kotlinApp/app/src/main/kotlin/com/example/android/downloadablefonts/MainActivity.kt diff --git a/ui/fonts/DownloadableFonts/kotlinApp/src/main/kotlin/com/example/android/downloadablefonts/QueryBuilder.kt b/ui/fonts/DownloadableFonts/kotlinApp/app/src/main/kotlin/com/example/android/downloadablefonts/QueryBuilder.kt index 1f6f679a..1f6f679a 100644 --- a/ui/fonts/DownloadableFonts/kotlinApp/src/main/kotlin/com/example/android/downloadablefonts/QueryBuilder.kt +++ b/ui/fonts/DownloadableFonts/kotlinApp/app/src/main/kotlin/com/example/android/downloadablefonts/QueryBuilder.kt diff --git a/ui/fonts/DownloadableFonts/kotlinApp/src/main/res/font/lobster_two.xml b/ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/font/lobster_two.xml index 28794824..28794824 100644 --- a/ui/fonts/DownloadableFonts/kotlinApp/src/main/res/font/lobster_two.xml +++ b/ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/font/lobster_two.xml diff --git a/ui/fonts/DownloadableFonts/kotlinApp/src/main/res/layout/activity_main.xml b/ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/layout/activity_main.xml index e0ca1d51..e0ca1d51 100644 --- a/ui/fonts/DownloadableFonts/kotlinApp/src/main/res/layout/activity_main.xml +++ b/ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/layout/activity_main.xml diff --git a/ui/fonts/DownloadableFonts/kotlinApp/src/main/res/layout/bottom_sheet_font_query.xml b/ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/layout/bottom_sheet_font_query.xml index c30193c9..c30193c9 100644 --- a/ui/fonts/DownloadableFonts/kotlinApp/src/main/res/layout/bottom_sheet_font_query.xml +++ b/ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/layout/bottom_sheet_font_query.xml diff --git a/ui/fonts/DownloadableFonts/kotlinApp/src/main/res/mipmap-hdpi/ic_launcher.png b/ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differindex cb86b974..cb86b974 100755 --- a/ui/fonts/DownloadableFonts/kotlinApp/src/main/res/mipmap-hdpi/ic_launcher.png +++ b/ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/ui/fonts/DownloadableFonts/kotlinApp/src/main/res/mipmap-hdpi/ic_launcher_round.png b/ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/mipmap-hdpi/ic_launcher_round.png Binary files differindex 7502f5d6..7502f5d6 100644 --- a/ui/fonts/DownloadableFonts/kotlinApp/src/main/res/mipmap-hdpi/ic_launcher_round.png +++ b/ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/mipmap-hdpi/ic_launcher_round.png diff --git a/ui/fonts/DownloadableFonts/kotlinApp/src/main/res/mipmap-mdpi/ic_launcher.png b/ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differindex bfeec7a3..bfeec7a3 100755 --- a/ui/fonts/DownloadableFonts/kotlinApp/src/main/res/mipmap-mdpi/ic_launcher.png +++ b/ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/ui/fonts/DownloadableFonts/kotlinApp/src/main/res/mipmap-mdpi/ic_launcher_round.png b/ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/mipmap-mdpi/ic_launcher_round.png Binary files differindex 13ca6d75..13ca6d75 100644 --- a/ui/fonts/DownloadableFonts/kotlinApp/src/main/res/mipmap-mdpi/ic_launcher_round.png +++ b/ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/mipmap-mdpi/ic_launcher_round.png diff --git a/ui/fonts/DownloadableFonts/kotlinApp/src/main/res/mipmap-xhdpi/ic_launcher.png b/ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/mipmap-xhdpi/ic_launcher.png Binary files differindex 358442e0..358442e0 100755 --- a/ui/fonts/DownloadableFonts/kotlinApp/src/main/res/mipmap-xhdpi/ic_launcher.png +++ b/ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/ui/fonts/DownloadableFonts/kotlinApp/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png Binary files differindex ff93f4d1..ff93f4d1 100644 --- a/ui/fonts/DownloadableFonts/kotlinApp/src/main/res/mipmap-xhdpi/ic_launcher_round.png +++ b/ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png diff --git a/ui/fonts/DownloadableFonts/kotlinApp/src/main/res/mipmap-xxhdpi/ic_launcher.png b/ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/mipmap-xxhdpi/ic_launcher.png Binary files differindex c99a1a00..c99a1a00 100755 --- a/ui/fonts/DownloadableFonts/kotlinApp/src/main/res/mipmap-xxhdpi/ic_launcher.png +++ b/ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/ui/fonts/DownloadableFonts/kotlinApp/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png Binary files differindex 8b642db8..8b642db8 100644 --- a/ui/fonts/DownloadableFonts/kotlinApp/src/main/res/mipmap-xxhdpi/ic_launcher_round.png +++ b/ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png diff --git a/ui/fonts/DownloadableFonts/kotlinApp/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png Binary files differindex 3bcda818..3bcda818 100755 --- a/ui/fonts/DownloadableFonts/kotlinApp/src/main/res/mipmap-xxxhdpi/ic_launcher.png +++ b/ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/ui/fonts/DownloadableFonts/kotlinApp/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png Binary files differindex a49362e3..a49362e3 100644 --- a/ui/fonts/DownloadableFonts/kotlinApp/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png +++ b/ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png diff --git a/ui/fonts/DownloadableFonts/kotlinApp/src/main/res/values/colors.xml b/ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/values/colors.xml index 4f03db6e..4f03db6e 100644 --- a/ui/fonts/DownloadableFonts/kotlinApp/src/main/res/values/colors.xml +++ b/ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/values/colors.xml diff --git a/ui/fonts/DownloadableFonts/kotlinApp/src/main/res/values/dimens.xml b/ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/values/dimens.xml index 7d51aa89..7d51aa89 100644 --- a/ui/fonts/DownloadableFonts/kotlinApp/src/main/res/values/dimens.xml +++ b/ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/values/dimens.xml diff --git a/ui/fonts/DownloadableFonts/kotlinApp/src/main/res/values/family_names.xml b/ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/values/family_names.xml index 9aa96d01..9aa96d01 100644 --- a/ui/fonts/DownloadableFonts/kotlinApp/src/main/res/values/family_names.xml +++ b/ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/values/family_names.xml diff --git a/ui/fonts/DownloadableFonts/kotlinApp/src/main/res/values/font_certs.xml b/ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/values/font_certs.xml index a09ad32f..a09ad32f 100644 --- a/ui/fonts/DownloadableFonts/kotlinApp/src/main/res/values/font_certs.xml +++ b/ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/values/font_certs.xml diff --git a/ui/fonts/DownloadableFonts/kotlinApp/src/main/res/values/preloaded_fonts.xml b/ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/values/preloaded_fonts.xml index df301f60..df301f60 100644 --- a/ui/fonts/DownloadableFonts/kotlinApp/src/main/res/values/preloaded_fonts.xml +++ b/ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/values/preloaded_fonts.xml diff --git a/ui/fonts/DownloadableFonts/kotlinApp/src/main/res/values/strings.xml b/ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/values/strings.xml index 1eed5534..1eed5534 100644 --- a/ui/fonts/DownloadableFonts/kotlinApp/src/main/res/values/strings.xml +++ b/ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/values/strings.xml diff --git a/ui/fonts/DownloadableFonts/kotlinApp/src/main/res/values/styles.xml b/ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/values/styles.xml index 9ba54f26..9ba54f26 100644 --- a/ui/fonts/DownloadableFonts/kotlinApp/src/main/res/values/styles.xml +++ b/ui/fonts/DownloadableFonts/kotlinApp/app/src/main/res/values/styles.xml diff --git a/ui/fonts/DownloadableFonts/kotlinApp/build.gradle b/ui/fonts/DownloadableFonts/kotlinApp/build.gradle index 1d94fb0d..ccae247b 100644 --- a/ui/fonts/DownloadableFonts/kotlinApp/build.gradle +++ b/ui/fonts/DownloadableFonts/kotlinApp/build.gradle @@ -1,37 +1,18 @@ -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' - -android { - compileSdkVersion 'android-O' - buildToolsVersion "26.0.0 rc2" - - 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 'O' - targetSdkVersion 'O' - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' - } +// Top-level build file where you can add configuration options common to all sub-projects/modules. +buildscript { + ext.kotlin_version = '1.1.2-3' + repositories { + jcenter() } - 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' + classpath 'com.android.tools.build:gradle:2.4.0-alpha6' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } -repositories { - mavenCentral() -} -dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" +allprojects { + repositories { + jcenter() + } } diff --git a/ui/fonts/DownloadableFonts/kotlinApp/gradle/wrapper/gradle-wrapper.jar b/ui/fonts/DownloadableFonts/kotlinApp/gradle/wrapper/gradle-wrapper.jar Binary files differnew file mode 100644 index 00000000..13372aef --- /dev/null +++ b/ui/fonts/DownloadableFonts/kotlinApp/gradle/wrapper/gradle-wrapper.jar diff --git a/ui/fonts/DownloadableFonts/kotlinApp/gradle/wrapper/gradle-wrapper.properties b/ui/fonts/DownloadableFonts/kotlinApp/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..9eaab7c2 --- /dev/null +++ b/ui/fonts/DownloadableFonts/kotlinApp/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Wed May 10 17:45:17 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 diff --git a/ui/fonts/DownloadableFonts/kotlinApp/gradlew b/ui/fonts/DownloadableFonts/kotlinApp/gradlew new file mode 100755 index 00000000..9d82f789 --- /dev/null +++ b/ui/fonts/DownloadableFonts/kotlinApp/gradlew @@ -0,0 +1,160 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/ui/fonts/DownloadableFonts/kotlinApp/gradlew.bat b/ui/fonts/DownloadableFonts/kotlinApp/gradlew.bat new file mode 100644 index 00000000..aec99730 --- /dev/null +++ b/ui/fonts/DownloadableFonts/kotlinApp/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/ui/fonts/DownloadableFonts/kotlinApp/screenshots/icon-web.png b/ui/fonts/DownloadableFonts/kotlinApp/screenshots/icon-web.png Binary files differnew file mode 100644 index 00000000..31629a96 --- /dev/null +++ b/ui/fonts/DownloadableFonts/kotlinApp/screenshots/icon-web.png diff --git a/ui/fonts/DownloadableFonts/kotlinApp/screenshots/screenshot-1.png b/ui/fonts/DownloadableFonts/kotlinApp/screenshots/screenshot-1.png Binary files differnew file mode 100644 index 00000000..05649a5c --- /dev/null +++ b/ui/fonts/DownloadableFonts/kotlinApp/screenshots/screenshot-1.png diff --git a/ui/fonts/DownloadableFonts/kotlinApp/screenshots/screenshot-2.png b/ui/fonts/DownloadableFonts/kotlinApp/screenshots/screenshot-2.png Binary files differnew file mode 100644 index 00000000..ed423814 --- /dev/null +++ b/ui/fonts/DownloadableFonts/kotlinApp/screenshots/screenshot-2.png diff --git a/ui/fonts/DownloadableFonts/kotlinApp/screenshots/screenshot-3.png b/ui/fonts/DownloadableFonts/kotlinApp/screenshots/screenshot-3.png Binary files differnew file mode 100644 index 00000000..31629a96 --- /dev/null +++ b/ui/fonts/DownloadableFonts/kotlinApp/screenshots/screenshot-3.png diff --git a/ui/fonts/DownloadableFonts/kotlinApp/settings.gradle b/ui/fonts/DownloadableFonts/kotlinApp/settings.gradle new file mode 100644 index 00000000..e7b4def4 --- /dev/null +++ b/ui/fonts/DownloadableFonts/kotlinApp/settings.gradle @@ -0,0 +1 @@ +include ':app' diff --git a/ui/fonts/DownloadableFonts/settings.gradle b/ui/fonts/DownloadableFonts/settings.gradle index 2279ee72..e7b4def4 100644 --- a/ui/fonts/DownloadableFonts/settings.gradle +++ b/ui/fonts/DownloadableFonts/settings.gradle @@ -1 +1 @@ -include ':app', ':kotlinApp' +include ':app' |