Skip to content
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.

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

More descriptive beta programme setting #297

Open
wants to merge 16 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ android:
- tools

# The BuildTools version used by your project
- build-tools-23.0.2
- build-tools-24.0.2

# The SDK version used to compile your project
- android-23
- android-24

# Additional components
#- extra-google-google_play_services
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Note taking <b>open-source</b> application aimed to have both a <b>simple interf
The project was created by the absence of such applications compatible with old phones and old versions of Android that would propose, however, an attractive look and aligned with the most recent design of the Google operating system


**Follow the developments and post your comments and advice on Google+ Beta Comunity at http://goo.gl/eF6qqF**
**Follow the developments and post your comments and advice on Google+ Beta Community at http://goo.gl/eF6qqF**

*Help to keep translations updated is always welcome, if you want give an hand checkout the translation project at [Crowdin][2]*

Expand Down
16 changes: 10 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,18 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.1.0'
classpath 'com.android.tools.build:gradle:2.1.3'
classpath 'me.tatarka:gradle-retrolambda:3.2.5'
classpath 'me.tatarka.retrolambda.projectlombok:lombok.ast:0.2.3.a2'
}
// Exclude the version that the android plugin depends on.
configurations.classpath.exclude group: 'com.android.tools.external.lombok'
}

plugins {
id "org.sonarqube" version "2.0.1"
}

