Skip to content

Commit

Permalink
Updates for 1.1
Browse files Browse the repository at this point in the history
Reorg BypassAndroid, BypassAndroidLite, and BypassAndroidFull projects as Android Studio projects.

API updates for Android (move to minSdkVersion 15 and targetSdkVersion 28 or else Google wouldn't allow the apps on the store any more)
  • Loading branch information
bostick committed Nov 2, 2018
1 parent 6f6f5b8 commit 2481ee6
Show file tree
Hide file tree
Showing 135 changed files with 1,512 additions and 339,692 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
import com.brentonbostick.capsloc.ui.paint.Color;
import com.brentonbostick.capsloc.ui.paint.FontStyle;

import java.util.Locale;

public abstract class MainMenuItem extends MenuItem {

LevelDB levelDB;
Expand All @@ -35,7 +37,7 @@ public void render() {
aabb = new AABB(aabb.x, aabb.y, menu.columnWidth[c], 20 + lab.aabb.height + 20);

if (levelDB.percentage != 0.0) {
String pString = String.format("%.2f%%", levelDB.percentage * 100);
String pString = String.format(Locale.US, "%.2f%%", levelDB.percentage * 100);

auxLab1 = new Label(pString);
auxLab1.color = Color.LIGHT_GRAY;
Expand Down
11 changes: 0 additions & 11 deletions BypassAndroid/.classpath

This file was deleted.

11 changes: 11 additions & 0 deletions BypassAndroid/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
*.iml
.gradle
/local.properties
/.idea/caches/build_file_checksums.ser
/.idea/libraries
/.idea/modules.xml
/.idea/workspace.xml
.DS_Store
/build
/captures
.externalNativeBuild
29 changes: 29 additions & 0 deletions BypassAndroid/.idea/codeStyles/Project.xml

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

6 changes: 6 additions & 0 deletions BypassAndroid/.idea/encodings.xml

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

18 changes: 18 additions & 0 deletions BypassAndroid/.idea/gradle.xml

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

38 changes: 38 additions & 0 deletions BypassAndroid/.idea/misc.xml

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

12 changes: 12 additions & 0 deletions BypassAndroid/.idea/runConfigurations.xml

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

50 changes: 0 additions & 50 deletions BypassAndroid/.project

This file was deleted.

11 changes: 0 additions & 11 deletions BypassAndroid/.settings/org.eclipse.jdt.core.prefs

This file was deleted.

33 changes: 0 additions & 33 deletions BypassAndroid/AndroidManifest.xml

This file was deleted.

27 changes: 27 additions & 0 deletions BypassAndroid/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {

repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.2.1'


// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
}

allprojects {
repositories {
google()
jcenter()
}
}

task clean(type: Delete) {
delete rootProject.buildDir
}
15 changes: 15 additions & 0 deletions BypassAndroid/gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Project-wide Gradle settings.
# IDE (e.g. Android Studio) users:
# Gradle settings configured through the IDE *will override*
# any settings specified in this file.
# For more details on how to configure your build environment visit
# http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
org.gradle.jvmargs=-Xmx1536m
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true


Binary file added BypassAndroid/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
5 changes: 5 additions & 0 deletions BypassAndroid/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 2481ee6

Please sign in to comment.