CringeStudios/Teraplex
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update dependencies, Remove broken code

Browse Source
This commit is contained in:
MrLetsplay 2021-05-24 17:38:23 +02:00
parent 81fddd903d
commit 8fd55b008f
6 changed files with 14 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/build.gradle
View File

@ -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" }

8
app/src/main/java/de/jg_cody/Teraplex/MainActivity.java
View File

@ -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.

19
app/src/main/java/de/jg_cody/Teraplex/ViewDemoActivity.java
View File

@ -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);
}
}

10
app/src/main/res/layout/fragment_flur.xml
View File

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -57,13 +56,4 @@
android:textAllCaps="false"
android:textColor="@color/white"></Button>
<de.jg_cody.Teraplex.ColorPickerView
android:id="@+id/colorPicker"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:colorpicker_showAlpha="true"
app:colorpicker_showHex="true"
app:colorpicker_showPreview="true"
/>
</LinearLayout>

6
build.gradle
View File

@ -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()
}
}

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -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