浏览代码

Android: Setting page, minor fix

LouYihua 8 年之前
父节点
当前提交
c36b574444

+ 4 - 14
android/app/src/main/AndroidManifest.xml

@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><!--
- Replace org.libsdl.app with the identifier of your game below, e.g.
-     com.gamemaker.game
--->
+<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="io.github.sdlpal"
     android:installLocation="auto"
     android:versionCode="2"
-    android:versionName="2.0"> <!-- Android 2.3.3 -->
+    android:versionName="2.0">
+
+    <!-- Android 2.3.3 -->
     <uses-sdk
         android:minSdkVersion="10"
         android:targetSdkVersion="12" />
@@ -18,16 +17,7 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <!--
- Create a Java class extending SDLActivity and place it in a
-         directory under src matching the package, e.g.
-         	src/com/gamemaker/game/MyGame.java
-
-         then replace "SDLActivity" with the name of your class (e.g. "MyGame")
-         in the XML below.
 
-         An example Java class can be found in README-android.txt
-    -->
     <application
         android:allowBackup="true"
         android:hardwareAccelerated="true"

+ 1 - 2
android/app/src/main/res/layout/activity_settings.xml

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="io.github.myapplication.SettingsActivity">
+    tools:context="io.github.sdlpal.SettingsActivity">
 
     <android.support.design.widget.AppBarLayout
         android:layout_width="match_parent"
@@ -15,7 +15,6 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
             app:popupTheme="@style/AppTheme.PopupOverlay"
             app:subtitle="@string/title_settings"
             app:title="SDLPal" />

+ 1 - 1
android/app/src/main/res/layout/content_settings.xml

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:context="io.github.myapplication.SettingsActivity"
+    tools:context="io.github.sdlpal.SettingsActivity"
     tools:showIn="@layout/activity_settings">
 
     <ScrollView

+ 0 - 6
android/app/src/main/res/values/colors.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="colorPrimary">#3F51B5</color>
-    <color name="colorPrimaryDark">#303F9F</color>
-    <color name="colorAccent">#FF4081</color>
-</resources>

+ 0 - 3
android/app/src/main/res/values/dimens.xml

@@ -1,3 +0,0 @@
-<resources>
-    <dimen name="fab_margin">16dp</dimen>
-</resources>

+ 1 - 6
android/app/src/main/res/values/styles.xml

@@ -1,12 +1,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-    </style>
+    <style name="AppTheme" parent="Theme.AppCompat" />
 
     <style name="AppTheme.NoActionBar">
         <item name="windowActionBar">false</item>