salmon-engine-projects/salmon-wallpaper
14
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed Android version (Sony Xperia Z3 Compact)

Browse Source
This commit is contained in:
emil.kabirov committed 2018-11-09 07:39:08 +05:00
1 parent 77616bef24
commit 1d4b103f06
8 files changed
+165 -104
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

proj.android-studio/app/CMakeLists.txt
+14 -5
View File
@@ -1,7 +1,14 @@
cmake_minimum_required(VERSION 3.4.1)
set(BOOST_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../boost_1_67_0)
set(BOOST_GIL_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../libs/boost-gil-extension)
#set( CMAKE_CXX_STANDARD 17 )
#add_definitions(-DEIGEN_HAS_CXX11_MATH=0)
#set(BOOST_GIL_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../libs/boost-gil-extension)
set(BOOST_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../boost_1_68_0)
set(ZIP_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../libs/julienr-libzip-android/jni)
set(LIBPNG_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../libs/libpng_1.4.1_android)
set(LIBJPEG_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../libs/jpeg-9)
@@ -9,15 +16,17 @@ set(EIGEN_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../eigen)
set(SOL2_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../sol2)
set(LUA_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../libs/lua-5.3.4/src)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../tes-engine)
include_directories(${BOOST_PATH})
include_directories(${LIBJPEG_PATH}/vc10)
include_directories(${LUA_PATH})
include_directories(${EIGEN_PATH})
include_directories(${SOL2_PATH})
include_directories(${LUA_PATH})
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../)
include_directories(${BOOST_PATH})
include_directories(${LIBPNG_PATH})
include_directories(${LIBJPEG_PATH})
include_directories(${ZIP_PATH})
include_directories(${BOOST_GIL_PATH})
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../tes-engine)
add_definitions(-DTARGET_ANDROID)
proj.android-studio/app/src/main/AndroidManifest.xml
+26 -10
View File
@@ -1,25 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="fishrungames.mountainwallpaper" android:versionCode="1" android:versionName="1.0.0">
<application android:label="@string/app_name" android:icon="@drawable/icon" >
<activity android:launchMode="standard" android:name=".Prefs">
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
package="fishrungames.mountainwallpaper"
android:versionCode="1"
android:versionName="1.0.0">
<uses-feature
android:glEsVersion="0x00020000"
android:required="true"/>
<application
android:label="@string/app_name"
android:icon="@drawable/icon" >
<activity
android:name=".Prefs">
<intent-filter>
<category android:name="android.intent.category.PREFERENCE"/>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<service android:name="MountainWallpaperService" android:enabled="true"
android:icon="@drawable/icon" android:label="@string/app_name"
<service
android:name=".MountainWallpaperService"
android:icon="@drawable/icon"
android:label="@string/app_name"
android:permission="android.permission.BIND_WALLPAPER">
<intent-filter android:priority="1">
<action android:name="android.service.wallpaper.WallpaperService" />
</intent-filter>
<meta-data android:name="android.service.wallpaper"
android:resource="@xml/wallpaper" />
<meta-data
android:name="android.service.wallpaper"
android:resource="@xml/wallpaper"/>
</service>
</application>
<uses-feature android:glEsVersion="0x00020000"/>
</manifest>
proj.android-studio/app/src/main/java/fishrungames/mountainwallpaper/Prefs.java
Regular → Executable
+6 -6
View File
@@ -31,17 +31,17 @@ public class Prefs extends PreferenceActivity implements
super.onCreate(savedInstanceState);
setContentView(R.layout.prefliste);
addPreferencesFromResource(R.xml.preferences);
snowPref = (CheckBoxPreference)this.getPreferenceManager().findPreference("Snow");
timeOfDayPref = (ListPreference) findPreference("Timeofday");
if (timeOfDayPref.getKey().compareToIgnoreCase("Timeofday") == 0)
{
JniWrapper.SetTimeOfDayPref(Integer.parseInt((String) timeOfDayPref.getValue()));
}
if (snowPref.getKey().compareToIgnoreCase("Snow") == 0) {
if (!snowPref.isChecked())
{
@@ -51,7 +51,7 @@ public class Prefs extends PreferenceActivity implements
{
JniWrapper.SetSnowPref(true);
}
}
}
}
proj.android-studio/app/src/main/res/layout/prefliste.xml
+32 -6
View File
@@ -1,10 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_height="fill_parent" android:layout_width="fill_parent">
<RelativeLayout android:id="@+id/LinearLayout01" android:layout_height="wrap_content" android:layout_width="fill_parent"><ImageView android:id="@+id/ImageView01" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/icon" android:layout_alignParentLeft="true" android:layout_marginLeft="3dp"></ImageView>
</RelativeLayout>
<ListView android:layout_width="fill_parent" android:id="@+id/android_list" android:layout_height="wrap_content"></ListView>
<TextView android:layout_width="fill_parent" android:id="@+id/android_text_feedback" android:padding="20px" android:text="@string/feedback" android:layout_height="wrap_content"></TextView>
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_height="fill_parent" android:layout_width="fill_parent">
<RelativeLayout
android:id="@+id/LinearLayout01"
android:layout_height="wrap_content"
android:layout_width="fill_parent">
<ImageView
android:id="@+id/ImageView01"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/icon"
android:layout_alignParentLeft="true"
android:layout_marginLeft="3dp">
</ImageView>
</RelativeLayout>
<ListView
android:layout_width="fill_parent"
android:id="@android:id/list"
android:layout_height="wrap_content">
</ListView>
<TextView
android:layout_width="fill_parent"
android:id="@+id/android_text_feedback"
android:padding="20px"
android:text="@string/feedback"
android:layout_height="wrap_content">
</TextView>
</LinearLayout>