Merge pull request #1 from tranleduy2000/master

merge

Author: bestm80eva

.idea/modules.xml

@@ -8,8 +8,8 @@ android {
         applicationId "com.duy.pascal.compiler"
         minSdkVersion rootProject.ext.minSdkVersion as Integer
         targetSdkVersion rootProject.ext.targetSdkVersion as Integer
-        versionCode 112
-        versionName "4.0.9"
+        versionCode 115
+        versionName "4.1.2"
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled true
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -50,32 +50,26 @@ dependencies {
     compile project(':colorpicker')
     compile project(':splitview')
 
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
-    
     compile "com.android.support:appcompat-v7:$android_support_version"
     compile "com.android.support:support-v4:$android_support_version"
     compile "com.android.support:design:$android_support_version"
     compile "com.android.support:cardview-v7:$android_support_version"
     compile "com.android.support:recyclerview-v7:$android_support_version"
     compile "com.android.support:support-annotations:$android_support_version"
-    compile "com.android.support:percent:$android_support_version"
-    compile "com.android.support:support-vector-drawable:$android_support_version"
 
     compile "com.android.support.constraint:constraint-layout:1.0.2"
     compile "com.android.support:multidex:1.0.1"
     compile 'com.google.firebase:firebase-core:11.0.2'
     compile 'com.google.firebase:firebase-crash:11.0.2'
-    compile 'com.google.firebase:firebase-messaging:11.0.2'
     compile 'io.github.kobakei:ratethisapp:1.1.2'
     compile 'commons-io:commons-io:2.4'
     compile 'com.github.clans:fab:1.6.4'
     compile 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
     compile 'com.github.bmelnychuk:atv:1.2.9'
     compile 'com.journeyapps:zxing-android-embedded:3.5.0'
     compile 'com.miguelcatalan:materialsearchview:1.4.0'
-    compile 'frankiesardo:icepick:3.2.0'
-    compile 'com.sothree.slidinguppanel:library:3.3.1'
-    provided 'frankiesardo:icepick-processor:3.2.0'
     compile 'com.github.bumptech.glide:glide:3.7.0'
+
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 }
 apply plugin: 'com.google.gms.google-services'

app/build.gradle

@@ -129,11 +129,6 @@
                 <action android:name="com.google.firebase.MESSAGING_EVENT"/>
             </intent-filter>
         </service>
-        <service android:name=".notify.FirebaseInstanceIDService">
-            <intent-filter>
-                <action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
-            </intent-filter>
-        </service>
 
         <!--
      Set custom default icon. This is used when no icon is set for incoming notification messages.

app/src/main/AndroidManifest.xml

@@ -1,41 +1,41 @@
-uses
-    aSensor, crt;
-var
-    x, y, z: real;
-begin
-    clrscr;
-    writeln('Press any key to stop program');
-    {1 = All,
-    2 = Accelerometer,
-    3 = Magnetometer,
-    4 = Light,
-    5 = Pressure,
-    6 = Gravity,
-    7 = Humidity,
-    8 = Temperature}
-
-    {Start sensor monitor, Accelerometer}
-    startSensor(2);
-    while not keypressed do
-    begin
-        {Get x, y, z value}
-        x := getXAccelerometer;
-        y := getYAccelerometer;
-        z := getZAccelerometer;
-
-        {Print to console}
-        writeln('  x = ', x:3:3);
-        writeln('  y = ', y:3:3);
-        writeln('  z = ', z:3:3);
-        {Clear screen}
-        delay(100);
-        clrscr;
-    end;
-    stopSensor;
-end.
-
-{For more information of Accelerometer sensor,
- see wiki https://en.wikipedia.org/wiki/Accelerometer
-or search with keyword "Acceleromeer sensor"
-If you want to improve this sample, please send code to me
+uses
+    aSensor, crt;
+var
+    x, y, z: real;
+begin
+    clrscr;
+    writeln('Press any key to stop program');
+    {1 = All,
+    2 = Accelerometer,
+    3 = Magnetometer,
+    4 = Light,
+    5 = Pressure,
+    6 = Gravity,
+    7 = Humidity,
+    8 = Temperature}
+
+    {Start sensor monitor, Accelerometer}
+    startSensor(2);
+    while not keypressed do
+    begin
+        {Get x, y, z value}
+        x := getXAccelerometer;
+        y := getYAccelerometer;
+        z := getZAccelerometer;
+
+        {Print to console}
+        writeln('  x = ', x:3:3);
+        writeln('  y = ', y:3:3);
+        writeln('  z = ', z:3:3);
+        {Clear screen}
+        delay(100);
+        clrscr;
+    end;
+    stopSensor;
+end.
+
+{For more information of Accelerometer sensor,
+ see wiki https://en.wikipedia.org/wiki/Accelerometer
+or search with keyword "Acceleromeer sensor"
+If you want to improve this sample, please send code to me
 Tranleduy1233@gmail.com}

app/src/main/assets/code_sample/android/accelerometer_sensor.pas renamed to app/src/main/assets/CodeSample/Android/accelerometer_sensor.pas

@@ -1,112 +1,112 @@
-uses aBattery, crt;
-var
-    status, health, level: Integer;
-    plugType: Integer;
-    tech: string;
-    vol: Integer;
-    temp: Integer;
-
-procedure printStatus(i: Integer);
-begin
-    {Returns the most recently received battery status data:
-    1 - unknown;
-    2 - charging;
-    3 - discharging;
-    4 - not charging;
-    5 - full;}
-    write('Battery status: ');
-    case i of
-    1: writeln('unknown');
-    2: writeln('charging');
-    3: writeln('discharging');
-    4: writeln('not charging');
-    5: writeln('full');
-    end;
-end;
-
-procedure printHealth(i: integer);
-begin
-    {Returns the most recently received battery health data:
-    1 - unknown;
-    2 - good;
-    3 - overheat;
-    4 - dead;
-    5 - over voltage;
-    6 - unspecified failure;}
-    case i of
-    1: writeln('unknown');
-    2: writeln('good');
-    3: writeln('overheat');
-    4: writeln('not dead');
-    5: writeln('over voltage');
-    6: writeln('unspecified failure');
-    end;
-end;
-
-procedure printPlugType(i: Integer);
-begin
-    {Returns the most recently received plug type data:
-    -1 - unknown
-    0 - unplugged;
-    1 - power items is an AC charger
-    2 - power items is a USB port
-    }
-    case i of
-    -1: writeln('unknown');
-    0: writeln('unplugged');
-    1: writeln('power source is an AC charger');
-    2: writeln('power source is a USB port');
-    end;
-end;
-
-procedure printLevel(i: Integer);
-begin
-    writeln('battery level (percentage): ', i, ' %');
-end;
-
-procedure printTechnology(tech: string);
-begin
-    writeln('Battery technology data: ', tech);
-end;
-
-procedure printVoltage(vol: Integer);
-begin
-    writeln('Voltage: ', vol);
-end;
-
-procedure printTemp(temp: Integer);
-begin
-    writeln('Temperature: ', vol);
-end;
-
-begin
-    {Start monitor}
-    batteryStartMonitoring;
-    {Wait 1 second for collection info}
-    delay(1000);
-
-    status := batteryGetStatus;
-    printStatus(status);
-
-    health := batteryGetHealth;
-    printHealth(health);
-
-    level := batteryGetLevel;
-    printLevel(level);
-
-    plugType := batteryGetPlugType;
-    printPlugType(plugType);
-
-    tech := batteryGetTechnology;
-    printTechnology(tech);
-
-    temp := batteryGetTemperature;
-    printTemp(temp);
-
-    vol := batteryGetVoltage;
-    printVoltage(vol);
-
-    {stop}
-    batteryStopMonitoring;
-    readln;
+uses aBattery, crt;
+var
+    status, health, level: Integer;
+    plugType: Integer;
+    tech: string;
+    vol: Integer;
+    temp: Integer;
+
+procedure printStatus(i: Integer);
+begin
+    {Returns the most recently received battery status data:
+    1 - unknown;
+    2 - charging;
+    3 - discharging;
+    4 - not charging;
+    5 - full;}
+    write('Battery status: ');
+    case i of
+    1: writeln('unknown');
+    2: writeln('charging');
+    3: writeln('discharging');
+    4: writeln('not charging');
+    5: writeln('full');
+    end;
+end;
+
+procedure printHealth(i: integer);
+begin
+    {Returns the most recently received battery health data:
+    1 - unknown;
+    2 - good;
+    3 - overheat;
+    4 - dead;
+    5 - over voltage;
+    6 - unspecified failure;}
+    case i of
+    1: writeln('unknown');
+    2: writeln('good');
+    3: writeln('overheat');
+    4: writeln('not dead');
+    5: writeln('over voltage');
+    6: writeln('unspecified failure');
+    end;
+end;
+
+procedure printPlugType(i: Integer);
+begin
+    {Returns the most recently received plug type data:
+    -1 - unknown
+    0 - unplugged;
+    1 - power items is an AC charger
+    2 - power items is a USB port
+    }
+    case i of
+    -1: writeln('unknown');
+    0: writeln('unplugged');
+    1: writeln('power source is an AC charger');
+    2: writeln('power source is a USB port');
+    end;
+end;
+
+procedure printLevel(i: Integer);
+begin
+    writeln('battery level (percentage): ', i, ' %');
+end;
+
+procedure printTechnology(tech: string);
+begin
+    writeln('Battery technology data: ', tech);
+end;
+
+procedure printVoltage(vol: Integer);
+begin
+    writeln('Voltage: ', vol);
+end;
+
+procedure printTemp(temp: Integer);
+begin
+    writeln('Temperature: ', vol);
+end;
+
+begin
+    {Start monitor}
+    batteryStartMonitoring;
+    {Wait 1 second for collection info}
+    delay(1000);
+
+    status := batteryGetStatus;
+    printStatus(status);
+
+    health := batteryGetHealth;
+    printHealth(health);
+
+    level := batteryGetLevel;
+    printLevel(level);
+
+    plugType := batteryGetPlugType;
+    printPlugType(plugType);
+
+    tech := batteryGetTechnology;
+    printTechnology(tech);
+
+    temp := batteryGetTemperature;
+    printTemp(temp);
+
+    vol := batteryGetVoltage;
+    printVoltage(vol);
+
+    {stop}
+    batteryStopMonitoring;
+    readln;
 end.