Skip to content

NOT FOR MERGE | Zotable changeset #134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
avram wants to merge 1 commit into
base: master
Choose a base branch
from
Open

NOT FOR MERGE | Zotable changeset #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 14 additions & 15 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,64 +3,63 @@ import groovy.swing.SwingBuilder
buildscript {
repositories {
mavenCentral()
maven { url 'http://download.crashlytics.com/maven' }
}
dependencies {
classpath 'com.android.tools.build:gradle:0.12.+'
classpath 'com.crashlytics.tools.gradle:crashlytics-gradle:1.+'
classpath 'com.android.tools.build:gradle:1.2.3'
}
}


repositories {
mavenLocal()
mavenCentral()
maven { url 'http://download.crashlytics.com/maven' }
jcenter()
}

apply plugin: 'android'
apply plugin: 'crashlytics'

dependencies {
compile 'com.android.support:support-v4:21.0.+'
compile 'com.android.support:appcompat-v7:21.0.+'
compile 'oauth.signpost:signpost-commonshttp4:1.2.1.2'
compile 'com.intellij:annotations:12.0'
compile 'com.crashlytics.android:crashlytics:1.+'
compile 'commons-io:commons-io:2.4'
compile 'com.squareup:otto:1.3.4'
compile 'com.google.zxing:android-integration:2.3.0'

// compile project(":libzotero-java")
compile 'com.getbase:floatingactionbutton:1.10.0'
compile 'com.nononsenseapps:filepicker:2.2.3'
}


android {
compileSdkVersion 19
buildToolsVersion "20.0.0"
compileSdkVersion 22
buildToolsVersion "22.0.1"

defaultConfig {
minSdkVersion 16
targetSdkVersion 22
versionCode 1440
versionName "1.4.4"
}

productFlavors {
amazon
google
}

signingConfigs {
release {
storeFile file("keystore")
keyAlias "zandy"
keyAlias "zotable"
storePassword ""
keyPassword ""
}
}

buildTypes {
release {
zipAlign true
zipAlignEnabled true
signingConfig signingConfigs.release
runProguard false
minifyEnabled false
proguardFile getDefaultProguardFile('proguard-android.txt')
}
}
Expand All @@ -77,7 +76,7 @@ android {
gradle.taskGraph.whenReady { taskGraph ->

println taskGraph.allTasks
if(taskGraph.hasTask(':zandy:assembleGoogleRelease')) {
if(taskGraph.hasTask(':zotable:assembleGoogleRelease')) {

def storePass = ''
def keyPass = ''
Expand Down
81 changes: 0 additions & 81 deletions src/instrumentTest/java/com/gimranov/zandy/app/test/ApiTest.java
View file
Open in desktop

This file was deleted.

27 changes: 0 additions & 27 deletions src/instrumentTest/java/com/gimranov/zandy/app/test/MainTest.java
View file
Open in desktop

This file was deleted.

75 changes: 57 additions & 18 deletions src/main/AndroidManifest.xml
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.gimranov.zandy.app">
package="com.mattrobertson.zotable.app" >

<uses-sdk
android:minSdkVersion="7"
android:targetSdkVersion="19" />
android:minSdkVersion="16"
android:targetSdkVersion="22" />

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

<application
android:name="com.gimranov.zandy.app.Application"
android:icon="@drawable/zandy72"
android:label="@string/app_name">
android:name=".Application"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@style/AppTheme" >
<activity
android:name=".MainActivity"
android:name=".Activity_Main"
android:label="@string/app_name"
android:launchMode="singleInstance">
android:launchMode="singleInstance" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW" />

<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />

<data android:scheme="zotero" />
<data android:scheme="zotable" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.SEND" />
Expand All @@ -39,13 +41,26 @@
android:name=".CollectionActivity"
android:label="@string/app_name"
android:launchMode="standard" />
<activity
android:name=".TagItemsActivity"
android:label="@string/app_name"
android:launchMode="standard" >
<intent-filter>
<action android:name="android.intent.action.SEARCH" />
</intent-filter>

<meta-data
android:name="android.app.searchable"
android:resource="@xml/searchable" />
</activity>
<activity
android:name=".ItemActivity"
android:label="@string/app_name"
android:launchMode="standard">
android:launchMode="standard" >
<intent-filter>
<action android:name="android.intent.action.SEARCH" />
</intent-filter>

<meta-data
android:name="android.app.searchable"
android:resource="@xml/searchable" />
Expand Down Expand Up @@ -75,20 +90,44 @@
android:label="@string/app_name"
android:launchMode="standard" />
<activity
android:name=".LookupActivity"
android:name=".RequestActivity"
android:label="@string/app_name"
android:launchMode="standard" />
<activity
android:name=".RequestActivity"
android:name=".NoteActivity"
android:label="@string/app_name"
android:launchMode="standard" />

<activity
android:name=".NoteActivity"
android:name=".SearchActivity"
android:label="@string/app_name"
android:launchMode="standard" />

<meta-data
android:name="com.crashlytics.ApiKey"
android:value="d02b3d0416bed4f24247e9114e295b0f38ae0455" />
<activity
android:name=".Activity_Preference"
android:label="@string/title_activity_activity__preference"
android:parentActivityName=".Activity_Main"
android:theme="@style/PreferencesTheme" >
</activity>
<activity
android:name=".PDFActivity"
android:label="Zotable" >
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<data android:mimeType="application/pdf" />
</intent-filter>
</activity>

<activity
android:name="com.nononsenseapps.filepicker.FilePickerActivity"
android:label="@string/app_name"
android:theme="@style/FilePickerTheme">
<intent-filter>
<action android:name="android.intent.action.GET_CONTENT" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
</application>

</manifest>
28 changes: 0 additions & 28 deletions src/main/java/com/gimranov/zandy/app/Application.java
View file
Open in desktop

This file was deleted.

Loading