Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
buildscript {
repositories {
jcenter()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.2.3'
classpath 'com.android.tools.build:gradle:3.2.0'
}
}

Expand All @@ -15,5 +16,6 @@ allprojects {

repositories {
jcenter()
google()
}
}
10 changes: 5 additions & 5 deletions demo/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 21
buildToolsVersion '21.1.1'
compileSdkVersion 30
buildToolsVersion '21.1.2'
defaultConfig {
applicationId 'me.gujun.android.taggroup.demo'
minSdkVersion 8
targetSdkVersion 21
minSdkVersion 14
targetSdkVersion 30
versionName project.VERSION_NAME
versionCode Integer.parseInt(project.VERSION_CODE)
}
Expand All @@ -22,5 +22,5 @@ android {

dependencies {
compile project(':library')
compile 'com.android.support:appcompat-v7:21.0.3'
compile 'androidx.appcompat:appcompat:1.3.1'
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

import android.content.Intent;
import android.os.Bundle;
import android.support.v7.app.ActionBarActivity;
import androidx.appcompat.app.AppCompatActivity;

import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
Expand All @@ -13,7 +14,7 @@
import me.gujun.android.taggroup.demo.db.TagsManager;


public class MainActivity extends ActionBarActivity {
public class MainActivity extends AppCompatActivity {
private TextView mPromptText;

private TagGroup mDefaultTagGroup;
Expand All @@ -38,7 +39,7 @@ protected void onCreate(Bundle savedInstanceState) {
mTagsManager = TagsManager.getInstance(getApplicationContext());
String[] tags = mTagsManager.getTags();

mPromptText = (TextView) findViewById(R.id.tv_prompt);
mPromptText = findViewById(R.id.tv_prompt);
mPromptText.setVisibility((tags == null || tags.length == 0) ? View.VISIBLE : View.GONE);
mPromptText.setOnClickListener(new View.OnClickListener() {
@Override
Expand All @@ -47,11 +48,11 @@ public void onClick(View v) {
}
});

mDefaultTagGroup = (TagGroup) findViewById(R.id.tag_group);
mSmallTagGroup = (TagGroup) findViewById(R.id.tag_group_small);
mLargeTagGroup = (TagGroup) findViewById(R.id.tag_group_large);
mBeautyTagGroup = (TagGroup) findViewById(R.id.tag_group_beauty);
mBeautyInverseTagGroup = (TagGroup) findViewById(R.id.tag_group_beauty_inverse);
mDefaultTagGroup = findViewById(R.id.tag_group);
mSmallTagGroup = findViewById(R.id.tag_group_small);
mLargeTagGroup = findViewById(R.id.tag_group_large);
mBeautyTagGroup = findViewById(R.id.tag_group_beauty);
mBeautyInverseTagGroup = findViewById(R.id.tag_group_beauty_inverse);
if (tags != null && tags.length > 0) {
mDefaultTagGroup.setTags(tags);
mSmallTagGroup.setTags(tags);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
package me.gujun.android.taggroup.demo;

import android.os.Bundle;
import android.support.v7.app.ActionBarActivity;
import androidx.appcompat.app.AppCompatActivity;

import android.view.Menu;
import android.view.MenuItem;

import me.gujun.android.taggroup.TagGroup;
import me.gujun.android.taggroup.demo.db.TagsManager;


public class TagEditorActivity extends ActionBarActivity {
public class TagEditorActivity extends AppCompatActivity {
private TagGroup mTagGroup;
private TagsManager mTagsManager;

Expand All @@ -21,7 +22,7 @@ protected void onCreate(Bundle savedInstanceState) {
mTagsManager = TagsManager.getInstance(getApplicationContext());
String[] tags = mTagsManager.getTags();

mTagGroup = (TagGroup) findViewById(R.id.tag_group);
mTagGroup = findViewById(R.id.tag_group);
mTagGroup.setTags(tags);
}

Expand Down
4 changes: 3 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,6 @@ POM_DEVELOPER_ID=2dxgujun
POM_DEVELOPER_NAME=Jun Gu

SNAPSHOT_REPOSITORY_URL=https://oss.sonatype.org/content/repositories/snapshots
RELEASE_REPOSITORY_URL=https://oss.sonatype.org/service/local/staging/deploy/maven2
RELEASE_REPOSITORY_URL=https://oss.sonatype.org/service/local/staging/deploy/maven2
android.useAndroidX=true
android.enableJetifier=true
6 changes: 3 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Apr 10 15:27:10 PDT 2013
#Tue Aug 17 23:21:38 BDT 2021
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
zipStoreBase=GRADLE_USER_HOME
6 changes: 3 additions & 3 deletions library/build.gradle
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
apply plugin: 'com.android.library'
android {
compileSdkVersion 21
buildToolsVersion '21.1.1'
compileSdkVersion 30
buildToolsVersion '21.1.2'
defaultConfig {
minSdkVersion 8
targetSdkVersion 21
targetSdkVersion 30
}
lintOptions {
abortOnError false
Expand Down