Skip to content

Commit ac8688e

Browse files
committed
Cleanup and create new android studio project
1 parent 0c30adb commit ac8688e

File tree

111 files changed

+1272
-3155
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+1272
-3155
lines changed

.gitignore

+6-30
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,6 @@
1-
# built application files
2-
*.apk
3-
*.ap_
4-
5-
# files for the dex VM
6-
*.dex
7-
8-
# Java class files
9-
*.class
10-
11-
# generated files
12-
bin/
13-
gen/
14-
15-
# Local configuration file (sdk path, etc)
16-
local.properties
17-
18-
# Eclipse project files
19-
.classpath
20-
.project
21-
22-
# Proguard folder generated by Eclipse
23-
proguard/
24-
25-
# Intellij project files
26-
*.iml
27-
*.ipr
28-
*.iws
29-
.idea/
30-
*.DS_Store
1+
.gradle
2+
/local.properties
3+
.DS_Store
4+
/build
5+
/captures
6+
.idea

.idea/.name

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/compiler.xml

+22
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/copyright/profiles_settings.xml

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/gradle.xml

+18
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

+46
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules.xml

+9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/runConfigurations.xml

+12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/vcs.xml

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

Gfx/Store/feature.png

-55.1 KB
Binary file not shown.

Gfx/Store/feature_de.png

-27.2 KB
Binary file not shown.

Gfx/Store/feature_en.png

-26.6 KB
Binary file not shown.

Gfx/Store/promo_graphic.png

-11.7 KB
Binary file not shown.

Gfx/Store/storeicon.png

-42.6 KB
Binary file not shown.

Gfx/Store/thebigone.png

-47.6 KB
Binary file not shown.

app/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/build

app/app.iml

+122
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="myownnotes-android" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
3+
<component name="FacetManager">
4+
<facet type="android-gradle" name="Android-Gradle">
5+
<configuration>
6+
<option name="GRADLE_PROJECT_PATH" value=":app" />
7+
</configuration>
8+
</facet>
9+
<facet type="android" name="Android">
10+
<configuration>
11+
<option name="SELECTED_BUILD_VARIANT" value="localDebug" />
12+
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
13+
<option name="ASSEMBLE_TASK_NAME" value="assembleLocalDebug" />
14+
<option name="COMPILE_JAVA_TASK_NAME" value="compileLocalDebugSources" />
15+
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleLocalDebugAndroidTest" />
16+
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileLocalDebugAndroidTestSources" />
17+
<afterSyncTasks>
18+
<task>generateLocalDebugAndroidTestSources</task>
19+
<task>generateLocalDebugSources</task>
20+
</afterSyncTasks>
21+
<option name="ALLOW_USER_CONFIGURATION" value="false" />
22+
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
23+
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
24+
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
25+
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
26+
</configuration>
27+
</facet>
28+
</component>
29+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
30+
<output url="file://$MODULE_DIR$/build/intermediates/classes/local/debug" />
31+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/local/debug" />
32+
<exclude-output />
33+
<content url="file://$MODULE_DIR$">
34+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/local/debug" isTestSource="false" generated="true" />
35+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/local/debug" isTestSource="false" generated="true" />
36+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/local/debug" isTestSource="false" generated="true" />
37+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/local/debug" isTestSource="false" generated="true" />
38+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/local/debug" type="java-resource" />
39+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/local/debug" type="java-resource" />
40+
<sourceFolder url="file://$MODULE_DIR$/src/localDebug/res" type="java-resource" />
41+
<sourceFolder url="file://$MODULE_DIR$/src/localDebug/resources" type="java-resource" />
42+
<sourceFolder url="file://$MODULE_DIR$/src/localDebug/assets" type="java-resource" />
43+
<sourceFolder url="file://$MODULE_DIR$/src/localDebug/aidl" isTestSource="false" />
44+
<sourceFolder url="file://$MODULE_DIR$/src/localDebug/java" isTestSource="false" />
45+
<sourceFolder url="file://$MODULE_DIR$/src/localDebug/jni" isTestSource="false" />
46+
<sourceFolder url="file://$MODULE_DIR$/src/localDebug/rs" isTestSource="false" />
47+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/local/debug" isTestSource="true" generated="true" />
48+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/local/debug" isTestSource="true" generated="true" />
49+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/local/debug" isTestSource="true" generated="true" />
50+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/local/debug" isTestSource="true" generated="true" />
51+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/local/debug" type="java-test-resource" />
52+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/local/debug" type="java-test-resource" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/local/res" type="java-resource" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/local/resources" type="java-resource" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/local/assets" type="java-resource" />
56+
<sourceFolder url="file://$MODULE_DIR$/src/local/aidl" isTestSource="false" />
57+
<sourceFolder url="file://$MODULE_DIR$/src/local/java" isTestSource="false" />
58+
<sourceFolder url="file://$MODULE_DIR$/src/local/jni" isTestSource="false" />
59+
<sourceFolder url="file://$MODULE_DIR$/src/local/rs" isTestSource="false" />
60+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestLocal/res" type="java-test-resource" />
61+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestLocal/resources" type="java-test-resource" />
62+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestLocal/assets" type="java-test-resource" />
63+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestLocal/aidl" isTestSource="true" />
64+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestLocal/java" isTestSource="true" />
65+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestLocal/jni" isTestSource="true" />
66+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestLocal/rs" isTestSource="true" />
67+
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
68+
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
69+
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
70+
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
71+
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
72+
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
73+
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
74+
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
85+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
86+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
87+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
89+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
90+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
91+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
92+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
94+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
95+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.1/jars" />
96+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/23.1.1/jars" />
97+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.1.1/jars" />
98+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars" />
99+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
100+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
101+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
102+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
103+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
104+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
105+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
106+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
107+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
108+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
109+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
110+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
111+
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
112+
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
113+
</content>
114+
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
115+
<orderEntry type="sourceFolder" forTests="false" />
116+
<orderEntry type="library" exported="" name="recyclerview-v7-23.1.1" level="project" />
117+
<orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
118+
<orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
119+
<orderEntry type="library" exported="" name="design-23.1.1" level="project" />
120+
<orderEntry type="library" exported="" name="appcompat-v7-23.1.1" level="project" />
121+
</component>
122+
</module>

