erik/TESRemoteProgrammer
erik/TESRemoteProgrammer
1
0
Fork 0
Code Issues Pull requests Releases Activity

Migrated to AndroidX.

Browse source
This commit is contained in:
Erik C. Thauvin 2019-09-28 00:58:45 -07:00
parent ecd3583b23
commit c25a824228
11 changed files with 37 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/.gitignore vendored
View file

@ -1,2 +1,3 @@
/build /build
libs/library-debug.aar libs/library-debug.aar
google-services.json

24
app/build.gradle
View file

@ -1,5 +1,6 @@
plugins { plugins {
id 'com.android.application' id 'com.android.application'
id 'com.google.gms.google-services'
id 'kotlin-android' id 'kotlin-android'
id 'kotlin-android-extensions' id 'kotlin-android-extensions'
id 'kotlin-kapt' id 'kotlin-kapt'
@ -17,7 +18,7 @@ android {
minSdkVersion 26 minSdkVersion 26
targetSdkVersion 28 targetSdkVersion 28
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0-alpha"
buildConfigField "long", "TIMESTAMP", System.currentTimeMillis() + "L" buildConfigField "long", "TIMESTAMP", System.currentTimeMillis() + "L"
} }
buildTypes { buildTypes {
@ -34,36 +35,39 @@ android {
ext { ext {
anko_version = '0.10.8' anko_version = '0.10.8'
support_version = "28.0.0" support_version = "28.0.0"
perms_dispatch_version = "3.3.2" perms_dispatch_version = "4.5.0"
} }
dependencies { dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'])
testImplementation 'junit:junit:4.12' implementation 'com.google.firebase:firebase-analytics:17.2.0'
implementation 'androidx.legacy:legacy-support-v13:1.0.0'
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation "com.android.support:support-v13:$support_version"
implementation "com.android.support:appcompat-v7:$support_version"
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation "org.jetbrains.anko:anko-sdk23:$anko_version" implementation "org.jetbrains.anko:anko-sdk23:$anko_version"
implementation "org.jetbrains.anko:anko-appcompat-v7:$anko_version" implementation "org.jetbrains.anko:anko-appcompat-v7:$anko_version"
implementation "org.jetbrains.anko:anko-support-v4:$anko_version" implementation "org.jetbrains.anko:anko-support-v4:$anko_version"
implementation "org.jetbrains.anko:anko-design:$anko_version" implementation "org.jetbrains.anko:anko-design:$anko_version"
implementation "com.android.support:design:$support_version"
implementation 'com.google.android.material:material:1.0.0'
implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.5' implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.5'
// https://github.com/JakeWharton/ViewPagerIndicator // https://github.com/JakeWharton/ViewPagerIndicator
implementation 'fr.avianey.com.viewpagerindicator:library:2.4.1.1@aar' implementation 'fr.avianey.com.viewpagerindicator:library:2.4.1.1@aar'
// https://github.com/hotchemi/PermissionsDispatcher // https://github.com/hotchemi/PermissionsDispatcher
// Version 4.x needs AndroidX implementation "org.permissionsdispatcher:permissionsdispatcher:$perms_dispatch_version"
//noinspection GradleDependency kapt "org.permissionsdispatcher:permissionsdispatcher-processor:$perms_dispatch_version"
implementation "com.github.hotchemi:permissionsdispatcher:$perms_dispatch_version"
kapt "com.github.hotchemi:permissionsdispatcher-processor:$perms_dispatch_version"
// https://github.com/medyo/android-about-page // https://github.com/medyo/android-about-page
implementation 'com.github.medyo:android-about-page:1.2.5' implementation 'com.github.medyo:android-about-page:1.2.5'
testImplementation 'junit:junit:4.12'
} }
repositories { repositories {

4
app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/AboutActivity.kt
View file

@ -20,8 +20,8 @@ package net.thauvin.erik.android.tesremoteprogrammer
import android.content.Intent import android.content.Intent
import android.net.Uri import android.net.Uri
import android.os.Bundle import android.os.Bundle
import android.support.v7.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import android.support.v7.app.AppCompatDelegate import androidx.appcompat.app.AppCompatDelegate
import mehdi.sakout.aboutpage.AboutPage import mehdi.sakout.aboutpage.AboutPage
import mehdi.sakout.aboutpage.Element import mehdi.sakout.aboutpage.Element
import java.util.Calendar import java.util.Calendar

2
app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/MainActivity.kt
View file

@ -25,7 +25,7 @@ import android.content.Context
import android.content.Intent import android.content.Intent
import android.graphics.Typeface import android.graphics.Typeface
import android.os.Bundle import android.os.Bundle
import android.support.v7.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import android.text.InputFilter import android.text.InputFilter
import android.text.InputType import android.text.InputType
import android.text.TextUtils import android.text.TextUtils

4
app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/ProgrammingActivity.kt
View file

@ -24,8 +24,8 @@ import android.content.res.ColorStateList
import android.graphics.Color import android.graphics.Color
import android.graphics.Typeface import android.graphics.Typeface
import android.os.Bundle import android.os.Bundle
import android.support.design.widget.Snackbar import com.google.android.material.snackbar.Snackbar
import android.support.v7.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import android.text.InputFilter import android.text.InputFilter
import android.text.InputType import android.text.InputType
import android.text.SpannableString import android.text.SpannableString

2
app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/SplashActivity.kt
View file

@ -18,7 +18,7 @@
package net.thauvin.erik.android.tesremoteprogrammer package net.thauvin.erik.android.tesremoteprogrammer
import android.os.Bundle import android.os.Bundle
import android.support.v7.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import org.jetbrains.anko.startActivity import org.jetbrains.anko.startActivity
class SplashActivity : AppCompatActivity() { class SplashActivity : AppCompatActivity() {

4
app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/StepsActivity.kt
View file

@ -20,8 +20,8 @@ package net.thauvin.erik.android.tesremoteprogrammer
import android.app.Fragment import android.app.Fragment
import android.app.FragmentManager import android.app.FragmentManager
import android.os.Bundle import android.os.Bundle
import android.support.v13.app.FragmentStatePagerAdapter import androidx.legacy.app.FragmentStatePagerAdapter
import android.support.v4.app.FragmentActivity import androidx.fragment.app.FragmentActivity
import kotlinx.android.synthetic.main.activity_steps.indicator import kotlinx.android.synthetic.main.activity_steps.indicator
import kotlinx.android.synthetic.main.activity_steps.pager import kotlinx.android.synthetic.main.activity_steps.pager
import java.util.ArrayList import java.util.ArrayList

2
app/src/main/res/layout/activity_steps.xml
View file

@ -4,7 +4,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
<android.support.v4.view.ViewPager <androidx.viewpager.widget.ViewPager
android:id="@+id/pager" android:id="@+id/pager"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"

16
app/src/main/res/menu/menu_main.xml
View file

@ -3,13 +3,13 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
tools:context=".MainActivity"> tools:context=".MainActivity">
<item <item
android:id="@+id/action_confs" android:id="@+id/action_confs"
android:orderInCategory="100" android:orderInCategory="100"
android:title="@string/action_config" android:title="@string/action_config"
app:showAsAction="never" /> app:showAsAction="never" />
<item <item
android:id="@+id/action_about" android:id="@+id/action_about"
android:orderInCategory="101" android:orderInCategory="101"
android:title="@string/action_about" android:title="@string/action_about"
app:showAsAction="never" /> app:showAsAction="never" />
</menu> </menu>

1
build.gradle
View file

@ -11,6 +11,7 @@ buildscript {
classpath 'com.android.tools.build:gradle:3.5.0' classpath 'com.android.tools.build:gradle:3.5.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'org.jmailen.gradle:kotlinter-gradle:2.1.1' classpath 'org.jmailen.gradle:kotlinter-gradle:2.1.1'
classpath 'com.google.gms:google-services:4.3.2'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files

4
gradle.properties
View file

@ -16,5 +16,7 @@
# This option should only be used with decoupled projects. More details, visit # This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true # org.gradle.parallel=true
android.enableJetifier=true
android.useAndroidX=true
org.gradle.daemon=true org.gradle.daemon=true
org.gradle.jvmargs=-Xmx1536M org.gradle.jvmargs=-Xmx1536M