Skip to content

Commit 1a18f17

Browse files
author
Victor Albertos
committed
migrate to androidx
1 parent bc1cb50 commit 1a18f17

18 files changed

+102
-36
lines changed

‎build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ buildscript {
99

1010
}
1111
dependencies {
12-
classpath 'com.android.tools.build:gradle:3.3.0'
12+
classpath 'com.android.tools.build:gradle:3.3.1'
1313
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1414
// NOTE: Do not place your application dependencies here; they belong
1515
// in the individual module build.gradle files

‎glimpse-core/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ android {
1010
versionCode 1
1111
versionName "1.0"
1212

13-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
13+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1414

1515
}
1616

‎glimpse-glide/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ android {
1111
versionCode 1
1212
versionName "1.0"
1313

14-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
14+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1515

1616
}
1717

‎glimpse-picasso/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ android {
1111
versionCode 1
1212
versionName "1.0"
1313

14-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
14+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1515

1616
}
1717

‎gradle.properties

+3
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,6 @@ org.gradle.jvmargs=-Xmx1536m
1313
# org.gradle.parallel=true
1414
# Kotlin code style for this project: "official" or "obsolete":
1515
kotlin.code.style=official
16+
17+
android.useAndroidX=true
18+
android.enableJetifier=true

‎sample-app/build.gradle

+10-7
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ android {
1111
targetSdkVersion 28
1212
versionCode 1
1313
versionName "1.0"
14-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
14+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1515
}
1616
buildTypes {
1717
release {
@@ -23,6 +23,7 @@ android {
2323
noCompress "tflite"
2424
noCompress "lite"
2525
}
26+
2627
}
2728

2829
dependencies {
@@ -31,15 +32,17 @@ dependencies {
3132
implementation project(':glimpse-picasso')
3233

3334
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
34-
implementation 'com.android.support:appcompat-v7:28.0.0'
35-
implementation 'com.android.support:recyclerview-v7:28.0.0'
36-
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
35+
implementation "com.google.android.material:material:1.0.0"
36+
implementation 'androidx.appcompat:appcompat:1.0.2'
37+
38+
implementation 'androidx.recyclerview:recyclerview:1.0.0'
39+
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
3740
implementation 'org.tensorflow:tensorflow-lite:0.0.0-nightly'
38-
testImplementation 'junit:junit:4.12'
39-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
40-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
41+
4142
implementation 'com.squareup.picasso:picasso:2.71828'
4243

4344
implementation 'com.github.bumptech.glide:glide:4.8.0'
4445
kapt 'com.github.bumptech.glide:compiler:4.8.0'
46+
47+
testImplementation 'junit:junit:4.12'
4548
}

‎sample-app/src/main/java/glimpse/sample/BenmarchActivity.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package glimpse.sample
22

33
import android.graphics.drawable.BitmapDrawable
44
import android.os.Bundle
5-
import android.support.v7.app.AppCompatActivity
65
import android.util.TimingLogger
6+
import androidx.appcompat.app.AppCompatActivity
77
import glimpse.core.crop
88
import glimpse.core.findCenter
99
import kotlinx.android.synthetic.main.activity_benmarch.*

‎sample-app/src/main/java/glimpse/sample/ImagesActivity.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ package glimpse.sample
22

33
import android.app.Activity
44
import android.os.Bundle
5-
import android.support.v7.app.AppCompatActivity
6-
import android.support.v7.widget.RecyclerView
7-
import android.support.v7.widget.StaggeredGridLayoutManager
85
import android.util.DisplayMetrics
96
import android.view.*
7+
import androidx.appcompat.app.AppCompatActivity
8+
import androidx.recyclerview.widget.RecyclerView
9+
import androidx.recyclerview.widget.StaggeredGridLayoutManager
1010
import com.squareup.picasso.Picasso
1111
import glimpse.picasso.GlimpseTransformation
1212
import kotlinx.android.synthetic.main.activity_images.*

‎sample-app/src/main/java/glimpse/sample/TestCropActivity.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ package glimpse.sample
22

33
import android.graphics.drawable.BitmapDrawable
44
import android.os.Bundle
5-
import android.support.v4.app.Fragment
6-
import android.support.v4.app.FragmentManager
7-
import android.support.v4.app.FragmentStatePagerAdapter
8-
import android.support.v7.app.AppCompatActivity
95
import android.view.*
106
import android.widget.ImageView
117
import android.widget.TextView
8+
import androidx.appcompat.app.AppCompatActivity
9+
import androidx.fragment.app.Fragment
10+
import androidx.fragment.app.FragmentManager
11+
import androidx.fragment.app.FragmentStatePagerAdapter
1212
import glimpse.core.crop
1313
import glimpse.sample.Shape.*
1414
import glimpse.sample.TestCropActivity.Companion.goodQuality

‎sample-app/src/main/java/glimpse/sample/UrlsSample.kt

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ private val urlsSample by lazy {
1111
"https://images.unsplash.com/photo-1499455631844-d77c223bca19",
1212
"https://images.unsplash.com/photo-1541691200587-2045c1c47483",
1313
"https://images.unsplash.com/photo-1515412512744-6e4adc8b5e55",
14-
"https://images.unsplash.com/photo-1515003197210-e0cd71810b5",
1514
"https://images.unsplash.com/photo-1467003909585-2f8a72700288",
1615
"https://images.unsplash.com/photo-1490818387583-1baba5e638af",
1716
"https://images.unsplash.com/photo-1478369402113-1fd53f17e8b4",

‎sample-app/src/main/res/drawable/ic_landscape.xml

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24.0"
5+
android:viewportHeight="24.0">
6+
<path
7+
android:fillColor="#FF000000"
8+
android:pathData="M4,18h17v-6H4v6zM4,5v6h17V5H4z"/>
9+
</vector>

‎sample-app/src/main/res/drawable/ic_portrait.xml

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24.0"
5+
android:viewportHeight="24.0">
6+
<path
7+
android:fillColor="#FF000000"
8+
android:pathData="M4,11h5L9,5L4,5v6zM4,18h5v-6L4,12v6zM10,18h5v-6h-5v6zM16,18h5v-6h-5v6zM10,11h5L15,5h-5v6zM16,5v6h5L21,5h-5z"/>
9+
</vector>

‎sample-app/src/main/res/drawable/ic_square.xml

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24.0"
5+
android:viewportHeight="24.0">
6+
<path
7+
android:fillColor="#FF000000"
8+
android:pathData="M3,9h4L7,5L3,5v4zM3,14h4v-4L3,10v4zM8,14h4v-4L8,10v4zM13,14h4v-4h-4v4zM8,9h4L12,5L8,5v4zM13,5v4h4L17,5h-4zM18,14h4v-4h-4v4zM3,19h4v-4L3,15v4zM8,19h4v-4L8,15v4zM13,19h4v-4h-4v4zM18,19h4v-4h-4v4zM18,5v4h4L22,5h-4z"/>
9+
</vector>

‎sample-app/src/main/res/layout/activity_benmarch.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<android.support.constraint.ConstraintLayout
2+
<androidx.constraintlayout.widget.ConstraintLayout
33
xmlns:android="http://schemas.android.com/apk/res/android"
44
xmlns:tools="http://schemas.android.com/tools"
55
xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -101,4 +101,4 @@
101101
app:layout_constraintTop_toBottomOf="@id/square_xs"/>
102102

103103

104-
</android.support.constraint.ConstraintLayout>
104+
</androidx.constraintlayout.widget.ConstraintLayout>

‎sample-app/src/main/res/layout/activity_images.xml

+23-8
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,37 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3-
xmlns:app="http://schemas.android.com/apk/res-auto"
4-
android:orientation="vertical"
5-
android:layout_width="match_parent"
6-
android:layout_height="match_parent">
2+
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:app="http://schemas.android.com/apk/res-auto"
4+
android:orientation="vertical"
5+
android:layout_width="match_parent"
6+
android:layout_height="match_parent">
77

8-
<android.support.v7.widget.Toolbar
8+
<androidx.appcompat.widget.Toolbar
99
android:id="@+id/toolbar"
10+
app:layout_constraintTop_toTopOf="parent"
1011
app:title="Glimpse"
1112
app:titleTextColor="@color/colorWhite"
1213
android:background="@color/colorPrimaryDark"
1314
android:layout_width="match_parent"
1415
android:layout_height="?attr/actionBarSize"
1516
android:elevation="4dp"/>
1617

17-
<android.support.v7.widget.RecyclerView
18+
<androidx.recyclerview.widget.RecyclerView
19+
app:layout_constraintTop_toBottomOf="parent"
1820
android:id="@+id/rvImages"
1921
android:scrollbars="vertical"
22+
app:layout_constraintBottom_toTopOf="@+id/bottomNavigationView"
2023
android:layout_width="match_parent"
2124
android:layout_height="match_parent"/>
22-
</LinearLayout>
25+
26+
<com.google.android.material.bottomnavigation.BottomNavigationView
27+
android:id="@+id/bottomNavigationView"
28+
android:layout_width="match_parent"
29+
app:layout_constraintBottom_toBottomOf="parent"
30+
android:layout_height="wrap_content"
31+
android:layout_gravity="bottom"
32+
android:background="@color/colorPrimary"
33+
app:itemIconTint="@color/colorWhite"
34+
app:itemTextColor="@color/colorWhite"
35+
app:menu="@menu/menu_bottom_navigation"/>
36+
37+
</androidx.constraintlayout.widget.ConstraintLayout>

‎sample-app/src/main/res/layout/item_image.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22

3-
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
44
xmlns:app="http://schemas.android.com/apk/res-auto"
55
android:layout_width="match_parent"
66
android:padding="1dp"
@@ -14,6 +14,6 @@
1414
android:layout_width="0dp"
1515
android:layout_height="100dp"/>
1616

17-
</android.support.constraint.ConstraintLayout>
17+
</androidx.constraintlayout.widget.ConstraintLayout>
1818

1919

‎sample-app/src/main/res/layout/test_activity_crop.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
android:orientation="vertical"
55
android:layout_height="match_parent">
66

7-
<android.support.v7.widget.Toolbar
7+
<androidx.appcompat.widget.Toolbar
88
android:id="@+id/toolbar"
99
app:title="Test crop"
1010
app:titleTextColor="@color/colorWhite"
@@ -13,13 +13,13 @@
1313
android:layout_height="?attr/actionBarSize"
1414
android:elevation="4dp"/>
1515

16-
<android.support.v4.view.ViewPager
16+
<androidx.viewpager.widget.ViewPager
1717
xmlns:android="http://schemas.android.com/apk/res/android"
1818
android:id="@+id/pager"
1919
android:layout_width="match_parent"
2020
android:layout_height="match_parent">
2121

22-
<android.support.v4.view.PagerTitleStrip
22+
<androidx.viewpager.widget.PagerTitleStrip
2323
android:id="@+id/pager_title_strip"
2424
android:layout_width="match_parent"
2525
android:layout_height="50dp"
@@ -29,6 +29,6 @@
2929
android:paddingTop="4dp"
3030
android:paddingBottom="4dp"/>
3131

32-
</android.support.v4.view.ViewPager>
32+
</androidx.viewpager.widget.ViewPager>
3333

3434
</LinearLayout>

‎sample-app/src/main/res/menu/menu_bottom_navigation.xml

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<menu xmlns:android="http://schemas.android.com/apk/res/android">
3+
4+
<item
5+
android:id="@+id/navigation_landscape"
6+
android:icon="@drawable/ic_landscape"
7+
android:title="Landscape"/>
8+
9+
<item
10+
android:id="@+id/navigation_portrait"
11+
android:icon="@drawable/ic_portrait"
12+
android:title="Portrait"/>
13+
14+
<item
15+
android:id="@+id/navigation_square"
16+
android:icon="@drawable/ic_square"
17+
android:title="Square"/>
18+
19+
</menu>

0 commit comments

Comments
 (0)