Skip to content
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 app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])

// Android
compile 'com.android.support:appcompat-v7:25.2.0'
compile 'com.android.support:recyclerview-v7:25.2.0'
compile 'com.android.support:appcompat-v7:25.3.1'
compile 'com.android.support:recyclerview-v7:25.3.1'

// 3rd party
compile 'com.jakewharton:butterknife:8.5.1' // View binding
Expand Down
2 changes: 1 addition & 1 deletion app/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Add project specific ProGuard rules here.
# By default, the flags in this file are appended to flags specified
# in /Users/temp/Desktop/Projects/Android/SDK/tools/proguard/proguard-android.txt
# in ${sdk.dir}/tools/proguard/proguard-android.txt
# You can edit the include path and order by changing the proguardFiles
# directive in build.gradle.
#
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
public class Preferences {

public static final String HIDE_CODE_INSTRUCTIONS = "code_instructions";

public static final String NOTIFICATION_ENABLE = "notification_enable";
public static final String NOTIFICATION_SOUND = "notification_sound";
public static final String NOTIFICATION_VIBRATE = "notification_vibrate";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ public ConnectivityEvent(Event event, String name, String mobile, String speed)
this.speed = speed;
}

}
}
2 changes: 1 addition & 1 deletion app/src/main/java/com/mbmc/fiinfo/data/Event.java
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ public static Event get(int type) {
}
}

}
}
2 changes: 1 addition & 1 deletion app/src/main/java/com/mbmc/fiinfo/helper/Database.java
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,4 @@ public void onUpgrade(SQLiteDatabase sqLiteDatabase, int oldVersion, int newVers
}
}

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ public void onReceive(Context context, Intent intent) {
previousEvent = event;
}

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@

public class MainActivity extends AppCompatActivity
implements LoaderManager.LoaderCallbacks<Cursor>, RefreshListener {

private static final int URL_LOADER = 0;
private static final String[] projection = {
Database.COLUMN_ID,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@ public StatViewHolder(View itemView) {
}
}

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] a
WidgetManager.update(context, this.getClass(), remoteViews, connectivityEvent);
}

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -95,4 +95,4 @@ private void setAction(Context context, RemoteViews remoteViews, String action,
remoteViews.setOnClickPendingIntent(viewId, PendingIntent.getBroadcast(context, 0, intent, 0));
}

}
}
2 changes: 1 addition & 1 deletion app/src/main/res/layout/fragment_notification_settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@
style="@style/SwitchTextAppearance"
/>

</LinearLayout>
</LinearLayout>
2 changes: 1 addition & 1 deletion app/src/main/res/layout/fragment_widget_settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,4 @@
/>
</FrameLayout>

</LinearLayout>
</LinearLayout>
2 changes: 1 addition & 1 deletion app/src/main/res/layout/layout_icon.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@
android:layout_height="wrap_content"
/>

</com.mbmc.fiinfo.ui.component.IconLayout>
</com.mbmc.fiinfo.ui.component.IconLayout>
2 changes: 1 addition & 1 deletion app/src/main/res/layout/layout_widget_1x1.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@
style="@style/TextViewStyle"
/>

</FrameLayout>
</FrameLayout>
2 changes: 1 addition & 1 deletion app/src/main/res/layout/view_code_instructions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@
android:text="@string/code_instructions_hide"
/>

</LinearLayout>
</LinearLayout>
2 changes: 1 addition & 1 deletion app/src/main/res/layout/view_event.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@
android:ellipsize="end"
/>

</LinearLayout>
</LinearLayout>
2 changes: 1 addition & 1 deletion app/src/main/res/layout/view_stat.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@
android:ellipsize="end"
/>

</LinearLayout>
</LinearLayout>
2 changes: 1 addition & 1 deletion app/src/main/res/values/colors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@
<color name="fi_green">#25A667</color>
<color name="fi_yellow">#FFC30F</color>

</resources>
</resources>
2 changes: 1 addition & 1 deletion app/src/main/res/xml/widget_1x1.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
android:minHeight="40dp"
android:initialLayout="@layout/layout_widget_1x1"
android:previewImage="@drawable/preview_1x1"
/>
/>
2 changes: 1 addition & 1 deletion app/src/main/res/xml/widget_4x1.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
android:minHeight="40dp"
android:initialLayout="@layout/layout_widget_4x1"
android:previewImage="@drawable/preview_4x1"
/>
/>
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.0'
classpath 'com.android.tools.build:gradle:2.3.1'
}
}

Expand Down
20 changes: 18 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
# 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

VERSION_NAME=0.9
VERSION_CODE=9
PACKAGE=com.mbmc.fiinfo
Expand All @@ -6,5 +24,3 @@ ANDROID_COMPILE_SDK_VERSION=25
ANDROID_TARGET_SDK_VERSION=23
ANDROID_MIN_SDK_VERSION=23
ANDROID_BUILD_TOOLS=25.0.2

org.gradle.jvmargs=-Xmx4608m -XX:MaxPermSize=512m
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Sun Mar 12 08:52:19 PDT 2017
#Tue Apr 11 18:40:58 SGT 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip
74 changes: 41 additions & 33 deletions gradlew

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

Loading