This commit is contained in:
2024-07-31 20:38:44 +09:00
parent ae743bf784
commit 4c620872af
25 changed files with 1230 additions and 875 deletions
+21 -15
View File
@@ -10,6 +10,7 @@
<WebView
android:id="@+id/menu_web"
android:layout_margin="20dp"
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintLeft_toLeftOf="parent"
@@ -18,17 +19,7 @@
app:layout_constraintTop_toBottomOf="@id/textview_title" />
<com.mime.dualscreenview.view.PagedTextLayout
android:id="@+id/paged_layer"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:visibility="invisible"
android:background="@color/black"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintBottom_toTopOf="@id/btn_setting"
app:layout_constraintTop_toBottomOf="@id/textview_title" />
<ImageButton
android:id="@+id/btn_home"
@@ -49,7 +40,7 @@
android:layout_width="0dp"
android:layout_height="@dimen/main_top_height"
android:text="@string/app_name"
android:background="#8FFF"
android:background="@color/black"
android:gravity="center"
android:textSize="24sp"
app:layout_constraintRight_toLeftOf="@id/btn_list"
@@ -104,7 +95,7 @@
android:tag="1"
android:text="@string/display_the_second_screen"
android:visibility="visible"
android:background="#8FFF"
android:background="@color/black"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintHorizontal_chainStyle="spread"
@@ -114,7 +105,7 @@
android:id="@+id/btn_setting"
android:layout_width="0dp"
android:layout_height="@dimen/main_top_height"
android:background="#8FFF"
android:background="@color/black"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@+id/btn_left"
app:layout_constraintRight_toLeftOf="@+id/btn_right"
@@ -128,12 +119,27 @@
android:layout_marginStart="16dp"
android:tag="0"
android:text="@string/display_the_second_screen"
android:background="#8FFF"
android:background="@color/black"
android:visibility="visible"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintHorizontal_chainStyle="spread" />
<com.mime.dualscreenview.view.PagedTextLayout
android:id="@+id/paged_layer"
android:layout_margin="1dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:visibility="invisible"
android:background="@color/black"
android:elevation="5dp"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintBottom_toTopOf="@id/btn_setting"
app:layout_constraintTop_toBottomOf="@id/textview_title" />
<ProgressBar
android:id="@+id/progress"
android:layout_width="0dp"
+60 -43
View File
@@ -1,52 +1,69 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="@dimen/main_top_height"
android:paddingBottom="@dimen/main_top_height"
android:layout_margin="0dp"
android:layout_margin="5dp"
xmlns:app="http://schemas.android.com/apk/res-auto">
<androidx.constraintlayout.widget.Guideline
android:id="@+id/center_guide"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.5"
android:layout_width="0dp"
android:layout_height="0dp"/>
<LinearLayout
android:layout_margin="8dp"
android:layout_alignParentStart="true"
android:layout_alignParentEnd="true"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.mime.dualscreenview.view.PagedTextView
android:layout_margin="5dp"
android:padding="2dp"
android:id="@+id/hidden_view"
android:visibility="visible"
android:layout_width="0dp"
android:layout_weight="1"
android:includeFontPadding="false"
android:lineSpacingExtra="0dp"
style="@style/sss"
android:layout_height="match_parent"/>
<View
android:id="@+id/demp"
android:layout_margin="5dp"
android:padding="2dp"
android:layout_weight="1"
android:layout_width="0dp"
android:layout_height="match_parent"/>
</LinearLayout>
<com.mime.dualscreenview.view.PagedTextView
android:padding="@dimen/textview_padding"
android:id="@+id/hidden_view"
android:visibility="invisible"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@id/sencond_view"
android:layout_width="0dp"
style="@style/sss"
android:layout_height="match_parent"/>
<LinearLayout
android:layout_margin="5dp"
android:layout_alignParentStart="true"
android:layout_alignParentEnd="true"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.appcompat.widget.AppCompatTextView
android:layout_margin="5dp"
android:padding="2dp"
android:gravity="center"
android:includeFontPadding="false"
android:id="@+id/first_view"
android:lineSpacingExtra="0dp"
android:layout_width="0dp"
android:layout_weight="1"
style="@style/sss"
android:layout_height="match_parent"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/first_view"
android:padding="@dimen/textview_padding"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toLeftOf="@id/sencond_view"
android:layout_width="0dp"
style="@style/sss"
android:layout_height="match_parent"/>
<androidx.appcompat.widget.AppCompatTextView
android:layout_margin="5dp"
android:padding="2dp"
android:includeFontPadding="false"
android:lineSpacingExtra="0dp"
android:visibility="visible"
android:id="@+id/sencond_view"
android:layout_width="0dp"
android:layout_weight="1"
style="@style/sss"
android:layout_height="match_parent"/>
<androidx.appcompat.widget.AppCompatTextView
android:padding="@dimen/textview_padding"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:visibility="visible"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="@id/center_guide"
android:id="@+id/sencond_view"
android:layout_width="0dp"
style="@style/sss"
android:layout_height="match_parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
</RelativeLayout>
+49 -49
View File
@@ -3,53 +3,53 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto">
<androidx.constraintlayout.widget.Guideline
android:id="@+id/vertical_guide"
android:orientation="horizontal"
app:layout_constraintGuide_percent="0.5"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<androidx.appcompat.widget.AppCompatTextView
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:id="@+id/preview"
android:text="@string/preview_text"
android:layout_width="0dp"
android:layout_height="0dp"/>
<ScrollView
android:id="@+id/config_setting"
android:background="#99444444"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="@id/vertical_guide"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_width="0dp"
android:layout_height="0dp">
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<include layout="@layout/item_setting_title"/>
<com.mime.dualscreenview.view.StepsEditor
android:id="@+id/text_size"
style="@style/StepsEditorStyle" />
<com.mime.dualscreenview.view.StepsEditor
android:id="@+id/letter_space"
style="@style/StepsEditorStyle" />
<com.mime.dualscreenview.view.StepsEditor
android:id="@+id/line_space"
style="@style/StepsEditorStyle" />
<com.mime.dualscreenview.view.StepsEditor
android:id="@+id/page_padding"
style="@style/StepsEditorStyle" />
<com.mime.dualscreenview.view.ScopeEditor
android:id="@+id/page_typesface"
style="@style/StepsEditorStyle" />
<com.mime.dualscreenview.view.ScopeEditor
android:id="@+id/page_style"
style="@style/StepsEditorStyle" />
</LinearLayout>
</ScrollView>
<!-- <androidx.constraintlayout.widget.Guideline-->
<!-- android:id="@+id/vertical_guide"-->
<!-- android:orientation="horizontal"-->
<!-- app:layout_constraintGuide_percent="0.5"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"/>-->
<!-- <androidx.appcompat.widget.AppCompatTextView-->
<!-- app:layout_constraintLeft_toLeftOf="parent"-->
<!-- app:layout_constraintRight_toRightOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- android:id="@+id/preview"-->
<!-- android:text="@string/preview_text"-->
<!-- android:layout_width="0dp"-->
<!-- android:layout_height="0dp"/>-->
<!-- <ScrollView-->
<!-- android:id="@+id/config_setting"-->
<!-- android:background="#99444444"-->
<!-- app:layout_constraintLeft_toLeftOf="parent"-->
<!-- app:layout_constraintRight_toRightOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="@id/vertical_guide"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- android:layout_width="0dp"-->
<!-- android:layout_height="0dp">-->
<!-- <LinearLayout-->
<!-- android:orientation="vertical"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content">-->
<!-- <include layout="@layout/item_setting_title"/>-->
<!-- <com.mime.dualscreenview.view.StepsEditor-->
<!-- android:id="@+id/text_size"-->
<!-- style="@style/StepsEditorStyle" />-->
<!-- <com.mime.dualscreenview.view.StepsEditor-->
<!-- android:id="@+id/letter_space"-->
<!-- style="@style/StepsEditorStyle" />-->
<!-- <com.mime.dualscreenview.view.StepsEditor-->
<!-- android:id="@+id/line_space"-->
<!-- style="@style/StepsEditorStyle" />-->
<!-- <com.mime.dualscreenview.view.StepsEditor-->
<!-- android:id="@+id/page_padding"-->
<!-- style="@style/StepsEditorStyle" />-->
<!-- <com.mime.dualscreenview.view.ScopeEditor-->
<!-- android:id="@+id/page_typesface"-->
<!-- style="@style/StepsEditorStyle" />-->
<!-- <com.mime.dualscreenview.view.ScopeEditor-->
<!-- android:id="@+id/page_style"-->
<!-- style="@style/StepsEditorStyle" />-->
<!-- </LinearLayout>-->
<!-- </ScrollView>-->
</androidx.constraintlayout.widget.ConstraintLayout>
+2 -2
View File
@@ -2,8 +2,8 @@
<!-- Base application theme. -->
<style name="Theme.DualScreenView" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
<!-- Primary brand color. -->
<item name="colorPrimary">@color/purple_200</item>
<item name="colorPrimaryVariant">@color/purple_700</item>
<item name="colorPrimary">@color/black</item>
<item name="colorPrimaryVariant">@color/black</item>
<item name="colorOnPrimary">@color/black</item>
<!-- Secondary brand color. -->
<item name="colorSecondary">@color/teal_200</item>
+3 -1
View File
@@ -1,11 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<resources xmlns:tools="http://schemas.android.com/tools">
<style name="sss">
<item name="android:statusBarColor" tools:targetApi="l">@color/black</item>
<item name="android:fontFamily">@font/kcc_sonkeechung</item>
<item name="android:textSize">14dp</item>
<item name="android:textAlignment">textStart</item>
</style>
<style name="StepsEditorStyle">
<item name="android:statusBarColor" tools:targetApi="l">@color/black</item>
<item name="android:layout_width">match_parent</item>>
<item name="android:layout_height">@dimen/setting_item_height</item>>
</style>
+4 -4
View File
@@ -2,15 +2,15 @@
<!-- Base application theme. -->
<style name="Theme.DualScreenView" parent="Theme.MaterialComponents.NoActionBar">
<!-- Primary brand color. -->
<item name="colorPrimary">@color/purple_500</item>
<item name="colorPrimaryVariant">@color/purple_700</item>
<item name="colorOnSecondary">@color/black</item>
<item name="colorPrimary">@color/black</item>
<item name="colorPrimaryVariant">@color/black</item>
<item name="colorOnPrimary">@color/white</item>
<!-- Secondary brand color. -->
<item name="colorSecondary">@color/teal_200</item>
<item name="colorSecondaryVariant">@color/teal_700</item>
<item name="colorOnSecondary">@color/black</item>
<!-- Status bar color. -->
<item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
<item name="android:statusBarColor">?attr/colorOnSecondary</item>
<!-- Customize your theme here. -->
<item name="windowNoTitle">true</item>
<item name="windowActionBar">false</item>