OSDN > Pesquisar Software > GOKIGEN > SCM > git > Gr2Control > Commit

GOKIGEN
Fork
LegacyGpsAdapter
A01c
BondImage
A01d
GokigenClock
GokigenAlignmentChecker
JoggingTimer
PKRemote
GokigenDiary
TestSampleApp
TheWarikan
MeMoMa
Gr2Control
FujiCam
GokigenCameraControlLibrary
BLEControl
mangle
ThetaThoughtShutter
ThetaView
mCalendar
A01f
prpr1
TransportHub

Gr2Control: Commit

Ricoh GR2 Control App for Android.

バージョン番号を更新。

--- a/app/build.gradle

+++ b/app/build.gradle

		@@ -6,8 +6,8 @@ android {
6	6	applicationId "net.osdn.gokigen.gr2control"
7	7	minSdkVersion 14
8	8	targetSdkVersion 28
9		- versionCode 1002000
10		- versionName "1.2.0"
	9	+ versionCode 1002001
	10	+ versionName "1.2.1"
11	11	}
12	12	buildTypes {
13	13	release {

--- a/app/src/main/res/layout-land/fragment_image_grid_view.xml

+++ b/app/src/main/res/layout-land/fragment_image_grid_view.xml

		@@ -5,7 +5,47 @@
5	5	android:layout_height="wrap_content"
6	6	android:orientation="vertical"
7	7	tools:ignore="HardcodedText" >
	8	+<!--
	9	+ <LinearLayout
	10	+ android:layout_width="wrap_content"
	11	+ android:layout_height="wrap_content"
	12	+ android:orientation="horizontal">
	13	+
	14	+ <RadioGroup
	15	+ android:id="@+id/radio_group_select_category"
	16	+ android:layout_width="wrap_content"
	17	+ android:layout_height="match_parent"
	18	+ android:layout_gravity="end"
	19	+ android:orientation="horizontal">
	20	+ <RadioButton
	21	+ android:id="@+id/radio_date"
	22	+ android:layout_width="wrap_content"
	23	+ android:layout_height="match_parent"
	24	+ android:text="@string/select_radio_date"
	25	+ android:checked="true"
	26	+ android:padding="2dp"
	27	+ android:textSize="9pt"
	28	+ />
	29	+ <RadioButton android:id="@+id/radio_path"
	30	+ android:layout_width="wrap_content"
	31	+ android:layout_height="match_parent"
	32	+ android:text="@string/select_radio_path"
	33	+ android:checked="false"
	34	+ android:padding="2dp"
	35	+ android:textSize="9pt"
	36	+ />
	37	+ </RadioGroup>
8	38
	39	+ <Spinner
	40	+ android:id="@+id/category_spinner"
	41	+ android:layout_gravity="start"
	42	+ android:layout_width="match_parent"
	43	+ android:layout_height="match_parent"
	44	+ android:padding="2dp"
	45	+ android:textSize="9pt"
	46	+ />
	47	+ </LinearLayout>
	48	+-->
9	49	<GridView
10	50	android:id="@+id/gridView1"
11	51	android:layout_width="match_parent"

--- a/app/src/main/res/layout/fragment_image_grid_view.xml

+++ b/app/src/main/res/layout/fragment_image_grid_view.xml

		@@ -5,7 +5,47 @@
5	5	android:layout_height="wrap_content"
6	6	android:orientation="vertical"
7	7	tools:ignore="HardcodedText" >
	8	+<!--
	9	+ <LinearLayout
	10	+ android:layout_width="wrap_content"
	11	+ android:layout_height="wrap_content"
	12	+ android:orientation="horizontal">
	13	+
	14	+ <RadioGroup
	15	+ android:id="@+id/radio_group_select_category"
	16	+ android:layout_width="wrap_content"
	17	+ android:layout_height="match_parent"
	18	+ android:layout_gravity="end"
	19	+ android:orientation="horizontal">
	20	+ <RadioButton
	21	+ android:id="@+id/radio_date"
	22	+ android:layout_width="wrap_content"
	23	+ android:layout_height="match_parent"
	24	+ android:text="@string/select_radio_date"
	25	+ android:checked="true"
	26	+ android:padding="2dp"
	27	+ android:textSize="9pt"
	28	+ />
	29	+ <RadioButton android:id="@+id/radio_path"
	30	+ android:layout_width="wrap_content"
	31	+ android:layout_height="match_parent"
	32	+ android:text="@string/select_radio_path"
	33	+ android:checked="false"
	34	+ android:padding="2dp"
	35	+ android:textSize="9pt"
	36	+ />
	37	+ </RadioGroup>
8	38
	39	+ <Spinner
	40	+ android:id="@+id/category_spinner"
	41	+ android:layout_gravity="start"
	42	+ android:layout_width="match_parent"
	43	+ android:layout_height="match_parent"
	44	+ android:padding="2dp"
	45	+ android:textSize="9pt"
	46	+ />
	47	+ </LinearLayout>
	48	+-->
9	49	<GridView
10	50	android:id="@+id/gridView1"
11	51	android:layout_width="match_parent"

--- a/app/src/main/res/values-ja/strings.xml

+++ b/app/src/main/res/values-ja/strings.xml

		@@ -120,4 +120,7 @@
120	120	<string name="summary_use_gr2_special_command">制御指示の一部にGR2用コマンドを使用します。</string>
121	121	<string name="dialog_confirm_title_output_log">ログの共有</string>
122	122	<string name="dialog_confirm_message_output_log">デバッグログを共有します。</string>
	123	+
	124	+ <string name="select_radio_date">日付</string>
	125	+ <string name="select_radio_path">パス</string>
123	126	</resources>

--- a/app/src/main/res/values/strings.xml

+++ b/app/src/main/res/values/strings.xml

		@@ -156,4 +156,6 @@
156	156	<string name="dialog_confirm_title_output_log">Share debug log</string>
157	157	<string name="dialog_confirm_message_output_log">Share the debug log, OK?</string>
158	158
	159	+ <string name="select_radio_date">Date</string>
	160	+ <string name="select_radio_path">Path</string>
159	161	</resources>

--- a/build.gradle

+++ b/build.gradle

		@@ -7,7 +7,7 @@ buildscript {
7	7	jcenter()
8	8	}
9	9	dependencies {
10		- classpath 'com.android.tools.build:gradle:3.3.2'
	10	+ classpath 'com.android.tools.build:gradle:3.4.0'
11	11
12	12
13	13	// NOTE: Do not place your application dependencies here; they belong