app/build.gradle

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
apply plugin: 'com.android.application'
2+
3+
android {
4+
compileSdkVersion 23
5+
buildToolsVersion "23.0.1"
6+
defaultConfig {
7+
applicationId "org.aykit.MyOwnNotes"
8+
minSdkVersion 16
9+
targetSdkVersion 23
10+
versionCode 1
11+
versionName '0.1'
12+
}
13+
buildTypes {
14+
release {
15+
minifyEnabled false
16+
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
17+
}
18+
}
19+
productFlavors {
20+
local {
21+
applicationId 'org.aykit.MyOwnNotes.local'
22+
}
23+
}
24+
}
25+
26+
dependencies {
27+
compile fileTree(dir: 'libs', include: ['*.jar'])
28+
testCompile 'junit:junit:4.12'
29+
compile 'com.android.support:appcompat-v7:23.1.1'
30+
compile 'com.android.support:support-v4:23.1.1'
31+
compile 'com.android.support:design:23.1.1'
32+
}

proguard-project.txt renamed to app/proguard-rules.pro

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
# To enable ProGuard in your project, edit project.properties
2-
# to define the proguard.config property as described in that file.
3-
#
41
# Add project specific ProGuard rules here.
52
# By default, the flags in this file are appended to flags specified
6-
# in ${sdk.dir}/tools/proguard/proguard-android.txt
7-
# You can edit the include path and order by changing the ProGuard
8-
# include property in project.properties.
3+
# in /Users/mklepp/Documents/android-sdks/tools/proguard/proguard-android.txt
4+
# You can edit the include path and order by changing the proguardFiles
5+
# directive in build.gradle.
96
#
107
# For more details, see
118
# http://developer.android.com/guide/developing/tools/proguard.html
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package org.aykit.MyOwnNotes;
2+
3+
import android.app.Application;
4+
import android.test.ApplicationTestCase;
5+
6+
/**
7+
* <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
8+
*/
9+
public class ApplicationTest extends ApplicationTestCase<Application> {
10+
public ApplicationTest() {
11+
super(Application.class);
12+
}
13+
}

app/src/main/AndroidManifest.xml

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
package="org.aykit.MyOwnNotes" >
4+
5+
<application
6+
android:allowBackup="true"
7+
android:icon="@mipmap/ic_launcher"
8+
android:label="@string/app_name"
9+
android:supportsRtl="true"
10+
android:theme="@style/AppTheme" >
11+
<activity
12+
android:name=".NoteListActivity"
13+
android:label="@string/app_name"
14+
android:theme="@style/AppTheme.NoActionBar" >
15+
<intent-filter>
16+
<action android:name="android.intent.action.MAIN" />
17+
18+
<category android:name="android.intent.category.LAUNCHER" />
19+
</intent-filter>
20+
</activity>
21+
<activity
22+
android:name=".NoteDetailActivity"
23+
android:label="@string/title_note_detail"
24+
android:parentActivityName=".NoteListActivity"
25+
android:theme="@style/AppTheme.NoActionBar" >
26+
<meta-data
27+
android:name="android.support.PARENT_ACTIVITY"
28+
android:value=".NoteListActivity" />
29+
</activity>
30+
</application>
31+
32+
</manifest>

0 commit comments

Comments
 (0)