Skip to content

Commit

Permalink
Fixed button location
Browse files Browse the repository at this point in the history
  • Loading branch information
VadVergasov committed Aug 26, 2019
1 parent f4fe420 commit 3bdb1f5
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 6 deletions.
9 changes: 8 additions & 1 deletion .cproject
Original file line number Diff line number Diff line change
Expand Up @@ -460,6 +460,13 @@
</scannerConfigBuildInfo>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
<storageModule moduleId="refreshScope"/>
<storageModule moduleId="refreshScope" versionNumber="2">
<configuration configurationName="Debug">
<resource resourceType="PROJECT" workspacePath="/WaterCleaner"/>
</configuration>
<configuration configurationName="Release">
<resource resourceType="PROJECT" workspacePath="/WaterCleaner"/>
</configuration>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
</cproject>
4 changes: 2 additions & 2 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-Trying to make icon in Popup.
-Few minor fixes.
-Added sound of current system ringtone.
-Now spinner is in focus, so no clicks on screen now.
-Added check for Tizen Version to prevent incorrect UI in Tizen 4.

1 change: 1 addition & 0 deletions inc/watercleaner.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include <sound_manager.h>
#include <stdio.h>
#include <system_settings.h>
#include <system_info.h>
#include <time.h>
#include <player.h>

Expand Down
10 changes: 9 additions & 1 deletion src/watercleaner.c
Original file line number Diff line number Diff line change
Expand Up @@ -186,11 +186,19 @@ static void create_base_gui(appdata_s *ad) {
elm_grid_pack(ad->grid, ad->label, 35, 45, 30, 10);
evas_object_show(ad->label);

char *version;
system_info_get_platform_string("http://tizen.org/feature/platform.version",
&version);

char *button_text = i18n_get_text("Clean");
ad->button = elm_button_add(ad->grid);
elm_object_text_set(ad->button, button_text);
elm_object_style_set(ad->button, "bottom");
elm_grid_pack(ad->grid, ad->button, 30, 90, 40, 10);
if (version[0] == '4') {
elm_grid_pack(ad->grid, ad->button, 30, 85, 40, 10);
} else {
elm_grid_pack(ad->grid, ad->button, 30, 90, 40, 10);
}
evas_object_smart_callback_add(ad->button, "clicked", clicked_cb, ad);
evas_object_show(ad->button);
evas_object_show(ad->win);
Expand Down
4 changes: 2 additions & 2 deletions tizen-manifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<manifest xmlns="http://tizen.org/ns/packages" api-version="2.3.2" package="com.vadvergasov.watercleaner" version="2.1.0">
<author email="[email protected]">VadVergasov</author>
<manifest xmlns="http://tizen.org/ns/packages" api-version="2.3.2" package="com.vadvergasov.watercleaner" version="2.2.0">
<author email="[email protected]" href="vadvergasov.github.io">VadVergasov</author>
<description>This app will help you to clean the watches after swimming.</description>
<profile name="wearable"/>
<ui-application appid="com.vadvergasov.watercleaner" exec="watercleaner" multiple="false" nodisplay="false" taskmanage="true" type="capp">
Expand Down

0 comments on commit 3bdb1f5

Please sign in to comment.