Smikkelbakje/J1B4-Fitbot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update Fitbot app styles and themes

Browse Source
This commit is contained in:
SebasKoedam
2024-04-26 11:11:21 +02:00
parent 6d745a0449
commit a5a26a3b25
10 changed files with 66 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/src/Fitbot/.idea/misc.xml generated
View File

@@ -8,13 +8,14 @@
<entry key="..\:/Users/31687/muupooviixee66-1/code/src/Fitbot/app/src/main/res/layout/activity_main_screen.xml" value="0.358695652173913" /> <entry key="..\:/Users/31687/muupooviixee66-1/code/src/Fitbot/app/src/main/res/layout/activity_main_screen.xml" value="0.358695652173913" />
<entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/layout/activity_bicepvideo.xml" value="0.136" /> <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/layout/activity_bicepvideo.xml" value="0.136" />
<entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/layout/activity_completion_screen.xml" value="0.18541666666666667" /> <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/layout/activity_completion_screen.xml" value="0.18541666666666667" />
<entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/layout/activity_main.xml" value="0.2" /> <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/layout/activity_main.xml" value="0.12" />
<entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/layout/activity_main_screen.xml" value="0.1" /> <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/layout/activity_main_screen.xml" value="0.1" />
<entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/layout/activity_power_screen.xml" value="0.1" />
<entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/layout/activity_sport_item.xml" value="0.18541666666666667" /> <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/layout/activity_sport_item.xml" value="0.18541666666666667" />
<entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/layout/activity_sport_menu.xml" value="0.18541666666666667" /> <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/layout/activity_sport_menu.xml" value="0.18541666666666667" />
<entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/layout/header.xml" value="0.18125" /> <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/layout/header.xml" value="0.18125" />
<entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/layout/toolbar.xml" value="0.1" /> <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/layout/toolbar.xml" value="0.1" />
<entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/menu/main_menu.xml" value="0.18125" /> <entry key="..\:/Users/sebas/Documents/HvA/Reposetories/muupooviixee66/code/src/Fitbot/app/src/main/res/menu/main_menu.xml" value="0.1" />
</map> </map>
</option> </option>
</component> </component>

11
code/src/Fitbot/app/src/main/AndroidManifest.xml
View File

@@ -16,13 +16,7 @@
android:exported="false" /> android:exported="false" />
<activity <activity
android:name=".ui.SportMenuActivity" android:name=".ui.SportMenuActivity"
android:exported="true" > android:exported="false" />
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity <activity
android:name=".BicepVideo" android:name=".BicepVideo"
android:exported="false" /> android:exported="false" />
@@ -31,6 +25,9 @@
android:exported="false" /> android:exported="false" />
<activity <activity
android:name=".MainActivity" android:name=".MainActivity"
android:exported="false" />
<activity
android:name=".MainScreen"
android:exported="true" > android:exported="true" >
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />

21
code/src/Fitbot/app/src/main/java/com/example/fitbot/MainScreen.java
View File

