Skip to content

Commit

Permalink
compile with new androidx sdk
Browse files Browse the repository at this point in the history
  • Loading branch information
huzongyao committed Nov 14, 2019
1 parent 27e628a commit 5a70eb1
Show file tree
Hide file tree
Showing 23 changed files with 190 additions and 255 deletions.
35 changes: 23 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@ An Android compress and extract library, P7Zip port for Android

### Details
#### Get Started
* Download to experience[download](https://github.com/hzy3774/AndroidP7zip/releases/latest)

* Add gradle dependencie:
``` gradle
dependencies {
implementation 'com.hzy:libp7zip:1.6.0'
implementation 'com.hzy:libp7zip:1.7.0'
}
```
* Or just download the aar [here](https://jcenter.bintray.com/com/hzy/libp7zip/)
Expand All @@ -31,6 +32,12 @@ android {
P7ZipApi.executeCommand(String command);
```

* Commands:
``` shell
7z a archive1.zip subdir\
7z x archive.zip -oc:\soft *.cpp -r
```

### Screenshot
![image](https://raw.githubusercontent.com/hzy3774/AndroidP7zip/master/misc/screenshot.gif)

Expand All @@ -42,23 +49,27 @@ P7ZipApi.executeCommand(String command);

| Format | Creation | Filename Extensions |
|:-------|:---------|:-----------------|
| 7z | X | 7z |
| BZIP2 | X | bz2 bzip2 tbz2 tbz |
| GZIP | X | gz gzip tgz |
| TAR | X | tar |
| WIM | X | wim swm |
| XZ | X | xz txz |
| zip | X | zip zipx jar xpi odt ods docx xlsx epub |
| 7z | | 7z |
| BZIP2 | | bz2 bzip2 tbz2 tbz |
| GZIP | | gz gzip tgz |
| TAR | | tar |
| WIM | | wim swm |
| XZ | | xz txz |
| zip | | zip zipx jar xpi odt ods docx xlsx epub |

### About Me
* GitHub: [https://huzongyao.github.io/](https://huzongyao.github.io/)
* ITEye博客:[http://hzy3774.iteye.com/](http://hzy3774.iteye.com/)
* 新浪微博: [http://weibo.com/hzy3774](http://weibo.com/hzy3774)
* ITEye博客:[https://hzy3774.iteye.com/](https://hzy3774.iteye.com/)
* 新浪微博: [https://weibo.com/hzy3774](https://weibo.com/hzy3774)

### Contact To Me
* QQ: [377406997](http://wpa.qq.com/msgrd?v=3&uin=377406997&site=qq&menu=yes)
* QQ: [377406997](https://wpa.qq.com/msgrd?v=3&uin=377406997&site=qq&menu=yes)
* Gmail: [[email protected]](mailto:[email protected])
* Foxmail: [[email protected]](mailto:[email protected])
* WeChat: hzy3774

![image](https://raw.githubusercontent.com/hzy3774/AndroidP7zip/master/misc/wechat.png)
![image](https://raw.githubusercontent.com/hzy3774/AndroidP7zip/master/misc/wechat.png)

### Others
* 想捐助我喝杯热水(¥0.01起捐)</br>
![donate](https://github.com/huzongyao/JChineseChess/blob/master/misc/donate.png?raw=true)
33 changes: 20 additions & 13 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 28
compileSdkVersion 29

signingConfigs {
demokey {
Expand All @@ -14,13 +14,16 @@ android {
defaultConfig {
applicationId "com.hzy.p7zip.app"
minSdkVersion 15
targetSdkVersion 28
versionCode 6
versionName "1.6.0"
targetSdkVersion 29
versionCode 7
versionName "1.7.0"
ndk {
abiFilters 'armeabi-v7a'
}
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
compileOptions {
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_1_8
}
buildTypes {
debug {
Expand All @@ -33,21 +36,25 @@ android {
signingConfig signingConfigs.demokey
}
}
applicationVariants.all { variant ->
variant.outputs.all {
def fileName = project.name + '-' + variant.name + '-V' +
defaultConfig.versionName + ".apk"
outputFileName = fileName
}
}
lintOptions {
abortOnError false
}
}

dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
testImplementation 'junit:junit:4.12'
implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.android.support:design:28.0.0'
implementation 'com.android.support:cardview-v7:28.0.0'
implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
implementation 'com.blankj:utilcode:1.22.9'
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'com.google.android.material:material:1.0.0'
implementation 'com.blankj:utilcode:1.25.9'
implementation 'com.afollestad.material-dialogs:commons:0.9.6.0'
implementation 'com.jakewharton:butterknife:8.8.1'
annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
implementation 'com.jakewharton:butterknife:10.1.0'
annotationProcessor 'com.jakewharton:butterknife-compiler:10.1.0'
implementation project(':libp7zip')
}

This file was deleted.

4 changes: 3 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.hzy.p7zip.app">

<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
Expand All @@ -10,7 +11,8 @@
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:theme="@style/AppTheme">
android:theme="@style/AppTheme"
tools:ignore="GoogleAppIndexingWarning">
<activity
android:name=".activity.MainActivity"
android:label="@string/title_activity_main"
Expand Down
21 changes: 11 additions & 10 deletions app/src/main/java/com/hzy/p7zip/app/activity/MainActivity.java
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
package com.hzy.p7zip.app.activity;

import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.design.widget.NavigationView;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction;
import android.support.v4.view.GravityCompat;
import android.support.v4.widget.DrawerLayout;
import android.support.v7.app.ActionBarDrawerToggle;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.view.MenuItem;

import androidx.annotation.NonNull;
import androidx.appcompat.app.ActionBarDrawerToggle;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
import androidx.core.view.GravityCompat;
import androidx.drawerlayout.widget.DrawerLayout;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;

import com.google.android.material.navigation.NavigationView;
import com.hzy.p7zip.app.R;
import com.hzy.p7zip.app.fragment.AboutFragment;
import com.hzy.p7zip.app.fragment.HelpFragment;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
package com.hzy.p7zip.app.adapter;

import android.app.Activity;
import android.support.v7.widget.RecyclerView;
import android.text.format.Formatter;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;

import androidx.recyclerview.widget.RecyclerView;

import com.hzy.p7zip.app.R;
import com.hzy.p7zip.app.bean.FileInfo;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
package com.hzy.p7zip.app.adapter;

import android.app.Activity;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;

import androidx.recyclerview.widget.RecyclerView;

import com.hzy.p7zip.app.R;

import java.io.File;
import java.util.ArrayList;
import java.util.List;

import butterknife.BindView;
import butterknife.ButterKnife;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
package com.hzy.p7zip.app.fragment;

import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import android.text.method.LinkMovementMethod;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;

import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;

import com.hzy.libp7zip.P7ZipApi;
import com.hzy.p7zip.app.R;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
package com.hzy.p7zip.app.fragment;

import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.webkit.WebResourceRequest;
import android.webkit.WebView;
import android.webkit.WebViewClient;

import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;

import com.hzy.p7zip.app.R;

import butterknife.BindView;
Expand Down
Loading

0 comments on commit 5a70eb1

Please sign in to comment.