Skip to content

Commit 808513a

Browse files
updated sdks...
1 parent e1c8ef1 commit 808513a

File tree

18 files changed

+42
-103
lines changed

18 files changed

+42
-103
lines changed

.idea/caches/build_file_checksums.ser

618 Bytes
Binary file not shown.

.idea/caches/gradle_models.ser

171 KB
Binary file not shown.

.idea/compiler.xml

Lines changed: 0 additions & 22 deletions
This file was deleted.

.idea/copyright/profiles_settings.xml

Lines changed: 0 additions & 3 deletions
This file was deleted.

.idea/encodings.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/gradle.xml

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 5 additions & 53 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/vcs.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

AutoFitTextViewLibrary/build.gradle

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
apply plugin: 'com.android.library'
22

33
android {
4-
compileSdkVersion 24
5-
buildToolsVersion "23.0.3"
4+
compileSdkVersion 28
65

76
defaultConfig {
8-
minSdkVersion 9
9-
targetSdkVersion 24
7+
minSdkVersion 14
8+
targetSdkVersion 28
109
versionCode 1
1110
versionName "1.0"
1211
}
@@ -31,5 +30,5 @@ android {
3130
}
3231

3332
dependencies {
34-
compile 'com.android.support:appcompat-v7:24.0.0'
33+
implementation 'androidx.appcompat:appcompat:1.0.2'
3534
}

AutoFitTextViewLibrary/src/com/lb/auto_fit_textview/AutoResizeTextView.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@
66
import android.graphics.RectF;
77
import android.graphics.Typeface;
88
import android.os.Build;
9-
import android.support.v7.widget.AppCompatTextView;
109
import android.text.Layout.Alignment;
1110
import android.text.StaticLayout;
1211
import android.text.TextPaint;
1312
import android.text.method.TransformationMethod;
1413
import android.util.AttributeSet;
1514
import android.util.TypedValue;
1615

16+
import androidx.appcompat.widget.AppCompatTextView;
17+
1718
/**
1819
* a textView that is able to self-adjust its font size depending on the min and max size of the font, and its own size.<br/>
1920
* code is heavily based on this StackOverflow thread:

AutoFitTextViewSample/build.gradle

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 24
5-
buildToolsVersion "23.0.3"
4+
compileSdkVersion 28
65

76
defaultConfig {
87
applicationId "com.example.autofittextviewsample"
9-
minSdkVersion 16
10-
targetSdkVersion 24
8+
minSdkVersion 14
9+
targetSdkVersion 28
1110
versionCode 1
1211
versionName "1.0"
1312
}
@@ -32,8 +31,8 @@ android {
3231
}
3332

3433
dependencies {
35-
compile fileTree(dir: 'libs', include: ['*.jar'])
36-
compile 'com.android.support:appcompat-v7:24.1.1'
37-
compile 'com.android.support:recyclerview-v7:24.1.1'
38-
compile project(':AutoFitTextViewLibrary')
34+
implementation fileTree(dir: 'libs', include: ['*.jar'])
35+
implementation 'androidx.appcompat:appcompat:1.0.2'
36+
implementation 'androidx.recyclerview:recyclerview:1.0.0'
37+
implementation project(':AutoFitTextViewLibrary')
3938
}
Binary file not shown.

AutoFitTextViewSample/res/layout/activity_main2.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
android:paddingTop="@dimen/activity_vertical_margin"
1212
tools:context="com.example.autofittextviewsample.Main2Activity">
1313

14-
<android.support.v7.widget.RecyclerView
14+
<androidx.recyclerview.widget.RecyclerView
1515
android:layout_width="match_parent" android:id="@android:id/list"
16-
android:layout_height="match_parent"></android.support.v7.widget.RecyclerView>
16+
android:layout_height="match_parent"></androidx.recyclerview.widget.RecyclerView>
1717

1818
</RelativeLayout>

AutoFitTextViewSample/src/com/example/autofittextviewsample/Main2Activity.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.example.autofittextviewsample;
22

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
5-
import android.support.v7.widget.LinearLayoutManager;
6-
import android.support.v7.widget.RecyclerView;
7-
import android.support.v7.widget.RecyclerView.Adapter;
4+
import androidx.appcompat.app.AppCompatActivity;
5+
import androidx.recyclerview.widget.LinearLayoutManager;
6+
import androidx.recyclerview.widget.RecyclerView;
7+
import androidx.recyclerview.widget.RecyclerView.Adapter;
88
import android.view.LayoutInflater;
99
import android.view.View;
1010
import android.view.ViewGroup;

AutoFitTextViewSample/src/com/example/autofittextviewsample/MainActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import android.content.Intent;
44
import android.net.Uri;
55
import android.os.Bundle;
6-
import android.support.v7.app.AppCompatActivity;
6+
import androidx.appcompat.app.AppCompatActivity;
77
import android.text.Editable;
88
import android.text.TextUtils.TruncateAt;
99
import android.text.TextWatcher;

build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
buildscript {
44
repositories {
55
jcenter()
6+
google()
67
}
78
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.2.0'
9+
classpath 'com.android.tools.build:gradle:3.3.0'
910

1011
// NOTE: Do not place your application dependencies here; they belong
1112
// in the individual module build.gradle files
@@ -15,5 +16,6 @@ buildscript {
1516
allprojects {
1617
repositories {
1718
jcenter()
19+
google()
1820
}
1921
}

gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,5 @@
1616
# This option should only be used with decoupled projects. More details, visit
1717
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
1818
# org.gradle.parallel=true
19+
android.enableJetifier=true
20+
android.useAndroidX=true
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Thu Sep 22 09:40:40 IDT 2016
1+
#Wed Feb 06 23:21:12 IST 2019
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip

0 commit comments

Comments
 (0)