@@ -1,11 +1,13 @@
package com.example.fitbot; package com.example.fitbot;
import android.annotation.SuppressLint;
import android.os.Bundle; import android.os.Bundle;
import android.support.design.widget.NavigationView; import android.support.design.widget.NavigationView;
import android.support.v4.view.GravityCompat;
import android.support.v4.widget.DrawerLayout; import android.support.v4.widget.DrawerLayout;
import android.support.v7.app.ActionBarDrawerToggle; import android.support.v7.app.ActionBarDrawerToggle;
import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatActivity;
import android.widget.Toolbar; import android.support.v7.widget.Toolbar;
public class MainScreen extends AppCompatActivity { public class MainScreen extends AppCompatActivity {
@@ -14,6 +16,7 @@ public class MainScreen extends AppCompatActivity {
NavigationView navigationView; NavigationView navigationView;
Toolbar toolbar; Toolbar toolbar;
@SuppressLint("WrongViewCast")
@Override @Override
protected void onCreate (Bundle savedInstanceState) { protected void onCreate (Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
@@ -25,11 +28,23 @@ public class MainScreen extends AppCompatActivity {
toolbar = findViewById(R.id.toolbar); toolbar = findViewById(R.id.toolbar);
/*---Tool Bar---*/ /*---Tool Bar---*/
setSupportActionBar(toolbar); // setSupportActionBar(toolbar);
/*---Navigation Drawer Menu---*/ /*---Navigation Drawer Menu---*/
ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(this.drawerLayout,toolbar,R.string.navigation_drawer_open,R.string.navigation_drawer_close); navigationView.bringToFront();
ActionBarDrawerToggle toggle=new
ActionBarDrawerToggle(this,drawerLayout,toolbar,R.string.navigation_drawer_open,R.string.navigation_drawer_close);
drawerLayout.addDrawerListener(toggle); drawerLayout.addDrawerListener(toggle);
toggle.syncState(); toggle.syncState();
} }
@Override
public void onBackPressed(){
if(drawerLayout.isDrawerOpen(GravityCompat.START)){
drawerLayout.closeDrawer(GravityCompat.START);
}
else
{super.onBackPressed();
}
}
} }

18
code/src/Fitbot/app/src/main/java/com/example/fitbot/PowerScreen.java
View File

@@ -25,15 +25,15 @@ public class PowerScreen extends AppCompatActivity {
Intent intent = new Intent(PowerScreen.this, BicepVideo.class); Intent intent = new Intent(PowerScreen.this, BicepVideo.class);
startActivity(intent); startActivity(intent);
}); });
openSquatVideo.setOnClickListener(v -> { // openSquatVideo.setOnClickListener(v -> {
Intent intent = new Intent(PowerScreen.this, SquatVideo.class); // Intent intent = new Intent(PowerScreen.this, SquatVideo.class);
startActivity(intent); // startActivity(intent);
}); // });
//
openTricepVideo.setOnClickListener(v -> { // openTricepVideo.setOnClickListener(v -> {
Intent intent = new Intent(PowerScreen.this, TricepVideo.class); // Intent intent = new Intent(PowerScreen.this, TricepVideo.class);
startActivity(intent); // startActivity(intent);
}); // });
goToHome.setOnClickListener(v -> { goToHome.setOnClickListener(v -> {
Intent intent = new Intent(PowerScreen.this, MainActivity.class); Intent intent = new Intent(PowerScreen.this, MainActivity.class);

34
code/src/Fitbot/app/src/main/res/layout/activity_main.xml
View File

@@ -1,30 +1,25 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/drawer_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".MainActivity"
android:fitsSystemWindows="true" android:fitsSystemWindows="true"
tools:context=".MainActivity"
tools:openDrawer="start"> tools:openDrawer="start">
<include <include
android:id="@+id/toolbar" android:id="@+id/toolbar"
layout="@layout/toolbar"/> layout="@layout/toolbar" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Hello World"
android:layout_centerInParent="true"/>
<android.support.design.widget.NavigationView <android.support.design.widget.NavigationView
android:id="@+id/nav_view"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:id="@+id/nav_view" android:layout_gravity="start"
app:headerLayout="@layout/header" app:headerLayout="@layout/header"
app:menu="@menu/main_menu" app:menu="@menu/main_menu" />
android:layout_gravity="start"/>
<Button <Button
android:id="@+id/menu_switch_btn" android:id="@+id/menu_switch_btn"
@@ -32,17 +27,6 @@
android:layout_height="50dp" android:layout_height="50dp"
android:text="Go to Sport Menu" android:text="Go to Sport Menu"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent" />
/>
<android.support.v7.widget.Toolbar </android.support.v4.widget.DrawerLayout>
android:id="@+id/toolbar"
android:layout_width="798dp"
android:layout_height="wrap_content"
android:background="#00FFFFFF"
android:minHeight="?attr/actionBarSize"
android:theme="?attr/actionBarTheme"
tools:layout_editor_absoluteX="0dp"
tools:layout_editor_absoluteY="0dp" />
</RelativeLayout>

13
code/src/Fitbot/app/src/main/res/layout/header.xml
View File

@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="200dp" android:layout_height="200dp"
@@ -9,17 +10,23 @@
android:padding="10dp"> android:padding="10dp">
<ImageView <ImageView
android:id="@+id/imageView"
android:layout_width="150dp" android:layout_width="150dp"
android:layout_height="150dp" android:layout_height="150dp"
android:src="@drawable/robotlogo"/> android:layout_marginStart="10dp"
android:layout_marginTop="20dp"
android:src="@drawable/robotlogo"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="60dp"
android:text="FitBot" android:text="FitBot"
android:textSize="48sp" android:textSize="48sp"
tools:layout_editor_absoluteX="160dp" app:layout_constraintStart_toEndOf="@+id/imageView"
tools:layout_editor_absoluteY="50dp"/> app:layout_constraintTop_toTopOf="parent" />
</android.support.constraint.ConstraintLayout> </android.support.constraint.ConstraintLayout>

4
code/src/Fitbot/app/src/main/res/layout/toolbar.xml
View File

@@ -2,8 +2,8 @@
<android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android" <android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/design_default_color_primary" android:background="#00000000"
android:elevation="8dp" android:elevation="8dp"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"> android:theme="@style/Theme.AppCompat.Light.NoActionBar">
</android.support.v7.widget.Toolbar> </android.support.v7.widget.Toolbar>

2
code/src/Fitbot/app/src/main/res/values-night/themes.xml
View File

@@ -1,6 +1,6 @@
<resources xmlns:tools="http://schemas.android.com/tools"> <resources xmlns:tools="http://schemas.android.com/tools">
<!-- Base application theme. --> <!-- Base application theme. -->
<style name="Theme.Fitbot" parent="Theme.AppCompat.Light.DarkActionBar"> <style name="Theme.Fitbot" parent="Theme.AppCompat.Light.NoActionBar">
<!-- Primary brand color. --> <!-- Primary brand color. -->
<item name="colorPrimary">@color/purple_200</item> <item name="colorPrimary">@color/purple_200</item>
<item name="colorPrimaryDark">@color/purple_700</item> <item name="colorPrimaryDark">@color/purple_700</item>

9
code/src/Fitbot/app/src/main/res/values/styles.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
<item name="android:statusBarColor">#00000000</item>
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>
</resources>

2
code/src/Fitbot/app/src/main/res/values/themes.xml
View File

@@ -1,6 +1,6 @@
<resources xmlns:tools="http://schemas.android.com/tools"> <resources xmlns:tools="http://schemas.android.com/tools">
<!-- Base application theme. --> <!-- Base application theme. -->
<style name="Theme.Fitbot" parent="Theme.AppCompat.Light.DarkActionBar"> <style name="Theme.Fitbot" parent="Theme.AppCompat.Light.NoActionBar">
<!-- Primary brand color. --> <!-- Primary brand color. -->
<item name="colorPrimary">@color/purple_500</item> <item name="colorPrimary">@color/purple_500</item>
<item name="colorPrimaryDark">@color/purple_700</item> <item name="colorPrimaryDark">@color/purple_700</item>