Skip to content

Commit

Permalink
Merge branch 'release/1.2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
G00fY2 committed Oct 10, 2020
2 parents 64db876 + 07df530 commit 2d2537a
Show file tree
Hide file tree
Showing 98 changed files with 1,398 additions and 821 deletions.
5 changes: 0 additions & 5 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 10 additions & 15 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
language: java
os: linux
dist: bionic
dist: focal
group: edge
git:
depth: false
env:
global:
# for updates check (dl.google.com/android/repository/repository2-1.xml)
- ANDROID_SDK_CMD_TOOLS=commandlinetools-linux-5842447_latest.zip
# for updates check https://developer.android.com/studio#downloads
- ANDROID_SDK_CMD_TOOLS=commandlinetools-linux-6825553_latest.zip
# storepass, keypass, keyalias
- secure: K4PVOrcYr6ZV16GgZWcw5RGDqxRTrilMK6pjz1r+RkQX6EPywmTsUH0y8EGP44bZc+TFMM0UfGPulHfrKzC3LDVSe+CpvNdQqq8c2Ysc9lQLubvFmVlWZ2rjHhA3jtg33FDIAWipb41WZEdmCJE1EI+OMbh8p8/7cGZ4K4tpd3B8ViXrf16ht50C56glL1lS3Jog/g9OEIPdhzYF23nYPOAeV3xJg3WBGxUUMOwp3vrpMJ/bYvnh/XLHUpPWnCcSWhKZolE3C6Itlv3CUdCyd2u8dnbTFX7KK0g4nrJdXJAyith0aE2RB6APdDDIdZkF3p2qU3aWBWVvNzjGc6tYpP9OB8sjobcx9oG8lIaO09qZnM+fLTs5b3ulvl8d3UZI0KxgSocvjxpltrqeuNODGarzwIWAmjxKr3Qnfo5LFUna1UMxKJ1ARyT7zS9yUbfE6ek42aEe7rEaqryjNFE5X6b9D2WexN+68YynvdRfDXlFx2JIW3hWTi7AG4zBI0LKhhtruwLY1hKty3JR5/Dz/dIMW6JZUmLdE7drPmLNBcKRh1H778EOcaD+1q1bzVnwbA+HLfHkO9Rzmk7UOY1ttWzFBH23W/pI6D6mn4WTFng0/iOEsw7fwHaXPGv6ZXxserC/nzmeYb0AfK3wq2p2ztEDtbSblw9lkMBYlvNi5I8=
- secure: SEcF7dl6ImTdeUYtw6dGeHRXbS4h8Ec9+Dnt2rFeobupo4e64818Fo10Uqqf+eM/5VVF2FAJLnEiq1SgfWZKjvUz9batJZNknc2JSKEGQPFaUD55USFCt2rxoLPFJKIee07kPTiXGPM2WWA+42cD+HpXAErMTd3BESsGwjni+xj2PhJuETDGrw+0D5T4TOXgd0uXNPl4p1PE+l3SejPqGQ961Wo+hbxd/y9JyZy/jZ9WW8XA6eEXXtecRY33NspwT58mBXDgZLIM/C3W0qfrGCiOPxwk0RpMo7YMbmYVPLG75AzihDtQ2F7P5edHz7v0yCAejrN23hi1LHb4Uku8tC2jzrH5eUpKfZuqap8DRcbdXq5je3oeuLSUu39FrzsDEmennS0eaD4jTsB5Sy2wld/UCmzV0QenUtPdBaFLU2Rxos3xJW4a2KyENRm5TGVNR/NAWpoacLed3zqDmb3K13WwskTGE1/mXRl+o0T0BVOBXuHXQ+nqATnGuAbw97LhhOeBZ/jA2yWBsaTxdjhB3E3uKWYZYdGIIgOwrZdM0RrVSgepg7NP+vh9iO70ckEzP+w4yws2ElKE3ZiOexEmrkFmqlxQW08b1FMaKJwpfsNiHkwW6u1jq1oeEBIzUrAMmo92uAjDAHKfn7FOsx5RVg20EKP9Rk9l2YKRA5dGJFI=
Expand All @@ -22,9 +22,10 @@ before_install:
# download and unzip Android SDK command line tools
- wget -nv https://dl.google.com/android/repository/$ANDROID_SDK_CMD_TOOLS
- mkdir -p $HOME/sdk/cmdline-tools && unzip -q $ANDROID_SDK_CMD_TOOLS -d $HOME/sdk/cmdline-tools
- mv $HOME/sdk/cmdline-tools/cmdline-tools $HOME/sdk/cmdline-tools/latest
# set SDK tools path variable and ANDROID_HOME
- export PATH=$PATH:$HOME/sdk/cmdline-tools/tools/bin
- export ANDROID_HOME=$HOME/sdk
- export PATH=$PATH:$HOME/sdk/cmdline-tools/latest/bin
- export ANDROID_SDK_ROOT=$HOME/sdk
# create empty cfg file to prevent sdkmanager warning message
- mkdir -p $HOME/.android && touch $HOME/.android/repositories.cfg
# decrypt private keystore
Expand All @@ -44,13 +45,7 @@ before_script:
# log all gradle warnings
- echo "org.gradle.warning.mode=all" >> $HOME/.gradle/gradle.properties
# control gradle build cache
- if [[ $CACHING == "true" ]]; then
echo "org.gradle.caching=true" >> $HOME/.gradle/gradle.properties;
echo "android.enableBuildCache=true" >> $HOME/.gradle/gradle.properties;
else
echo "org.gradle.caching=false" >> $HOME/.gradle/gradle.properties;
echo "android.enableBuildCache=false" >> $HOME/.gradle/gradle.properties;
fi
- echo "org.gradle.caching=$CACHING" >> $HOME/.gradle/gradle.properties;
before_cache:
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
- rm -rf $HOME/.gradle/caches/*/plugin-resolution/
Expand All @@ -72,12 +67,12 @@ jobs:
- # Build debug
if: branch IN (develop, master)
env: CACHING=true
script: "./gradlew assembleDebug --scan"
script: "./gradlew assembleDebug"
- # Build and deploy release on tags
if: tag IS present
env: CACHING=false
script:
- "./gradlew assembleRelease -Pmy_storepass=$storepass -Pmy_keyalias=$keyalias -Pmy_keypass=$keypass --scan"
- "./gradlew assembleRelease -Pmy_storepass=$storepass -Pmy_keyalias=$keyalias -Pmy_keypass=$keypass"
- "./gradlew :app:bundleRelease -Pmy_storepass=$storepass -Pmy_keyalias=$keyalias -Pmy_keypass=$keypass"
deploy:
provider: releases
Expand All @@ -87,7 +82,7 @@ jobs:
file:
- $TRAVIS_BUILD_DIR/app/build/outputs/bundle/release/*.aab
- $TRAVIS_BUILD_DIR/app/build/outputs/apk/release/*.apk
- $TRAVIS_BUILD_DIR/app/build/outputs/mapping/release/mapping.txt
- $TRAVIS_BUILD_DIR/app/build/outputs/mapping/release/*mapping.txt
draft: false
on:
tags: true
Expand Down
12 changes: 5 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<p align="center"><a href="#"><img src="https://raw.githubusercontent.com/G00fY2/DeveloperWidget/gh-pages/media/app_icon.png" alt="DeveloperWidget Icon" height="160px"></a></p>

# Developer Widget [![Build Status](https://travis-ci.com/G00fY2/DeveloperWidget.svg?branch=develop)](https://travis-ci.com/G00fY2/DeveloperWidget) [![Release](https://img.shields.io/github/release/G00fY2/DeveloperWidget.svg)](https://github.com/G00fY2/DeveloperWidget/releases) [![API](https://img.shields.io/badge/API-14%2B-blue.svg?style=flat)](https://android-arsenal.com/api?level=14)
# Developer Widget [![Build Status](https://travis-ci.com/G00fY2/DeveloperWidget.svg?branch=develop)](https://travis-ci.com/G00fY2/DeveloperWidget) [![Release](https://img.shields.io/github/v/release/G00fY2/DeveloperWidget)](https://github.com/G00fY2/DeveloperWidget/releases) [![Pre-Release](https://img.shields.io/github/v/release/G00fY2/DeveloperWidget?include_prereleases&label=pre-release)](https://github.com/G00fY2/DeveloperWidget/releases) [![API](https://img.shields.io/badge/API-14%2B-blue.svg?style=flat)](https://developer.android.com/studio/releases/platforms#4.0)

**Lightweight Android app that offers a widget to show device data, manage installed apps and list locally stored APK files.**

Expand All @@ -12,7 +12,10 @@
[<img src="https://raw.githubusercontent.com/G00fY2/DeveloperWidget/gh-pages/media/store_screenshot_4.png" width=160>](https://raw.githubusercontent.com/G00fY2/DeveloperWidget/gh-pages/media/store_screenshot_4.png)
[<img src="https://raw.githubusercontent.com/G00fY2/DeveloperWidget/gh-pages/media/store_screenshot_5.png" width=160>](https://raw.githubusercontent.com/G00fY2/DeveloperWidget/gh-pages/media/store_screenshot_5.png)

created with [App Mockup](https://app-mockup.com)
## Download
<a href='https://play.google.com/store/apps/details?id=com.g00fy2.developerwidget'><img alt='Get it on Google Play' width='215' src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png'/></a>

You also find the latest APK in the [GitHub releases](https://github.com/G00fY2/DeveloperWidget/releases).

## Description
The app was built from a developer for developers. You may know the hassle of having multiple physical devices running different software. This app will help you keep track of important device information and allows you to organize your apps and local APK files. You will never again struggle to find APK files using a file browser or search for the app settings menu on a custom manufacturer UI.
Expand Down Expand Up @@ -48,11 +51,6 @@ The main feature of the app is an 4x1 (horizontally resizable) homescreen widget
* Show more information in the APK install view
* currently installed version, filepath, certificates ...

## Download
<a href='https://play.google.com/store/apps/details?id=com.g00fy2.developerwidget'><img alt='Get it on Google Play' width='215' src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png'/></a>

You also find the latest APK in the [GitHub releases](https://github.com/G00fY2/DeveloperWidget/releases).

## Release Notes

Check out the [Release Notes](https://github.com/G00fY2/DeveloperWidget/releases) to find out what changed
Expand Down
102 changes: 0 additions & 102 deletions app/build.gradle

This file was deleted.

107 changes: 107 additions & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
plugins {
id("com.android.application")
kotlin("android")
kotlin("kapt")
id("de.nanogiants.android-versioning")
}

android {
compileSdkVersion(29)
buildToolsVersion = "30.0.2"
defaultConfig {
applicationId = "com.g00fy2.developerwidget"
minSdkVersion(14)
targetSdkVersion(29)
versionCode = versioning.getVersionCode()
versionName = versioning.getVersionName()

vectorDrawables.useSupportLibrary = true
setProperty("archivesBaseName", "developerwidget")
}
signingConfigs {
create("release") {
storeFile = file("../keystore.jks")
storePassword = findProperty("my_storepass") as String?
keyAlias = findProperty("my_keyalias") as String?
keyPassword = findProperty("my_keypass") as String?
}
}
buildTypes {
getByName("debug") {
applicationIdSuffix = ".debug"
}
getByName("release") {
signingConfig = signingConfigs.getByName("release")
isShrinkResources = true
isMinifyEnabled = true
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
}
}
buildFeatures {
viewBinding = true
aidl = false
renderScript = false
resValues = false
shaders = false
}
sourceSets {
getByName("main").java.srcDirs("src/main/kotlin")
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8.toString()
useIR = true
}
lintOptions {
isCheckReleaseBuilds = false // TODO remove when https://issuetracker.google.com/issues/141126614 is fixed
}
dependenciesInfo {
includeInApk = false
}
}

versioning {
keepOriginalMappingFile = false
}

repositories {
google()
mavenCentral()
jcenter {
content {
includeModule("com.g00fy2", "versioncompare")
includeModule("org.jetbrains.trove4j", "trove4j") // required by com.android.tools.lint:lint-gradle
}
}
}
dependencies {
// Kotlin
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9")

// AndroidX
implementation("androidx.appcompat:appcompat:1.3.0-alpha02")
implementation("androidx.core:core-ktx:1.5.0-alpha04")
implementation("androidx.activity:activity:1.2.0-beta01")
implementation("androidx.fragment:fragment:1.3.0-beta01")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.3.0-beta01")
implementation("androidx.recyclerview:recyclerview:1.2.0-alpha06")
implementation("androidx.constraintlayout:constraintlayout:2.0.2")
implementation("androidx.vectordrawable:vectordrawable:1.2.0-alpha02")

// UI
implementation("com.google.android.material:material:1.3.0-alpha03")

// Misc
implementation("com.jakewharton.timber:timber:4.7.1")
implementation("com.g00fy2:versioncompare:1.3.5")

// Dagger
implementation("com.google.dagger:dagger:2.29.1")
kapt("com.google.dagger:dagger-compiler:2.29.1")
implementation("com.google.dagger:dagger-android:2.29.1")
implementation("com.google.dagger:dagger-android-support:2.29.1")
kapt("com.google.dagger:dagger-android-processor:2.29.1")
}
6 changes: 2 additions & 4 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.g00fy2.developerwidget"
tools:ignore="LockedOrientationActivity">
tools:ignore="LockedOrientationActivity,GoogleAppIndexingWarning">

<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
Expand All @@ -14,9 +14,7 @@
android:label="@string/app_name"
android:requestLegacyExternalStorage="true"
android:supportsRtl="false"
android:theme="@style/AppTheme"
tools:ignore="GoogleAppIndexingWarning"
tools:targetApi="q">
android:theme="@style/AppTheme">

<activity
android:name=".activities.apkinstall.ApkActivity"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import javax.inject.Inject

class DevWidgetApp : DaggerApplication() {

override fun applicationInjector(): AndroidInjector<out DaggerApplication> = DaggerAppComponent.factory().create(this)

@Inject
lateinit var dayNightController: DayNightController

override fun applicationInjector(): AndroidInjector<out DaggerApplication> = DaggerAppComponent.factory().create(this)

override fun onCreate() {
super.onCreate()

Expand Down
Loading

0 comments on commit 2d2537a

Please sign in to comment.