allprojects {
repositories {
mavenLocal()
Expand All @@ -38,9 +42,9 @@ allprojects {
}
}

apply plugin: "sonar-runner"
sonarRunner {
sonarProperties {
apply plugin: 'org.sonarqube'
sonarqube {
properties {
property "sonar.host.url", "http://localhost:9000"
property "sonar.analysis.mode", "incremental"
property 'sonar.sourceEncoding', 'UTF-8'
Expand All @@ -49,8 +53,8 @@ sonarRunner {
}
}
subprojects {
sonarRunner {
sonarProperties {
sonarqube {
properties {
properties["sonar.sources"] += "omniNotes/src/main/java"
}
}
Expand Down
2 changes: 1 addition & 1 deletion etc/translations/play_store_description.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Note taking open-source application aimed to have both a lightweight footprint on system performances and simple interface but keeping smart behavior.

Follow the developments and post your comments and advice on Google+ Beta Comunity at https://plus.google.com/u/0/communities/112276053772152071903
Follow the developments and post your comments and advice on Google+ Beta Community at https://plus.google.com/u/0/communities/112276053772152071903

Help to complete translations is needed, if you want give me an hand please send me an e-mail!

Expand Down
5 changes: 5 additions & 0 deletions etc/translations/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@
<string name="proceed">Proceed</string>
<string name="contracted_view">Reduced view</string>
<string name="expanded_view">Expanded view</string>
<string name="grid_view">Grid view</string>
<string name="add_shortcut">Add shortcut</string>
<string name="shortcut_added">Shortcut added to home screen</string>
<string name="shortcut_note_deleted">Shortcut points to deleted note</string>
Expand Down Expand Up @@ -278,6 +279,7 @@
<string name="minutes">minutes</string>
<string name="settings_simple_calendar">Simple calendar and time</string>
<string name="settings_simple_calendar_summary">Use the (simpler) Android interface for date/time selection, instead of Google interface</string>
<string name="settings_first_day_of_week">First day of week</string>
<string name="settings_tour_show_again">App tour</string>
<string name="settings_tour_show_again_summary">Show me the application tour again</string>
<string name="backup_include_settings">Include settings and password</string>
Expand Down Expand Up @@ -317,6 +319,9 @@
<string name="settings_attachments_on_bottom">Attachments on bottom</string>
<string name="settings_attachments_on_bottom_summary_on">Shows attachments below note content</string>
<string name="settings_attachments_on_bottom_summary_off">Shows attachments above note content</string>
<string name="settings_prettified_dates">Prettified dates</string>
<string name="settings_prettified_dates_summary_on">Dates are shown in a simplier format</string>
<string name="settings_prettified_dates_summary_off">Dates are shown in a more detailed format</string>
<string name="settings_screen_privacy">Privacy</string>
<string name="settings_error_reporting">Error reporting</string>
<string name="settings_error_reporting_summary_on">When app crashes developer will be informed to help you</string>
Expand Down
8 changes: 5 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
#

MIN_SDK=14
TARGET_SDK=23
VERSION_NAME=5.3.0
VERSION_CODE=221
TARGET_SDK=24
VERSION_NAME=6.0
VERSION_CODE=228
PACKAGE=it.feio.android.omninotes

# The following properties are empty defaults to allow build and can EVENTUALLY be overridden to allow:
Expand All @@ -28,3 +28,5 @@ ANALYTICS_URL=
CRASH_REPORTING_URL=
# App's version check for update dialog
VERSION_CHECK_URL=
# Google Maps API key to provide addresses autocompletion feature
MAPS_API_KEY=
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#

#Thu Nov 27 09:24:39 CET 2014
#Tue Sep 06 19:09:13 CEST 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
13 changes: 9 additions & 4 deletions omniNotes/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ apply plugin: 'me.tatarka.retrolambda'

android {

compileSdkVersion 23
buildToolsVersion "23.0.2"
compileSdkVersion 24
buildToolsVersion "24.0.2"
defaultConfig {
applicationId project.PACKAGE
minSdkVersion project.MIN_SDK
Expand Down Expand Up @@ -74,8 +74,8 @@ dependencies {
}
compile 'com.github.gabrielemariotti.changeloglib:changelog:2.0.0'
compile 'be.billington.calendar.recurrencepicker:library:1.1.1'
compile 'com.android.support:appcompat-v7:23.2.1'
compile 'com.android.support:design:23.2.1'
compile 'com.android.support:appcompat-v7:24.2.0'
compile 'com.android.support:design:24.2.0'
compile 'de.greenrobot:eventbus:2.4.0'
compile 'com.pushbullet:android-extensions:1.0.4@aar'
compile 'com.getbase:floatingactionbutton:1.10.1'
Expand Down Expand Up @@ -108,10 +108,15 @@ dependencies {
compile 'com.github.federicoiosue:Omni-Notes-Commons:develop-SNAPSHOT'
compile 'com.github.federicoiosue:checklistview:3.1.3'
compile 'com.github.federicoiosue:pixlui:2.6'

compile 'com.android.support:appcompat-v7:24.2.0'
compile 'com.android.support:cardview-v7:24.2.0'
compile 'com.android.support:recyclerview-v7:24.2.0'
}

android.buildTypes.each { type ->
type.buildConfigField 'String', 'ANALYTICS_URL', '"' + ANALYTICS_URL + '"'
type.buildConfigField 'String', 'CRASH_REPORTING_URL', '"' + CRASH_REPORTING_URL + '"'
type.buildConfigField 'String', 'VERSION_CHECK_URL', '"' + VERSION_CHECK_URL + '"'
type.buildConfigField 'String', 'MAPS_API_KEY', '"' + MAPS_API_KEY + '"'
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,11 @@
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.support.design.widget.CollapsingToolbarLayout;
import android.support.v4.app.FragmentTransaction;
import android.support.v4.content.LocalBroadcastManager;
import android.support.v7.app.ActionBarActivity;
import android.support.v7.app.AppCompatActivity;
import android.util.Log;
import android.view.*;
import android.widget.EditText;
Expand All @@ -49,12 +51,12 @@
import java.util.List;

@SuppressLint("Registered")
public class BaseActivity extends ActionBarActivity {
public class BaseActivity extends AppCompatActivity {

protected final int TRANSITION_VERTICAL = 0;
protected final int TRANSITION_HORIZONTAL = 1;

protected SharedPreferences prefs;
public SharedPreferences prefs;

protected String navigation;
protected String navigationTmp; // used for widget navigation
Expand Down Expand Up @@ -237,13 +239,19 @@ protected void setActionBarTitle(String title) {
int actionBarTitle = Resources.getSystem().getIdentifier("action_bar_title", "id", "android");
android.widget.TextView actionBarTitleView = (android.widget.TextView) getWindow().findViewById(actionBarTitle);
Typeface font = Typeface.createFromAsset(getAssets(), "fonts/Roboto-Regular.ttf");
if (actionBarTitleView != null) {
actionBarTitleView.setTypeface(font);
}
//if (actionBarTitleView != null) {
// actionBarTitleView.setTypeface(font);
//}

if (getSupportActionBar() != null) {
getSupportActionBar().setTitle(title);
}
// CollapsingToolbarLayout collapsingToolbar =
// (CollapsingToolbarLayout) findViewById(R.id.collapsing_toolbar);
// collapsingToolbar.setCollapsedTitleTypeface(font);
// collapsingToolbar.setTitle("Title");


//if (getSupportActionBar() != null) {
// getSupportActionBar().setTitle(title);
//}
}


Expand Down
Loading