We are now using AppCompat and support Material

This commit is contained in:
Alexandros Schillings
2015-07-13 16:04:39 +01:00
parent 262fa72910
commit ab6997b5af
17 changed files with 115 additions and 78 deletions
+4 -3
View File
@@ -14,14 +14,15 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_connect"
android:orderInCategory="100"
android:showAsAction="always|withText"
android:title="@string/menu_connect"/>
android:title="@string/menu_connect"
app:showAsAction="always|withText"/>
</menu>
+10 -8
View File
@@ -14,28 +14,30 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_refresh"
android:checkable="false"
android:orderInCategory="1"
android:showAsAction="ifRoom"/>
android:title=""
app:showAsAction="always"/>
<item
android:id="@+id/menu_share"
android:icon="@drawable/ic_action_share"
android:orderInCategory="100"
android:showAsAction="ifRoom"
android:title="@string/menu_share"/>
android:title="@string/menu_share"
app:showAsAction="ifRoom"/>
<item
android:id="@+id/menu_connect"
android:orderInCategory="102"
android:showAsAction="ifRoom|withText"
android:title="@string/menu_connect"/>
android:title="@string/menu_connect"
app:showAsAction="ifRoom|withText"/>
<item
android:id="@+id/menu_disconnect"
android:orderInCategory="103"
android:showAsAction="ifRoom|withText"
android:title="@string/menu_disconnect"/>
android:title="@string/menu_disconnect"
app:showAsAction="ifRoom|withText"/>
</menu>
+13 -10
View File
@@ -14,33 +14,36 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_refresh"
android:checkable="false"
android:orderInCategory="1"
android:showAsAction="ifRoom"/>
android:title=""
app:showAsAction="always"/>
<item
android:id="@+id/menu_scan"
android:orderInCategory="100"
android:showAsAction="ifRoom|withText"
android:title="@string/menu_scan"/>
android:title="@string/menu_scan"
app:showAsAction="ifRoom|withText"/>
<item
android:id="@+id/menu_stop"
android:orderInCategory="101"
android:showAsAction="ifRoom|withText"
android:title="@string/menu_stop"/>
android:title="@string/menu_stop"
app:showAsAction="ifRoom|withText"/>
<item
android:id="@+id/menu_share"
android:icon="@drawable/ic_action_share"
android:orderInCategory="102"
android:showAsAction="ifRoom"
android:title="@string/menu_share"/>
android:title="@string/menu_share"
app:showAsAction="ifRoom"/>
<item
android:id="@+id/menu_about"
android:orderInCategory="103"
android:showAsAction="never"
android:title="@string/menu_about"/>
android:title="@string/menu_about"
app:showAsAction="never"/>
</menu>
@@ -4,7 +4,7 @@
Base application theme for API 11+. This theme completely replaces
AppBaseTheme from res/values/styles.xml on API 11+ devices.
-->
<style name="AppBaseTheme" parent="android:Theme.Holo.Light">
<style name="AppBaseTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<!-- API 11 theme customizations can go here. -->
</style>
@@ -5,7 +5,7 @@
AppBaseTheme from BOTH res/values/styles.xml and
res/values-v11/styles.xml on API 14+ devices.
-->
<style name="AppBaseTheme" parent="android:Theme.Holo.Light.DarkActionBar">
<style name="AppBaseTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<!-- API 14 theme customizations can go here. -->
</style>
+3 -3
View File
@@ -4,7 +4,7 @@
Base application theme, dependent on API level. This theme is replaced
by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
-->
<style name="AppBaseTheme" parent="android:Theme.Light">
<style name="AppBaseTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<!--
Theme customizations available in newer API levels can go in
res/values-vXX/styles.xml, while customizations related to
@@ -17,7 +17,7 @@
<!-- All customizations that are NOT specific to a particular API-level can go here. -->
</style>
<style name="GridLayoutDataTextView" parent="android:Widget.Holo.Light.TextView">
<style name="GridLayoutDataTextView">
<item name="android:textSize">12sp</item>
<item name="android:layout_weight">1</item>
<item name="android:ellipsize">none</item>
@@ -33,7 +33,7 @@
<item name="android:typeface">monospace</item>
</style>
<style name="GridLayoutTitleTextView" parent="android:Widget.Holo.Light.TextView">
<style name="GridLayoutTitleTextView">
<item name="android:textSize">12sp</item>
</style>