From 8fd55b008f863eb5c0ed737ebf55c820d838f915 Mon Sep 17 00:00:00 2001 From: MrLetsplay2003 Date: Mon, 24 May 2021 17:38:23 +0200 Subject: [PATCH] Update dependencies, Remove broken code --- app/build.gradle | 16 ++++++---------- .../de/jg_cody/Teraplex/MainActivity.java | 8 ++++---- .../de/jg_cody/Teraplex/ViewDemoActivity.java | 19 ------------------- app/src/main/res/layout/fragment_flur.xml | 10 ---------- build.gradle | 6 +++--- gradle/wrapper/gradle-wrapper.properties | 2 +- 6 files changed, 14 insertions(+), 47 deletions(-) delete mode 100644 app/src/main/java/de/jg_cody/Teraplex/ViewDemoActivity.java diff --git a/app/build.gradle b/app/build.gradle index dc54cd0..5b776d0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -32,22 +32,18 @@ android { dependencies { - implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'androidx.appcompat:appcompat:1.3.0' implementation 'com.google.android.material:material:1.3.0' implementation 'androidx.constraintlayout:constraintlayout:2.0.4' - implementation 'androidx.navigation:navigation-fragment:2.3.3' - implementation 'androidx.navigation:navigation-ui:2.3.3' - implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.3.0' - implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.0' + implementation 'androidx.navigation:navigation-fragment:2.3.5' + implementation 'androidx.navigation:navigation-ui:2.3.5' + implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.3.1' + implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1' implementation 'com.jcraft:jsch:0.1.55' - testImplementation 'junit:junit:4.+' + testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.2' androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' - implementation 'android.support:support-v4:28.0.0' - implementation 'android.support:appcompat-v7:28.0.0' - implementation 'android.support:preference-v7:28.0.0' implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation project(':colorpicker') } repositories { maven { url "https://jitpack.io" } diff --git a/app/src/main/java/de/jg_cody/Teraplex/MainActivity.java b/app/src/main/java/de/jg_cody/Teraplex/MainActivity.java index 2effb8b..8a88052 100644 --- a/app/src/main/java/de/jg_cody/Teraplex/MainActivity.java +++ b/app/src/main/java/de/jg_cody/Teraplex/MainActivity.java @@ -57,10 +57,10 @@ public class MainActivity extends AppCompatActivity implements AddButtonDialog.A protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); if (savedInstanceState == null) { - getSupportFragmentManager().beginTransaction() + /*getSupportFragmentManager().beginTransaction() .replace(android.R.id.content, new DemoPreferenceFragment()) .commit(); - NonDeveloperMessage.maybeShow(this); + NonDeveloperMessage.maybeShow(this);*/ } setContentView(R.layout.activity_main); @@ -106,7 +106,7 @@ public class MainActivity extends AppCompatActivity implements AddButtonDialog.A } - static public class DemoPreferenceFragment extends PreferenceFragmentCompat { + /*static public class DemoPreferenceFragment extends PreferenceFragmentCompat { @Override public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { addPreferencesFromResource(R.xml.preferences); @@ -118,7 +118,7 @@ public class MainActivity extends AppCompatActivity implements AddButtonDialog.A ((ColorPreference) preference).showDialog(this, 0); } else super.onDisplayPreferenceDialog(preference); } - } + }*/ @Override public boolean onCreateOptionsMenu(Menu menu) { // Inflate the menu; this adds items to the action bar if it is present. diff --git a/app/src/main/java/de/jg_cody/Teraplex/ViewDemoActivity.java b/app/src/main/java/de/jg_cody/Teraplex/ViewDemoActivity.java deleted file mode 100644 index ad20b97..0000000 --- a/app/src/main/java/de/jg_cody/Teraplex/ViewDemoActivity.java +++ /dev/null @@ -1,19 +0,0 @@ -package de.jg_cody.Teraplex; - - -import android.app.Activity; -import android.os.Bundle; - -import de.jg_cody.Teraplex.ColorPickerView; - -public class ViewDemoActivity extends Activity { - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.fragment_flur); - - ColorPickerView picker = (ColorPickerView)findViewById(R.id.colorPicker); - picker.setColor(0xffff0000); - } -} \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_flur.xml b/app/src/main/res/layout/fragment_flur.xml index dae9159..28a548a 100644 --- a/app/src/main/res/layout/fragment_flur.xml +++ b/app/src/main/res/layout/fragment_flur.xml @@ -1,7 +1,6 @@ - - \ No newline at end of file diff --git a/build.gradle b/build.gradle index dfbc7c1..2520ee4 100644 --- a/build.gradle +++ b/build.gradle @@ -2,10 +2,10 @@ buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:4.1.2" + classpath 'com.android.tools.build:gradle:4.2.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -15,7 +15,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7b7fb82..1bafdb1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip