Commit aeb47069 authored by Muhammad Suryono's avatar Muhammad Suryono

fix dashboard

parent dc6f7bcb
<component name="ProjectCodeStyleConfiguration"> <component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173"> <code_scheme name="Project" version="173">
<DBN-PSQL>
<case-options enabled="true">
<option name="KEYWORD_CASE" value="lower" />
<option name="FUNCTION_CASE" value="lower" />
<option name="PARAMETER_CASE" value="lower" />
<option name="DATATYPE_CASE" value="lower" />
<option name="OBJECT_CASE" value="preserve" />
</case-options>
<formatting-settings enabled="false" />
</DBN-PSQL>
<DBN-SQL>
<case-options enabled="true">
<option name="KEYWORD_CASE" value="lower" />
<option name="FUNCTION_CASE" value="lower" />
<option name="PARAMETER_CASE" value="lower" />
<option name="DATATYPE_CASE" value="lower" />
<option name="OBJECT_CASE" value="preserve" />
</case-options>
<formatting-settings enabled="false">
<option name="STATEMENT_SPACING" value="one_line" />
<option name="CLAUSE_CHOP_DOWN" value="chop_down_if_statement_long" />
<option name="ITERATION_ELEMENTS_WRAPPING" value="chop_down_if_not_single" />
</formatting-settings>
</DBN-SQL>
<DBN-PSQL> <DBN-PSQL>
<case-options enabled="true"> <case-options enabled="true">
<option name="KEYWORD_CASE" value="lower" /> <option name="KEYWORD_CASE" value="lower" />
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
android:label="@string/app_name" android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher"
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/AppTheme"> android:theme="@style/AppTheme.appbar">
<activity android:name=".PaymentActivity" android:theme="@style/AppTheme.appbar"></activity> <activity android:name=".PaymentActivity" android:theme="@style/AppTheme.appbar"></activity>
<activity android:name=".CartActivity" /> <activity android:name=".CartActivity" />
<activity android:name=".SplashScreen"> <activity android:name=".SplashScreen">
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
</activity> </activity>
<activity android:name=".MainActivity"> <activity android:name=".MainActivity" android:theme="@style/AppTheme.appbar">
</activity> </activity>
......
...@@ -11,18 +11,10 @@ import android.view.WindowManager; ...@@ -11,18 +11,10 @@ import android.view.WindowManager;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar; import androidx.appcompat.widget.Toolbar;
import androidx.core.content.ContextCompat; import androidx.core.content.ContextCompat;
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProviders; import androidx.lifecycle.ViewModelProviders;
import com.google.android.material.appbar.MaterialToolbar; import com.google.android.material.appbar.MaterialToolbar;
import com.google.gson.Gson;
import com.yono.messeripos.models.CategoryModels;
import com.yono.messeripos.models.MainViewModels; import com.yono.messeripos.models.MainViewModels;
import com.yono.messeripos.models.ProductModels;
import com.yono.messeripos.response.DataResponse;
import java.util.ArrayList;
public class MainActivity extends AppCompatActivity { public class MainActivity extends AppCompatActivity {
MaterialToolbar toolbar; MaterialToolbar toolbar;
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
tools:context=".MainActivity"> tools:context=".MainActivity">
<include <include
android:id="@+id/topAppBar" android:id="@+id/topBar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
layout="@layout/appbar_dashboard"> layout="@layout/appbar_dashboard">
...@@ -15,10 +15,10 @@ ...@@ -15,10 +15,10 @@
<include <include
android:id="@+id/category" android:id="@+id/category"
android:layout_marginTop="10dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@+id/topAppBar" app:layout_constraintTop_toBottomOf="@+id/topBar"
layout="@layout/item_category"/> layout="@layout/item_category"/>
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<com.google.android.material.appbar.MaterialToolbar android:id="@+id/topAppBar"
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:elevation="0dp" xmlns:app="http://schemas.android.com/apk/res-auto"
style="@style/Widget.MaterialComponents.Toolbar.Primary" android:paddingStart="15dp"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android">
app:menu="@menu/home"
app:navigationIcon="@drawable/ic_meser"
xmlns:app="http://schemas.android.com/apk/res-auto">
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/tilSearch" android:id="@+id/topAppBar"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
app:menu="@menu/home"
android:elevation="0dp"
app:navigationIcon="@drawable/ic_meser"
android:layout_marginTop="30dp"
style="@style/Widget.MaterialComponents.Toolbar.Primary"
>
<com.google.android.material.textfield.TextInputEditText <EditText
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:drawableStart="@drawable/ic_baseline_search_24"
android:hint="Search"
android:imeOptions="actionSearch"
android:textColor="#fff" android:textColor="#fff"
android:hint="Search"
android:paddingStart="10dp"
android:textColorHint="#fff"
android:outlineSpotShadowColor="#fff"
android:textColorHighlight="#fff" android:textColorHighlight="#fff"
android:textColorHint="#fff" /> android:drawableStart="@drawable/ic_baseline_search_24"/>
</com.google.android.material.textfield.TextInputLayout>
</com.google.android.material.appbar.MaterialToolbar>
</com.google.android.material.appbar.AppBarLayout>
</com.google.android.material.appbar.MaterialToolbar>
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
android:gravity="end" android:gravity="end"
android:paddingStart="@dimen/material_emphasis_medium" android:paddingStart="@dimen/material_emphasis_medium"
android:paddingEnd="@dimen/material_emphasis_disabled" android:paddingEnd="@dimen/material_emphasis_disabled"
android:textColor="@drawable/ic_launcher_background" android:textColor="@color/colorPrimary"
android:textSize="12sp" /> android:textSize="12sp" />
<com.google.android.material.textview.MaterialTextView <com.google.android.material.textview.MaterialTextView
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment